From 8350ce97f2065eed9638c595d3938a573d6fa343 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 5 Jan 2012 17:05:21 -0800
Subject: Revert "More 1.9 way"

This reverts commit 675094b2757cf90399dadca4489b1036810ae570.
---
 activemodel/lib/active_model/conversion.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'activemodel/lib')

diff --git a/activemodel/lib/active_model/conversion.rb b/activemodel/lib/active_model/conversion.rb
index c7c805f1a2..80a3ba51c3 100644
--- a/activemodel/lib/active_model/conversion.rb
+++ b/activemodel/lib/active_model/conversion.rb
@@ -39,9 +39,11 @@ 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
-      key = respond_to?(:id) && id
-      key ? [key] : nil
+      persisted? ? [id] : nil
     end
 
     # Returns a string representing the object's key suitable for use in URLs,
-- 
cgit v1.2.3