aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/lib/active_resource/base.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activeresource/lib/active_resource/base.rb')
-rw-r--r--activeresource/lib/active_resource/base.rb5
1 files changed, 3 insertions, 2 deletions
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