From fc956425d405e75bcf310f3e6f08cf201cc8131a Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Fri, 6 Jan 2012 10:48:47 -0200
Subject: Revert "Revert "More 1.9 way""

Fixed failing tests
This reverts commit 8350ce97f2065eed9638c595d3938a573d6fa343.
---
 activemodel/lib/active_model/conversion.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'activemodel/lib')

diff --git a/activemodel/lib/active_model/conversion.rb b/activemodel/lib/active_model/conversion.rb
index 80a3ba51c3..c7c805f1a2 100644
--- a/activemodel/lib/active_model/conversion.rb
+++ b/activemodel/lib/active_model/conversion.rb
@@ -39,11 +39,9 @@ module ActiveModel
 
     # 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,
-- 
cgit v1.2.3