Permalink
Browse files

Revert "Merge pull request #10433 from wangjohn/making_callbacks_more…

…_performant"

This reverts commit 09751fd, reversing
changes made to 6a5ab08.

This change caused a failure in
actionpack/test/abstract/callbacks_test.rb.
  • Loading branch information...
1 parent ffaceaa commit 30f297bef5fec202ee6b26e67c9e45fb7a500251 @jonleighton jonleighton committed May 3, 2013
Showing with 11 additions and 33 deletions.
  1. +11 −33 activesupport/lib/active_support/callbacks.rb
@@ -132,10 +132,6 @@ def next_id
@@_callback_sequence += 1
end
- def object_filter?
- @_is_object_filter
- end
-
def matches?(_kind, _filter)
if @_is_object_filter
_filter_matches = @filter.to_s.start_with?(_method_name_for_object_filter(_kind, _filter, false))
@@ -341,7 +337,6 @@ def initialize(name, config)
:terminator => "false",
:scope => [ :kind ]
}.merge!(config)
- @callbacks_hash = Hash.new { |h, k| h[k] = [] }
end
def compile
@@ -366,37 +361,20 @@ def prepend(*callbacks)
private
- def append_one(callback)
- handle_duplicates(callback)
- push(callback)
- end
+ def append_one(callback)
+ remove_duplicates(callback)
+ push(callback)
+ end
- def prepend_one(callback)
- handle_duplicates(callback)
- unshift(callback)
- end
+ def prepend_one(callback)
+ remove_duplicates(callback)
+ unshift(callback)
+ end
- # We check to see if this callback already exists. If it does (i.e. if
- # +callback.duplicates?(c)+ for any callback +c+ in the list of
- # callbacks), then we delete the previously defined callback.
- #
- # We make use of the rep-invariant that only one callback exists which
- # might match the new callback. The +@callbacks_hash+ is keyed on the
- # +kind+ and +filter+ of the callback, the attributes used to check if
- # two callbacks match.
- def handle_duplicates(callback)
- if callback.object_filter?
- scan_and_remove_duplicates(callback)
- else
- hash_key = [callback.kind, callback.filter]
- delete @callbacks_hash[hash_key] if @callbacks_hash[hash_key]
- @callbacks_hash[hash_key] = callback
- end
- end
+ def remove_duplicates(callback)
+ delete_if { |c| callback.duplicates?(c) }
+ end
- def scan_and_remove_duplicates(callback)
- delete_if { |c| callback.duplicates?(c) }
- end
end
module ClassMethods

0 comments on commit 30f297b

Please sign in to comment.