decisiv-sharded_database 0.1.4.1 → 0.1.4.2

data/lib/sharded_database/aggregate_proxy.rb

@@ -41,6 +41,8 @@ module ShardedDatabase
       load_target.source_class = @klass
       load_target.class_eval %{
         def #{method}(*args)
+          return @#{method} if @#{method}
+          
           if proxy_#{method}.respond_to?(:proxy_reflection)
             proxy_#{method}.proxy_reflection.klass.metaclass.delegate :connection, :to => self.source_class
             proxy_#{method}
@@ -49,13 +51,9 @@ module ShardedDatabase
             # Revisit this later and do it properly.
             
             reflection = self.class.reflect_on_all_associations.find { |a| a.name == :#{method} }
-            klass = reflection.klass
-            
-            @original_connection = klass.connection
+            klass = reflection.klass            
             klass.metaclass.delegate :connection, :to => self.source_class
-            @#{method} ||= klass.find(send(reflection.primary_key_name))
-            klass.metaclass.delegate :connection, :to => @original_connection
-            
+            @#{method} ||= klass.find(send(reflection.primary_key_name))            
             @#{method}
           end
         end

data/lib/sharded_database.rb

@@ -4,6 +4,6 @@ require 'sharded_database/core_extensions'
 
 module ShardedDatabase
   
-  VERSION = '0.1.4.1'
+  VERSION = '0.1.4.2'
   
 end

data/test/sharded_database/association_test.rb

@@ -26,6 +26,10 @@ class AssociationTest < ShardedDatabase::TestCase
       assert_instance_of Company, @parent.company
     end
     
+    should 'cache the associated object' do
+      assert_equal @parent.company.object_id, @parent.company.object_id
+    end
+    
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: decisiv-sharded_database
 version: !ruby/object:Gem::Version 
-  version: 0.1.4.1
+  version: 0.1.4.2
 platform: ruby
 authors: 
 - Brennan Dunn