kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

AS::Callbacks: Refactor :per_key option

Browse source
This commit is contained in:
Bogdan Gusiev 2012-01-17 11:43:45 +02:00
parent 5f8274efe1
commit a21b5771ad
1 changed files with 7 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
activesupport/lib/active_support/callbacks.rb
View file

@ -91,29 +91,23 @@ module ActiveSupport
class Callback #:nodoc:#
@@_callback_sequence = 0
attr_accessor :chain, :filter, :kind, :options, :per_key, :klass, :raw_filter
attr_accessor :chain, :filter, :kind, :options, :klass, :raw_filter
def initialize(chain, filter, kind, options, klass)
@chain, @kind, @klass = chain, kind, klass
normalize_options!(options)
@per_key = options.delete(:per_key)
@raw_filter, @options = filter, options
@filter = _compile_filter(filter)
@compiled_options = _compile_options(options)
@callback_id = next_id
_compile_per_key_options
end
def clone(chain, klass)
obj = super()
obj.chain = chain
obj.klass = klass
obj.per_key = @per_key.dup
obj.options = @options.dup
obj.per_key[:if] = @per_key[:if].dup
obj.per_key[:unless] = @per_key[:unless].dup
obj.options[:if] = @options[:if].dup
obj.options[:unless] = @options[:unless].dup
obj
@ -124,8 +118,9 @@ module ActiveSupport
options[:unless] = Array(options[:unless])
options[:per_key] ||= {}
options[:per_key][:if] = Array(options[:per_key][:if])
options[:per_key][:unless] = Array(options[:per_key][:unless])
options[:if] += Array(options[:per_key][:if])
options[:unless] += Array(options[:per_key][:unless])
end
def name
@ -147,22 +142,11 @@ module ActiveSupport
def recompile!(_options, _per_key)
_update_filter(self.options, _options)
_update_filter(self.per_key, _per_key)
_update_filter(self.options, _per_key)
@callback_id = next_id
@filter = _compile_filter(@raw_filter)
@compiled_options = _compile_options(@options)
_compile_per_key_options
end
def _compile_per_key_options
key_options = _compile_options(@per_key)
@klass.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
def _one_time_conditions_valid_#{@callback_id}?
true if #{key_options}
end
RUBY_EVAL
end
# Wraps code with filter
@ -200,11 +184,6 @@ module ActiveSupport
end
end
def one_time_conditions_valid?(object)
object.send("_one_time_conditions_valid_#{@callback_id}?")
end
private
# Compile around filters with conditions into proxy methods
@ -341,7 +320,7 @@ module ActiveSupport
method << "halted = false"
callbacks = yielding
applicable_callbacks_for(key, object).reverse_each do |callback|
reverse_each do |callback|
callbacks = callback.apply(callbacks, key, object)
end
method << callbacks
@ -369,13 +348,6 @@ module ActiveSupport
method.join("\n")
end
# Selects callbacks that have valid <tt>:per_key</tt> condition
def applicable_callbacks_for(key, object)
return self unless key
select do |callback|
callback.one_time_conditions_valid?(object)
end
end
end
module ClassMethods
@ -402,7 +374,7 @@ module ActiveSupport
end
def __callback_runner_name(key, kind)
"_run__#{self.name.hash.abs}__#{kind}__#{key.hash.abs}__callbacks"
"_run__#{self.name.hash.abs}__#{kind}__callbacks"
end
# This is used internally to append, prepend and skip callbacks to the