More 1.9 way

rails · Jan 5, 2012 · 675094b · 675094b · tenderlove · Jan 6, 2012
1 parent 0e8dda7
commit 675094b
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/activemodel/lib/active_model/conversion.rb b/activemodel/lib/active_model/conversion.rb
@@ -39,11 +39,9 @@ def to_model
 
     # Returns an Enumerable of all key attributes if any is set, regardless
     # if the object is persisted or not.
-    #
-    # Note the default implementation uses persisted? just because all objects
-    # in Ruby 1.8.x responds to <tt>:id</tt>.
     def to_key
-      persisted? ? [id] : nil
+      key = respond_to?(:id) && id
+      key ? [key] : nil
     end
 
     # Returns a string representing the object's key suitable for use in URLs,