vendor/activesupport/lib/active_support/option_merger.rb in relevance-castronaut-0.5.4 vs vendor/activesupport/lib/active_support/option_merger.rb in relevance-castronaut-0.6.0

- old
+ new

@@ -8,18 +8,10 @@ @context, @options = context, options end private def method_missing(method, *arguments, &block) - merge_argument_options! arguments - @context.send!(method, *arguments, &block) - end - - def merge_argument_options!(arguments) - arguments << if arguments.last.respond_to? :to_hash - @options.merge(arguments.pop) - else - @options.dup - end + arguments << (arguments.last.respond_to?(:to_hash) ? @options.deep_merge(arguments.pop) : @options.dup) + @context.__send__(method, *arguments, &block) end end end