Permalink
Browse files

rename terminal to halting, try to keep naming consistent

  • Loading branch information...
1 parent bd95ff8 commit c5953f7dba20a6706a9f3dcce4cb43d7d91aad33 @tenderlove tenderlove committed May 14, 2013
Showing with 4 additions and 4 deletions.
  1. +4 −4 activesupport/lib/active_support/callbacks.rb
@@ -110,10 +110,10 @@ class Before
def self.build(next_callback, user_callback, user_conditions, chain_config, filter)
if chain_config.key?(:terminator) && user_conditions.any?
halted_lambda = eval "lambda { |result| #{chain_config[:terminator]} }"
- terminal_and_conditional(next_callback, user_callback, user_conditions, halted_lambda, filter)
+ halting_and_conditional(next_callback, user_callback, user_conditions, halted_lambda, filter)
elsif chain_config.key? :terminator
halted_lambda = eval "lambda { |result| #{chain_config[:terminator]} }"
- terminal(next_callback, user_callback, halted_lambda, filter)
+ halting(next_callback, user_callback, halted_lambda, filter)
elsif user_conditions.any?
conditional(next_callback, user_callback, user_conditions)
else
@@ -123,7 +123,7 @@ def self.build(next_callback, user_callback, user_conditions, chain_config, filt
private
- def self.terminal_and_conditional(next_callback, user_callback, user_conditions, halted_lambda, filter)
+ def self.halting_and_conditional(next_callback, user_callback, user_conditions, halted_lambda, filter)
lambda { |env|
target = env.target
value = env.value
@@ -140,7 +140,7 @@ def self.terminal_and_conditional(next_callback, user_callback, user_conditions,
}
end
- def self.terminal(next_callback, user_callback, halted_lambda, filter)
+ def self.halting(next_callback, user_callback, halted_lambda, filter)
lambda { |env|
target = env.target
value = env.value

0 comments on commit c5953f7

Please sign in to comment.