Further cleaning up new callbacks

2 files changed, 44 insertions, 44 deletions

diff --git a/activesupport/test/new_callback_inheritance_test.rb b/activesupport/test/new_callback_inheritance_test.rb
index 9a1882b9d3..da0c19eaea 100644
--- a/activesupport/test/new_callback_inheritance_test.rb
+++ b/activesupport/test/new_callback_inheritance_test.rb
@@ -11,8 +11,8 @@ class GrandParent
   end
   
   define_callbacks :dispatch
-  _set_callback :dispatch, :before, :before1, :before2, :per_key => {:if => proc {|c| c.action_name == "index" || c.action_name == "update" }}
-  _set_callback :dispatch, :after, :after1, :after2, :per_key => {:if => proc {|c| c.action_name == "update" || c.action_name == "delete" }}  
+  set_callback :dispatch, :before, :before1, :before2, :per_key => {:if => proc {|c| c.action_name == "index" || c.action_name == "update" }}
+  set_callback :dispatch, :after, :after1, :after2, :per_key => {:if => proc {|c| c.action_name == "update" || c.action_name == "delete" }}  
   
   def before1
     @log << "before1"
@@ -39,12 +39,12 @@ class GrandParent
 end
 
 class Parent < GrandParent
-  _skip_callback :dispatch, :before, :before2, :per_key => {:unless => proc {|c| c.action_name == "update" }}
-  _skip_callback :dispatch, :after, :after2, :per_key => {:unless => proc {|c| c.action_name == "delete" }}
+  skip_callback :dispatch, :before, :before2, :per_key => {:unless => proc {|c| c.action_name == "update" }}
+  skip_callback :dispatch, :after, :after2, :per_key => {:unless => proc {|c| c.action_name == "delete" }}
 end
 
 class Child < GrandParent
-  _skip_callback :dispatch, :before, :before2, :per_key => {:unless => proc {|c| c.action_name == "update" }}, :if => :state_open?
+  skip_callback :dispatch, :before, :before2, :per_key => {:unless => proc {|c| c.action_name == "update" }}, :if => :state_open?
   
   def state_open?
     @state == :open
diff --git a/activesupport/test/new_callbacks_test.rb b/activesupport/test/new_callbacks_test.rb
index de501e9f7b..7e092b5f63 100644
--- a/activesupport/test/new_callbacks_test.rb
+++ b/activesupport/test/new_callbacks_test.rb
@@ -10,11 +10,11 @@ module NewCallbacksTest
     define_callbacks :save
   
     def self.before_save(*filters, &blk)
-      _set_callback(:save, :before, *filters, &blk)
+      set_callback(:save, :before, *filters, &blk)
     end
   
     def self.after_save(*filters, &blk)
-      _set_callback(:save, :after, *filters, &blk)
+      set_callback(:save, :after, *filters, &blk)
     end
 
     class << self
@@ -37,7 +37,7 @@ module NewCallbacksTest
       def callback_object(callback_method)
         klass = Class.new
         klass.send(:define_method, callback_method) do |model|
-          model.history << [callback_method, :object]
+          model.history << [:"#{callback_method}_save", :object]
         end
         klass.new
       end
@@ -54,7 +54,7 @@ module NewCallbacksTest
       send(callback_method, callback_symbol(callback_method_sym))
       send(callback_method, callback_string(callback_method_sym))
       send(callback_method, callback_proc(callback_method_sym))
-      send(callback_method, callback_object(callback_method_sym))
+      send(callback_method, callback_object(callback_method_sym.to_s.gsub(/_save/, '')))
       send(callback_method) { |model| model.history << [callback_method_sym, :block] }
     end
 
@@ -64,10 +64,10 @@ module NewCallbacksTest
   end
 
   class PersonSkipper < Person
-    _skip_callback :save, :before, :before_save_method, :if => :yes
-    _skip_callback :save, :after, :before_save_method, :unless => :yes
-    _skip_callback :save, :after, :before_save_method, :if => :no
-    _skip_callback :save, :before, :before_save_method, :unless => :no
+    skip_callback :save, :before, :before_save_method, :if => :yes
+    skip_callback :save, :after, :before_save_method, :unless => :yes
+    skip_callback :save, :after, :before_save_method, :if => :no
+    skip_callback :save, :before, :before_save_method, :unless => :no
     def yes; true; end
     def no; false; end
   end
@@ -77,8 +77,8 @@ module NewCallbacksTest
 
     define_callbacks :dispatch
     
-    _set_callback :dispatch, :before, :log, :per_key => {:unless => proc {|c| c.action_name == :index || c.action_name == :show }}
-    _set_callback :dispatch, :after, :log2
+    set_callback :dispatch, :before, :log, :per_key => {:unless => proc {|c| c.action_name == :index || c.action_name == :show }}
+    set_callback :dispatch, :after, :log2
   
     attr_reader :action_name, :logger
     def initialize(action_name)
@@ -102,8 +102,8 @@ module NewCallbacksTest
   end
 
   class Child < ParentController
-    _skip_callback :dispatch, :before, :log, :per_key => {:if => proc {|c| c.action_name == :update} }
-    _skip_callback :dispatch, :after, :log2
+    skip_callback :dispatch, :before, :log, :per_key => {:if => proc {|c| c.action_name == :update} }
+    skip_callback :dispatch, :after, :log2
   end
 
   class OneTimeCompile < Record
@@ -188,19 +188,19 @@ module NewCallbacksTest
   class AroundPerson < MySuper
     attr_reader :history
   
-    _set_callback :save, :before, :nope,           :if =>     :no
-    _set_callback :save, :before, :nope,           :unless => :yes
-    _set_callback :save, :after,  :tweedle
-    _set_callback :save, :before, "tweedle_dee"
-    _set_callback :save, :before, proc {|m| m.history << "yup" }
-    _set_callback :save, :before, :nope,           :if =>     proc { false }
-    _set_callback :save, :before, :nope,           :unless => proc { true }
-    _set_callback :save, :before, :yup,            :if =>     proc { true }
-    _set_callback :save, :before, :yup,            :unless => proc { false }
-    _set_callback :save, :around, :tweedle_dum
-    _set_callback :save, :around, :w0tyes,         :if =>     :yes
-    _set_callback :save, :around, :w0tno,          :if =>     :no
-    _set_callback :save, :around, :tweedle_deedle
+    set_callback :save, :before, :nope,           :if =>     :no
+    set_callback :save, :before, :nope,           :unless => :yes
+    set_callback :save, :after,  :tweedle
+    set_callback :save, :before, "tweedle_dee"
+    set_callback :save, :before, proc {|m| m.history << "yup" }
+    set_callback :save, :before, :nope,           :if =>     proc { false }
+    set_callback :save, :before, :nope,           :unless => proc { true }
+    set_callback :save, :before, :yup,            :if =>     proc { true }
+    set_callback :save, :before, :yup,            :unless => proc { false }
+    set_callback :save, :around, :tweedle_dum
+    set_callback :save, :around, :w0tyes,         :if =>     :yes
+    set_callback :save, :around, :w0tno,          :if =>     :no
+    set_callback :save, :around, :tweedle_deedle
   
     def no; false; end
     def yes; true; end
@@ -260,7 +260,7 @@ module NewCallbacksTest
     define_callbacks :save
     attr_reader :stuff
     
-    _set_callback :save, :before, :omg, :per_key => {:if => :yes}
+    set_callback :save, :before, :omg, :per_key => {:if => :yes}
     
     def yes() true end
       
@@ -354,15 +354,15 @@ module NewCallbacksTest
   
     define_callbacks :save, "result == :halt"
   
-    _set_callback :save, :before, :first
-    _set_callback :save, :before, :second
-    _set_callback :save, :around, :around_it  
-    _set_callback :save, :before, :third
-    _set_callback :save, :after, :first
-    _set_callback :save, :around, :around_it
-    _set_callback :save, :after, :second
-    _set_callback :save, :around, :around_it
-    _set_callback :save, :after, :third
+    set_callback :save, :before, :first
+    set_callback :save, :before, :second
+    set_callback :save, :around, :around_it  
+    set_callback :save, :before, :third
+    set_callback :save, :after, :first
+    set_callback :save, :around, :around_it
+    set_callback :save, :after, :second
+    set_callback :save, :around, :around_it
+    set_callback :save, :after, :third
 
   
     attr_reader :history, :saved
@@ -397,11 +397,11 @@ module NewCallbacksTest
   end
 
   class CallbackObject
-    def before_save(caller)
+    def before(caller)
       caller.record << "before"
     end
     
-    def around_save(caller)
+    def around(caller)
       caller.record << "around before"
       yield
       caller.record << "around after"
@@ -412,7 +412,7 @@ module NewCallbacksTest
     include ActiveSupport::NewCallbacks
     
     define_callbacks :save
-    _set_callback :save, :before, CallbackObject.new
+    set_callback :save, :before, CallbackObject.new
     
     attr_accessor :record
     def initialize
@@ -430,7 +430,7 @@ module NewCallbacksTest
     include ActiveSupport::NewCallbacks
     
     define_callbacks :save
-    _set_callback :save, :around, CallbackObject.new
+    set_callback :save, :around, CallbackObject.new
     
     attr_accessor :record
     def initialize