seamless_database_pool 1.0.14 → 1.0.15

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 49f36daf8b3d407d0a64c919cd55d41edb67299c
+  data.tar.gz: 27a40dda0546f89699c713a692119fc312da0da6
+SHA512:
+  metadata.gz: 90c9a05dfb35afff08add517f6ddc3ab4f5ffeb2fe50d28a6102c9321c2d9fee384a6bbbccc08170a9290bf66950f3d8d72e50e952069a819293066367da6596
+  data.tar.gz: 37090f84c9134e7fe74657d0ff66623871b23aefbbae54d20fa6d17e59809773a9ffccfee5cc8e9d5d94c0fbbab3f5498eb30082e2525df911272228ea10736f

data/lib/active_record/connection_adapters/seamless_database_pool_adapter.rb

@@ -257,6 +257,10 @@ module ActiveRecord
         end
       end
       
+      def to_s
+        "#<#{self.class.name}:0x#{object_id.to_s(16)} #{all_connections.size} connections>"
+      end
+      
       class DatabaseConnectionError < StandardError
       end
       
@@ -371,6 +375,7 @@ module ActiveRecord
             raise e if conn == master_connection
           end
         end
+        nil
       end
     end
   end

data/spec/connection_adapters_spec.rb

@@ -13,7 +13,11 @@ describe "Test connection adapters" do
         let(:master_connection){ connection.master_connection }
   
         before(:all) do
-          ActiveRecord::Base.configurations = {'adapter' => "sqlite3", 'database' => ":memory:"}
+          if ActiveRecord::VERSION::MAJOR < 3 || (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0)
+            ActiveRecord::Base.configurations = {'adapter' => "sqlite3", 'database' => ":memory:"}
+          else
+            ActiveRecord::Base.configurations = {"test" => {'adapter' => "sqlite3", 'database' => ":memory:"}}
+          end
           ActiveRecord::Base.establish_connection('adapter' => "sqlite3", 'database' => ":memory:")
           ActiveRecord::Base.connection
           SeamlessDatabasePool::TestModel.db_model(adapter).create_tables

data/spec/seamless_database_pool_adapter_spec.rb

@@ -51,7 +51,7 @@ describe "SeamlessDatabasePoolAdapter ActiveRecord::Base extension" do
       ]
     }
     
-    pool_connection = mock(:connection)
+    pool_connection = double(:connection)
     master_connection = SeamlessDatabasePool::MockConnection.new("master")
     read_connection_1 = SeamlessDatabasePool::MockConnection.new("read_1")
     read_connection_2 = SeamlessDatabasePool::MockConnection.new("read_2")
@@ -62,7 +62,7 @@ describe "SeamlessDatabasePoolAdapter ActiveRecord::Base extension" do
     ActiveRecord::Base.should_receive(:reader_connection).with('adapter' => 'reader', 'host' => 'read_host_1', 'username' => 'user', 'pool_weight' => 1).and_return(read_connection_1)
     ActiveRecord::Base.should_receive(:reader_connection).with('adapter' => 'reader', 'host' => 'read_host_2', 'username' => 'user', 'pool_weight' => 2).and_return(read_connection_2)
     
-    klass = mock(:class)
+    klass = double(:class)
     ActiveRecord::ConnectionAdapters::SeamlessDatabasePoolAdapter.should_receive(:adapter_class).with(master_connection).and_return(klass)
     klass.should_receive(:new).with(nil, logger, master_connection, [read_connection_1, read_connection_2], weights).and_return(pool_connection)
     
@@ -88,6 +88,10 @@ describe "SeamlessDatabasePoolAdapter" do
     connection_class.new(nil, nil, master_connection, [read_connection_1, read_connection_2], weights)
   end
   
+  it "should be able to be converted to a string" do
+    pool_connection.to_s.should =~ /\A#<ActiveRecord::ConnectionAdapters::SeamlessDatabasePoolAdapter::Abstract:0x[0-9a-f]+ 3 connections>\z/
+  end
+  
   context "selecting a connection from the pool" do
     it "should initialize the connection pool" do
       pool_connection.master_connection.should == master_connection
@@ -104,7 +108,8 @@ describe "SeamlessDatabasePoolAdapter" do
     end
   
     it "should select a random read connection" do
-      mock_connection = stub(:connection, :active? => true)
+      mock_connection = double(:connection)
+      mock_connection.stub(:active? => true)
       pool_connection.should_receive(:available_read_connections).and_return([:fake1, :fake2, mock_connection])
       pool_connection.should_receive(:rand).with(3).and_return(2)
       pool_connection.random_read_connection.should == mock_connection
@@ -117,7 +122,7 @@ describe "SeamlessDatabasePoolAdapter" do
   
     it "should use the master connection in a block" do
       connection_class = ActiveRecord::ConnectionAdapters::SeamlessDatabasePoolAdapter.adapter_class(master_connection)
-      connection = connection_class.new(nil, mock(:logger), master_connection, [read_connection_1], {read_connection_1 => 1})
+      connection = connection_class.new(nil, double(:logger), master_connection, [read_connection_1], {read_connection_1 => 1})
       connection.random_read_connection.should == read_connection_1
       connection.use_master_connection do
         connection.random_read_connection.should == master_connection
@@ -127,7 +132,7 @@ describe "SeamlessDatabasePoolAdapter" do
   
     it "should use the master connection inside a transaction" do
       connection_class = ActiveRecord::ConnectionAdapters::SeamlessDatabasePoolAdapter.adapter_class(master_connection)
-      connection = connection_class.new(nil, mock(:logger), master_connection, [read_connection_1], {read_connection_1 => 1})
+      connection = connection_class.new(nil, double(:logger), master_connection, [read_connection_1], {read_connection_1 => 1})
       master_connection.should_receive(:begin_db_transaction)
       master_connection.should_receive(:commit_db_transaction)
       master_connection.should_receive(:select).with('Transaction SQL', nil)
@@ -236,12 +241,12 @@ describe "SeamlessDatabasePoolAdapter" do
     end
   
     it "should try to reconnect dead connections when they become available again" do
-      master_connection.stub!(:select).and_raise("SQL ERROR")
+      master_connection.stub(:select).and_raise("SQL ERROR")
       master_connection.should_receive(:active?).and_return(false, false, true)
       master_connection.should_receive(:reconnect!)
       now = Time.now
       lambda{pool_connection.select_value("SQL")}.should raise_error("SQL ERROR")
-      Time.stub!(:now).and_return(now + 31)
+      Time.stub(:now => now + 31)
       lambda{pool_connection.select_value("SQL")}.should raise_error("SQL ERROR")
     end
   

data/spec/seamless_database_pool_spec.rb

@@ -11,16 +11,15 @@ describe "SeamlessDatabasePool" do
   end
   
   it "should use the master connection by default" do
-    connection = stub(:connection, :master_connection => :master_db_connection)
-    connection.stub!(:using_master_connection?).and_return(false)
+    connection = double(:connection, :master_connection => :master_db_connection, :using_master_connection? => false)
     SeamlessDatabasePool.read_only_connection_type.should == :master
     SeamlessDatabasePool.read_only_connection(connection).should == :master_db_connection
   end
   
   it "should be able to set using persistent read connections" do
-    connection = mock(:connection)
+    connection = double(:connection)
     connection.should_receive(:random_read_connection).once.and_return(:read_db_connection)
-    connection.stub!(:using_master_connection?).and_return(false)
+    connection.stub(:using_master_connection? => false)
     SeamlessDatabasePool.use_persistent_read_connection
     SeamlessDatabasePool.read_only_connection_type.should == :persistent
     SeamlessDatabasePool.read_only_connection(connection).should == :read_db_connection
@@ -28,9 +27,9 @@ describe "SeamlessDatabasePool" do
   end
   
   it "should be able to set using random read connections" do
-    connection = mock(:connection)
+    connection = double(:connection)
     connection.should_receive(:random_read_connection).and_return(:read_db_connection_1, :read_db_connection_2)
-    connection.stub!(:using_master_connection?).and_return(false)
+    connection.stub(:using_master_connection? => false)
     SeamlessDatabasePool.use_random_read_connection
     SeamlessDatabasePool.read_only_connection_type.should == :random
     SeamlessDatabasePool.read_only_connection(connection).should == :read_db_connection_1
@@ -38,23 +37,23 @@ describe "SeamlessDatabasePool" do
   end
   
   it "should use the master connection if the connection is forcing it" do
-    connection = stub(:connection, :master_connection => :master_db_connection)
+    connection = double(:connection, :master_connection => :master_db_connection)
     connection.should_receive(:using_master_connection?).and_return(true)
     SeamlessDatabasePool.use_persistent_read_connection
     SeamlessDatabasePool.read_only_connection(connection).should == :master_db_connection
   end
   
   it "should be able to set using the master connection" do
-    connection = stub(:connection, :master_connection => :master_db_connection)
-    connection.stub!(:using_master_connection?).and_return(false)
+    connection = double(:connection, :master_connection => :master_db_connection)
+    connection.stub(:using_master_connection? => false)
     SeamlessDatabasePool.use_master_connection
     SeamlessDatabasePool.read_only_connection(connection).should == :master_db_connection
   end
   
   it "should be able to use persistent read connections within a block" do
-    connection = stub(:connection, :master_connection => :master_db_connection)
+    connection = double(:connection, :master_connection => :master_db_connection)
     connection.should_receive(:random_read_connection).once.and_return(:read_db_connection)
-    connection.stub!(:using_master_connection?).and_return(false)
+    connection.stub(:using_master_connection? => false)
     SeamlessDatabasePool.read_only_connection(connection).should == :master_db_connection
     SeamlessDatabasePool.use_persistent_read_connection do
       SeamlessDatabasePool.read_only_connection(connection).should == :read_db_connection
@@ -65,9 +64,9 @@ describe "SeamlessDatabasePool" do
   end
   
   it "should be able to use random read connections within a block" do
-    connection = stub(:connection, :master_connection => :master_db_connection)
+    connection = double(:connection, :master_connection => :master_db_connection)
     connection.should_receive(:random_read_connection).and_return(:read_db_connection_1, :read_db_connection_2)
-    connection.stub!(:using_master_connection?).and_return(false)
+    connection.stub(:using_master_connection? => false)
     SeamlessDatabasePool.read_only_connection(connection).should == :master_db_connection
     SeamlessDatabasePool.use_random_read_connection do
       SeamlessDatabasePool.read_only_connection(connection).should == :read_db_connection_1
@@ -78,9 +77,9 @@ describe "SeamlessDatabasePool" do
   end
   
   it "should be able to use the master connection within a block" do
-    connection = stub(:connection, :master_connection => :master_db_connection)
+    connection = double(:connection, :master_connection => :master_db_connection)
     connection.should_receive(:random_read_connection).once.and_return(:read_db_connection)
-    connection.stub!(:using_master_connection?).and_return(false)
+    connection.stub(:using_master_connection? => false)
     SeamlessDatabasePool.use_persistent_read_connection
     SeamlessDatabasePool.read_only_connection(connection).should == :read_db_connection
     SeamlessDatabasePool.use_master_connection do
@@ -92,9 +91,9 @@ describe "SeamlessDatabasePool" do
   end
   
   it "should be able to use connection blocks within connection blocks" do
-    connection = stub(:connection, :master_connection => :master_db_connection)
-    connection.should_receive(:random_read_connection).any_number_of_times.and_return(:read_db_connection)
-    connection.stub!(:using_master_connection?).and_return(false)
+    connection = double(:connection, :master_connection => :master_db_connection)
+    connection.stub(:random_read_connection => :read_db_connection)
+    connection.stub(:using_master_connection? => false)
     SeamlessDatabasePool.use_persistent_read_connection do
       SeamlessDatabasePool.read_only_connection(connection).should == :read_db_connection
       SeamlessDatabasePool.use_master_connection do
@@ -109,9 +108,8 @@ describe "SeamlessDatabasePool" do
   end
   
   it "should be able to change the persistent connection" do
-    connection = mock(:connection)
-    connection.stub!(:random_read_connection).and_return(:read_db_connection)
-    connection.stub!(:using_master_connection?).and_return(false)
+    connection = double(:connection)
+    connection.stub(:random_read_connection => :read_db_connection, :using_master_connection? => false)
     
     SeamlessDatabasePool.use_persistent_read_connection
     SeamlessDatabasePool.read_only_connection_type.should == :persistent

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: seamless_database_pool
 version: !ruby/object:Gem::Version
-  version: 1.0.14
-  prerelease: 
+  version: 1.0.15
 platform: ruby
 authors:
 - Brian Durand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.20
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -135,27 +122,26 @@ files:
 - spec/test_model.rb
 homepage: http://github.com/bdurand/seamless_database_pool
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Add support for master/slave database clusters in ActiveRecord to improve
   performance.
 test_files: []