Rework NewCallbacks to not require method_missing

1 files changed, 9 insertions, 1 deletions

diff --git a/activesupport/lib/active_support/new_callbacks.rb b/activesupport/lib/active_support/new_callbacks.rb
index 65d2ddac32..b93057fe27 100644
--- a/activesupport/lib/active_support/new_callbacks.rb
+++ b/activesupport/lib/active_support/new_callbacks.rb
@@ -353,7 +353,15 @@ module ActiveSupport
         str = <<-RUBY_EVAL
           def _run_#{symbol}_callbacks(key = nil)
             if key
-              send("_run__\#{self.class.name.split("::").last}__#{symbol}__\#{key}__callbacks") { yield if block_given? }
+              name = "_run__\#{self.class.name.split("::").last}__#{symbol}__\#{key}__callbacks"
+              
+              if respond_to?(name)
+                send(name) { yield if block_given? }
+              else
+                self.class._create_and_run_keyed_callback(
+                  self.class.name.split("::").last,
+                  :#{symbol}, key, self) { yield if block_given? }
+              end
             else
               #{str}
             end