mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
db5d26c9d7
It was causing error when using `with_options` passing a lambda as its
last argument.
class User < ActiveRecord::Base
with_options dependent: :destroy do |assoc|
assoc.has_many :profiles, -> { where(active: true) }
end
end
It was happening because the `option_merger` was taking the last
argument and checking if it was a Hash. This breaks the HasMany usage,
because its last argument can be a Hash or a Proc.
As the behavior described in this test:
https://github.com/rails/rails/blob/master/activesupport/test/option_merger_test.rb#L69
the method will only accept the lambda, this way it will keep the expected behavior. See 9eaa0a34
25 lines
746 B
Ruby
25 lines
746 B
Ruby
require 'active_support/core_ext/hash/deep_merge'
|
|
|
|
module ActiveSupport
|
|
class OptionMerger #:nodoc:
|
|
instance_methods.each do |method|
|
|
undef_method(method) if method !~ /^(__|instance_eval|class|object_id)/
|
|
end
|
|
|
|
def initialize(context, options)
|
|
@context, @options = context, options
|
|
end
|
|
|
|
private
|
|
def method_missing(method, *arguments, &block)
|
|
if arguments.first.is_a?(Proc)
|
|
proc = arguments.pop
|
|
arguments << lambda { |*args| @options.deep_merge(proc.call(*args)) }
|
|
else
|
|
arguments << (arguments.last.respond_to?(:to_hash) ? @options.deep_merge(arguments.pop) : @options.dup)
|
|
end
|
|
|
|
@context.__send__(method, *arguments, &block)
|
|
end
|
|
end
|
|
end
|