seamless_database_pool 1.0.18 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97df06be58768fd03235c0370d3f6e48a997f720
-  data.tar.gz: 4175c26ce145bc7e429f7b996a72fda489450506
+  metadata.gz: c628c023a3a48064597f57d3aab3eaa36b843516
+  data.tar.gz: 26d3ae808291738d05f8ed27d52eca11c70c9983
 SHA512:
-  metadata.gz: fab0026bafa0d44e418d1522f0d6ee584b9fcaaa01af1fffe2a3388c93ff52b841656e2e68487d7e7b58ae4bfd757a8532d197157f5e7a677400c37d0bf48092
-  data.tar.gz: cdb1f53c64c9798e252ad7016d04d3fc5c771195cba4a6745a7b31eee5fa8d8c68def54dfc94db7b23e6bb83b287d4546423bbd03916374be85f7092bc6c8f87
+  metadata.gz: 04f6f9d7b8f15bec686fab951c1f87f0a36641ee00371a69cb78e9c31b41e21a1053fae5f1690cddcddd2705aa83e290907be0adf10273b944f7181046ce1bf5
+  data.tar.gz: 32bdc669ea87870be6affafd889cb7893e24a50ade3ddf8fbff6b4386c89fa0cb2c0f28aebe7dcbf7b8b949cc404140b7ae4ecb3545584e0e431a02a3714865b

data/CHANGELOG.md

@@ -0,0 +1,93 @@
+## 1.0.20
+
+* Remove calls to `alias_method_chain` for Rails 5.1 compatibility (thanks )
+
+* Don't check read only connections on calls to `verify!` and `active?` when not necessary (thanks wjordan)
+
+## 1.0.19
+
+* Require ruby 2.0 or greater
+
+* Eliminate deprecation warning on Rails 5 (thanks wjordan)
+
+## 1.0.18
+
+* ActiveRecord 5.0 compatibility (thanks jkowens)
+
+* End support for ActiveRecord 3.1
+
+## 1.0.17
+
+* Do not update the HTTP session if there are no changes.
+
+## 1.0.16
+
+* Use shorter to_s output for output on connection.inspect.
+
+## 1.0.15
+
+* Implement less wordy connection to string method so logs don't fill up with long messages on connection errors.
+
+* Update specs to remove deprecation warnings
+
+* Fix adapter specs to work with ActiveRecord 4.1 configuration changes
+
+## 1.0.14
+
+* Remove custom connection timeout logic; Use the underlying driver's timeouts instead.
+
+* Fix to work with query cache.
+
+* Make driver less aggressive about overriding methods to proxy to the master connection.
+
+* End support for ActiveRecord 2.x
+
+* Add support for ActiveRecord 4.0
+
+## 1.0.13
+
+* Fix to work with `rake db:*` Rails tasks by removing the adapter from the configuration when db:* tasks are run.
+
+* Fix connection pool issues so checkout/checkins don't interact with the underlying connections (thanks afex)
+
+* Ruby 2.0/Rails 4.0 compatibility (thanks t27duck)
+
+## 1.0.12
+
+* Remove excessively long log messages on reconnect attempts.
+
+## 1.0.11
+
+* Remove debug code that prevented recovering from errors.
+
+## 1.0.10
+
+* Compatibility with ActiveRecord 3.1.0
+
+## 1.0.9
+
+* Compatibility with bind variables.
+
+## 1.0.8
+
+* Compatibility with ActiveRecord 3.1.0rc4
+
+## 1.0.7
+
+* Make compatible with ActionController 3.0
+
+* Improved handling of down slave instances.
+
+## 1.0.6
+
+* Make compatible with ActiveRecord 3.0.
+
+* Make compatible with database adapters other than MySQL including PostgrSQL.
+
+* Better test suite to actually hit three different database adapters.
+
+## 1.0.5
+
+* Update docs.
+
+* Remove rake dependency on rspec

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Brian Durand
+Copyright (c) 2008-2017 Brian Durand
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -53,6 +53,7 @@ By default, the master connection will be included in the read pool. If you woul
     username: read_user
     password: abc123
     pool_adapter: mysql2
+    prepared_statements: false # required for ActiveRecord 5
     port: 3306
     master:
       host: master-db.example.com
@@ -66,7 +67,7 @@ By default, the master connection will be included in the read pool. If you woul
 
 In this configuration, the master connection will be a mysql connection to master-db.example.com:6000 using the username master_user and the password 567pass.
 
-The read pool will use three mysql connections to master-db, read-db-1, and read-db-2. The master connection will use a different port, username, password for the connection. The read connections will use the same values. Further, the connection read-db-1 will get half the traffic as the other two connections, so presumably it's on a more powerful box.
+The read pool will use three mysql connections to master-db, read-db-1, and read-db-2. The master connection will use a different port, username, password for the connection. The read connections will use the same values. Further, the connection read-db-1 will get twice as many read requests as each of the other two connections, so presumably it's on a more powerful box.
 
 You must use compatible database adapters for both the master and the read connections. For example, you cannot use an Oracle server as your master and PostgreSQL servers as you read slaves.
 
@@ -80,4 +81,4 @@ This is done with static methods on SeamlessDatabasePool.
 
 To ease integration into a Ruby on Rails application, several controller filters are provided to invoke the above connection methods in a block. These are not implemented as standard controller filters so that the connection methods can be in effect for other filters.
 
-See SeamlessDatabasePool::ControllerFilter for more details.
+See SeamlessDatabasePool::ControllerFilter for more details.

data/VERSION

@@ -1 +1 @@
-1.0.18
+1.0.20

data/lib/active_record/connection_adapters/seamless_database_pool_adapter.rb

@@ -50,7 +50,7 @@ module ActiveRecord
           begin
             require "active_record/connection_adapters/#{adapter}_adapter"
           rescue LoadError
-            raise "Please install the #{adapter} adapter: `gem install activerecord-#{adapter}-adapter` (#{$!})"
+            raise LoadError.new("Please install the #{adapter} adapter: `gem install activerecord-#{adapter}-adapter` (#{$!})")
           end
         end
 
@@ -62,19 +62,16 @@ module ActiveRecord
     end
     
     module SeamlessDatabasePoolBehavior
-      def self.included(base)
-        base.alias_method_chain(:reload, :seamless_database_pool)
-      end
       
       # Force reload to use the master connection since it's probably being called for a reason.
-      def reload_with_seamless_database_pool(*args)
+      def reload(*args)
         SeamlessDatabasePool.use_master_connection do
-          reload_without_seamless_database_pool(*args)
+          super *args
         end
       end
     end
     
-    include(SeamlessDatabasePoolBehavior) unless include?(SeamlessDatabasePoolBehavior)
+    prepend SeamlessDatabasePoolBehavior
   end
 
   module ConnectionAdapters
@@ -99,6 +96,7 @@ module ActiveRecord
           override_classes.each do |connection_class|
             master_methods.concat(connection_class.public_instance_methods(false))
             master_methods.concat(connection_class.protected_instance_methods(false))
+            master_methods.concat(connection_class.private_instance_methods(false))
           end
           master_methods = master_methods.collect{|m| m.to_sym}.uniq
           master_methods -= public_instance_methods(false) + protected_instance_methods(false) + private_instance_methods(false)
@@ -199,9 +197,13 @@ module ActiveRecord
       end
       
       def active?
-        active = true
-        do_to_connections {|conn| active &= conn.active?}
-        return active
+        if SeamlessDatabasePool.read_only_connection_type == :master
+          @master_connection.active?
+        else
+          active = true
+          do_to_connections {|conn| active &= conn.active?}
+          active
+        end
       end
 
       def reconnect!
@@ -217,7 +219,11 @@ module ActiveRecord
       end
 
       def verify!(*ignored)
-        do_to_connections {|conn| conn.verify!(*ignored)}
+        if SeamlessDatabasePool.read_only_connection_type == :master
+          @master_connection.verify!(*ignored)
+        else
+          do_to_connections {|conn| conn.verify!(*ignored)}
+        end
       end
 
       def reset_runtime

data/lib/seamless_database_pool/arel_compiler.rb

@@ -14,7 +14,7 @@ module Arel
               # try to load an externally defined compiler, in case this adapter has defined the compiler on its own.
               require "#{master_adapter.downcase}/arel_compiler"
             rescue LoadError
-              raise "#{master_adapter} is not supported by Arel."
+              raise LoadError.new("#{master_adapter} is not supported by Arel.")
             end
           end
           compiler_class = Arel::SqlCompiler.const_get("#{master_adapter}Compiler")

data/lib/seamless_database_pool/connection_statistics.rb

@@ -3,48 +3,41 @@ module SeamlessDatabasePool
   # and it will keep track of how often each connection calls update, insert, execute,
   # or select.
   module ConnectionStatistics
-    def self.included(base)
-      base.alias_method_chain(:update, :connection_statistics)
-      base.alias_method_chain(:insert, :connection_statistics)
-      base.alias_method_chain(:execute, :connection_statistics)
-      base.alias_method_chain(:select, :connection_statistics)
-    end
-  
     # Get the connection statistics
     def connection_statistics
       @connection_statistics ||= {}
     end
-    
+
     def reset_connection_statistics
       @connection_statistics = {}
     end
-  
-    def update_with_connection_statistics(sql, name = nil)
+
+    def update(sql, name = nil)
       increment_connection_statistic(:update) do
-        update_without_connection_statistics(sql, name)
+        super(sql, name)
       end
     end
-  
-    def insert_with_connection_statistics(sql, name = nil)
+
+    def insert(sql, name = nil)
       increment_connection_statistic(:insert) do
-        insert_without_connection_statistics(sql, name)
+        super(sql, name)
       end
     end
-  
-    def execute_with_connection_statistics(sql, name = nil)
+
+    def execute(sql, name = nil)
       increment_connection_statistic(:execute) do
-        execute_without_connection_statistics(sql, name)
+        super(sql, name)
       end
     end
-  
+
     protected
-  
-    def select_with_connection_statistics(sql, name = nil, *args)
+
+    def select(sql, name = nil, *args)
       increment_connection_statistic(:select) do
-        select_without_connection_statistics(sql, name, *args)
+        super(sql, name, *args)
       end
     end
-  
+
     def increment_connection_statistic(method)
       if @counting_pool_statistics
         yield

data/lib/seamless_database_pool/controller_filter.rb

@@ -6,35 +6,28 @@ module SeamlessDatabasePool
   # when you need different connection types.
   #
   # Example:
-  # 
+  #
   #   ApplicationController < ActionController::Base
   #     include SeamlessDatabasePool::ControllerFilter
   #     use_database_pool :all => :persistent, [:save, :delete] => :master
   #     ...
-  
-  module ControllerFilter    
+  module ControllerFilter
     def self.included(base)
       unless base.respond_to?(:use_database_pool)
         base.extend(ClassMethods)
         base.class_eval do
-          if base.method_defined?(:perform_action) || base.private_method_defined?(:perform_action)
-            alias_method_chain :perform_action, :seamless_database_pool
-          else
-            alias_method_chain :process, :seamless_database_pool
-          end
-          alias_method_chain :redirect_to, :seamless_database_pool
+          send(:prepend, ControllerFilterHooks)
         end
       end
     end
-    
+
     module ClassMethods
-      
       def seamless_database_pool_options
         return @seamless_database_pool_options if @seamless_database_pool_options
         @seamless_database_pool_options = superclass.seamless_database_pool_options.dup if superclass.respond_to?(:seamless_database_pool_options)
         @seamless_database_pool_options ||= {}
       end
-      
+
       # Call this method to set up the connection types that will be used for your actions.
       # The configuration is given as a hash where the key is the action name and the value is
       # the connection type (:master, :persistent, or :random). You can specify :all as the action
@@ -58,7 +51,7 @@ module SeamlessDatabasePool
         @seamless_database_pool_options = remapped_options
       end
     end
-    
+
     # Force the master connection to be used on the next request. This is very useful for the Post-Redirect pattern
     # where you post a request to your save action and then redirect the user back to the edit action. By calling
     # this method, you won't have to worry if the replication engine is slower than the redirect. Normally you
@@ -68,34 +61,13 @@ module SeamlessDatabasePool
     def use_master_db_connection_on_next_request
       session[:next_request_db_connection] = :master if session
     end
-    
+
     def seamless_database_pool_options
       self.class.seamless_database_pool_options
     end
-    
-    # Rails 3.x hook for setting the read connection for the request.
-    def process_with_seamless_database_pool(action, *args)
-      set_read_only_connection_for_block(action) do
-        process_without_seamless_database_pool(action, *args)
-      end
-    end
-    
-    def redirect_to_with_seamless_database_pool(options = {}, response_status = {})
-      if SeamlessDatabasePool.read_only_connection_type(nil) == :master
-        use_master_db_connection_on_next_request
-      end
-      redirect_to_without_seamless_database_pool(options, response_status)
-    end
-    
+
     private
-    
-    # Rails 2.x hook for setting the read connection for the request.
-    def perform_action_with_seamless_database_pool(*args)
-      set_read_only_connection_for_block(action_name) do
-        perform_action_without_seamless_database_pool(*args)
-      end
-    end
-    
+
     # Set the read only connection for a block. Used to set the connection for a controller action.
     def set_read_only_connection_for_block(action)
       read_pool_method = nil
@@ -103,7 +75,7 @@ module SeamlessDatabasePool
         read_pool_method = session[:next_request_db_connection]
         session.delete(:next_request_db_connection) if session[:next_request_db_connection]
       end
-      
+
       read_pool_method ||= seamless_database_pool_options[action.to_sym] || seamless_database_pool_options[:all]
       if read_pool_method
         SeamlessDatabasePool.set_read_only_connection_type(read_pool_method) do
@@ -114,4 +86,28 @@ module SeamlessDatabasePool
       end
     end
   end
+
+  module ControllerFilterHooks
+    # Rails 3.x hook for setting the read connection for the request.
+    def process(action, *args)
+      set_read_only_connection_for_block(action) do
+        super(action, *args)
+      end
+    end
+
+    # Rails 2.x hook for setting the read connection for the request.
+    def perform_action(*args)
+      set_read_only_connection_for_block(action_name) do
+        super
+      end
+    end
+
+    def redirect_to(options = {}, response_status = {})
+      if SeamlessDatabasePool.read_only_connection_type(nil) == :master
+        use_master_db_connection_on_next_request
+      end
+
+      super(options, response_status)
+    end
+  end
 end

data/lib/seamless_database_pool/railtie.rb

@@ -4,8 +4,12 @@ module SeamlessDatabasePool
       namespace :db do
         task :load_config do
           # Override seamless_database_pool configuration so db:* rake tasks work as expected.
-          original_config = Rails.application.config.database_configuration
-          ActiveRecord::Base.configurations = SeamlessDatabasePool.master_database_configuration(original_config)
+          module DatabaseConfiguration
+            def configurations
+              SeamlessDatabasePool.master_database_configuration(super.deep_dup)
+            end
+          end
+          ActiveRecord::Base.singleton_class.prepend(DatabaseConfiguration)
         end
       end
     end

data/seamless_database_pool.gemspec

@@ -12,8 +12,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '~> 2.0'
 
-  spec.add_runtime_dependency(%q<activerecord>, [">= 3.0.20"])
+  spec.add_runtime_dependency(%q<activerecord>, [">= 3.2.0"])
   spec.add_development_dependency(%q<rspec>, [">= 2.0"])
   spec.add_development_dependency(%q<sqlite3>, [">= 0"])
   spec.add_development_dependency(%q<mysql>, [">= 0"])

data/spec/connection_adapters_spec.rb

@@ -13,7 +13,7 @@ describe "Test connection adapters" do
         let(:master_connection){ connection.master_connection }
   
         before(:all) do
-          if ActiveRecord::VERSION::MAJOR < 3 || (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0)
+          if ActiveRecord::VERSION::MAJOR < 4 || (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0)
             ActiveRecord::Base.configurations = {'adapter' => "sqlite3", 'database' => ":memory:"}
           else
             ActiveRecord::Base.configurations = {"test" => {'adapter' => "sqlite3", 'database' => ":memory:"}}
@@ -230,6 +230,19 @@ describe "Test connection adapters" do
             
             with_driver.string.should == without_driver.string
           end
+
+          it "should allow for database specific types" do 
+            if adapter == "postgresql"
+              SeamlessDatabasePool.use_master_connection do
+                connection.enable_extension "hstore" 
+                connection.create_table(:pg) do |t|
+                  t.hstore :my_hash
+                end
+              end
+              connection.drop_table(:pg)
+            end
+          end
+          
         end
       end
     end

data/spec/connection_statistics_spec.rb

@@ -1,32 +1,31 @@
 require 'spec_helper'
 
 describe SeamlessDatabasePool::ConnectionStatistics do
-  
   module SeamlessDatabasePool
     class ConnectionStatisticsTester
       def insert (sql, name = nil)
         "INSERT #{sql}/#{name}"
       end
-      
+
       def update (sql, name = nil)
         execute(sql)
         "UPDATE #{sql}/#{name}"
       end
-      
+
       def execute (sql, name = nil)
         "EXECUTE #{sql}/#{name}"
       end
-      
+
       protected
-      
+
       def select (sql, name = nil, binds = [])
         "SELECT #{sql}/#{name}"
       end
-      
-      include ::SeamlessDatabasePool::ConnectionStatistics
+
+      prepend ::SeamlessDatabasePool::ConnectionStatistics
     end
   end
-  
+
   it "should increment statistics on update" do
     connection = SeamlessDatabasePool::ConnectionStatisticsTester.new
     connection.update('SQL', 'name').should == "UPDATE SQL/name"
@@ -34,7 +33,7 @@ describe SeamlessDatabasePool::ConnectionStatistics do
     connection.update('SQL 2').should == "UPDATE SQL 2/"
     connection.connection_statistics.should == {:update => 2}
   end
-  
+
   it "should increment statistics on insert" do
     connection = SeamlessDatabasePool::ConnectionStatisticsTester.new
     connection.insert('SQL', 'name').should == "INSERT SQL/name"
@@ -42,7 +41,7 @@ describe SeamlessDatabasePool::ConnectionStatistics do
     connection.insert('SQL 2').should == "INSERT SQL 2/"
     connection.connection_statistics.should == {:insert => 2}
   end
-  
+
   it "should increment statistics on execute" do
     connection = SeamlessDatabasePool::ConnectionStatisticsTester.new
     connection.execute('SQL', 'name').should == "EXECUTE SQL/name"
@@ -50,7 +49,7 @@ describe SeamlessDatabasePool::ConnectionStatistics do
     connection.execute('SQL 2').should == "EXECUTE SQL 2/"
     connection.connection_statistics.should == {:execute => 2}
   end
-  
+
   it "should increment statistics on select" do
     connection = SeamlessDatabasePool::ConnectionStatisticsTester.new
     connection.send(:select, 'SQL', 'name').should == "SELECT SQL/name"
@@ -58,14 +57,14 @@ describe SeamlessDatabasePool::ConnectionStatistics do
     connection.send(:select, 'SQL 2').should == "SELECT SQL 2/"
     connection.connection_statistics.should == {:select => 2}
   end
-  
+
   it "should increment counts only once within a block" do
     connection = SeamlessDatabasePool::ConnectionStatisticsTester.new
     expect(connection).to receive(:execute).with('SQL')
     connection.update('SQL')
     connection.connection_statistics.should == {:update => 1}
   end
-  
+
   it "should be able to clear the statistics" do
     connection = SeamlessDatabasePool::ConnectionStatisticsTester.new
     connection.update('SQL')
@@ -73,5 +72,5 @@ describe SeamlessDatabasePool::ConnectionStatistics do
     connection.reset_connection_statistics
     connection.connection_statistics.should == {}
   end
-  
+
 end

data/spec/controller_filter_spec.rb

@@ -1,45 +1,45 @@
 require 'spec_helper'
 
 describe "SeamlessDatabasePool::ControllerFilter" do
-  
+
   module SeamlessDatabasePool
     class TestApplicationController
       attr_reader :session
-      
+
       def initialize(session)
         @session = session
       end
-      
+
       def process(action, *args)
         send action
       end
-      
+
       def redirect_to (options = {}, response_status = {})
         options
       end
-      
+
       def base_action
         ::SeamlessDatabasePool.read_only_connection_type
       end
     end
-    
+
     class TestBaseController < TestApplicationController
       include ::SeamlessDatabasePool::ControllerFilter
 
       use_database_pool :read => :persistent
-      
+
       def read
         ::SeamlessDatabasePool.read_only_connection_type
       end
-      
+
       def other
         ::SeamlessDatabasePool.read_only_connection_type
       end
     end
-    
+
     class TestOtherController < TestBaseController
       use_database_pool :all => :random, [:edit, :save, :redirect_master_action] => :master
-      
+
       def edit
         ::SeamlessDatabasePool.read_only_connection_type
       end
@@ -47,102 +47,102 @@ describe "SeamlessDatabasePool::ControllerFilter" do
       def save
         ::SeamlessDatabasePool.read_only_connection_type
       end
-      
+
       def redirect_master_action
         redirect_to(:action => :read)
       end
-      
+
       def redirect_read_action
         redirect_to(:action => :read)
       end
     end
-  
+
     class TestRails2ApplicationController < TestApplicationController
       attr_reader :action_name
-    
+
       def process(action, *args)
         @action_name = action
         perform_action
       end
-    
+
       private
-    
+
       def perform_action
         send action_name
       end
     end
-  
+
     class TestRails2BaseController < TestRails2ApplicationController
       include ::SeamlessDatabasePool::ControllerFilter
 
       use_database_pool :read => :persistent
-    
+
       def read
         ::SeamlessDatabasePool.read_only_connection_type
       end
     end
   end
-  
+
   let(:session){Hash.new}
   let(:controller){SeamlessDatabasePool::TestOtherController.new(session)}
-  
+
   it "should work with nothing set" do
     controller = SeamlessDatabasePool::TestApplicationController.new(session)
     controller.process('base_action').should == :master
   end
-  
+
   it "should allow setting a connection type for a single action" do
     controller = SeamlessDatabasePool::TestBaseController.new(session)
     controller.process('read').should == :persistent
   end
-  
+
   it "should allow setting a connection type for actions" do
     controller.process('edit').should == :master
     controller.process('save').should == :master
   end
-  
+
   it "should allow setting a connection type for all actions" do
     controller.process('other').should == :random
   end
-  
+
   it "should inherit the superclass' options" do
     controller.process('read').should == :persistent
   end
-  
+
   it "should be able to force using the master connection on the next request" do
     # First request
     controller.process('read').should == :persistent
     controller.use_master_db_connection_on_next_request
-    
+
     # Second request
     controller.process('read').should == :master
-    
+
     # Third request
     controller.process('read').should == :persistent
   end
-  
+
   it "should not break trying to force the master connection if sessions are not enabled" do
     controller.process('read').should == :persistent
     controller.use_master_db_connection_on_next_request
-    
+
     # Second request
     session.clear
     controller.process('read').should == :persistent
   end
-  
+
   it "should force the master connection on the next request for a redirect in master connection block" do
     controller = SeamlessDatabasePool::TestOtherController.new(session)
     controller.process('redirect_master_action').should == {:action => :read}
-    
+
     controller.process('read').should == :master
   end
 
   it "should not force the master connection on the next request for a redirect not in master connection block" do
     controller.process('redirect_read_action').should == {:action => :read}
-    
+
     controller.process('read').should == :persistent
   end
-  
+
   it "should work with a Rails 2 controller" do
     controller = SeamlessDatabasePool::TestRails2BaseController.new(session)
     controller.process('read').should == :persistent

data/spec/database.yml

@@ -5,6 +5,7 @@
 sqlite3:
   adapter: seamless_database_pool
   database: test.sqlite3
+  prepared_statements: false
   master:
     adapter: sqlite3
     pool_weight: 0
@@ -15,6 +16,7 @@ sqlite3:
 postgresql:
   adapter: seamless_database_pool
   database: seamless_database_pool_test
+  prepared_statements: false
   username: postgres
   password: postgres
   master:

data/spec/seamless_database_pool_adapter_spec.rb

@@ -189,27 +189,54 @@ describe "SeamlessDatabasePoolAdapter" do
   end
   
   context "fork to all connections" do
-    it "should fork active? to all connections and return true if all are up" do
-      expect(master_connection).to receive(:active?).and_return(true)
-      expect(read_connection_1).to receive(:active?).and_return(true)
-      expect(read_connection_2).to receive(:active?).and_return(true)
-      pool_connection.active?.should == true
-    end
-  
-    it "should fork active? to all connections and return false if one is down" do
-      expect(master_connection).to receive(:active?).and_return(true)
-      expect(read_connection_1).to receive(:active?).and_return(true)
-      expect(read_connection_2).to receive(:active?).and_return(false)
-      pool_connection.active?.should == false
+    context "when read-only connection type is master" do
+      it "should fork active? to master connection only" do
+        expect(master_connection).to receive(:active?).and_return(true)
+        expect(read_connection_1).not_to receive(:active?)
+        expect(read_connection_2).not_to receive(:active?)
+        pool_connection.active?.should == true
+      end
+
+      it "should fork verify! to master connection only" do
+        expect(master_connection).to receive(:verify!).with(5)
+        expect(read_connection_1).not_to receive(:verify!)
+        expect(read_connection_2).not_to receive(:verify!)
+        pool_connection.verify!(5)
+      end
     end
-  
-    it "should fork verify! to all connections" do
-      expect(master_connection).to receive(:verify!).with(5)
-      expect(read_connection_1).to receive(:verify!).with(5)
-      expect(read_connection_2).to receive(:verify!).with(5)
-      pool_connection.verify!(5)
+
+    context "When read-only connection type is persistent or random" do
+      around do |example|
+        SeamlessDatabasePool.set_read_only_connection_type(:persistent) do
+          example.run
+        end
+        SeamlessDatabasePool.set_read_only_connection_type(:random) do
+          example.run
+        end
+      end
+
+      it "should fork active? to all connections and return true if all are up" do
+        expect(master_connection).to receive(:active?).and_return(true)
+        expect(read_connection_1).to receive(:active?).and_return(true)
+        expect(read_connection_2).to receive(:active?).and_return(true)
+        pool_connection.active?.should == true
+      end
+
+      it "should fork active? to all connections and return false if one is down" do
+        expect(master_connection).to receive(:active?).and_return(true)
+        expect(read_connection_1).to receive(:active?).and_return(true)
+        expect(read_connection_2).to receive(:active?).and_return(false)
+        pool_connection.active?.should == false
+      end
+
+      it "should fork verify! to all connections" do
+        expect(master_connection).to receive(:verify!).with(5)
+        expect(read_connection_1).to receive(:verify!).with(5)
+        expect(read_connection_2).to receive(:verify!).with(5)
+        pool_connection.verify!(5)
+      end
     end
-  
+
     it "should fork disconnect! to all connections" do
       expect(master_connection).to receive(:disconnect!)
       expect(read_connection_1).to receive(:disconnect!)

data/spec/spec_helper.rb

@@ -22,4 +22,5 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
   config.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
+  config.mock_with(:rspec) { |c| c.syntax = [:should, :expect] }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seamless_database_pool
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.20
 platform: ruby
 authors:
 - Brian Durand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.20
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.20
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- HISTORY.txt
+- CHANGELOG.md
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -121,9 +121,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Add support for master/slave database clusters in ActiveRecord to improve

data/HISTORY.txt

@@ -1,79 +0,0 @@
-1.0.18
-
-ActiveRecord 5.0 compatibility (thanks jkowens)
-
-1.0.17
-
-Do not update the HTTP session if there are no changes.
-
-1.0.16
-
-Use shorter to_s output for output on connection.inspect.
-
-1.0.15
-
-Implement less wordy connection to string method so logs don't fill up with long messages on connection errors.
-
-Update specs to remove deprecation warnings
-
-Fix adapter specs to work with ActiveRecord 4.1 configuration changes
-
-1.0.14
-
-Remove custom connection timeout logic; Use the underlying driver's timeouts instead.
-
-Fix to work with query cache.
-
-Make driver less aggressive about overriding methods to proxy to the master connection.
-
-End support for ActiveRecord 2.x
-
-Add support for ActiveRecord 4.0
-
-1.0.13
-
-Fix to work with `rake db:*` Rails tasks by removing the adapter from the configuration when db:* tasks are run.
-
-Fix connection pool issues so checkout/checkins don't interact with the underlying connections (thanks afex)
-
-Ruby 2.0/Rails 4.0 compatibility (thanks t27duck)
-
-1.0.12
-
-Remove excessively long log messages on reconnect attempts.
-
-1.0.11
-
-Remove debug code that prevented recovering from errors.
-
-1.0.10
-
-Compatibility with ActiveRecord 3.1.0
-
-1.0.9
-
-Compatibility with bind variables.
-
-1.0.8
-
-Compatibility with ActiveRecord 3.1.0rc4
-
-1.0.7
-
-Make compatible with ActionController 3.0
-
-Improved handling of down slave instances.
-
-1.0.6
-
-Make compatible with ActiveRecord 3.0.
-
-Make compatible with database adapters other than MySQL including PostgrSQL.
-
-Better test suite to actually hit three different database adapters.
-
-1.0.5
-
-Update docs.
-
-Remove rake dependency on rspec