activesupport 5.0.7.2 → 5.1.7

data/lib/active_support/cache/mem_cache_store.rb

@@ -1,13 +1,13 @@
 begin
-  require 'dalli'
+  require "dalli"
 rescue LoadError => e
   $stderr.puts "You don't have dalli installed in your application. Please add it to your Gemfile and run bundle install"
   raise e
 end
 
-require 'digest/md5'
-require 'active_support/core_ext/marshal'
-require 'active_support/core_ext/array/extract_options'
+require "digest/md5"
+require "active_support/core_ext/marshal"
+require "active_support/core_ext/array/extract_options"
 
 module ActiveSupport
   module Cache
@@ -26,24 +26,24 @@ module ActiveSupport
     class MemCacheStore < Store
       # Provide support for raw values in the local cache strategy.
       module LocalCacheWithRaw # :nodoc:
-        protected
-        def read_entry(key, options)
-          entry = super
-          if options[:raw] && local_cache && entry
-            entry = deserialize_entry(entry.value)
+        private
+          def read_entry(key, options)
+            entry = super
+            if options[:raw] && local_cache && entry
+              entry = deserialize_entry(entry.value)
+            end
+            entry
           end
-          entry
-        end
 
-        def write_entry(key, entry, options) # :nodoc:
-          if options[:raw] && local_cache
-            raw_entry = Entry.new(entry.value.to_s)
-            raw_entry.expires_at = entry.expires_at
-            super(key, raw_entry, options)
-          else
-            super
+          def write_entry(key, entry, options)
+            if options[:raw] && local_cache
+              raw_entry = Entry.new(entry.value.to_s)
+              raw_entry.expires_at = entry.expires_at
+              super(key, raw_entry, options)
+            else
+              super
+            end
           end
-        end
       end
 
       prepend Strategy::LocalCache
@@ -85,7 +85,7 @@ module ActiveSupport
           @data = addresses.first
         else
           mem_cache_options = options.dup
-          UNIVERSAL_OPTIONS.each{|name| mem_cache_options.delete(name)}
+          UNIVERSAL_OPTIONS.each { |name| mem_cache_options.delete(name) }
           @data = self.class.build_mem_cache(*(addresses + [mem_cache_options]))
         end
       end
@@ -96,7 +96,7 @@ module ActiveSupport
         options = names.extract_options!
         options = merged_options(options)
 
-        keys_to_names = Hash[names.map{|name| [normalize_key(name, options), name]}]
+        keys_to_names = Hash[names.map { |name| [normalize_key(name, options), name] }]
         raw_values = @data.get_multi(keys_to_names.keys)
         values = {}
         raw_values.each do |key, value|
@@ -110,9 +110,9 @@ module ActiveSupport
       # operator and can only be used on values written with the :raw option.
       # Calling it on a value not stored with :raw will initialize that value
       # to zero.
-      def increment(name, amount = 1, options = nil) # :nodoc:
+      def increment(name, amount = 1, options = nil)
         options = merged_options(options)
-        instrument(:increment, name, :amount => amount) do
+        instrument(:increment, name, amount: amount) do
           rescue_error_with nil do
             @data.incr(normalize_key(name, options), amount)
           end
@@ -123,9 +123,9 @@ module ActiveSupport
       # operator and can only be used on values written with the :raw option.
       # Calling it on a value not stored with :raw will initialize that value
       # to zero.
-      def decrement(name, amount = 1, options = nil) # :nodoc:
+      def decrement(name, amount = 1, options = nil)
         options = merged_options(options)
-        instrument(:decrement, name, :amount => amount) do
+        instrument(:decrement, name, amount: amount) do
           rescue_error_with nil do
             @data.decr(normalize_key(name, options), amount)
           end
@@ -143,14 +143,14 @@ module ActiveSupport
         @data.stats
       end
 
-      protected
+      private
         # Read an entry from the cache.
-        def read_entry(key, options) # :nodoc:
+        def read_entry(key, options)
           rescue_error_with(nil) { deserialize_entry(@data.get(key, options)) }
         end
 
         # Write an entry to the cache.
-        def write_entry(key, entry, options) # :nodoc:
+        def write_entry(key, entry, options)
           method = options && options[:unless_exist] ? :add : :set
           value = options[:raw] ? entry.value.to_s : entry
           expires_in = options[:expires_in].to_i
@@ -164,31 +164,21 @@ module ActiveSupport
         end
 
         # Delete an entry from the cache.
-        def delete_entry(key, options) # :nodoc:
+        def delete_entry(key, options)
           rescue_error_with(false) { @data.delete(key) }
         end
 
-      private
-
         # Memcache keys are binaries. So we need to force their encoding to binary
         # before applying the regular expression to ensure we are escaping all
         # characters properly.
         def normalize_key(key, options)
           key = super.dup
           key = key.force_encoding(Encoding::ASCII_8BIT)
-          key = key.gsub(ESCAPE_KEY_CHARS){ |match| "%#{match.getbyte(0).to_s(16).upcase}" }
+          key = key.gsub(ESCAPE_KEY_CHARS) { |match| "%#{match.getbyte(0).to_s(16).upcase}" }
           key = "#{key[0, 213]}:md5:#{Digest::MD5.hexdigest(key)}" if key.size > 250
           key
         end
 
-        def escape_key(key)
-          ActiveSupport::Deprecation.warn(<<-MESSAGE.strip_heredoc)
-            `escape_key` is deprecated and will be removed from Rails 5.1.
-            Please use `normalize_key` which will return a fully resolved key or nothing.
-          MESSAGE
-          key
-        end
-
         def deserialize_entry(raw_value)
           if raw_value
             entry = Marshal.load(raw_value) rescue raw_value

data/lib/active_support/cache/memory_store.rb

@@ -1,10 +1,10 @@
-require 'monitor'
+require "monitor"
 
 module ActiveSupport
   module Cache
     # A cache store implementation which stores everything into memory in the
     # same process. If you're running multiple Ruby on Rails server processes
-    # (which is the case if you're using mongrel_cluster or Phusion Passenger),
+    # (which is the case if you're using Phusion Passenger or puma clustered mode),
     # then this means that Rails server process instances won't be able
     # to share cache data with each other and this may not be the most
     # appropriate cache in that scenario.
@@ -28,6 +28,7 @@ module ActiveSupport
         @pruning = false
       end
 
+      # Delete all data stored in a given cache store.
       def clear(options = nil)
         synchronize do
           @data.clear
@@ -39,8 +40,8 @@ module ActiveSupport
       # Preemptively iterates through all stored keys and removes the ones which have expired.
       def cleanup(options = nil)
         options = merged_options(options)
-        instrument(:cleanup, :size => @data.size) do
-          keys = synchronize{ @data.keys }
+        instrument(:cleanup, size: @data.size) do
+          keys = synchronize { @data.keys }
           keys.each do |key|
             entry = @data[key]
             delete_entry(key, options) if entry && entry.expired?
@@ -56,8 +57,8 @@ module ActiveSupport
         begin
           start_time = Time.now
           cleanup
-          instrument(:prune, target_size, :from => @cache_size) do
-            keys = synchronize{ @key_access.keys.sort{|a,b| @key_access[a].to_f <=> @key_access[b].to_f} }
+          instrument(:prune, target_size, from: @cache_size) do
+            keys = synchronize { @key_access.keys.sort { |a, b| @key_access[a].to_f <=> @key_access[b].to_f } }
             keys.each do |key|
               delete_entry(key, options)
               return if @cache_size <= target_size || (max_time && Time.now - start_time > max_time)
@@ -83,6 +84,7 @@ module ActiveSupport
         modify_value(name, -amount, options)
       end
 
+      # Deletes cache entries if the cache key matches a given pattern.
       def delete_matched(matcher, options = nil)
         options = merged_options(options)
         instrument(:delete_matched, matcher.inspect) do
@@ -104,15 +106,15 @@ module ActiveSupport
         @monitor.synchronize(&block)
       end
 
-      protected
+      private
 
         PER_ENTRY_OVERHEAD = 240
 
-        def cached_size(key, entry) # :nodoc:
+        def cached_size(key, entry)
           key.to_s.bytesize + entry.size + PER_ENTRY_OVERHEAD
         end
 
-        def read_entry(key, options) # :nodoc:
+        def read_entry(key, options)
           entry = @data[key]
           synchronize do
             if entry
@@ -124,7 +126,7 @@ module ActiveSupport
           entry
         end
 
-        def write_entry(key, entry, options) # :nodoc:
+        def write_entry(key, entry, options)
           entry.dup_value!
           synchronize do
             old_entry = @data[key]
@@ -141,7 +143,7 @@ module ActiveSupport
           end
         end
 
-        def delete_entry(key, options) # :nodoc:
+        def delete_entry(key, options)
           synchronize do
             @key_access.delete(key)
             entry = @data.delete(key)
@@ -150,8 +152,6 @@ module ActiveSupport
           end
         end
 
-      private
-
         def modify_value(name, amount, options)
           synchronize do
             options = merged_options(options)

data/lib/active_support/cache/null_store.rb

@@ -25,15 +25,15 @@ module ActiveSupport
       def delete_matched(matcher, options = nil)
       end
 
-      protected
-        def read_entry(key, options) # :nodoc:
+      private
+        def read_entry(key, options)
         end
 
-        def write_entry(key, entry, options) # :nodoc:
+        def write_entry(key, entry, options)
           true
         end
 
-        def delete_entry(key, options) # :nodoc:
+        def delete_entry(key, options)
           false
         end
     end

data/lib/active_support/cache/strategy/local_cache.rb

@@ -1,6 +1,6 @@
-require 'active_support/core_ext/object/duplicable'
-require 'active_support/core_ext/string/inflections'
-require 'active_support/per_thread_registry'
+require "active_support/core_ext/object/duplicable"
+require "active_support/core_ext/string/inflections"
+require "active_support/per_thread_registry"
 
 module ActiveSupport
   module Cache
@@ -9,7 +9,7 @@ module ActiveSupport
       # duration of a block. Repeated calls to the cache for the same key will hit the
       # in-memory cache for faster access.
       module LocalCache
-        autoload :Middleware, 'active_support/cache/strategy/local_cache_middleware'
+        autoload :Middleware, "active_support/cache/strategy/local_cache_middleware"
 
         # Class for storing and registering the local caches.
         class LocalCacheRegistry # :nodoc:
@@ -70,6 +70,7 @@ module ActiveSupport
         def with_local_cache
           use_temporary_local_cache(LocalStore.new) { yield }
         end
+
         # Middleware class can be inserted as a Rack handler to be local cache for the
         # duration of request.
         def middleware
@@ -92,20 +93,20 @@ module ActiveSupport
 
         def increment(name, amount = 1, options = nil) # :nodoc:
           return super unless local_cache
-          value = bypass_local_cache{super}
+          value = bypass_local_cache { super }
           write_cache_value(name, value, options)
           value
         end
 
         def decrement(name, amount = 1, options = nil) # :nodoc:
           return super unless local_cache
-          value = bypass_local_cache{super}
+          value = bypass_local_cache { super }
           write_cache_value(name, value, options)
           value
         end
 
-        protected
-          def read_entry(key, options) # :nodoc:
+        private
+          def read_entry(key, options)
             if cache = local_cache
               cache.fetch_entry(key) { super }
             else
@@ -113,25 +114,17 @@ module ActiveSupport
             end
           end
 
-          def write_entry(key, entry, options) # :nodoc:
+          def write_entry(key, entry, options)
             local_cache.write_entry(key, entry, options) if local_cache
             super
           end
 
-          def delete_entry(key, options) # :nodoc:
+          def delete_entry(key, options)
             local_cache.delete_entry(key, options) if local_cache
             super
           end
 
-          def set_cache_value(value, name, amount, options) # :nodoc:
-            ActiveSupport::Deprecation.warn(<<-MESSAGE.strip_heredoc)
-              `set_cache_value` is deprecated and will be removed from Rails 5.1.
-              Please use `write_cache_value` instead.
-            MESSAGE
-            write_cache_value name, value, options
-          end
-
-          def write_cache_value(name, value, options) # :nodoc:
+          def write_cache_value(name, value, options)
             name = normalize_key(name, options)
             cache = local_cache
             cache.mute do
@@ -143,10 +136,8 @@ module ActiveSupport
             end
           end
 
-        private
-
           def local_cache_key
-            @local_cache_key ||= "#{self.class.name.underscore}_local_cache_#{object_id}".gsub(/[\/-]/, '_').to_sym
+            @local_cache_key ||= "#{self.class.name.underscore}_local_cache_#{object_id}".gsub(/[\/-]/, "_").to_sym
           end
 
           def local_cache

data/lib/active_support/cache/strategy/local_cache_middleware.rb

@@ -1,11 +1,10 @@
-require 'rack/body_proxy'
-require 'rack/utils'
+require "rack/body_proxy"
+require "rack/utils"
 
 module ActiveSupport
   module Cache
     module Strategy
       module LocalCache
-
         #--
         # This class wraps up local storage for middlewares. Only the middleware method should
         # construct them.
@@ -13,9 +12,9 @@ module ActiveSupport
           attr_reader :name, :local_cache_key
 
           def initialize(name, local_cache_key)
-            @name             = name
+            @name = name
             @local_cache_key = local_cache_key
-            @app              = nil
+            @app = nil
           end
 
           def new(app)

data/lib/active_support/callbacks.rb

@@ -1,13 +1,12 @@
-require 'active_support/concern'
-require 'active_support/descendants_tracker'
-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/module/attribute_accessors'
-require 'active_support/core_ext/string/filters'
-require 'active_support/deprecation'
-require 'thread'
+require "active_support/concern"
+require "active_support/descendants_tracker"
+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/string/filters"
+require "active_support/deprecation"
+require "thread"
 
 module ActiveSupport
   # Callbacks are code hooks that are run at key points in an object's life cycle.
@@ -63,16 +62,12 @@ module ActiveSupport
 
     included do
       extend ActiveSupport::DescendantsTracker
+      class_attribute :__callbacks, instance_writer: false
+      self.__callbacks ||= {}
     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
@@ -86,706 +81,776 @@ module ActiveSupport
     #   run_callbacks :save do
     #     save
     #   end
-    def run_callbacks(kind, &block)
-      send "_run_#{kind}_callbacks", &block
-    end
-
-    private
+    #
+    #--
+    #
+    # As this method is used in many places, and often wraps large portions of
+    # user code, it has an additional design goal of minimizing its impact on
+    # the visible call stack. An exception from inside a :before or :after
+    # callback can be as noisy as it likes -- but when control has passed
+    # smoothly through and into the supplied block, we want as little evidence
+    # as possible that we were here.
+    def run_callbacks(kind)
+      callbacks = __callbacks[kind.to_sym]
 
-    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
+        env = Filters::Environment.new(self, false, nil)
+        next_sequence = callbacks.compile
+
+        invoke_sequence = Proc.new do
+          skipped = nil
+          while true
+            current = next_sequence
+            current.invoke_before(env)
+            if current.final?
+              env.value = !env.halted && (!block_given? || yield)
+            elsif current.skip?(env)
+              (skipped ||= []) << current
+              next_sequence = next_sequence.nested
+              next
+            else
+              next_sequence = next_sequence.nested
+              begin
+                target, block, method, *arguments = current.expand_call_template(env, invoke_sequence)
+                target.send(method, *arguments, &block)
+              ensure
+                next_sequence = current
+              end
+            end
+            current.invoke_after(env)
+            skipped.pop.invoke_after(env) while skipped && skipped.first
+            break env.value
+          end
+        end
 
-    module Conditionals # :nodoc:
-      class Value
-        def initialize(&block)
-          @block = block
+        # Common case: no 'around' callbacks defined
+        if next_sequence.final?
+          next_sequence.invoke_before(env)
+          env.value = !env.halted && (!block_given? || yield)
+          next_sequence.invoke_after(env)
+          env.value
+        else
+          invoke_sequence.call
         end
-        def call(target, value); @block.call(value); end
       end
     end
 
-    module Filters
-      Environment = Struct.new(:target, :halted, :value, :run_block)
+    private
 
-      class End
-        def call(env)
-          block = env.run_block
-          env.value = !env.halted && (!block || block.call)
-          env
-        end
+      # A hook invoked every time a before callback is halted.
+      # This can be overridden in ActiveSupport::Callbacks implementors in order
+      # to provide better debugging/logging.
+      def halted_callback_hook(filter)
       end
-      ENDING = End.new
 
-      class Before
-        def self.build(callback_sequence, user_callback, user_conditions, chain_config, filter)
-          halted_lambda = chain_config[:terminator]
-
-          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)
+      module Conditionals # :nodoc:
+        class Value
+          def initialize(&block)
+            @block = block
           end
+          def call(target, value); @block.call(value); end
         end
+      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
+      module Filters
+        Environment = Struct.new(:target, :halted, :value)
 
-            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
+        class Before
+          def self.build(callback_sequence, user_callback, user_conditions, chain_config, filter)
+            halted_lambda = chain_config[:terminator]
+
+            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 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
 
-            env
+              env
+            end
           end
-        end
-        private_class_method :halting_and_conditional
+          private_class_method :halting_and_conditional
 
-        def self.halting(callback_sequence, user_callback, halted_lambda, filter)
-          callback_sequence.before do |env|
-            target = env.target
-            value  = env.value
-            halted = env.halted
+          def self.halting(callback_sequence, user_callback, halted_lambda, filter)
+            callback_sequence.before do |env|
+              target = env.target
+              value  = env.value
+              halted = env.halted
 
-            unless halted
-              result_lambda = -> { user_callback.call target, value }
-              env.halted = halted_lambda.call(target, result_lambda)
+              unless halted
+                result_lambda = -> { user_callback.call target, value }
+                env.halted = halted_lambda.call(target, result_lambda)
 
-              if env.halted
-                target.send :halted_callback_hook, filter
+                if env.halted
+                  target.send :halted_callback_hook, filter
+                end
               end
-            end
 
-            env
+              env
+            end
           end
+          private_class_method :halting
         end
-        private_class_method :halting
-      end
 
-      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)
+        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
-              halting(callback_sequence, user_callback)
+              if user_conditions.any?
+                conditional callback_sequence, user_callback, user_conditions
+              else
+                simple callback_sequence, user_callback
+              end
             end
-          else
-            if user_conditions.any?
-              conditional callback_sequence, user_callback, user_conditions
-            else
-              simple callback_sequence, user_callback
+          end
+
+          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
+
+              env
             end
           end
-        end
+          private_class_method :halting_and_conditional
 
-        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
+          def self.halting(callback_sequence, user_callback)
+            callback_sequence.after do |env|
+              unless env.halted
+                user_callback.call env.target, env.value
+              end
 
-            if !halted && user_conditions.all? { |c| c.call(target, value) }
-              user_callback.call target, value
+              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
 
-            env
+              env
+            end
           end
-        end
-        private_class_method :halting_and_conditional
+          private_class_method :conditional
 
-        def self.halting(callback_sequence, user_callback)
-          callback_sequence.after do |env|
-            unless env.halted
+          def self.simple(callback_sequence, user_callback)
+            callback_sequence.after do |env|
               user_callback.call env.target, env.value
-            end
 
-            env
+              env
+            end
           end
+          private_class_method :simple
         end
-        private_class_method :halting
+      end
 
-        def self.conditional(callback_sequence, user_callback, user_conditions)
-          callback_sequence.after do |env|
-            target = env.target
-            value  = env.value
+      class Callback #:nodoc:#
+        def self.build(chain, filter, kind, options)
+          if filter.is_a?(String)
+            raise ArgumentError, <<-MSG.squish
+              Passing string to define a callback is not supported. See the `.set_callback`
+              documentation to see supported values.
+            MSG
+          end
 
-            if user_conditions.all? { |c| c.call(target, value) }
-              user_callback.call target, value
-            end
+          new chain.name, filter, kind, options, chain.config
+        end
 
-            env
-          end
+        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
-        private_class_method :conditional
 
-        def self.simple(callback_sequence, user_callback)
-          callback_sequence.after do |env|
-            user_callback.call env.target, env.value
+        def filter; @key; end
+        def raw_filter; @filter; end
 
-            env
-          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
-        private_class_method :simple
-      end
 
-      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)
+        def matches?(_kind, _filter)
+          @kind == _kind && filter == _filter
+        end
+
+        def duplicates?(other)
+          case @filter
+          when Symbol, String
+            matches?(other.kind, other.filter)
           else
-            halting(callback_sequence, user_callback)
+            false
           end
         end
 
-        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
+        # Wraps code with filter
+        def apply(callback_sequence)
+          user_conditions = conditions_lambdas
+          user_callback = CallTemplate.build(@filter, self)
+
+          case kind
+          when :before
+            Filters::Before.build(callback_sequence, user_callback.make_lambda, user_conditions, chain_config, @filter)
+          when :after
+            Filters::After.build(callback_sequence, user_callback.make_lambda, user_conditions, chain_config)
+          when :around
+            callback_sequence.around(user_callback, user_conditions)
           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
+        def current_scopes
+          Array(chain_config[:scope]).map { |s| public_send(s) }
+        end
 
-            if env.halted
-              run.call
+        private
+          def compute_identifier(filter)
+            case filter
+            when String, ::Proc
+              filter.object_id
             else
-              user_callback.call(target, value) {
-                run.call.value
-              }
-              env
+              filter
             end
           end
-        end
-        private_class_method :halting
+
+          def conditions_lambdas
+            @if.map { |c| CallTemplate.build(c, self).make_lambda } +
+              @unless.map { |c| CallTemplate.build(c, self).inverted_lambda }
+          end
       end
-    end
 
-    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
+      # A future invocation of user-supplied code (either as a callback,
+      # or a condition filter).
+      class CallTemplate # :nodoc:
+        def initialize(target, method, arguments, block)
+          @override_target = target
+          @method_name = method
+          @arguments = arguments
+          @override_block = block
         end
 
-        new chain.name, filter, kind, options, chain.config
-      end
+        # Return the parts needed to make this call, with the given
+        # input values.
+        #
+        # Returns an array of the form:
+        #
+        #   [target, block, method, *arguments]
+        #
+        # This array can be used as such:
+        #
+        #   target.send(method, *arguments, &block)
+        #
+        # The actual invocation is left up to the caller to minimize
+        # call stack pollution.
+        def expand(target, value, block)
+          result = @arguments.map { |arg|
+            case arg
+            when :value; value
+            when :target; target
+            when :block; block || raise(ArgumentError)
+            end
+          }
 
-      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
+          result.unshift @method_name
+          result.unshift @override_block || block
+          result.unshift @override_target || target
 
-      def filter; @key; end
-      def raw_filter; @filter; end
+          # target, block, method, *arguments = result
+          # target.send(method, *arguments, &block)
+          result
+        end
 
-      def merge_conditional_options(chain, if_option:, unless_option:)
-        options = {
-          :if     => @if.dup,
-          :unless => @unless.dup
-        }
+        # Return a lambda that will make this call when given the input
+        # values.
+        def make_lambda
+          lambda do |target, value, &block|
+            target, block, method, *arguments = expand(target, value, block)
+            target.send(method, *arguments, &block)
+          end
+        end
 
-        options[:if].concat     Array(unless_option)
-        options[:unless].concat Array(if_option)
+        # Return a lambda that will make this call when given the input
+        # values, but then return the boolean inverse of that result.
+        def inverted_lambda
+          lambda do |target, value, &block|
+            target, block, method, *arguments = expand(target, value, block)
+            ! target.send(method, *arguments, &block)
+          end
+        end
 
-        self.class.build chain, @filter, @kind, options
-      end
+        # Filters support:
+        #
+        #   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 CallTemplate and handled
+        # the same after this point.
+        def self.build(filter, callback)
+          case filter
+          when Symbol
+            new(nil, filter, [], nil)
+          when String
+            new(nil, :instance_exec, [:value], compile_lambda(filter))
+          when Conditionals::Value
+            new(filter, :call, [:target, :value], nil)
+          when ::Proc
+            if filter.arity > 1
+              new(nil, :instance_exec, [:target, :block], filter)
+            elsif filter.arity > 0
+              new(nil, :instance_exec, [:target], filter)
+            else
+              new(nil, :instance_exec, [], filter)
+            end
+          else
+            method_to_call = callback.current_scopes.join("_")
 
-      def matches?(_kind, _filter)
-        @kind == _kind && filter == _filter
-      end
+            new(filter, method_to_call, [:target], nil)
+          end
+        end
 
-      def duplicates?(other)
-        case @filter
-        when Symbol, String
-          matches?(other.kind, other.filter)
-        else
-          false
+        def self.compile_lambda(filter)
+          eval("lambda { |value| #{filter} }")
         end
       end
 
-      # Wraps code with filter
-      def apply(callback_sequence)
-        user_conditions = conditions_lambdas
-        user_callback = make_lambda @filter
+      # 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 # :nodoc:
+        def initialize(nested = nil, call_template = nil, user_conditions = nil)
+          @nested = nested
+          @call_template = call_template
+          @user_conditions = user_conditions
 
-        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)
+          @before = []
+          @after = []
         end
-      end
 
-      private
-
-      def invert_lambda(l)
-        lambda { |*args, &blk| !l.call(*args, &blk) }
-      end
+        def before(&before)
+          @before.unshift(before)
+          self
+        end
 
-      # Filters support:
-      #
-      #   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 Symbol
-          lambda { |target, _, &blk| target.send filter, &blk }
-        when String
-          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
-
-          if filter.arity <= 0
-            lambda { |target, _| target.instance_exec(&filter) }
-          else
-            lambda { |target, _| target.instance_exec(target, &filter) }
-          end
-        else
-          scopes = Array(chain_config[:scope])
-          method_to_call = scopes.map{ |s| public_send(s) }.join("_")
+        def after(&after)
+          @after.push(after)
+          self
+        end
 
-          lambda { |target, _, &blk|
-            filter.public_send method_to_call, target, &blk
-          }
+        def around(call_template, user_conditions)
+          CallbackSequence.new(self, call_template, user_conditions)
         end
-      end
 
-      def compute_identifier(filter)
-        case filter
-        when String, ::Proc
-          filter.object_id
-        else
-          filter
+        def skip?(arg)
+          arg.halted || !@user_conditions.all? { |c| c.call(arg.target, arg.value) }
         end
-      end
 
-      def conditions_lambdas
-        @if.map { |c| make_lambda c } +
-          @unless.map { |c| invert_lambda make_lambda c }
-      end
-    end
+        def nested
+          @nested
+        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 final?
+          !@call_template
+        end
 
-      def before(&before)
-        @before.unshift(before)
-        self
-      end
+        def expand_call_template(arg, block)
+          @call_template.expand(arg.target, arg.value, block)
+        end
 
-      def after(&after)
-        @after.push(after)
-        self
-      end
+        def invoke_before(arg)
+          @before.each { |b| b.call(arg) }
+        end
 
-      def around(&around)
-        CallbackSequence.new do |arg|
-          around.call(arg) {
-            self.call(arg)
-          }
+        def invoke_after(arg)
+          @after.each { |a| a.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 #:nodoc:#
+        include Enumerable
 
-    # An Array with a compile method.
-    class CallbackChain #:nodoc:#
-      include Enumerable
-
-      attr_reader :name, :config
-
-      def initialize(name, config)
-        @name = name
-        @config = {
-          scope: [:kind],
-          terminator: default_terminator
-        }.merge!(config)
-        @chain = []
-        @callbacks = nil
-        @mutex = Mutex.new
-      end
+        attr_reader :name, :config
 
-      def each(&block); @chain.each(&block); end
-      def index(o);     @chain.index(o); end
-      def empty?;       @chain.empty?; end
+        def initialize(name, config)
+          @name = name
+          @config = {
+            scope: [:kind],
+            terminator: default_terminator
+          }.merge!(config)
+          @chain = []
+          @callbacks = nil
+          @mutex = Mutex.new
+        end
 
-      def insert(index, o)
-        @callbacks = nil
-        @chain.insert(index, o)
-      end
+        def each(&block); @chain.each(&block); end
+        def index(o);     @chain.index(o); end
+        def empty?;       @chain.empty?; end
 
-      def delete(o)
-        @callbacks = nil
-        @chain.delete(o)
-      end
+        def insert(index, o)
+          @callbacks = nil
+          @chain.insert(index, o)
+        end
 
-      def clear
-        @callbacks = nil
-        @chain.clear
-        self
-      end
+        def delete(o)
+          @callbacks = nil
+          @chain.delete(o)
+        end
 
-      def initialize_copy(other)
-        @callbacks = nil
-        @chain     = other.chain.dup
-        @mutex     = Mutex.new
-      end
+        def clear
+          @callbacks = nil
+          @chain.clear
+          self
+        end
+
+        def initialize_copy(other)
+          @callbacks = nil
+          @chain     = other.chain.dup
+          @mutex     = Mutex.new
+        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
+        def compile
+          @callbacks || @mutex.synchronize do
+            final_sequence = CallbackSequence.new
+            @callbacks ||= @chain.reverse.inject(final_sequence) do |callback_sequence, callback|
+              callback.apply callback_sequence
+            end
           end
         end
-      end
 
-      def append(*callbacks)
-        callbacks.each { |c| append_one(c) }
-      end
+        def append(*callbacks)
+          callbacks.each { |c| append_one(c) }
+        end
 
-      def prepend(*callbacks)
-        callbacks.each { |c| prepend_one(c) }
-      end
+        def prepend(*callbacks)
+          callbacks.each { |c| prepend_one(c) }
+        end
 
-      protected
-      def chain; @chain; end
+        protected
+          def chain; @chain; end
 
-      private
+        private
 
-      def append_one(callback)
-        @callbacks = nil
-        remove_duplicates(callback)
-        @chain.push(callback)
-      end
-
-      def prepend_one(callback)
-        @callbacks = nil
-        remove_duplicates(callback)
-        @chain.unshift(callback)
-      end
+          def append_one(callback)
+            @callbacks = nil
+            remove_duplicates(callback)
+            @chain.push(callback)
+          end
 
-      def remove_duplicates(callback)
-        @callbacks = nil
-        @chain.delete_if { |c| callback.duplicates?(c) }
-      end
+          def prepend_one(callback)
+            @callbacks = nil
+            remove_duplicates(callback)
+            @chain.unshift(callback)
+          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
+          def remove_duplicates(callback)
+            @callbacks = nil
+            @chain.delete_if { |c| callback.duplicates?(c) }
           end
-          terminate
-        end
-      end
-    end
 
-    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]
+          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) #:nodoc:
-        ([self] + ActiveSupport::DescendantsTracker.descendants(self)).reverse_each do |target|
-          chain = target.get_callbacks name
-          yield target, chain.dup
+      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
-      end
 
-      # Install a callback for the given event.
-      #
-      #   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 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_method
-      #
-      # 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.
-      #
-      # 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, 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)
-        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
-
-        __update_callbacks(name) do |target, chain|
-          options[:prepend] ? chain.prepend(*mapped) : chain.append(*mapped)
-          target.set_callbacks name, chain
+        # 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
-      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.
-      #
-      #   class Writer < Person
-      #      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)
-        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|
-            callback = chain.find {|c| c.matches?(type, filter) }
-
-            if !callback && options[:raise]
-              raise ArgumentError, "#{type.to_s.capitalize} #{name} callback #{filter.inspect} has not been defined"
-            end
+        # Install a callback for the given event.
+        #
+        #   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 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_method
+        #
+        # The callback can be specified as a symbol naming an instance method; as a
+        # proc, lambda, or block; 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.
+        #
+        # 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, a string (deprecated) or an array of symbols,
+        #   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 (deprecated) or an array of symbols,
+        #   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)
+          type, filters, options = normalize_callback_params(filter_list, block)
+
+          if options[:if].is_a?(String) || options[:unless].is_a?(String)
+            ActiveSupport::Deprecation.warn(<<-MSG.squish)
+              Passing string to be evaluated in :if and :unless conditional
+              options is deprecated and will be removed in Rails 5.2 without
+              replacement. Pass a symbol for an instance method, or a lambda,
+              proc or block, instead.
+            MSG
+          end
 
-            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
+          self_chain = get_callbacks name
+          mapped = filters.map do |filter|
+            Callback.build(self_chain, filter, type, options)
+          end
 
-            chain.delete(callback)
+          __update_callbacks(name) do |target, chain|
+            options[:prepend] ? chain.prepend(*mapped) : chain.append(*mapped)
+            target.set_callbacks name, chain
           end
-          target.set_callbacks name, chain
         end
-      end
 
-      # Remove all set callbacks for the given event.
-      def reset_callbacks(name)
-        callbacks = get_callbacks name
+        # 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: -> { 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)
+          type, filters, options = normalize_callback_params(filter_list, block)
+
+          if options[:if].is_a?(String) || options[:unless].is_a?(String)
+            ActiveSupport::Deprecation.warn(<<-MSG.squish)
+              Passing string to :if and :unless conditional options is deprecated
+              and will be removed in Rails 5.2 without replacement.
+            MSG
+          end
 
-        ActiveSupport::DescendantsTracker.descendants(self).each do |target|
-          chain = target.get_callbacks(name).dup
-          callbacks.each { |c| chain.delete(c) }
-          target.set_callbacks name, chain
-        end
+          options[:raise] = true unless options.key?(:raise)
 
-        self.set_callbacks name, callbacks.dup.clear
-      end
+          __update_callbacks(name) do |target, chain|
+            filters.each do |filter|
+              callback = chain.find { |c| c.matches?(type, filter) }
+
+              if !callback && options[:raise]
+                raise ArgumentError, "#{type.to_s.capitalize} #{name} callback #{filter.inspect} has not been defined"
+              end
+
+              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
 
-      # 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 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: ->(target, result_lambda) { result_lambda.call == false }
-      #
-      #   In this example, if any before validate callbacks returns +false+,
-      #   any successive before and around callback is not executed.
-      #
-      #   The default terminator halts the chain when a callback throws +:abort+.
-      #
-      # * <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.
-      #
-      #     class Audit
-      #       def before(caller)
-      #         puts 'Audit: before is called'
-      #       end
-      #
-      #       def before_save(caller)
-      #         puts 'Audit: before_save is called'
-      #       end
-      #     end
-      #
-      #     class Account
-      #       include ActiveSupport::Callbacks
-      #
-      #       define_callbacks :save
-      #       set_callback :save, :before, Audit.new
-      #
-      #       def save
-      #         run_callbacks :save do
-      #           puts 'save in main'
-      #         end
-      #       end
-      #     end
-      #
-      #   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]
-      #
-      #   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]
-      #
-      #   would call <tt>Audit#save</tt>.
-      #
-      # 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)
+              chain.delete(callback)
             end
-          RUBY
+            target.set_callbacks name, chain
+          end
         end
-      end
 
-      protected
+        # Remove all set callbacks for the given event.
+        def reset_callbacks(name)
+          callbacks = get_callbacks name
 
-      def get_callbacks(name) # :nodoc:
-        send "_#{name}_callbacks"
-      end
+          ActiveSupport::DescendantsTracker.descendants(self).each do |target|
+            chain = target.get_callbacks(name).dup
+            callbacks.each { |c| chain.delete(c) }
+            target.set_callbacks name, chain
+          end
 
-      def set_callbacks(name, callbacks) # :nodoc:
-        send "_#{name}_callbacks=", callbacks
-      end
+          set_callbacks(name, callbacks.dup.clear)
+        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
+        # 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 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: ->(target, result_lambda) { result_lambda.call == false }
+        #
+        #   In this example, if any before validate callbacks returns +false+,
+        #   any successive before and around callback is not executed.
+        #
+        #   The default terminator halts the chain when a callback throws +:abort+.
+        #
+        # * <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.
+        #
+        #     class Audit
+        #       def before(caller)
+        #         puts 'Audit: before is called'
+        #       end
+        #
+        #       def before_save(caller)
+        #         puts 'Audit: before_save is called'
+        #       end
+        #     end
+        #
+        #     class Account
+        #       include ActiveSupport::Callbacks
+        #
+        #       define_callbacks :save
+        #       set_callback :save, :before, Audit.new
+        #
+        #       def save
+        #         run_callbacks :save do
+        #           puts 'save in main'
+        #         end
+        #       end
+        #     end
+        #
+        #   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]
+        #
+        #   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]
+        #
+        #   would call <tt>Audit#save</tt>.
+        #
+        # ===== Notes
+        #
+        # +names+ passed to +define_callbacks+ must not end with
+        # <tt>!</tt>, <tt>?</tt> or <tt>=</tt>.
+        #
+        # Calling +define_callbacks+ multiple times with the same +names+ will
+        # overwrite previous callbacks registered with +set_callback+.
+        def define_callbacks(*names)
+          options = names.extract_options!
+
+          names.each do |name|
+            name = name.to_sym
+
+            set_callbacks name, CallbackChain.new(name, options)
+
+            module_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def _run_#{name}_callbacks(&block)
+                run_callbacks #{name.inspect}, &block
+              end
+
+              def self._#{name}_callbacks
+                get_callbacks(#{name.inspect})
+              end
+
+              def self._#{name}_callbacks=(value)
+                set_callbacks(#{name.inspect}, value)
+              end
+
+              def _#{name}_callbacks
+                __callbacks[#{name.inspect}]
+              end
+            RUBY
           end
-          terminate
         end
-      end
 
-      private
+        protected
+
+          def get_callbacks(name) # :nodoc:
+            __callbacks[name.to_sym]
+          end
 
-      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
+          def set_callbacks(name, callbacks) # :nodoc:
+            self.__callbacks = __callbacks.merge(name.to_sym => callbacks)
+          end
       end
-    end
   end
 end