Added PropertySet#valid? and refactored code that tests key validity

datamapper · Oct 23, 2009 · a105712 · a105712
1 parent 539d861
commit a105712
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/lib/dm-core/associations/relationship.rb b/lib/dm-core/associations/relationship.rb
@@ -554,7 +554,7 @@ def valid_collection?(collection)
       # @api private
       def valid_resource?(resource)
         resource.kind_of?(target_model) &&
-        target_key.zip(target_key.get!(resource)).all? { |property, value| property.valid?(value) }
+        target_key.valid?(target_key.get!(resource))
       end
 
       # TODO: document

diff --git a/lib/dm-core/property_set.rb b/lib/dm-core/property_set.rb
@@ -126,6 +126,12 @@ def loaded?(resource)
       all? { |property| property.loaded?(resource) }
     end
 
+    # TODO: document
+    # @api semipublic
+    def valid?(values)
+      zip(values.nil? ? [] : values).all? { |property, value| property.valid?(value) }
+    end
+
     # TODO: document
     # @api semipublic
     def typecast(values)

diff --git a/lib/dm-core/resource.rb b/lib/dm-core/resource.rb
@@ -86,11 +86,14 @@ def repository
     def key
       return @key if defined?(@key)
 
-      key = model.key(repository_name).map do |property|
+      model_key = model.key(repository_name)
+
+      key = model_key.map do |property|
         original_attributes[property] || (property.loaded?(self) ? property.get!(self) : nil)
       end
 
-      @key = key if key.all? { |value| !value.nil? }
+      # only memoize a valid key
+      @key = key if model_key.valid?(key)
     end
 
     # Checks if this Resource instance is new