sequel-rails 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 246de7c0ab5e5b678e5cc36cbd9e4b8244e1e508
-  data.tar.gz: 2a1e078efd0934a6c93ac02772c0fcef672fbf78
+SHA256:
+  metadata.gz: ba61c0752e0e4ebeea5a6c4b01f6cf85f94c0413866c43dad74af0cfa694950a
+  data.tar.gz: 30ea0b29dd1ffbe0438f1b2ed1626a176146348aa4c820de51b85335eec8d4f0
 SHA512:
-  metadata.gz: 8507eb62d41126c59d9cf089476d87cc3a6da8cb25c2794a47665a157274604f203b9c59542a8612cd5907fa77387c7555cd766bb38e7e0c2ea3d21b8b54bc6d
-  data.tar.gz: 59e78d025928669a0d92b5b4fa5bbd4f017e5ca5a1805a6459ebf7d3db30be31c0a459c0c23313c5e04325f660a8efd7efa536eb5d6fb000dc46f7d18a86bfcd
+  metadata.gz: 1455a020956c332f8d91d65fd11678ca3701ca404cfd32adc760e1f753ab531c5e29433d3a1189d12a07c76a779feea1935913e7cc65ef518b85caf210a01dc6
+  data.tar.gz: d8be6934a488b6a4aff2eb6ca6b6007833fc9614439809a8a20a691c398dbd79768f3eb62711ad50c41e427e3ecd41f4845ca546590389f0a2860a2ba41a76e4

data/.travis.yml

@@ -1,12 +1,15 @@
 language: ruby
 cache: bundler
-sudo: false
+services:
+  - mysql
+  - postgresql
 rvm:
   - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
-  - jruby-9.1.16.0
+  - 2.3.8
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
+  - jruby-9.2.8.0
 before_script:
   - mysql -e 'create database sequel_rails_test;'
   - mysql -e 'create database sequel_rails_test_mysql2;'
@@ -22,15 +25,30 @@ gemfile:
   - ci/rails-4.2.gemfile
   - ci/rails-5.0.gemfile
   - ci/rails-5.1.gemfile
+  - ci/rails-5.2.gemfile
 matrix:
   exclude:
-    - rvm: 2.4.3
+    - rvm: 2.4.9
       gemfile: ci/rails-4.0.gemfile
-    - rvm: 2.4.3
+    - rvm: 2.4.9
       gemfile: ci/rails-4.1.gemfile
-    - rvm: 2.5.0
+    - rvm: 2.5.7
       gemfile: ci/rails-4.0.gemfile
-    - rvm: 2.5.0
+    - rvm: 2.5.7
+      gemfile: ci/rails-4.1.gemfile
+    - rvm: 2.6.5
+      gemfile: ci/rails-4.0.gemfile
+    - rvm: 2.6.5
+      gemfile: ci/rails-4.1.gemfile
+    - rvm: 2.6.5
+      gemfile: ci/rails-4.2.gemfile
+    - rvm: 2.6.5
+      gemfile: ci/rails-5.0.gemfile
+    - rvm: 2.6.5
+      gemfile: ci/rails-5.1.gemfile
+    - rvm: jruby-9.2.8.0
+      gemfile: ci/rails-4.0.gemfile
+    - rvm: jruby-9.2.8.0
       gemfile: ci/rails-4.1.gemfile
 notifications:
   email:

data/History.md

@@ -1,3 +1,15 @@
+1.1.0 (2019-10-29)
+==================
+
+* Add test_connect option (p-leger)
+  [#165](https://github.com/TalentBox/sequel-rails/pull/165)
+* Silence logger for sessions store (Michael Coyne)
+  [#171](https://github.com/TalentBox/sequel-rails/pull/171)
+* Add db:sessions:clear and db:sessions:trim rake tasks (Michael Coyne)
+  [#170](https://github.com/TalentBox/sequel-rails/pull/170)
+* Allow 'servers' to propagate to Sequel connection (Dustin Byrne)
+  [#169](https://github.com/TalentBox/sequel-rails/pull/169)
+
 1.0.1 (2018-02-27)
 ==================
 

data/README.md

@@ -188,6 +188,10 @@ You can configure some options with the usual rails mechanism, in
     # This setting disabled the automatic connect after Rails init
     config.sequel.skip_connect = true
 
+    # Configure if Sequel should try to 'test' the database connection in order
+    # to fail early
+    config.sequel.test_connect = true
+
     # If you want to use a specific logger
     config.sequel.logger = MyLogger.new($stdout)
 ```
@@ -333,6 +337,8 @@ rake db:schema:load                   # Load a schema.rb file into the database
 rake db:seed                          # Load the seed data from db/seeds.rb
 rake db:setup                         # Create the database, load the schema, and initialize with the seed data
 rake db:test:prepare                  # Prepare test database (ensure all migrations ran, drop and re-create database then load schema). This task can be run in the same invocation as other task (eg: rake db:migrate db:test:prepare).
+rake db:sessions:clear                # Delete all sessions from the database
+rake db:sessions:trim[threshold]      # Delete all sessions older than `threshold` days (default to 30 days, eg: rake db:session:trim[10])
 ```
 
 Note on Patches/Pull Requests
@@ -403,6 +409,9 @@ Improvements have been made by those awesome contributors:
 * ckoenig (@ckoenig)
 * Rolf Timmermans (@rolftimmermans)
 * Olivier Lacan (@olivierlacan)
+* Dustin Byrne (@dsbyrne)
+* Michael Coyne (@mjc-gh)
+* p-leger (@p-leger)
 
 Credits
 =======

data/ci/rails-4.2.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'railties', '~> 4.2.10'
+gem 'railties', '~> 4.2.11'
 
 gemspec :path => '../'
 

data/ci/rails-5.0.gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'railties', '~> 5.0.6'
-gem 'activemodel', '~> 5.0.6'
+gem 'railties', '~> 5.0.7'
+gem 'activemodel', '~> 5.0.7'
 
 gemspec :path => '../'
 

data/ci/rails-5.1.gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'railties', '~> 5.1.4'
-gem 'activemodel', '~> 5.1.4'
-gem 'actionpack', '~> 5.1.4'
+gem 'railties', '~> 5.1.6'
+gem 'activemodel', '~> 5.1.6'
+gem 'actionpack', '~> 5.1.6'
 
 gemspec :path => '../'
 

data/ci/rails-5.2.gemfile

@@ -0,0 +1,28 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 5.2.2'
+gem 'activemodel', '~> 5.2.2'
+gem 'actionpack', '~> 5.2.2'
+
+gemspec :path => '../'
+
+gem 'sequel', "#{ENV['SEQUEL']}"
+
+gem 'fakefs', '0.11.2', :require => 'fakefs/safe'
+
+# MRI/Rubinius Adapter Dependencies
+platform :ruby do
+  gem 'pg'
+  if RUBY_VERSION < '2.4'
+    gem 'mysql'
+  end
+  gem 'mysql2'
+  gem 'sqlite3'
+end
+
+# JRuby Adapter Dependencies
+platform :jruby do
+  gem 'jdbc-sqlite3'
+  gem 'jdbc-mysql'
+  gem 'jdbc-postgres'
+end

data/lib/action_dispatch/middleware/session/sequel_store.rb

@@ -26,13 +26,17 @@ module ActionDispatch
       end
 
       def get_session(env, sid)
-        session = load_from_store(sid)
-        env[SESSION_RECORD_KEY] = session
-        [session.session_id, session.data]
+        with_silenced_logger do
+          session = load_from_store(sid)
+          env[SESSION_RECORD_KEY] = session
+          [session.session_id, session.data]
+        end
       end
 
       def write_session(req, sid, session_data, options)
-        set_session(req.env, sid, session_data, options)
+        with_silenced_logger do
+          set_session(req.env, sid, session_data, options)
+        end
       end
 
       def set_session(env, sid, session_data, options)
@@ -42,7 +46,9 @@ module ActionDispatch
       end
 
       def delete_session(req, sid, options)
-        destroy_session(req.env, sid, options)
+        with_silenced_logger do
+          destroy_session(req.env, sid, options)
+        end
       end
 
       def destroy_session(env, sid, options)
@@ -53,10 +59,12 @@ module ActionDispatch
       end
 
       def get_session_model(env, sid)
-        if env[ENV_SESSION_OPTIONS_KEY][:id].nil?
-          env[SESSION_RECORD_KEY] = load_from_store(sid)
-        else
-          env[SESSION_RECORD_KEY] ||= load_from_store(sid)
+        with_silenced_logger do
+          if env[ENV_SESSION_OPTIONS_KEY][:id].nil?
+            env[SESSION_RECORD_KEY] = load_from_store(sid)
+          else
+            env[SESSION_RECORD_KEY] ||= load_from_store(sid)
+          end
         end
       end
 
@@ -65,6 +73,10 @@ module ActionDispatch
         klass.where(:session_id => sid).first ||
           klass.new(:session_id => generate_sid, :data => {})
       end
+
+      def with_silenced_logger
+        Rails.application.config.sequel.logger.silence { yield }
+      end
     end
   end
 end

data/lib/generators/sequel/migration/migration_generator.rb

@@ -61,7 +61,7 @@ module Sequel
       end
 
       def validate_file_name!
-        raise IllegalMigrationNameError file_name unless file_name =~ /^[_a-z0-9]+$/
+        raise IllegalMigrationNameError.new(file_name) unless file_name =~ /^[_a-z0-9]+$/
       end
     end
   end

data/lib/generators/sequel/session_migration/session_migration_generator.rb

@@ -23,7 +23,7 @@ module Sequel
       end
 
       def validate_file_name!
-        raise IllegalMigrationNameError file_name unless file_name =~ /^[_a-z0-9]+$/
+        raise IllegalMigrationNameError, file_name unless file_name =~ /^[_a-z0-9]+$/
       end
     end
   end

data/lib/sequel_rails/configuration.rb

@@ -28,6 +28,7 @@ module SequelRails
       self.load_database_tasks = true
       self.after_connect = nil
       self.skip_connect = nil
+      self.test_connect = true
     end
 
     def environment_for(name)
@@ -72,6 +73,8 @@ module SequelRails
 
       config['max_connections'] = max_connections if max_connections
       config['search_path'] = search_path if search_path
+      config['servers'] = servers if servers
+      config['test'] = test_connect
 
       url = ENV['DATABASE_URL']
       config['url'] ||= url if url

data/lib/sequel_rails/db_config.rb

@@ -73,8 +73,8 @@ module SequelRails
         return URI::Generic.build(:scheme => adapter, :opaque => database)
       end
 
-      # these four are handled separately
-      params = cfg.reject { |k, _| %w(adapter host port database).include? k }
+      # these are handled separately
+      params = cfg.reject { |k, _| non_params.include? k }
 
       if (v = params['search_path'])
         # make sure there's no whitespace
@@ -96,6 +96,10 @@ module SequelRails
         :query => q
       )
     end
+
+    def non_params
+      %w(adapter host port database servers)
+    end
   end
 end
 

data/lib/sequel_rails/railties/database.rake

@@ -213,6 +213,23 @@ namespace sequel_rails_namespace do
       Rails.env = previous_env
     end
   end
+
+  namespace :sessions do
+    desc 'Clear the sessions table'
+    task clear: :environment do
+      db_for_current_env.from(:sessions).truncate
+    end
+
+    desc 'Trim old sessions from the table (default: > 30 days)'
+    task :trim, [:threshold] => :environment do |_, args|
+      cutoff_period = (args.fetch(:threshold) { 30 }).to_i.days.ago
+
+      db_for_current_env
+        .from(:sessions)
+        .where { updated_at < cutoff_period }
+        .delete
+    end
+  end
 end
 
 task 'test:prepare' => "#{sequel_rails_namespace}:test:prepare"

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

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,6 +96,22 @@ 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(:environments) do
       {
@@ -135,6 +151,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 +204,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
@@ -248,8 +318,10 @@ describe SequelRails::Configuration do
         let(:environment) { 'development' }
 
         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 +335,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 }
@@ -296,7 +370,9 @@ describe SequelRails::Configuration do
         let(:environment) { 'remote' }
 
         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 +386,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 }

data/spec/lib/sequel_rails/railtie_spec.rb

@@ -123,7 +123,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -215,6 +215,7 @@ files:
 - ci/rails-4.2.gemfile
 - ci/rails-5.0.gemfile
 - ci/rails-5.1.gemfile
+- ci/rails-5.2.gemfile
 - config.ru
 - lib/action_dispatch/middleware/session/sequel_store.rb
 - lib/generators/sequel.rb
@@ -298,8 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Use Sequel with Rails (3.x and 4.x)