activesupport 3.1.0 → 5.0.0

data/lib/active_support/callbacks.rb

@@ -1,30 +1,33 @@
 require 'active_support/concern'
 require 'active_support/descendants_tracker'
-require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/kernel/reporting'
 require 'active_support/core_ext/kernel/singleton_class'
-require 'active_support/core_ext/object/inclusion'
+require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/string/filters'
+require 'active_support/deprecation'
+require 'thread'
 
 module ActiveSupport
-  # \Callbacks are code hooks that are run at key points in an object's lifecycle.
-  # The typical use case is to have a base class define a set of callbacks relevant
-  # to the other functionality it supplies, so that subclasses can install callbacks
-  # that enhance or modify the base functionality without needing to override
-  # or redefine methods of the base class.
+  # Callbacks are code hooks that are run at key points in an object's life cycle.
+  # The typical use case is to have a base class define a set of callbacks
+  # relevant to the other functionality it supplies, so that subclasses can
+  # install callbacks that enhance or modify the base functionality without
+  # needing to override or redefine methods of the base class.
   #
-  # Mixing in this module allows you to define the events in the object's lifecycle
-  # that will support callbacks (via +ClassMethods.define_callbacks+), set the instance
-  # methods, procs, or callback objects to be called (via +ClassMethods.set_callback+),
-  # and run the installed callbacks at the appropriate times (via +run_callbacks+).
+  # Mixing in this module allows you to define the events in the object's
+  # life cycle that will support callbacks (via +ClassMethods.define_callbacks+),
+  # set the instance methods, procs, or callback objects to be called (via
+  # +ClassMethods.set_callback+), and run the installed callbacks at the
+  # appropriate times (via +run_callbacks+).
   #
-  # Three kinds of callbacks are supported: before callbacks, run before a certain event;
-  # after callbacks, run after the event; and around callbacks, blocks that surround the
-  # event, triggering it when they yield. Callback code can be contained in instance
-  # methods, procs or lambdas, or callback objects that respond to certain predetermined
-  # methods. See +ClassMethods.set_callback+ for details.
-  #
-  # ==== Example
+  # Three kinds of callbacks are supported: before callbacks, run before a
+  # certain event; after callbacks, run after the event; and around callbacks,
+  # blocks that surround the event, triggering it when they yield. Callback code
+  # can be contained in instance methods, procs or lambdas, or callback objects
+  # that respond to certain predetermined methods. See +ClassMethods.set_callback+
+  # for details.
   #
   #   class Record
   #     include ActiveSupport::Callbacks
@@ -55,7 +58,6 @@ module ActiveSupport
   #   saving...
   #   - save
   #   saved
-  #
   module Callbacks
     extend Concern
 
@@ -63,510 +65,635 @@ module ActiveSupport
       extend ActiveSupport::DescendantsTracker
     end
 
+    CALLBACK_FILTER_TYPES = [:before, :after, :around]
+
+    # If true, Active Record and Active Model callbacks returning +false+ will
+    # halt the entire callback chain and display a deprecation message.
+    # If false, callback chains will only be halted by calling +throw :abort+.
+    # Defaults to +true+.
+    mattr_accessor(:halt_and_display_warning_on_return_false, instance_writer: false) { true }
+
     # Runs the callbacks for the given event.
     #
     # Calls the before and around callbacks in the order they were set, yields
-    # the block (if given one), and then runs the after callbacks in reverse order.
-    # Optionally accepts a key, which will be used to compile an optimized callback
-    # method for each key. See +ClassMethods.define_callbacks+ for more information.
+    # the block (if given one), and then runs the after callbacks in reverse
+    # order.
     #
-    # If the callback chain was halted, returns +false+. Otherwise returns the result
-    # of the block, or +true+ if no block is given.
+    # If the callback chain was halted, returns +false+. Otherwise returns the
+    # result of the block, +nil+ if no callbacks have been set, or +true+
+    # if callbacks have been set but no block is given.
     #
     #   run_callbacks :save do
     #     save
     #   end
-    #
-    def run_callbacks(kind, *args, &block)
-      send("_run_#{kind}_callbacks", *args, &block)
+    def run_callbacks(kind, &block)
+      send "_run_#{kind}_callbacks", &block
     end
 
-    class Callback #:nodoc:#
-      @@_callback_sequence = 0
-
-      attr_accessor :chain, :filter, :kind, :options, :per_key, :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
+    private
 
-        _compile_per_key_options
+    def __run_callbacks__(callbacks, &block)
+      if callbacks.empty?
+        yield if block_given?
+      else
+        runner = callbacks.compile
+        e = Filters::Environment.new(self, false, nil, block)
+        runner.call(e).value
       end
+    end
+
+    # A hook invoked every time a before callback is halted.
+    # This can be overridden in AS::Callback implementors in order
+    # to provide better debugging/logging.
+    def halted_callback_hook(filter)
+    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
+    module Conditionals # :nodoc:
+      class Value
+        def initialize(&block)
+          @block = block
+        end
+        def call(target, value); @block.call(value); end
       end
+    end
 
-      def normalize_options!(options)
-        options[:if] = Array.wrap(options[:if])
-        options[:unless] = Array.wrap(options[:unless])
+    module Filters
+      Environment = Struct.new(:target, :halted, :value, :run_block)
 
-        options[:per_key] ||= {}
-        options[:per_key][:if] = Array.wrap(options[:per_key][:if])
-        options[:per_key][:unless] = Array.wrap(options[:per_key][:unless])
+      class End
+        def call(env)
+          block = env.run_block
+          env.value = !env.halted && (!block || block.call)
+          env
+        end
       end
+      ENDING = End.new
 
-      def name
-        chain.name
-      end
+      class Before
+        def self.build(callback_sequence, user_callback, user_conditions, chain_config, filter)
+          halted_lambda = chain_config[:terminator]
 
-      def next_id
-        @@_callback_sequence += 1
-      end
+          if user_conditions.any?
+            halting_and_conditional(callback_sequence, user_callback, user_conditions, halted_lambda, filter)
+          else
+            halting(callback_sequence, user_callback, halted_lambda, filter)
+          end
+        end
 
-      def matches?(_kind, _filter)
-        @kind == _kind && @filter == _filter
-      end
+        def self.halting_and_conditional(callback_sequence, user_callback, user_conditions, halted_lambda, filter)
+          callback_sequence.before do |env|
+            target = env.target
+            value  = env.value
+            halted = env.halted
+
+            if !halted && user_conditions.all? { |c| c.call(target, value) }
+              result_lambda = -> { user_callback.call target, value }
+              env.halted = halted_lambda.call(target, result_lambda)
+              if env.halted
+                target.send :halted_callback_hook, filter
+              end
+            end
 
-      def _update_filter(filter_options, new_options)
-        filter_options[:if].push(new_options[:unless]) if new_options.key?(:unless)
-        filter_options[:unless].push(new_options[:if]) if new_options.key?(:if)
-      end
+            env
+          end
+        end
+        private_class_method :halting_and_conditional
 
-      def recompile!(_options, _per_key)
-        _update_filter(self.options, _options)
-        _update_filter(self.per_key, _per_key)
+        def self.halting(callback_sequence, user_callback, halted_lambda, filter)
+          callback_sequence.before do |env|
+            target = env.target
+            value  = env.value
+            halted = env.halted
 
-        @callback_id      = next_id
-        @filter           = _compile_filter(@raw_filter)
-        @compiled_options = _compile_options(@options)
-                            _compile_per_key_options
-      end
+            unless halted
+              result_lambda = -> { user_callback.call target, value }
+              env.halted = halted_lambda.call(target, result_lambda)
 
-      def _compile_per_key_options
-        key_options  = _compile_options(@per_key)
+              if env.halted
+                target.send :halted_callback_hook, filter
+              end
+            end
 
-        @klass.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-          def _one_time_conditions_valid_#{@callback_id}?
-            true #{key_options[0]}
+            env
           end
-        RUBY_EVAL
+        end
+        private_class_method :halting
       end
 
-      # This will supply contents for before and around filters, and no
-      # contents for after filters (for the forward pass).
-      def start(key=nil, object=nil)
-        return if key && !object.send("_one_time_conditions_valid_#{@callback_id}?")
+      class After
+        def self.build(callback_sequence, user_callback, user_conditions, chain_config)
+          if chain_config[:skip_after_callbacks_if_terminated]
+            if user_conditions.any?
+              halting_and_conditional(callback_sequence, user_callback, user_conditions)
+            else
+              halting(callback_sequence, user_callback)
+            end
+          else
+            if user_conditions.any?
+              conditional callback_sequence, user_callback, user_conditions
+            else
+              simple callback_sequence, user_callback
+            end
+          end
+        end
 
-        # options[0] is the compiled form of supplied conditions
-        # options[1] is the "end" for the conditional
-        #
-        case @kind
-        when :before
-          # if condition    # before_save :filter_name, :if => :condition
-          #   filter_name
-          # end
-          filter = <<-RUBY_EVAL
-            unless halted
-              # This double assignment is to prevent warnings in 1.9.3.  I would
-              # remove the `result` variable, but apparently some other
-              # generated code is depending on this variable being set sometimes
-              # and sometimes not.
-              result = result = #{@filter}
-              halted = (#{chain.config[:terminator]})
+        def self.halting_and_conditional(callback_sequence, user_callback, user_conditions)
+          callback_sequence.after do |env|
+            target = env.target
+            value  = env.value
+            halted = env.halted
+
+            if !halted && user_conditions.all? { |c| c.call(target, value) }
+              user_callback.call target, value
             end
-          RUBY_EVAL
 
-          [@compiled_options[0], filter, @compiled_options[1]].compact.join("\n")
-        when :around
-          # Compile around filters with conditions into proxy methods
-          # that contain the conditions.
-          #
-          # For `around_save :filter_name, :if => :condition':
-          #
-          # def _conditional_callback_save_17
-          #   if condition
-          #     filter_name do
-          #       yield self
-          #     end
-          #   else
-          #     yield self
-          #   end
-          # end
-          #
-          name = "_conditional_callback_#{@kind}_#{next_id}"
-          @klass.class_eval <<-RUBY_EVAL,  __FILE__, __LINE__ + 1
-             def #{name}(halted)
-              #{@compiled_options[0] || "if true"} && !halted
-                #{@filter} do
-                  yield self
-                end
-              else
-                yield self
-              end
+            env
+          end
+        end
+        private_class_method :halting_and_conditional
+
+        def self.halting(callback_sequence, user_callback)
+          callback_sequence.after do |env|
+            unless env.halted
+              user_callback.call env.target, env.value
+            end
+
+            env
+          end
+        end
+        private_class_method :halting
+
+        def self.conditional(callback_sequence, user_callback, user_conditions)
+          callback_sequence.after do |env|
+            target = env.target
+            value  = env.value
+
+            if user_conditions.all? { |c| c.call(target, value) }
+              user_callback.call target, value
             end
-          RUBY_EVAL
-          "#{name}(halted) do"
+
+            env
+          end
+        end
+        private_class_method :conditional
+
+        def self.simple(callback_sequence, user_callback)
+          callback_sequence.after do |env|
+            user_callback.call env.target, env.value
+
+            env
+          end
         end
+        private_class_method :simple
       end
 
-      # This will supply contents for around and after filters, but not
-      # before filters (for the backward pass).
-      def end(key=nil, object=nil)
-        return if key && !object.send("_one_time_conditions_valid_#{@callback_id}?")
+      class Around
+        def self.build(callback_sequence, user_callback, user_conditions, chain_config)
+          if user_conditions.any?
+            halting_and_conditional(callback_sequence, user_callback, user_conditions)
+          else
+            halting(callback_sequence, user_callback)
+          end
+        end
 
-        case @kind
-        when :after
-          # if condition    # after_save :filter_name, :if => :condition
-          #   filter_name
-          # end
-          [@compiled_options[0], @filter, @compiled_options[1]].compact.join("\n")
-        when :around
-          <<-RUBY_EVAL
-            value
+        def self.halting_and_conditional(callback_sequence, user_callback, user_conditions)
+          callback_sequence.around do |env, &run|
+            target = env.target
+            value  = env.value
+            halted = env.halted
+
+            if !halted && user_conditions.all? { |c| c.call(target, value) }
+              user_callback.call(target, value) {
+                run.call.value
+              }
+              env
+            else
+              run.call
+            end
+          end
+        end
+        private_class_method :halting_and_conditional
+
+        def self.halting(callback_sequence, user_callback)
+          callback_sequence.around do |env, &run|
+            target = env.target
+            value  = env.value
+
+            if env.halted
+              run.call
+            else
+              user_callback.call(target, value) {
+                run.call.value
+              }
+              env
+            end
           end
-          RUBY_EVAL
         end
+        private_class_method :halting
       end
+    end
 
-      private
+    class Callback #:nodoc:#
+      def self.build(chain, filter, kind, options)
+        if filter.is_a?(String)
+          ActiveSupport::Deprecation.warn(<<-MSG.squish)
+            Passing string to define callback is deprecated and will be removed
+            in Rails 5.1 without replacement.
+          MSG
+        end
+
+        new chain.name, filter, kind, options, chain.config
+      end
 
-      # Options support the same options as filters themselves (and support
-      # symbols, string, procs, and objects), so compile a conditional
-      # expression based on the options
-      def _compile_options(options)
-        return [] if options[:if].empty? && options[:unless].empty?
+      attr_accessor :kind, :name
+      attr_reader :chain_config
+
+      def initialize(name, filter, kind, options, chain_config)
+        @chain_config  = chain_config
+        @name    = name
+        @kind    = kind
+        @filter  = filter
+        @key     = compute_identifier filter
+        @if      = Array(options[:if])
+        @unless  = Array(options[:unless])
+      end
+
+      def filter; @key; end
+      def raw_filter; @filter; end
+
+      def merge_conditional_options(chain, if_option:, unless_option:)
+        options = {
+          :if     => @if.dup,
+          :unless => @unless.dup
+        }
+
+        options[:if].concat     Array(unless_option)
+        options[:unless].concat Array(if_option)
+
+        self.class.build chain, @filter, @kind, options
+      end
 
-        conditions = []
+      def matches?(_kind, _filter)
+        @kind == _kind && filter == _filter
+      end
 
-        unless options[:if].empty?
-          conditions << Array.wrap(_compile_filter(options[:if]))
+      def duplicates?(other)
+        case @filter
+        when Symbol, String
+          matches?(other.kind, other.filter)
+        else
+          false
         end
+      end
+
+      # Wraps code with filter
+      def apply(callback_sequence)
+        user_conditions = conditions_lambdas
+        user_callback = make_lambda @filter
 
-        unless options[:unless].empty?
-          conditions << Array.wrap(_compile_filter(options[:unless])).map {|f| "!#{f}"}
+        case kind
+        when :before
+          Filters::Before.build(callback_sequence, user_callback, user_conditions, chain_config, @filter)
+        when :after
+          Filters::After.build(callback_sequence, user_callback, user_conditions, chain_config)
+        when :around
+          Filters::Around.build(callback_sequence, user_callback, user_conditions, chain_config)
         end
+      end
 
-        ["if #{conditions.flatten.join(" && ")}", "end"]
+      private
+
+      def invert_lambda(l)
+        lambda { |*args, &blk| !l.call(*args, &blk) }
       end
 
       # Filters support:
       #
-      #   Arrays::  Used in conditions. This is used to specify
-      #             multiple conditions. Used internally to
-      #             merge conditions from skip_* filters
-      #   Symbols:: A method to call
-      #   Strings:: Some content to evaluate
-      #   Procs::   A proc to call with the object
-      #   Objects:: An object with a before_foo method on it to call
-      #
-      # All of these objects are compiled into methods and handled
-      # the same after this point:
-      #
-      #   Arrays::  Merged together into a single filter
-      #   Symbols:: Already methods
-      #   Strings:: class_eval'ed into methods
-      #   Procs::   define_method'ed into methods
-      #   Objects::
-      #     a method is created that calls the before_foo method
-      #     on the object.
-      #
-      def _compile_filter(filter)
-        method_name = "_callback_#{@kind}_#{next_id}"
+      #   Symbols:: A method to call.
+      #   Strings:: Some content to evaluate.
+      #   Procs::   A proc to call with the object.
+      #   Objects:: An object with a <tt>before_foo</tt> method on it to call.
+      #
+      # All of these objects are converted into a lambda and handled
+      # the same after this point.
+      def make_lambda(filter)
         case filter
-        when Array
-          filter.map {|f| _compile_filter(f)}
         when Symbol
-          filter
+          lambda { |target, _, &blk| target.send filter, &blk }
         when String
-          "(#{filter})"
-        when Proc
-          @klass.send(:define_method, method_name, &filter)
-          return method_name if filter.arity <= 0
+          l = eval "lambda { |value| #{filter} }"
+          lambda { |target, value| target.instance_exec(value, &l) }
+        when Conditionals::Value then filter
+        when ::Proc
+          if filter.arity > 1
+            return lambda { |target, _, &block|
+              raise ArgumentError unless block
+              target.instance_exec(target, block, &filter)
+            }
+          end
 
-          method_name << (filter.arity == 1 ? "(self)" : " self, Proc.new ")
+          if filter.arity <= 0
+            lambda { |target, _| target.instance_exec(&filter) }
+          else
+            lambda { |target, _| target.instance_exec(target, &filter) }
+          end
         else
-          @klass.send(:define_method, "#{method_name}_object") { filter }
+          scopes = Array(chain_config[:scope])
+          method_to_call = scopes.map{ |s| public_send(s) }.join("_")
 
-          _normalize_legacy_filter(kind, filter)
-          scopes = Array.wrap(chain.config[:scope])
-          method_to_call = scopes.map{ |s| s.is_a?(Symbol) ? send(s) : s }.join("_")
-
-          @klass.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-            def #{method_name}(&blk)
-              #{method_name}_object.send(:#{method_to_call}, self, &blk)
-            end
-          RUBY_EVAL
+          lambda { |target, _, &blk|
+            filter.public_send method_to_call, target, &blk
+          }
+        end
+      end
 
-          method_name
+      def compute_identifier(filter)
+        case filter
+        when String, ::Proc
+          filter.object_id
+        else
+          filter
         end
       end
 
-      def _normalize_legacy_filter(kind, filter)
-        if !filter.respond_to?(kind) && filter.respond_to?(:filter)
-          filter.singleton_class.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-            def #{kind}(context, &block) filter(context, &block) end
-          RUBY_EVAL
-        elsif filter.respond_to?(:before) && filter.respond_to?(:after) && kind == :around
-          def filter.around(context)
-            should_continue = before(context)
-            yield if should_continue
-            after(context)
-          end
+      def conditions_lambdas
+        @if.map { |c| make_lambda c } +
+          @unless.map { |c| invert_lambda make_lambda c }
+      end
+    end
+
+    # Execute before and after filters in a sequence instead of
+    # chaining them with nested lambda calls, see:
+    # https://github.com/rails/rails/issues/18011
+    class CallbackSequence
+      def initialize(&call)
+        @call = call
+        @before = []
+        @after = []
+      end
+
+      def before(&before)
+        @before.unshift(before)
+        self
+      end
+
+      def after(&after)
+        @after.push(after)
+        self
+      end
+
+      def around(&around)
+        CallbackSequence.new do |arg|
+          around.call(arg) {
+            self.call(arg)
+          }
         end
       end
+
+      def call(arg)
+        @before.each { |b| b.call(arg) }
+        value = @call.call(arg)
+        @after.each { |a| a.call(arg) }
+        value
+      end
     end
 
-    # An Array with a compile method
-    class CallbackChain < Array #:nodoc:#
+    # An Array with a compile method.
+    class CallbackChain #:nodoc:#
+      include Enumerable
+
       attr_reader :name, :config
 
       def initialize(name, config)
         @name = name
         @config = {
-          :terminator => "false",
-          :rescuable => false,
-          :scope => [ :kind ]
-        }.merge(config)
+          scope: [:kind],
+          terminator: default_terminator
+        }.merge!(config)
+        @chain = []
+        @callbacks = nil
+        @mutex = Mutex.new
       end
 
-      def compile(key=nil, object=nil)
-        method = []
-        method << "value = nil"
-        method << "halted = false"
+      def each(&block); @chain.each(&block); end
+      def index(o);     @chain.index(o); end
+      def empty?;       @chain.empty?; end
 
-        each do |callback|
-          method << callback.start(key, object)
-        end
+      def insert(index, o)
+        @callbacks = nil
+        @chain.insert(index, o)
+      end
 
-        if config[:rescuable]
-          method << "rescued_error = nil"
-          method << "begin"
-        end
+      def delete(o)
+        @callbacks = nil
+        @chain.delete(o)
+      end
+
+      def clear
+        @callbacks = nil
+        @chain.clear
+        self
+      end
 
-        method << "value = yield if block_given? && !halted"
+      def initialize_copy(other)
+        @callbacks = nil
+        @chain     = other.chain.dup
+        @mutex     = Mutex.new
+      end
 
-        if config[:rescuable]
-          method << "rescue Exception => e"
-          method << "rescued_error = e"
-          method << "end"
+      def compile
+        @callbacks || @mutex.synchronize do
+          final_sequence = CallbackSequence.new { |env| Filters::ENDING.call(env) }
+          @callbacks ||= @chain.reverse.inject(final_sequence) do |callback_sequence, callback|
+            callback.apply callback_sequence
+          end
         end
+      end
 
-        reverse_each do |callback|
-          method << callback.end(key, object)
-        end
+      def append(*callbacks)
+        callbacks.each { |c| append_one(c) }
+      end
 
-        method << "raise rescued_error if rescued_error" if config[:rescuable]
-        method << "halted ? false : (block_given? ? value : true)"
-        method.compact.join("\n")
+      def prepend(*callbacks)
+        callbacks.each { |c| prepend_one(c) }
       end
-    end
 
-    module ClassMethods
-      # Generate the internal runner method called by +run_callbacks+.
-      def __define_runner(symbol) #:nodoc:
-        body = send("_#{symbol}_callbacks").compile
-
-        silence_warnings do
-          undef_method "_run_#{symbol}_callbacks" if method_defined?("_run_#{symbol}_callbacks")
-          class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-            def _run_#{symbol}_callbacks(key = nil, &blk)
-              if key
-                name = "_run__\#{self.class.name.hash.abs}__#{symbol}__\#{key.hash.abs}__callbacks"
-
-                unless respond_to?(name)
-                  self.class.__create_keyed_callback(name, :#{symbol}, self, &blk)
-                end
-
-                send(name, &blk)
-              else
-                #{body}
-              end
-            end
-            private :_run_#{symbol}_callbacks
-          RUBY_EVAL
-        end
+      protected
+      def chain; @chain; end
+
+      private
+
+      def append_one(callback)
+        @callbacks = nil
+        remove_duplicates(callback)
+        @chain.push(callback)
       end
 
-      # This is called the first time a callback is called with a particular
-      # key. It creates a new callback method for the key, calculating
-      # which callbacks can be omitted because of per_key conditions.
-      #
-      def __create_keyed_callback(name, kind, object, &blk) #:nodoc:
-        @_keyed_callbacks ||= {}
-        @_keyed_callbacks[name] ||= begin
-          str = send("_#{kind}_callbacks").compile(name, object)
-          class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-            def #{name}() #{str} end
-            protected :#{name}
-          RUBY_EVAL
-          true
+      def prepend_one(callback)
+        @callbacks = nil
+        remove_duplicates(callback)
+        @chain.unshift(callback)
+      end
+
+      def remove_duplicates(callback)
+        @callbacks = nil
+        @chain.delete_if { |c| callback.duplicates?(c) }
+      end
+
+      def default_terminator
+        Proc.new do |target, result_lambda|
+          terminate = true
+          catch(:abort) do
+            result_lambda.call if result_lambda.is_a?(Proc)
+            terminate = false
+          end
+          terminate
         end
       end
+    end
 
-      # This is used internally to append, prepend and skip callbacks to the
-      # CallbackChain.
-      #
-      def __update_callbacks(name, filters = [], block = nil) #:nodoc:
-        type = filters.first.in?([:before, :after, :around]) ? filters.shift : :before
-        options = filters.last.is_a?(Hash) ? filters.pop : {}
+    module ClassMethods
+      def normalize_callback_params(filters, block) # :nodoc:
+        type = CALLBACK_FILTER_TYPES.include?(filters.first) ? filters.shift : :before
+        options = filters.extract_options!
         filters.unshift(block) if block
+        [type, filters, options.dup]
+      end
 
-        ([self] + ActiveSupport::DescendantsTracker.descendants(self)).reverse.each do |target|
-          chain = target.send("_#{name}_callbacks")
-          yield target, chain.dup, type, filters, options
-          target.__define_runner(name)
+      # This is used internally to append, prepend and skip callbacks to the
+      # CallbackChain.
+      def __update_callbacks(name) #:nodoc:
+        ([self] + ActiveSupport::DescendantsTracker.descendants(self)).reverse_each do |target|
+          chain = target.get_callbacks name
+          yield target, chain.dup
         end
       end
 
       # Install a callback for the given event.
       #
-      #   set_callback :save, :before, :before_meth
-      #   set_callback :save, :after,  :after_meth, :if => :condition
-      #   set_callback :save, :around, lambda { |r| stuff; result = yield; stuff }
+      #   set_callback :save, :before, :before_method
+      #   set_callback :save, :after,  :after_method, if: :condition
+      #   set_callback :save, :around, ->(r, block) { stuff; result = block.call; stuff }
       #
-      # The second arguments indicates whether the callback is to be run +:before+,
+      # The second argument indicates whether the callback is to be run +:before+,
       # +:after+, or +:around+ the event. If omitted, +:before+ is assumed. This
       # means the first example above can also be written as:
       #
-      #   set_callback :save, :before_meth
+      #   set_callback :save, :before_method
       #
-      # The callback can specified as a symbol naming an instance method; as a proc,
-      # lambda, or block; as a string to be instance evaluated; or as an object that
-      # responds to a certain method determined by the <tt>:scope</tt> argument to
-      # +define_callback+.
+      # The callback can be specified as a symbol naming an instance method; as a
+      # proc, lambda, or block; as a string to be instance evaluated(deprecated); or as an
+      # object that responds to a certain method determined by the <tt>:scope</tt>
+      # argument to +define_callbacks+.
       #
       # If a proc, lambda, or block is given, its body is evaluated in the context
       # of the current object. It can also optionally accept the current object as
       # an argument.
       #
-      # Before and around callbacks are called in the order that they are set; after
-      # callbacks are called in the reverse order.
-      # 
+      # Before and around callbacks are called in the order that they are set;
+      # after callbacks are called in the reverse order.
+      #
       # Around callbacks can access the return value from the event, if it
       # wasn't halted, from the +yield+ call.
       #
       # ===== Options
       #
-      # * <tt>:if</tt> - A symbol naming an instance method or a proc; the callback
-      #   will be called only when it returns a true value.
-      # * <tt>:unless</tt> - A symbol naming an instance method or a proc; the callback
-      #   will be called only when it returns a false value.
-      # * <tt>:prepend</tt> - If true, the callback will be prepended to the existing
-      #   chain rather than appended.
-      # * <tt>:per_key</tt> - A hash with <tt>:if</tt> and <tt>:unless</tt> options;
-      #   see "Per-key conditions" below.
-      #
-      # ===== Per-key conditions
-      #
-      # When creating or skipping callbacks, you can specify conditions that
-      # are always the same for a given key. For instance, in Action Pack,
-      # we convert :only and :except conditions into per-key conditions.
-      #
-      #   before_filter :authenticate, :except => "index"
-      #
-      # becomes
-      #
-      #   set_callback :process_action, :before, :authenticate, :per_key => {:unless => proc {|c| c.action_name == "index"}}
-      #
-      # Per-key conditions are evaluated only once per use of a given key.
-      # In the case of the above example, you would do:
-      #
-      #   run_callbacks(:process_action, action_name) { ... dispatch stuff ... }
-      #
-      # In that case, each action_name would get its own compiled callback
-      # method that took into consideration the per_key conditions. This
-      # is a speed improvement for ActionPack.
-      #
+      # * <tt>:if</tt> - A symbol, a string or an array of symbols and strings,
+      #   each naming an instance method or a proc; the callback will be called
+      #   only when they all return a true value.
+      # * <tt>:unless</tt> - A symbol, a string or an array of symbols and
+      #   strings, each naming an instance method or a proc; the callback will
+      #   be called only when they all return a false value.
+      # * <tt>:prepend</tt> - If +true+, the callback will be prepended to the
+      #   existing chain rather than appended.
       def set_callback(name, *filter_list, &block)
-        mapped = nil
-
-        __update_callbacks(name, filter_list, block) do |target, chain, type, filters, options|
-          mapped ||= filters.map do |filter|
-            Callback.new(chain, filter, type, options.dup, self)
-          end
-
-          filters.each do |filter|
-            chain.delete_if {|c| c.matches?(type, filter) }
-          end
-
-          options[:prepend] ? chain.unshift(*(mapped.reverse)) : chain.push(*mapped)
+        type, filters, options = normalize_callback_params(filter_list, block)
+        self_chain = get_callbacks name
+        mapped = filters.map do |filter|
+          Callback.build(self_chain, filter, type, options)
+        end
 
-          target.send("_#{name}_callbacks=", chain)
+        __update_callbacks(name) do |target, chain|
+          options[:prepend] ? chain.prepend(*mapped) : chain.append(*mapped)
+          target.set_callbacks name, chain
         end
       end
 
-      # Skip a previously set callback. Like +set_callback+, <tt>:if</tt> or <tt>:unless</tt>
-      # options may be passed in order to control when the callback is skipped.
+      # Skip a previously set callback. Like +set_callback+, <tt>:if</tt> or
+      # <tt>:unless</tt> options may be passed in order to control when the
+      # callback is skipped.
       #
       #   class Writer < Person
-      #      skip_callback :validate, :before, :check_membership, :if => lambda { self.age > 18 }
+      #      skip_callback :validate, :before, :check_membership, if: -> { self.age > 18 }
       #   end
       #
+      # An <tt>ArgumentError</tt> will be raised if the callback has not
+      # already been set (unless the <tt>:raise</tt> option is set to <tt>false</tt>).
       def skip_callback(name, *filter_list, &block)
-        __update_callbacks(name, filter_list, block) do |target, chain, type, filters, options|
+        type, filters, options = normalize_callback_params(filter_list, block)
+        options[:raise] = true unless options.key?(:raise)
+
+        __update_callbacks(name) do |target, chain|
           filters.each do |filter|
-            filter = chain.find {|c| c.matches?(type, filter) }
+            callback = chain.find {|c| c.matches?(type, filter) }
 
-            if filter && options.any?
-              new_filter = filter.clone(chain, self)
-              chain.insert(chain.index(filter), new_filter)
-              new_filter.recompile!(options, options[:per_key] || {})
+            if !callback && options[:raise]
+              raise ArgumentError, "#{type.to_s.capitalize} #{name} callback #{filter.inspect} has not been defined"
             end
 
-            chain.delete(filter)
+            if callback && (options.key?(:if) || options.key?(:unless))
+              new_callback = callback.merge_conditional_options(chain, if_option: options[:if], unless_option: options[:unless])
+              chain.insert(chain.index(callback), new_callback)
+            end
+
+            chain.delete(callback)
           end
-          target.send("_#{name}_callbacks=", chain)
+          target.set_callbacks name, chain
         end
       end
 
       # Remove all set callbacks for the given event.
-      #
-      def reset_callbacks(symbol)
-        callbacks = send("_#{symbol}_callbacks")
+      def reset_callbacks(name)
+        callbacks = get_callbacks name
 
         ActiveSupport::DescendantsTracker.descendants(self).each do |target|
-          chain = target.send("_#{symbol}_callbacks").dup
+          chain = target.get_callbacks(name).dup
           callbacks.each { |c| chain.delete(c) }
-          target.send("_#{symbol}_callbacks=", chain)
-          target.__define_runner(symbol)
+          target.set_callbacks name, chain
         end
 
-        self.send("_#{symbol}_callbacks=", callbacks.dup.clear)
-
-        __define_runner(symbol)
+        self.set_callbacks name, callbacks.dup.clear
       end
 
-      # Define sets of events in the object lifecycle that support callbacks.
+      # Define sets of events in the object life cycle that support callbacks.
       #
       #   define_callbacks :validate
       #   define_callbacks :initialize, :save, :destroy
       #
       # ===== Options
       #
-      # * <tt>:terminator</tt> - Determines when a before filter will halt the callback
-      #   chain, preventing following callbacks from being called and the event from being
-      #   triggered. This is a string to be eval'ed. The result of the callback is available
-      #   in the <tt>result</tt> variable.
+      # * <tt>:terminator</tt> - Determines when a before filter will halt the
+      #   callback chain, preventing following before and around callbacks from
+      #   being called and the event from being triggered.
+      #   This should be a lambda to be executed.
+      #   The current object and the result lambda of the callback will be provided
+      #   to the terminator lambda.
       #
-      #     define_callbacks :validate, :terminator => "result == false"
+      #     define_callbacks :validate, terminator: ->(target, result_lambda) { result_lambda.call == false }
       #
       #   In this example, if any before validate callbacks returns +false+,
-      #   other callbacks are not executed. Defaults to "false", meaning no value
-      #   halts the chain.
+      #   any successive before and around callback is not executed.
+      #
+      #   The default terminator halts the chain when a callback throws +:abort+.
       #
-      # * <tt>:rescuable</tt> - By default, after filters are not executed if
-      #   the given block or a before filter raises an error. By setting this option
-      #   to <tt>true</tt> exception raised by given block is stored and after
-      #   executing all the after callbacks the stored exception is raised.
+      # * <tt>:skip_after_callbacks_if_terminated</tt> - Determines if after
+      #   callbacks should be terminated by the <tt>:terminator</tt> option. By
+      #   default after callbacks are executed no matter if callback chain was
+      #   terminated or not. This option makes sense only when <tt>:terminator</tt>
+      #   option is specified.
       #
-      # * <tt>:scope</tt> - Indicates which methods should be executed when an object
-      #   is used as a callback.
+      # * <tt>:scope</tt> - Indicates which methods should be executed when an
+      #   object is used as a callback.
       #
       #     class Audit
       #       def before(caller)
@@ -591,31 +718,74 @@ module ActiveSupport
       #       end
       #     end
       #
-      #   In the above case whenever you save an account the method <tt>Audit#before</tt> will
-      #   be called. On the other hand
+      #   In the above case whenever you save an account the method
+      #   <tt>Audit#before</tt> will be called. On the other hand
       #
-      #     define_callbacks :save, :scope => [:kind, :name]
+      #     define_callbacks :save, scope: [:kind, :name]
       #
-      #   would trigger <tt>Audit#before_save</tt> instead. That's constructed by calling
-      #   <tt>#{kind}_#{name}</tt> on the given instance. In this case "kind" is "before" and
-      #   "name" is "save". In this context +:kind+ and +:name+ have special meanings: +:kind+
-      #   refers to the kind of callback (before/after/around) and +:name+ refers to the
-      #   method on which callbacks are being defined.
+      #   would trigger <tt>Audit#before_save</tt> instead. That's constructed
+      #   by calling <tt>#{kind}_#{name}</tt> on the given instance. In this
+      #   case "kind" is "before" and "name" is "save". In this context +:kind+
+      #   and +:name+ have special meanings: +:kind+ refers to the kind of
+      #   callback (before/after/around) and +:name+ refers to the method on
+      #   which callbacks are being defined.
       #
       #   A declaration like
       #
-      #     define_callbacks :save, :scope => [:name]
+      #     define_callbacks :save, scope: [:name]
       #
       #   would call <tt>Audit#save</tt>.
       #
-      def define_callbacks(*callbacks)
-        config = callbacks.last.is_a?(Hash) ? callbacks.pop : {}
-        callbacks.each do |callback|
-          class_attribute "_#{callback}_callbacks"
-          send("_#{callback}_callbacks=", CallbackChain.new(callback, config))
-          __define_runner(callback)
+      # NOTE: +method_name+ passed to `define_model_callbacks` must not end with
+      # `!`, `?` or `=`.
+      def define_callbacks(*names)
+        options = names.extract_options!
+
+        names.each do |name|
+          class_attribute "_#{name}_callbacks", instance_writer: false
+          set_callbacks name, CallbackChain.new(name, options)
+
+          module_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def _run_#{name}_callbacks(&block)
+              __run_callbacks__(_#{name}_callbacks, &block)
+            end
+          RUBY
+        end
+      end
+
+      protected
+
+      def get_callbacks(name) # :nodoc:
+        send "_#{name}_callbacks"
+      end
+
+      def set_callbacks(name, callbacks) # :nodoc:
+        send "_#{name}_callbacks=", callbacks
+      end
+
+      def deprecated_false_terminator # :nodoc:
+        Proc.new do |target, result_lambda|
+          terminate = true
+          catch(:abort) do
+            result = result_lambda.call if result_lambda.is_a?(Proc)
+            if Callbacks.halt_and_display_warning_on_return_false && result == false
+              display_deprecation_warning_for_false_terminator
+            else
+              terminate = false
+            end
+          end
+          terminate
         end
       end
+
+      private
+
+      def display_deprecation_warning_for_false_terminator
+        ActiveSupport::Deprecation.warn(<<-MSG.squish)
+          Returning `false` in Active Record and Active Model callbacks will not implicitly halt a callback chain in Rails 5.1.
+          To explicitly halt the callback chain, please use `throw :abort` instead.
+        MSG
+      end
     end
   end
 end