eager_record 0.1.2 → 0.1.3

data/lib/eager_record/eager_preloading.rb

@@ -41,15 +41,17 @@ module EagerRecord
       def load_target_with_eager_preloading
         return nil unless defined?(@loaded)
 
-        if !loaded? and (!@owner.new_record? || foreign_key_present)
-          if originating_collection = @owner.instance_variable_get(:@originating_collection)
-            association_name = @reflection.name
-            @owner.class.__send__(:preload_associations, originating_collection, association_name)
-            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
+        if @owner.read_attribute(@reflection.primary_key_name)
+          if !loaded? and (!@owner.new_record? || foreign_key_present)
+            if originating_collection = @owner.instance_variable_get(:@originating_collection)
+              association_name = @reflection.name
+              @owner.class.__send__(:preload_associations, originating_collection, association_name)
+              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
         end

data/lib/eager_record/version.rb

@@ -1,3 +1,3 @@
 module EagerRecord
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eager_record
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Mat Brown
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-21 00:00:00 -04:00
+date: 2011-01-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,9 +42,9 @@ extra_rdoc_files: []
 
 files: 
 - rails/init.rb
+- lib/eager_record/scoped_preloading.rb
 - lib/eager_record/version.rb
 - lib/eager_record/unmarshallable.rb
-- lib/eager_record/scoped_preloading.rb
 - lib/eager_record/eager_preloading.rb
 - lib/eager_record.rb
 - README.rdoc