decisiv-sharded_database 0.3.1.1 → 0.3.2.1

data/lib/sharded_database/aggregate.rb

@@ -89,12 +89,9 @@ module ShardedDatabase
             
             def #{association.name}_with_connection(*args)
               reflection = self.class.reflect_on_association(:#{association.name})
+              reflection.options.merge!({ :connection_class => #{@klass.name}} )
               klass = reflection.klass
               ModelWithConnection.borrow_connection(klass, #{@klass.name}) do
-                unless reflection.belongs_to?
-                  # TODO
-                  klass.send :include, ShardedDatabase::ModelWithConnection
-                end
                 #{association.name}_without_connection(*args)
               end
             end

data/lib/sharded_database/has_many_association.rb

@@ -0,0 +1,37 @@
+module ShardedDatabase
+  module HasManyAssociation
+    
+    def self.included(klass)
+      klass.class_eval do
+        alias_method_chain :initialize, :connection
+        #alias_method_chain :find, :connection
+      end
+    end
+    
+    def initialize_with_connection(owner, reflection)
+      if @connection_class = reflection.options[:connection_class]
+        @original_class = reflection.klass
+        reflection.metaclass.class_eval %{
+          def klass
+            ModelWithConnection.borrow_connection(#{@original_class.name}, #{@connection_class.name})
+          end
+        }
+      end
+      initialize_without_connection(owner, reflection)
+    end
+    
+    def find_with_connection(*args)
+      if connection_class = @reflection.options[:connection_class]
+        ShardedDatabase::ModelWithConnection.borrow_connection(@reflection.klass, connection_class) do
+          find_without_connection(*args)
+        end
+      else
+        find_without_connection(*args)
+      end
+    end
+    
+  end
+end
+
+ActiveRecord::Associations::HasManyAssociation.send :include, ShardedDatabase::HasManyAssociation
+ActiveRecord::Associations::HasManyThroughAssociation.send :include, ShardedDatabase::HasManyAssociation

data/lib/sharded_database/model_with_connection.rb

@@ -15,9 +15,9 @@ module ShardedDatabase
       @eigen = requesting_class.metaclass
       @eigen.send :alias_method, :proxy_connection, :connection
       @eigen.delegate :connection, :to => target_class
-      yield(requesting_class)
+      block_given? ? yield(requesting_class) : requesting_class
     ensure
-      @eigen.send :alias_method, :connection, :proxy_connection
+      @eigen.send :alias_method, :connection, :proxy_connection if block_given?
     end
     
     

data/lib/sharded_database.rb

@@ -1,10 +1,11 @@
 require 'sharded_database/model_with_connection'
 require 'sharded_database/aggregate_proxy'
 require 'sharded_database/aggregate'
+require 'sharded_database/has_many_association'
 require 'sharded_database/core_extensions'
 
 module ShardedDatabase
   
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
   
 end

data/test/sharded_database/association_test.rb

@@ -9,9 +9,16 @@ class AssociationTest < ShardedDatabase::TestCase
   
   context 'Connection delegation on has_many associations' do
     
-    should_eventually 'fetch items from the parent instance connection' do
+    should 'fetch items from the parent instance connection' do
       assert_instance_of Array, @parent.items
-      assert_equal '', @parent.items
+      assert_equal 1, @parent.items.size
+    end
+    
+    should 'return original connection after accessing a has_many association' do
+      original = Item.connection
+      AggregateEmployee.find_by_source('one').items
+      final = Item.connection
+      assert_equal original, final
     end
     
   end
@@ -30,6 +37,13 @@ class AssociationTest < ShardedDatabase::TestCase
       assert_equal @parent.call_company, @parent.company
     end
     
+    should 'return original connection after accessing a belongs_to association' do
+      original = Company.connection
+      AggregateEmployee.find_by_source('one').company
+      final = Company.connection
+      assert_equal original, final
+    end
+    
   end
   
 end

data/test/sharded_database/connection_test.rb

@@ -10,8 +10,6 @@ class ConnectionTest < ShardedDatabase::TestCase
   
   should 'have instances of the same source share the same connection' do
     first, second = AggregateEmployee.find_all_by_source('two', :limit => 2)
-    
-    #assert_connection :shard_two, first, second
     assert_equal first.connection.object_id, second.connection.object_id  # ensure that delegation is working correctly
   end
   
@@ -20,16 +18,9 @@ class ConnectionTest < ShardedDatabase::TestCase
   end
   
   should 'return original connection after accessing just the target model' do
-    original = Employee.connection.instance_variable_get('@config')[:database]
+    original = Employee.connection
     AggregateEmployee.find_by_source('one')
-    final = Employee.connection.instance_variable_get('@config')[:database]
-    assert_equal original, final
-  end
-  
-  should 'return original connection after accessing an association' do
-    original = Company.connection.instance_variable_get('@config')[:database]
-    AggregateEmployee.find_by_source('one').company
-    final = Company.connection.instance_variable_get('@config')[:database]
+    final = Employee.connection
     assert_equal original, final
   end
   
@@ -37,18 +28,10 @@ class ConnectionTest < ShardedDatabase::TestCase
     
     should 'allow for an ActiveRecord::Base class to be supplied' do
       object = Employee.first(:connection => Connection::One)
-      #assert_connection :shard_one, object      
     end
     
     should 'allow for a Proc object to be supplied' do
       proc = lambda { |*args| (args.first % 2) == 1 ? Connection::One : Connection::Two }
-      
-      #assert_connection :shard_one, Employee.find(1, :connection => proc)
-      #assert_connection :shard_two, Employee.find(2, :connection => proc)
-    end
-    
-    should 'allow for a symbol to be supplied (which calls a method)' do
-      #assert_connection :shard_one, Employee.find(1, :connection => :pick_connection)
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: decisiv-sharded_database
 version: !ruby/object:Gem::Version 
-  version: 0.3.1.1
+  version: 0.3.2.1
 platform: ruby
 authors: 
 - Brennan Dunn
@@ -30,6 +30,7 @@ files:
 - lib/sharded_database/aggregate_proxy.rb
 - lib/sharded_database/core_extensions.rb
 - lib/sharded_database/model_with_connection.rb
+- lib/sharded_database/has_many_association.rb
 has_rdoc: true
 homepage: http://github.com/brennandunn/sharded_database/
 post_install_message: