schoefmax-multi_db 0.1.3 → 0.1.4

data/README.rdoc

@@ -94,6 +94,9 @@ And add this to your ApplicationController:
 
    after_filter { ActiveRecord::Base.connection_proxy.next_reader! }
 
+*NOTE*: It's not possible to toggle this mode in a running process, as the dynamically
+generated methods will have the initially defined "stickyness" built in.
+
 === Usage outside of Rails
 
 You can use multi_db together with other framworks or in standalone scripts.

data/lib/multi_db/active_record_extensions.rb

@@ -20,7 +20,9 @@ module MultiDb
     end
     
     def reload_with_master(*args, &block)
-      connection_proxy.with_master { reload_without_master }
+      self.class.connection_proxy.with_master do
+        reload_without_master(*args, &block)
+      end
     end
   end
 end

data/multi_db.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{multi_db}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maximilian Sch\303\266fmann"]

data/spec/connection_proxy_spec.rb

@@ -12,7 +12,11 @@ describe MultiDb::ConnectionProxy do
   before(:all) do
     ActiveRecord::Base.configurations = MULTI_DB_SPEC_CONFIG
     ActiveRecord::Base.establish_connection :test
+    ActiveRecord::Migration.verbose = false
+    ActiveRecord::Migration.create_table(:master_models, :force => true) {}
     class MasterModel < ActiveRecord::Base; end
+    ActiveRecord::Migration.create_table(:foo_models, :force => true) {|t| t.string :bar}
+    class FooModel < ActiveRecord::Base; end
     @sql = 'SELECT 1 + 1 FROM DUAL'
   end
   
@@ -24,6 +28,10 @@ describe MultiDb::ConnectionProxy do
     @slave2 = MultiDb::SlaveDatabase2.retrieve_connection
   end
 
+  after(:each) do
+    ActiveRecord::Base.send :alias_method, :reload, :reload_without_master
+  end
+
   it 'AR::B#connection should return an instance of MultiDb::ConnectionProxy' do
     ActiveRecord::Base.connection.should be_kind_of(MultiDb::ConnectionProxy)
   end
@@ -138,13 +146,23 @@ describe MultiDb::ConnectionProxy do
     MasterModel.retrieve_connection.should_receive(:select_all).once.and_return([])
     MasterModel.first
   end
+
+  it 'should reload models from the master' do
+    foo = FooModel.create!(:bar => 'baz')
+    foo.bar = "not_saved"
+    @slave1.should_not_receive(:select_all)
+    @slave2.should_not_receive(:select_all)
+    foo.reload
+    # we didn't stub @master#select_all here, check that we actually hit the db
+    foo.bar.should == 'baz'
+  end
   
   describe 'with sticky_slave ' do
 
     before { MultiDb::ConnectionProxy.sticky_slave = true  }
     after  { MultiDb::ConnectionProxy.sticky_slave = false }
 
-    it 'should not switch to the next reader when #sticky_master is true' do
+    it 'should not switch to the next reader automatically' do
       @slave1.should_receive(:select_all).exactly(3)
       @slave2.should_receive(:select_all).exactly(0)
       3.times { @proxy.select_all(@sql) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: schoefmax-multi_db
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - "Maximilian Sch\xC3\xB6fmann"
@@ -14,6 +14,7 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: