From 7c84bbf1607bf4059de04cc4c8ec84df2334574b Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Mon, 20 Jul 2009 23:57:01 -0500 Subject: Add wrap_with_notifications helper to AMo observing --- activeresource/lib/active_resource/base.rb | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'activeresource/lib/active_resource/base.rb') diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb index 88a431a6d9..bc82139dac 100644 --- a/activeresource/lib/active_resource/base.rb +++ b/activeresource/lib/active_resource/base.rb @@ -804,8 +804,7 @@ module ActiveResource # my_company.size = 10 # my_company.save # sends PUT /companies/1 (update) def save - notify(:before_save) - (new? ? create : update).tap { notify(:after_save) } + new? ? create : update end # Deletes the resource from the remote service. @@ -821,8 +820,7 @@ module ActiveResource # new_person.destroy # Person.find(new_id) # 404 (Resource Not Found) def destroy - notify(:before_destroy) - connection.delete(element_path, self.class.headers).tap { notify(:after_destroy) } + connection.delete(element_path, self.class.headers) end # Evaluates to true if this resource is not new? and is @@ -997,20 +995,16 @@ module ActiveResource # Update the resource on the remote service. def update - notify(:before_update) connection.put(element_path(prefix_options), encode, self.class.headers).tap do |response| load_attributes_from_response(response) - notify(:after_update) end end # Create (i.e., \save to the remote service) the \new resource. def create - notify(:before_create) connection.post(collection_path, encode, self.class.headers).tap do |response| self.id = id_from_response(response) load_attributes_from_response(response) - notify(:after_create) end end @@ -1093,7 +1087,6 @@ module ActiveResource class Base extend ActiveModel::Naming - include CustomMethods, Validations - include ActiveModel::Observing + include CustomMethods, Observing, Validations end end -- cgit v1.2.3