Kill AMo observing wrap_with_notifications since ARes was only using it

rails · Sep 2, 2009 · 723a47b · 723a47b
1 parent e870e24
commit 723a47b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/activemodel/lib/active_model/observing.rb b/activemodel/lib/active_model/observing.rb
@@ -40,23 +40,6 @@ def instantiate_observers
         observers.each { |o| instantiate_observer(o) }
       end
 
-      # Wraps methods with before and after notifications.
-      #
-      #   wrap_with_notifications :create, :save, :update, :destroy
-      def wrap_with_notifications(*methods)
-        methods.each do |method|
-          class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-            def #{method}_with_notifications(*args, &block)
-              notify_observers(:before_#{method})
-              result = #{method}_without_notifications(*args, &block)
-              notify_observers(:after_#{method})
-              result
-            end
-          EOS
-          alias_method_chain(method, :notifications)
-        end
-      end
-
       protected
         def instantiate_observer(observer) #:nodoc:
           # string/symbol

diff --git a/activeresource/lib/active_resource/observing.rb b/activeresource/lib/active_resource/observing.rb
@@ -4,7 +4,18 @@ module Observing
     include ActiveModel::Observing
 
     included do
-      wrap_with_notifications :create, :save, :update, :destroy
+      %w( create save update destroy ).each do |method|
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{method}_with_notifications(*args, &block)
+            notify_observers(:before_#{method})
+            if result = #{method}_without_notifications(*args, &block)
+              notify_observers(:after_#{method})
+            end
+            result
+          end
+        EOS
+        alias_method_chain(method, :notifications)
+      end
     end
   end
 end