diff options
| author | Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local> | 2009-06-02 19:00:59 -0700 |
|---|---|---|
| committer | Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local> | 2009-06-02 19:00:59 -0700 |
| commit | 971e2438d98326c994ec6d3ef8e37b7e868ed6e2 (patch) | |
| tree | 3a746ec6e845b7956775055a1a2453bd46eb6eb4 /activesupport/test/new_callback_inheritance_test.rb | |
| parent | 196f780e30fcece25e4d09c12f9b9f7374ebed29 (diff) | |
| download | rails-971e2438d98326c994ec6d3ef8e37b7e868ed6e2.tar.gz rails-971e2438d98326c994ec6d3ef8e37b7e868ed6e2.tar.bz2 rails-971e2438d98326c994ec6d3ef8e37b7e868ed6e2.zip | |
Simplify callbacks to use less metaprogramming
Diffstat (limited to 'activesupport/test/new_callback_inheritance_test.rb')
| -rw-r--r-- | activesupport/test/new_callback_inheritance_test.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/activesupport/test/new_callback_inheritance_test.rb b/activesupport/test/new_callback_inheritance_test.rb index 95020389b0..9a1882b9d3 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 - dispatch_callback :before, :before1, :before2, :per_key => {:if => proc {|c| c.action_name == "index" || c.action_name == "update" }} - dispatch_callback :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_dispatch_callback :before, :before2, :per_key => {:unless => proc {|c| c.action_name == "update" }} - skip_dispatch_callback :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_dispatch_callback :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 |