From 97487c4e1154696fb0b30ea8727ba5459f575719 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 4 Sep 2006 23:36:13 +0000 Subject: load nil is noop. use new? instead of new_resource? git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5006 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activeresource/lib/active_resource/base.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'activeresource/lib') diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb index ec6cee19fa..40a50201a7 100644 --- a/activeresource/lib/active_resource/base.rb +++ b/activeresource/lib/active_resource/base.rb @@ -102,7 +102,7 @@ module ActiveResource @prefix_options = prefix_options end - def new_resource? + def new? id.nil? end @@ -115,7 +115,7 @@ module ActiveResource end def save - new_resource? ? create : update + new? ? create : update end def destroy @@ -134,6 +134,7 @@ module ActiveResource # Manually load attributes from a hash. Recursively loads collections of # resources. def load(attributes) + return self if attributes.nil? attributes.each do |key, value| @attributes[key.to_s] = case value -- cgit v1.2.3