replica 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/replica.rb

@@ -1,145 +1,7 @@
 require 'activerecord'
+require 'replica/base'
+require 'replica/association_collection'
+require 'replica/connection_pool'
 
-module ActiveRecord # :nodoc:
-  class Base # :nodoc:
-    module Replica
-
-      # Executes queries using the slave database. Fails over to master if no slave is found.
-      # if you want to execute a block of code on the slave you can go:
-      #   Account.with_slave do
-      #     Account.first
-      #   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
-      #   end
-      def with_slave(&block)
-        with_replica(:slave, &block)
-      end
-
-      # See with_slave
-      def with_master(&block)
-        with_replica(nil, &block)
-      end
-
-      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
-        if replica
-          "#{name}_#{replica}"
-        elsif self == ActiveRecord::Base
-          name
-        else
-          superclass.connection_pool_name
-        end
-      end
-
-      # Specify which database to use.
-      #
-      # Example:
-      # database.yml
-      #   test_slave:
-      #     adapter: mysql
-      #     ...
-      #
-      # 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
-        yield
-      ensure
-        self.current_replica_name = old_replica_name
-      end
-
-      private
-
-        def current_replica_name
-          Thread.current[replica_key]
-        end
-
-        def current_replica_name=(new_replica_name)
-          Thread.current[replica_key] = new_replica_name
-
-          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"))
-        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, &block)
-            @target.with_replica_block(@replica) { @target.send(method, *args, &block) }
-          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
-
-    end
-  end
-end
+ActiveRecord::Base.extend ActiveRecord::Base::Replica
+ActiveRecord::Associations::AssociationCollection.send(:include, ActiveRecord::Associations::AssociationCollection::Replica)

data/lib/replica/association_collection.rb

@@ -0,0 +1,38 @@
+module ActiveRecord # :nodoc:
+  module Associations
+    class AssociationCollection < AssociationProxy #:nodoc:
+      module Replica
+        def with_slave
+          with_replica(:slave)
+        end
+
+        def with_master
+          with_replica(nil)
+        end
+
+        def with_slave_if(condition)
+          condition ? with_slave : with_master
+        end
+
+        def with_slave_unless(condition)
+          with_slave_if(!condition)
+        end
+
+        def with_replica(replica_name)
+          Proxy.new(self, replica_name)
+        end
+
+        class Proxy
+          def initialize(association_collection, replica)
+            @association_collection = association_collection
+            @replica = replica
+          end
+
+          def method_missing(method, *args, &block)
+            @association_collection.proxy_reflection.klass.with_replica_block(@replica) { @association_collection.send(method, *args, &block) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/replica/base.rb

@@ -0,0 +1,120 @@
+module ActiveRecord # :nodoc:
+  class Base # :nodoc:
+    module Replica
+
+      # Executes queries using the slave database. Fails over to master if no slave is found.
+      # if you want to execute a block of code on the slave you can go:
+      #   Account.with_slave do
+      #     Account.first
+      #   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
+      #   end
+      def with_slave(&block)
+        with_replica(:slave, &block)
+      end
+
+      # See with_slave
+      def with_master(&block)
+        with_replica(nil, &block)
+      end
+
+      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
+        if replica
+          "#{name}_#{replica}"
+        elsif self == ActiveRecord::Base
+          name
+        else
+          superclass.connection_pool_name
+        end
+      end
+
+      # Specify which database to use.
+      #
+      # Example:
+      # database.yml
+      #   test_slave:
+      #     adapter: mysql
+      #     ...
+      #
+      # 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
+        yield
+      ensure
+        self.current_replica_name = old_replica_name
+      end
+
+      private
+
+        def current_replica_name
+          Thread.current[replica_key]
+        end
+
+        def current_replica_name=(new_replica_name)
+          Thread.current[replica_key] = new_replica_name
+
+          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"))
+        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, &block)
+            @target.with_replica_block(@replica) { @target.send(method, *args, &block) }
+          end
+        end
+    end
+  end
+end

data/lib/replica/connection_pool.rb

@@ -0,0 +1,23 @@
+module ActiveRecord # :nodoc:
+  # 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
+
+    end
+  end
+end

data/test/models.rb

@@ -1,7 +1,9 @@
 class Account < ActiveRecord::Base
   # attributes: id, name, updated_at, created_at
+  has_many :tickets
 end
 
 class Ticket < ActiveRecord::Base
   # attributes: id, title, account_id, updated_at, created_at
+  belongs_to :account
 end

data/test/replica_test.rb

@@ -36,7 +36,6 @@ 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
 
@@ -112,4 +111,24 @@ class ReplicaTest < ActiveRecord::TestCase
     end
 
   end
+
+  context "replica proxy" do
+    should "successfully execute queries" do
+      assert_using_master_db(Account)
+      Account.create!
+
+      assert_not_equal Account.count, Account.with_slave.count
+    end
+
+    should "work association collections" do
+      assert_using_master_db(Account)
+      account = Account.create!
+
+      Ticket.connection.expects(:select_all).with("SELECT * FROM `tickets` WHERE (`tickets`.account_id = #{account.id})  LIMIT 1", anything).returns([])
+      Ticket.with_slave.connection.expects(:select_all).with("SELECT * FROM `tickets` WHERE (`tickets`.account_id = #{account.id})  LIMIT 1", anything).returns([])
+
+      account.tickets.first
+      account.tickets.with_slave.first
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: replica
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Eric Chapweske
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-28 00:00:00 -08:00
+date: 2010-02-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,6 +40,9 @@ files:
 - Rakefile
 - VERSION
 - lib/replica.rb
+- lib/replica/association_collection.rb
+- lib/replica/base.rb
+- lib/replica/connection_pool.rb
 - test/database.yml
 - test/helper.rb
 - test/models.rb