lib/active_support/callbacks.rb in activesupport-4.2.2 vs lib/active_support/callbacks.rb in activesupport-4.2.3.rc1

@@ -76,25 +76,23 @@
     #
     #   run_callbacks :save do
     #     save
     #   end
     def run_callbacks(kind, &block)
-      send "_run_#{kind}_callbacks", &block
-    end
+      callbacks = send("_#{kind}_callbacks")
 
-    private
-
-    def _run_callbacks(callbacks, &block)
       if callbacks.empty?
-        block.call if block
+        yield if block_given?
       else
         runner = callbacks.compile
         e = Filters::Environment.new(self, false, nil, block)
         runner.call(e).value
       end
     end
 
+    private
+
     # A hook invoked every time a before callback is halted.
     # This can be overridden in AS::Callback implementors in order
     # to provide better debugging/logging.
     def halted_callback_hook(filter)
     end
@@ -634,14 +632,16 @@
       # Around callbacks can access the return value from the event, if it
       # wasn't halted, from the +yield+ call.
       #
       # ===== Options
       #
-      # * <tt>:if</tt> - A symbol naming an instance method or a proc; the
-      #   callback will be called only when it returns a +true+ value.
-      # * <tt>:unless</tt> - A symbol naming an instance method or a proc; the
-      #   callback will be called only when it returns a +false+ value.
+      # * <tt>:if</tt> - A symbol, a string or an array of symbols and strings,
+      #   each naming an instance method or a proc; the callback will be called
+      #   only when they all return a true value.
+      # * <tt>:unless</tt> - A symbol, a string or an array of symbols and
+      #   strings, each naming an instance method or a proc; the callback will
+      #   be called only when they all return a false value.
       # * <tt>:prepend</tt> - If +true+, the callback will be prepended to the
       #   existing chain rather than appended.
       def set_callback(name, *filter_list, &block)
         type, filters, options = normalize_callback_params(filter_list, block)
         self_chain = get_callbacks name
@@ -768,15 +768,9 @@
         options = names.extract_options!
 
         names.each do |name|
           class_attribute "_#{name}_callbacks"
           set_callbacks name, CallbackChain.new(name, options)
-
-          module_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def _run_#{name}_callbacks(&block)
-              _run_callbacks(_#{name}_callbacks, &block)
-            end
-          RUBY
         end
       end
 
       protected