multi_db 0.2.2 → 0.3.0

data/README.rdoc

@@ -25,7 +25,7 @@ master database.
 
 === Caveats
 
-* works only with activerecord 2.1, 2.2 and 2.3
+* works with activerecord 2.1, 2.2, 2.3, and 3.0
 
 === Install
 
@@ -259,7 +259,7 @@ If you haven't already, install the rspec gem, then create an empty database
 called "multi_db_test" (you might want to tweak the spec/config/database.yml).
 From the plugin directory, run:
 
-  spec spec
+  rspec spec
 
 
 Copyright (c) 2008, Max Schoefmann <max (a) pragmatic-it de>

data/lib/multi_db/active_record_extensions.rb

@@ -3,17 +3,16 @@ module MultiDb
     def self.included(base)
       base.send :include, InstanceMethods
       base.send :extend, ClassMethods
-      base.alias_method_chain :reload, :master
       base.cattr_accessor :connection_proxy
       # handle subclasses which were defined by the framework or plugins
-      base.send(:subclasses).each do |child|
+      base.send(:descendants).each do |child|
         child.hijack_connection
       end
     end
 
     module InstanceMethods
-      def reload_with_master(*args, &block)
-        self.connection_proxy.with_master { reload_without_master }
+      def reload(options = nil)
+        self.connection_proxy.with_master { super }
       end
     end
 

data/lib/multi_db/connection_proxy.rb

@@ -1,7 +1,9 @@
+require 'active_record/connection_adapters/abstract/query_cache'
+
 module MultiDb
   class ConnectionProxy
-    include QueryCacheCompat
     include ActiveRecord::ConnectionAdapters::QueryCache
+    include QueryCacheCompat
     extend ThreadLocalAccessors
     
     # Safe methods are those that should either go to the slave ONLY or go
@@ -37,6 +39,9 @@ module MultiDb
       # has to do this.
       # This will not affect failover if a master is unavailable.
       attr_accessor :sticky_slave
+      
+      # if master should be the default db
+      attr_accessor :defaults_to_master
 
       # Replaces the connection of ActiveRecord::Base with a proxy and
       # establishes the connections to the slaves.
@@ -64,7 +69,7 @@ module MultiDb
       #   production_slave_database_someserver:
       # These would be available later as MultiDb::SlaveDatabaseSomeserver
       def init_slaves
-        returning([]) do |slaves|
+        [].tap do |slaves|
           ActiveRecord::Base.configurations.each do |name, values|
             if name.to_s =~ /#{self.environment}_(slave_database.*)/
               weight  = if values['weight'].blank?
@@ -93,8 +98,14 @@ module MultiDb
       @slaves    = scheduler.new(slaves)
       @master    = master
       @reconnect = false
-      self.current      = @slaves.current
-      self.master_depth = 0
+      @query_cache = {}
+      if self.class.defaults_to_master
+        self.current = @master
+        self.master_depth = 1
+      else
+        self.current = @slaves.current
+        self.master_depth = 0
+      end
     end
 
     def slave
@@ -104,14 +115,25 @@ module MultiDb
     def scheduler
       @slaves
     end
-
+    
+    
     def with_master
       self.current = @master
       self.master_depth += 1
       yield
     ensure
       self.master_depth -= 1
-      self.current = slave if master_depth.zero?
+      self.current = slave if (master_depth <= 0) 
+    end
+  
+  
+    def with_slave
+      self.current = slave
+      self.master_depth -= 1
+      yield
+    ensure
+      self.master_depth += 1
+      self.current = @master if (master_depth > 0)
     end
     
     def transaction(start_db_transaction = true, &block)
@@ -121,7 +143,7 @@ module MultiDb
     # Calls the method on master/slave and dynamically creates a new
     # method on success to speed up subsequent calls
     def method_missing(method, *args, &block)
-      returning(send(target_method(method), method, *args, &block)) do 
+      send(target_method(method), method, *args, &block).tap do 
         create_delegation_method!(method)
       end
     end
@@ -129,7 +151,7 @@ module MultiDb
     # Switches to the next slave database for read operations.
     # Fails over to the master database if all slaves are unavailable.
     def next_reader!
-      return unless master_depth.zero? # don't if in with_master block
+      return if  master_depth > 0  # don't if in with_master block
       self.current = @slaves.next
     rescue Scheduler::NoMoreItems
       logger.warn "[MULTIDB] All slaves are blacklisted. Reading from master"

data/multi_db.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{multi_db}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maximilian Sch\303\266fmann"]
-  s.date = %q{2009-03-11}
+  s.date = %q{2011-05-17}
   s.description = "Connection proxy for ActiveRecord for single master / multiple slave database deployments"
   s.email = "max@pragmatic-it.de"
   s.extra_rdoc_files = ["LICENSE", "README.rdoc"]

data/spec/connection_proxy_spec.rb

@@ -31,10 +31,6 @@ describe MultiDb::ConnectionProxy do
       @slave3 = MultiDb::SlaveDatabase3.retrieve_connection
       @slave4 = MultiDb::SlaveDatabase4.retrieve_connection
     end
-
-    after(:each) do
-      ActiveRecord::Base.send :alias_method, :reload, :reload_without_master
-    end
   
     it 'AR::B should respond to #connection_proxy' do
       ActiveRecord::Base.connection_proxy.should be_kind_of(MultiDb::ConnectionProxy)
@@ -284,6 +280,49 @@ describe MultiDb::ConnectionProxy do
       end
     end
     
-  end # with alternative scheduler
+    describe "defaults_to_master" do
+      before do
+        MultiDb::ConnectionProxy.defaults_to_master = true
+        MultiDb::ConnectionProxy.setup!
+        @proxy = ActiveRecord::Base.connection_proxy
+      end
+      
+      after do
+        MultiDb::ConnectionProxy.defaults_to_master = nil
+      end
+      
+      it "sets the default database to master" do
+        @proxy.current.should == @proxy.master
+      end
+      
+      it "is still master, when using with_master" do 
+        @proxy.with_master do 
+          @proxy.current.should == @proxy.master
+        end
+      end
+      
+      it "switches to slave, when using with_slave" do
+        @proxy.with_slave do 
+          @proxy.current.should_not == @proxy.master
+        end
+      end
+      
+      
+      it "keep right connection, when nesting with slave/master blocks" do
+        @proxy.with_slave do
+          @proxy.current.should_not == @proxy.master
+          @proxy.with_slave do
+            @proxy.current.should_not == @proxy.master
+            @proxy.with_master do
+              @proxy.current.should == @proxy.master
+            end
+            @proxy.current.should_not == @proxy.master
+          end
+          @proxy.current.should_not == @proxy.master
+        end
+        @proxy.current.should == @proxy.master
+      end
+    end
+  end
 end
 

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-# gem 'activerecord', '2.2.2'
-%w[tlattr_accessors active_record yaml erb spec].each {|lib| require lib}
+gem 'activerecord', '3.0.5'
+%w[tlattr_accessors active_record yaml erb rspec logger].each {|lib| require lib}
 
 RAILS_ENV = ENV['RAILS_ENV'] = 'test'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: multi_db
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Maximilian Sch\xC3\xB6fmann"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-11 00:00:00 +01:00
+date: 2011-05-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency