eager_record 0.0.2 → 0.0.3

data/lib/eager_record/version.rb

@@ -1,3 +1,3 @@
 module EagerRecord
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/eager_record.rb

@@ -1,4 +1,4 @@
-require 'rubygems'
+ 'rubygems'
 require 'active_record'
 require 'digest'
 
@@ -81,7 +81,12 @@ module EagerRecord
         if originating_collection = @owner.instance_variable_get(:@originating_collection)
           association_name = @reflection.name
           @owner.class.__send__(:preload_associations, originating_collection, association_name)
-          return @target if loaded?
+          new_association = @owner.__send__(:association_instance_get, association_name)
+          if new_association && __id__ != new_association.__id__ && new_association.loaded?
+            @target = new_association.target
+            @loaded = true
+            return
+          end
         end
       end
       load_target_without_eager_preloading

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Mat Brown
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 -04:00
+date: 2010-05-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency