diff options
Diffstat (limited to 'activemodel/lib/active_model/callbacks.rb')
| -rw-r--r-- | activemodel/lib/active_model/callbacks.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb index d612743c44..fde3381df2 100644 --- a/activemodel/lib/active_model/callbacks.rb +++ b/activemodel/lib/active_model/callbacks.rb @@ -128,27 +128,27 @@ module ActiveModel def _define_before_model_callback(klass, callback) klass.define_singleton_method("before_#{callback}") do |*args, **options, &block| - options.assert_valid_keys :if, :unless, :prepend - set_callback(:"#{callback}", :before, *args, **options, &block) + options.assert_valid_keys(:if, :unless, :prepend) + set_callback(:"#{callback}", :before, *args, options, &block) end end def _define_around_model_callback(klass, callback) klass.define_singleton_method("around_#{callback}") do |*args, **options, &block| - options.assert_valid_keys :if, :unless, :prepend - set_callback(:"#{callback}", :around, *args, **options, &block) + options.assert_valid_keys(:if, :unless, :prepend) + set_callback(:"#{callback}", :around, *args, options, &block) end end def _define_after_model_callback(klass, callback) klass.define_singleton_method("after_#{callback}") do |*args, **options, &block| - options.assert_valid_keys :if, :unless, :prepend + options.assert_valid_keys(:if, :unless, :prepend) options[:prepend] = true conditional = ActiveSupport::Callbacks::Conditionals::Value.new { |v| v != false } options[:if] = Array(options[:if]) << conditional - set_callback(:"#{callback}", :after, *args, **options, &block) + set_callback(:"#{callback}", :after, *args, options, &block) end end end |