replica 1.0.1 → 1.0.2

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/replica.rb

@@ -11,6 +11,9 @@ module ActiveRecord # :nodoc:
       #   end
       # the first account will be found on the slave DB
       #
+      # For one-liners you can simply do
+      #   Account.with_slave.first
+      #
       # this is the same as:
       #   Account.with_replica(:slave) do
       #     Account.first
@@ -18,7 +21,7 @@ module ActiveRecord # :nodoc:
       def with_slave(&block)
         with_replica(:slave, &block)
       end
-      
+
       # See with_slave
       def with_master(&block)
         with_replica(nil, &block)
@@ -27,11 +30,11 @@ module ActiveRecord # :nodoc:
       def with_slave_if(condition, &block)
         condition ? with_slave(&block) : with_master(&block)
       end
-      
+
       def with_slave_unless(condition, &block)
         with_slave_if(!condition, &block)
       end
-      
+
       # Name of the connection pool. Used by ConnectionHandler to retrieve the current connection pool.
       def connection_pool_name # :nodoc:
         replica = current_replica_name
@@ -44,7 +47,7 @@ module ActiveRecord # :nodoc:
         end
       end
 
-      # Specify which database to use. 
+      # Specify which database to use.
       #
       # Example:
       # database.yml
@@ -53,22 +56,31 @@ module ActiveRecord # :nodoc:
       #     ...
       #
       # Account.with_replica(:slave) { Account.count }
+      # Account.with_replica(:slave).count
       #
       def with_replica(replica_name, &block)
+        if block_given?
+          with_replica_block(replica_name, &block)
+        else
+          Proxy.new(self, replica_name)
+        end
+      end
+
+      def with_replica_block(replica_name, &block)
         old_replica_name = current_replica_name
         begin
           self.current_replica_name = replica_name
         rescue ActiveRecord::AdapterNotSpecified => e
           self.current_replica_name = old_replica_name
           logger.warn("Failed to establish replica connection: #{e.message} - defaulting to master")
-        end        
+        end
         yield
       ensure
         self.current_replica_name = old_replica_name
       end
 
       private
-      
+
         def current_replica_name
           Thread.current[replica_key]
         end
@@ -78,47 +90,56 @@ module ActiveRecord # :nodoc:
 
           establish_replica_connection(new_replica_name) unless connected_to_replica?
         end
-        
+
         def establish_replica_connection(replica_name)
-           name = replica_name ? "#{RAILS_ENV}_#{replica_name}" : RAILS_ENV
-           spec = configurations[name]
-           raise AdapterNotSpecified.new("No database defined by #{name} in database.yml") if spec.nil?
-           
-           connection_handler.establish_connection(connection_pool_name, ConnectionSpecification.new(spec, "#{spec['adapter']}_connection"))
+          name = replica_name ? "#{RAILS_ENV}_#{replica_name}" : RAILS_ENV
+          spec = configurations[name]
+          raise AdapterNotSpecified.new("No database defined by #{name} in database.yml") if spec.nil?
+
+          connection_handler.establish_connection(connection_pool_name, ConnectionSpecification.new(spec, "#{spec['adapter']}_connection"))
         end
-        
+
         def connected_to_replica?
           connection_handler.connection_pools.has_key?(connection_pool_name)
         end
-        
+
         def replica_key
           @replica_key ||= "#{name}_replica"
         end
-        
+
+        class Proxy
+          def initialize(target, replica)
+            @target = target
+            @replica = replica
+          end
+
+          def method_missing(method, *args)
+            @target.with_replica_block(@replica) { @target.send(method, *args) }
+          end
+        end
     end
   end
   Base.extend(Base::Replica)
-  
+
   # The only difference here is that we use klass.connection_pool_name
   # instead of klass.name as the pool key
   module ConnectionAdapters # :nodoc:
     class ConnectionHandler # :nodoc:
-      
+
       def retrieve_connection_pool(klass)
         pool = @connection_pools[klass.connection_pool_name]
         return pool if pool
         return nil if ActiveRecord::Base == klass
         retrieve_connection_pool klass.superclass
       end
-      
+
       def remove_connection(klass)
-         pool = @connection_pools[klass.connection_pool_name]
-         @connection_pools.delete_if { |key, value| value == pool }
-         pool.disconnect! if pool
-         pool.spec.config if pool
-       end
-      
+        pool = @connection_pools[klass.connection_pool_name]
+        @connection_pools.delete_if { |key, value| value == pool }
+        pool.disconnect! if pool
+        pool.spec.config if pool
+      end
+
     end
   end
 end
-

data/test/helper.rb

@@ -20,7 +20,7 @@ load(File.dirname(__FILE__) + "/schema.rb")
 
 
 class Test::Unit::TestCase
-  
+
   def assert_using_master_db(klass)
     assert_equal('replica_test', klass.connection.instance_variable_get(:@config)[:database])
   end
@@ -28,5 +28,5 @@ class Test::Unit::TestCase
   def assert_using_slave_db(klass)
     assert_equal('replica_test_slave', klass.connection.instance_variable_get(:@config)[:database])
   end
-  
+
 end

data/test/replica_test.rb

@@ -13,7 +13,7 @@ class ReplicaTest < ActiveRecord::TestCase
     should "default to the master database" do
       Account.create!
 
-      ActiveRecord::Base.with_slave { assert_using_master_db(Account) } 
+      ActiveRecord::Base.with_slave { assert_using_master_db(Account) }
       Account.with_slave { assert_using_master_db(Account) }
       Ticket.with_slave  { assert_using_master_db(Account) }
     end
@@ -36,6 +36,7 @@ class ReplicaTest < ActiveRecord::TestCase
 
       assert_not_equal Account.count, ActiveRecord::Base.with_slave { Account.count }
       assert_not_equal Account.count, Account.with_slave { Account.count }
+      assert_not_equal Account.count, Account.with_slave.count
       assert_equal Account.count, Ticket.with_slave { Account.count }
     end
 
@@ -67,25 +68,25 @@ class ReplicaTest < ActiveRecord::TestCase
 
     should "support conditional methods" do
       assert_using_master_db(Account)
-      
+
       Account.with_slave_if(true) do
         assert_using_slave_db(Account)
       end
-      
+
       assert_using_master_db(Account)
 
       Account.with_slave_if(false) do
         assert_using_master_db(Account)
       end
-      
+
       Account.with_slave_unless(true) do
         assert_using_master_db(Account)
       end
-      
+
       Account.with_slave_unless(false) do
         assert_using_slave_db(Account)
       end
-      
+
     end
 
     should_eventually "support nested with_* blocks" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: replica
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Eric Chapweske
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -08:00
+date: 2010-01-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency