sequel-rails 1.0.1 → 1.2.0

data/spec/lib/generators/sequel/migration_spec.rb

@@ -21,7 +21,7 @@ describe Sequel::Generators::MigrationGenerator do
   it 'refuses to generate migration with invalid filename' do
     expect do
       run_generator ['add_something:datetime']
-    end.to raise_error
+    end.to raise_error(Sequel::IllegalMigrationNameError)
   end
 
   context 'when name starts with create' do
@@ -251,5 +251,13 @@ describe Sequel::Generators::MigrationGenerator do
         }
       end
     end
+
+    context 'when invalid migration name' do
+      it 'raises error' do
+        expect { run_generator ['invalid:file:name'] }
+          .to raise_error(Sequel::IllegalMigrationNameError)
+          .with_message("Illegal name for migration file: invalid:file:name (only lower case letters, numbers, and '_' allowed)")
+      end
+    end
   end
 end

data/spec/lib/generators/sequel/session_migration_spec.rb

@@ -11,7 +11,7 @@ describe Sequel::Generators::SessionMigrationGenerator do
   it 'refuses to generate migration with invalid filename' do
     expect do
       run_generator ['add:sessions']
-    end.to raise_error
+    end.to raise_error(Sequel::IllegalMigrationNameError)
   end
 
   it 'creates a new migration for sessions table' do

data/spec/lib/sequel_rails/configuration_spec.rb

@@ -96,24 +96,50 @@ describe SequelRails::Configuration do
     end
   end
 
+  describe '#test_connect' do
+    it 'defaults to true' do
+      expect(subject.test_connect).to be true
+    end
+
+    it 'can be assigned' do
+      subject.test_connect = true
+      expect(subject.test_connect).to be true
+    end
+
+    it 'can be set from merging another hash' do
+      subject.merge!(:test_connect => true)
+      expect(subject.test_connect).to be true
+    end
+  end
+
   describe '#connect' do
+    let(:adapter) { ENV['TEST_ADAPTER'] || 'postgres' }
     let(:environments) do
       {
         'development' => {
-          'adapter' => 'postgres',
+          'adapter' => adapter,
           'owner' => (ENV['TEST_OWNER'] || ENV['USER']),
-          'username' => (ENV['TEST_OWNER'] || ENV['USER']),
+          'username' => (ENV['TEST_USERNAME'] || ENV['TEST_OWNER'] || ENV['USER']),
           'database' => 'sequel_rails_test_storage_dev',
-          'host' => '127.0.0.1',
+          'password' => ENV['TEST_PASSWORD'],
+          'host' => ENV['TEST_DATABASE_HOST'],
+          'port' => ENV['TEST_DATABASE_PORT'],
         },
         'test' => {
-          'adapter' => 'postgres',
+          'adapter' => adapter,
           'owner' => (ENV['TEST_OWNER'] || ENV['USER']),
-          'username' => (ENV['TEST_OWNER'] || ENV['USER']),
+          'username' => (ENV['TEST_USERNAME'] || ENV['TEST_OWNER'] || ENV['USER']),
           'database' => 'sequel_rails_test_storage_test',
-          'host' => '127.0.0.1',
+          'password' => ENV['TEST_PASSWORD'],
+          'host' => ENV['TEST_DATABASE_HOST'],
+          'port' => ENV['TEST_DATABASE_PORT'],
+        },
+        'remote_pg' => {
+          'adapter' => 'postgres',
+          'host' => '10.0.0.1',
+          'database' => 'sequel_rails_test_storage_dev',
         },
-        'remote' => {
+        'remote_mysql' => {
           'adapter' => 'mysql',
           'host' => '10.0.0.1',
           'database' => 'sequel_rails_test_storage_remote',
@@ -135,6 +161,22 @@ describe SequelRails::Configuration do
     context 'when stubbing SequelRails.jruby?' do
       before { allow(SequelRails).to receive(:jruby?).and_return(is_jruby) }
 
+      shared_examples 'test_connect' do
+        context 'test_connect' do
+          it 'passes the value' do
+            expect(::Sequel).to receive(:connect) do |hash_or_url, *_|
+              if hash_or_url.is_a? Hash
+                expect(hash_or_url[:test]).to eq true
+              else
+                expect(hash_or_url).to include('test=true')
+              end
+            end
+
+            subject.connect environment
+          end
+        end
+      end
+
       shared_examples 'max_connections' do
         context 'with max_connections=7 config option' do
           let(:max_connections) { 31_337 }
@@ -172,6 +214,44 @@ describe SequelRails::Configuration do
         end
       end
 
+      shared_examples 'servers' do
+        context 'servers' do
+          let(:servers) { { read_only: { host: 'replica' } } }
+
+          shared_examples 'passes the value only through options hash' do
+            it 'passes the value only through options hash' do
+              expect(::Sequel).to receive(:connect) do |hash_or_url, *_|
+                if hash_or_url.is_a? Hash
+                  servers.keys.each do |k|
+                    expect(hash_or_url[:servers][k]).to eq servers[k]
+                  end
+                else
+                  puts hash_or_url
+                  expect(hash_or_url).not_to include('servers=')
+                end
+              end
+              subject.connect environment
+            end
+          end
+
+          context 'with servers set in config' do
+            before do
+              subject.servers = servers
+            end
+
+            include_examples 'passes the value only through options hash'
+          end
+
+          context 'with servers set in environment' do
+            before do
+              environments[environment]['servers'] = servers
+            end
+
+            include_examples 'passes the value only through options hash'
+          end
+        end
+      end
+
       shared_examples 'with DATABASE_URL in ENV' do
         let(:database_url) { 'adapter://user:pass@host/db' }
         def with_database_url_env
@@ -245,11 +325,13 @@ describe SequelRails::Configuration do
           end
         end
 
-        let(:environment) { 'development' }
+        let(:environment) { 'remote_pg' }
 
         context 'in C-Ruby' do
+          include_examples 'test_connect'
           include_examples 'max_connections'
           include_examples 'search_path'
+          include_examples 'servers'
           include_examples 'with DATABASE_URL in ENV'
 
           let(:is_jruby) { false }
@@ -263,8 +345,10 @@ describe SequelRails::Configuration do
         end
 
         context 'in JRuby' do
+          include_examples 'test_connect'
           include_examples 'max_connections'
           include_examples 'search_path'
+          include_examples 'servers'
           include_examples 'with DATABASE_URL in ENV'
 
           let(:is_jruby) { true }
@@ -273,7 +357,7 @@ describe SequelRails::Configuration do
             expect(::Sequel).to receive(:connect) do |url, hash|
               expect(url).to start_with('jdbc:postgresql://')
               expect(hash[:adapter]).to eq('jdbc:postgresql')
-              expect(hash[:host]).to eq('127.0.0.1')
+              expect(hash[:host]).to eq('10.0.0.1')
             end
             subject.connect environment
           end
@@ -293,10 +377,12 @@ describe SequelRails::Configuration do
       end
 
       context 'for a mysql connection' do
-        let(:environment) { 'remote' }
+        let(:environment) { 'remote_mysql' }
 
         context 'in C-Ruby' do
+          include_examples 'test_connect'
           include_examples 'max_connections'
+          include_examples 'servers'
           include_examples 'with DATABASE_URL in ENV'
 
           let(:is_jruby) { false }
@@ -310,7 +396,9 @@ describe SequelRails::Configuration do
         end
 
         context 'in JRuby' do
+          include_examples 'test_connect'
           include_examples 'max_connections'
+          include_examples 'servers'
           include_examples 'with DATABASE_URL in ENV'
 
           let(:is_jruby) { true }
@@ -349,5 +437,16 @@ describe SequelRails::Configuration do
         subject.connect environment
       end
     end
+
+    describe 'after each connection hook' do
+      let(:environment) { 'development' }
+
+      it 'runs hook if provided' do
+        called = 0
+        subject.after_new_connection = ->(_conn){ called += 1 }
+        subject.connect environment
+        expect(called).to eq(1)
+      end
+    end
   end
 end

data/spec/lib/sequel_rails/migrations_spec.rb

@@ -8,23 +8,46 @@ describe SequelRails::Migrations do
     describe ".#{migration_method}" do
       let(:result) { double(:result) }
       context 'with no version specified' do
-        let(:opts) { {} }
         it 'runs migrations using Sequel::Migrator' do
           expect(::Sequel::Migrator).to receive(:run).with(
-            db, Rails.root.join('db/migrate'), opts
+            db,
+            Rails.root.join('db/migrate'),
+            { :allow_missing_migration_files => false }
           ).and_return result
           expect(described_class.send(migration_method)).to be(result)
         end
       end
       context 'with version specified' do
-        let(:opts) { { :target => 1 } }
         it 'runs migrations using Sequel::Migrator' do
           expect(::Sequel::Migrator).to receive(:run).with(
-            db, Rails.root.join('db/migrate'), opts
+            db,
+            Rails.root.join('db/migrate'),
+            { :allow_missing_migration_files => false, :target => 1 }
           ).and_return result
           expect(described_class.send(migration_method, 1)).to be(result)
         end
       end
+
+      context 'with allow_missing_migration_files' do
+        around do |ex|
+          option = SequelRails.configuration.allow_missing_migration_files
+          SequelRails.configuration.allow_missing_migration_files = true
+
+          ex.run
+
+          SequelRails.configuration.allow_missing_migration_files = option
+        end
+
+        it 'runs migrations using Sequel::Migrator' do
+          expect(::Sequel::Migrator).to receive(:run).with(
+            db,
+            Rails.root.join('db/migrate'),
+            { :allow_missing_migration_files => true }
+          ).and_return result
+
+          described_class.send(migration_method)
+        end
+      end
     end
   end
 

data/spec/lib/sequel_rails/railtie_spec.rb

@@ -93,8 +93,12 @@ describe SequelRails::Railtie do
 
     context 'and DATABASE_URL is defined' do
       let :database_url do
-        cfg = Combustion::Application.config.database_configuration['test']
-        SequelRails::DbConfig.new(cfg).url
+        if ENV['TEST_ADAPTER']=~/sqlite/
+          'sqlite:/' # in-memory db
+        else
+          cfg = Combustion::Application.config.database_configuration['test']
+          SequelRails::DbConfig.new(cfg).url
+        end
       end
 
       around do |ex|
@@ -123,7 +127,7 @@ describe SequelRails::Railtie do
       it 'initializing the application fails' do
         expect do
           configure_sequel!
-        end.to raise_error
+        end.to raise_error RuntimeError, "Database not configured.\nPlease create config/database.yml or set DATABASE_URL in environment."
       end
     end
   end

data/spec/lib/sequel_rails/railties/database_rake_spec.rb

@@ -99,4 +99,46 @@ describe 'Database rake tasks', :no_transaction => true do
       end
     end
   end
+
+  describe 'db:sessions:clear' do
+    let(:sessions) { Sequel::Model.db.from(:sessions) }
+
+    after { sessions.delete }
+
+    it 'truncates sessions table' do
+      sessions.insert session_id: 'foo', data: ''
+      sessions.insert session_id: 'bar', data: ''
+
+      Dir.chdir app_root do
+        expect { `rake db:sessions:clear` }.to change { sessions.count }.by(-2)
+      end
+    end
+  end
+
+  describe 'db:sessions:trim' do
+    let(:sessions) { Sequel::Model.db.from(:sessions) }
+
+    before do
+      sessions.insert session_id: 'foo', data: '', updated_at: (Date.today - 60).to_time
+      sessions.insert session_id: 'bar', data: '', updated_at: Date.today.to_time
+    end
+
+    after { sessions.delete }
+
+    it 'delete sessions before cutoff' do
+      Dir.chdir app_root do
+        expect { `rake db:sessions:trim` }.to change { sessions.count }.by(-1)
+      end
+    end
+
+    context 'with threshold' do
+      it 'delete sessions before cutoff' do
+        sessions.insert session_id: 'baz', data: '', updated_at: (Date.today - 44).to_time
+
+        Dir.chdir app_root do
+          expect { `rake db:sessions:trim[45]` }.to change { sessions.count }.by(-1)
+        end
+      end
+    end
+  end
 end

data/spec/lib/sequel_rails/storage/mysql_spec.rb

@@ -46,7 +46,7 @@ describe SequelRails::Storage::Mysql, :mysql do
     let(:dump_file_name) { 'dump.sql' }
     it 'uses the mysqldump command' do
       expect(subject).to receive(:`).with(
-        "mysqldump --user\\=#{username} --password\\=#{password} --host\\=#{host} --port\\=#{port} --no-data --result-file\\=#{dump_file_name} #{database}"
+        "mysqldump --user\\=#{username} --password\\=#{password} --host\\=#{host} --port\\=#{port} --no-data --skip-dump-date --result-file\\=#{dump_file_name} #{database}"
       )
       subject._dump dump_file_name
     end

data/spec/lib/sequel_rails/storage/postgres_spec.rb

@@ -83,6 +83,17 @@ describe SequelRails::Storage::Postgres, :postgres do
     end
   end
 
+  describe '#drop' do
+    before do
+      stub_const('Sequel::DATABASES', [])
+    end
+
+    it 'properly executes without active sequel connections' do
+      expect(Sequel::Model).not_to receive(:db)
+      subject.drop
+    end
+  end
+
   describe '#_dump' do
     let(:dump_file_name) { 'dump.sql' }
     it 'uses the pg_dump command' do

data/spec/lib/sequel_rails/storage/sqlite_spec.rb

@@ -17,7 +17,10 @@ describe SequelRails::Storage::Sqlite, :sqlite do
       it 'defer to Sequel' do
         path = double(:path)
         allow(subject).to receive(:path).and_return path
-        expect(::Sequel).to receive(:connect).with('adapter' => 'sqlite3', 'database' => path)
+        expect(::Sequel).to receive(:connect).with({
+          'adapter' => 'sqlite3',
+          'database' => path
+        })
         subject._create
       end
     end

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ require 'ammeter/init'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 rspec_exclusions = {}
-rspec_exclusions[:skip_jdbc] = SequelRails.jruby?
+rspec_exclusions[:skip_jdbc] = !SequelRails.jruby?
 rspec_exclusions[:postgres] = ENV['TEST_ADAPTER'] != 'postgresql'
 rspec_exclusions[:mysql] = !%w(mysql mysql2).include?(ENV['TEST_ADAPTER'])
 rspec_exclusions[:sqlite] = ENV['TEST_ADAPTER'] != 'sqlite3'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Brasten Sager (brasten)
 - Jonathan TRON
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2022-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -77,16 +77,16 @@ dependencies:
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
@@ -107,76 +107,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 1.27.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 1.27.0
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +185,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.13.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.13.4
 description: Integrate Sequel with Rails (3.x and 4.x)
 email:
 - brasten@gmail.com
@@ -201,20 +209,20 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".rubocop_todo.yml"
 - Gemfile
 - History.md
 - LICENSE
 - README.md
 - Rakefile
-- ci/rails-4.0.gemfile
-- ci/rails-4.1.gemfile
-- ci/rails-4.2.gemfile
-- ci/rails-5.0.gemfile
-- ci/rails-5.1.gemfile
+- ci/rails-5.2.gemfile
+- ci/rails-6.0.gemfile
+- ci/rails-6.1.gemfile
+- ci/rails-7.0.gemfile
 - config.ru
 - lib/action_dispatch/middleware/session/sequel_store.rb
 - lib/generators/sequel.rb
@@ -238,7 +246,6 @@ files:
 - lib/sequel_rails/railties/i18n_support.rb
 - lib/sequel_rails/railties/legacy_model_config.rb
 - lib/sequel_rails/railties/log_subscriber.rb
-- lib/sequel_rails/railties/spring_support.rb
 - lib/sequel_rails/sequel/database/active_support_notification.rb
 - lib/sequel_rails/sequel/plugins/rails_extensions.rb
 - lib/sequel_rails/shellwords.rb
@@ -250,7 +257,6 @@ files:
 - lib/sequel_rails/storage/postgres.rb
 - lib/sequel_rails/storage/sqlite.rb
 - lib/sequel_rails/version.rb
-- rubocop-todo.yml
 - sequel-rails.gemspec
 - spec/helpers/io.rb
 - spec/integration/sessions_controller_spec.rb
@@ -282,7 +288,7 @@ homepage: http://talentbox.github.io/sequel-rails/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -298,9 +304,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Use Sequel with Rails (3.x and 4.x)
 test_files:

data/.travis.yml

@@ -1,37 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-rvm:
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
-  - jruby-9.1.16.0
-before_script:
-  - mysql -e 'create database sequel_rails_test;'
-  - mysql -e 'create database sequel_rails_test_mysql2;'
-  - mysql -e 'create database sequel_rails_test_storage_dev;'
-  - psql  -c 'create database sequel_rails_test_storage_dev;' -U postgres
-  - psql  -c 'create database sequel_rails_test;' -U postgres
-env:
-  - SEQUEL='~> 4.0'
-  - SEQUEL='~> 5.0'
-gemfile:
-  - ci/rails-4.0.gemfile
-  - ci/rails-4.1.gemfile
-  - ci/rails-4.2.gemfile
-  - ci/rails-5.0.gemfile
-  - ci/rails-5.1.gemfile
-matrix:
-  exclude:
-    - rvm: 2.4.3
-      gemfile: ci/rails-4.0.gemfile
-    - rvm: 2.4.3
-      gemfile: ci/rails-4.1.gemfile
-    - rvm: 2.5.0
-      gemfile: ci/rails-4.0.gemfile
-    - rvm: 2.5.0
-      gemfile: ci/rails-4.1.gemfile
-notifications:
-  email:
-    - jonathan.tron@metrilio.com