slave_pools 1.0.0.rc3 → 1.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e6a45beb574601032f4618737cb16626fad3b32
-  data.tar.gz: edf4ff14ab00c4eb85551b9a977c52c362bdef43
+  metadata.gz: d874a3eed928f50de0897109c923c87a142b8530
+  data.tar.gz: 525dd736b487ef2c1c7d025742363ac2e8bbcdf5
 SHA512:
-  metadata.gz: 2daa6e7d816fd82fb85d8f34644be0e9588ec6e34653e6887b3a866f9affb47091f82503963fc067b74e77c84c2085e5c23acc7ee0a641677015b6c8c5fbaa3b
-  data.tar.gz: 6c3770d21e1d19b4b8bec198730bace7f95a109af22644fda294b552db13d0bbd98e5da38f37d703d8492a65e71bec445cc4161165aeee5078ea3e39eb6f75de
+  metadata.gz: 6671beaae7b1d6e997b973c15ae8d795c9a8cf5c11b2f2e2c374cd6881270bea3b1211f61ff94e204f99c92ee8f40fc0edc478f9ee36f5aafdd6a1ca2baabf49
+  data.tar.gz: 54ab55daf2d791f86c5f3d707c6bf98c4c6d5d7113b84a7ef75fa4164f6b06e61f267cee8115dfabc78f109c6f9b25d07249bceb0754533dd962c1181680d43b

data/lib/slave_pools/engine.rb

@@ -12,6 +12,12 @@ module SlavePools
             :select_rows, :select, :verify!, :raw_connection, :active?, :reconnect!,
             :disconnect!, :reset_runtime, :log, :log_info
           ]
+        elsif ActiveRecord::VERSION::MAJOR == 4
+          [
+            :select_all, :select_one, :select_value, :select_values,
+            :select_rows, :select, :verify!, :raw_connection, :active?, :reconnect!,
+            :disconnect!, :reset_runtime, :log
+          ]
         else
           warn "Unsupported ActiveRecord version #{ActiveRecord.version}. Please whitelist the safe methods."
         end

data/lib/slave_pools/version.rb

@@ -1,3 +1,3 @@
 module SlavePools
-  VERSION = "1.0.0.rc3"
+  VERSION = "1.0.0.rc4"
 end

data/lib/slave_pools.rb

@@ -4,12 +4,10 @@ require 'slave_pools/pool'
 require 'slave_pools/pools'
 require 'slave_pools/active_record_extensions'
 require 'slave_pools/hijack'
-require 'slave_pools/observer_extensions'
 require 'slave_pools/query_cache'
 require 'slave_pools/connection_proxy'
 
 require 'slave_pools/engine' if defined? Rails
-ActiveRecord::Observer.send :include, SlavePools::ObserverExtensions
 ActiveRecord::Base.send :include, SlavePools::ActiveRecordExtensions
 
 module SlavePools

data/spec/config/test_model.rb

@@ -1,19 +1,2 @@
 class TestModel < ActiveRecord::Base
-  has_many :test_subs
-end
-
-class TestSub < ActiveRecord::Base
-  belongs_to :test_model
-end
-
-class TestModelObserver < ActiveRecord::Observer
-  
-  def after_create(test_model)
-    ActiveRecord::Base.logger.info "in observer"
-    TestSub.create(:test_model=>test_model)
-    TestModel.first
-  end
-end
-
-
-
+end

data/spec/connection_proxy_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require_relative 'spec_helper'
+require_relative 'config/test_model'
 
 describe SlavePools do
 
@@ -165,7 +166,7 @@ describe SlavePools do
 
   it 'should reload models from the master' do
     foo = TestModel.create!
-    @master.should_receive(:select_all).and_return([{'id' => foo.id}])
+    @master.should_receive(:select_all).and_return(ActiveRecord::Result.new(["id"], ["1"]))
     @default_slave1.should_not_receive(:select_all)
     @default_slave2.should_not_receive(:select_all)
     foo.reload

data/spec/pool_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require_relative 'spec_helper'
 
 describe SlavePools::Pool do
 

data/spec/query_cache_spec.rb

@@ -1,3 +1,4 @@
+require 'rack'
 require_relative 'spec_helper'
 
 describe SlavePools::QueryCache do
@@ -55,6 +56,7 @@ describe SlavePools::QueryCache do
         @proxy.next_slave!
         3.times { @proxy.select_all(@sql)}
         @master.query_cache.keys.size.should == 1
+        [200, {}, nil]
       }
       mw.call({})
     end
@@ -75,6 +77,7 @@ describe SlavePools::QueryCache do
           @proxy.send(meths[i], '')
           @master.query_cache.keys.size.should == 0
         end
+        [200, {}, nil]
       }
       mw.call({})
     end

data/spec/slave_pools_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require_relative 'spec_helper'
 
 describe SlavePools do
 

data/spec/spec_helper.rb

@@ -16,7 +16,6 @@ ActiveRecord::Base.configurations = YAML::load(File.open(spec_dir + '/config/dat
 ActiveRecord::Base.establish_connection :test
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Migration.create_table(:test_models, :force => true) {}
-ActiveRecord::Migration.create_table(:test_subs, :force => true) {|t| t.integer :test_model_id}
 
 require 'slave_pools'
 SlavePools::Engine.initializers.each(&:run)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slave_pools
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
 platform: ruby
 authors:
 - Dan Drabik
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.12
 - !ruby/object:Gem::Dependency
@@ -39,6 +39,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.11
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -87,22 +101,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
-- lib/slave_pools.rb
 - lib/slave_pools/active_record_extensions.rb
 - lib/slave_pools/config.rb
 - lib/slave_pools/connection_proxy.rb
 - lib/slave_pools/engine.rb
 - lib/slave_pools/hijack.rb
-- lib/slave_pools/observer_extensions.rb
 - lib/slave_pools/pool.rb
 - lib/slave_pools/pools.rb
 - lib/slave_pools/query_cache.rb
 - lib/slave_pools/version.rb
+- lib/slave_pools.rb
+- LICENSE
+- README.md
 - spec/config/test_model.rb
 - spec/connection_proxy_spec.rb
-- spec/observer_extensions_spec.rb
 - spec/pool_spec.rb
 - spec/query_cache_spec.rb
 - spec/slave_pools_spec.rb
@@ -127,14 +139,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Connection proxy for ActiveRecord for master / replica setups.
 test_files:
 - spec/config/test_model.rb
 - spec/connection_proxy_spec.rb
-- spec/observer_extensions_spec.rb
 - spec/pool_spec.rb
 - spec/query_cache_spec.rb
 - spec/slave_pools_spec.rb

data/lib/slave_pools/observer_extensions.rb

@@ -1,19 +0,0 @@
-module SlavePools
-  module ObserverExtensions
-    def self.included(base)
-      base.alias_method_chain :update, :masterdb
-    end
-
-    # Send observed_method(object) if the method exists.
-    # currently replicating the update method instead of using the aliased method call to update_without_master
-    def update_with_masterdb(observed_method, object, &block) #:nodoc:
-      if object.class.connection.respond_to?(:with_master)
-        object.class.connection.with_master do
-          update_without_masterdb(observed_method, object)
-        end
-      else
-        update_without_masterdb(observed_method, object)
-      end
-    end
-  end
-end

data/spec/observer_extensions_spec.rb

@@ -1,21 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/config/test_model')
-
-describe SlavePools do
-
-  before(:each) do
-    reset_proxy(SlavePools.proxy)
-    @observer = TestModelObserver.instance
-
-    @test_model = TestModel.create
-  end
-
-  it "should use observers correctly" do
-    TestSub.first.test_model_id.should == @test_model.id
-  end
-
-  it "should not throw a stack too deep error" do
-    @test_model.should be_valid
-  end
-end
-