Merge pull request #10 from jeremiahlukus/master

update ruby version, sqlite version, and fix tests

Author: jantmanAtCox

.github/workflows/test.yml

@@ -0,0 +1,39 @@
+name: Test
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['3.3', 'jruby-9.4']
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+
+    - name: Update RubyGems
+      run: gem update --system
+
+    - name: Show versions
+      run: |
+        gem --version
+        bundler --version
+        ruby --version
+
+    - name: Install dependencies
+      run: bundle install
+
+    - name: Run tests
+      run: bundle exec rspec

.ruby-version

@@ -1 +1 @@
-ruby-1.9.3
+3.3.0

.travis.yml

@@ -20,11 +20,11 @@ def self.get_vehicle(params)
       end
 
       def self.perform_joins(params)
-        params.keys.inject(from(:vehicles)) { |r, e| r.join("#{e}s".to_sym, :id => "vehicles__#{e}_id".to_sym) }
+        params.keys.inject(from(:vehicles)) { |r, e| r.join("#{e}s".to_sym, :id => Sequel.qualify(:vehicles, "#{e}_id".to_sym)) }
       end
 
       def self.add_conditions_to_join(join_query, params)
-        params.inject(join_query) { |r, e| r.where("#{e.first}s__name".to_sym => e.last) }
+        params.inject(join_query) { |r, e| r.where(Sequel.qualify("#{e.first}s".to_sym, :name) => e.last) }
       end
 
       def self.get_random_vehicle

Gemfile.jruby

@@ -1,6 +1,7 @@
 require 'securerandom'
 require 'sequel'
 require 'vin_bank'
+require 'vinbot/version'
 require 'vinbot/vehicle'
 require 'vinbot/vin'
 

lib/data/vehicle.rb

@@ -1,3 +1,3 @@
 module Vinbot
-  VERSION = "2.0.4"
+  VERSION = "3.0.0"
 end

lib/vinbot.rb

@@ -15,6 +15,8 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://github.com/manheim/vinbot"
   spec.license = "MIT"
 
+  spec.required_ruby_version = ">= 3.0.0"
+
   spec.files = Dir["lib/**/*"]
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

lib/vinbot/version.rb

@@ -14,6 +14,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/manheim/vinbot"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = ">= 3.0.0"
+
   spec.files         = Dir["lib/**/*"]
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -24,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-nav"
-  spec.add_runtime_dependency "sqlite3"
+  spec.add_runtime_dependency "sqlite3", "~> 2.7.3"
   spec.add_runtime_dependency "sequel"
   spec.add_runtime_dependency "vin_bank", ">= 3.1.0"
 end