@@ -10,7 +10,13 @@ module ActiveSupport private def method_missing(method, *arguments, &block) - arguments << (arguments.last.respond_to?(:to_hash) ? @options.deep_merge(arguments.pop) : @options.dup) + if arguments.last.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 activesupport/lib/active_support/option_merger.rb @@ -64,6 +64,14 @@ class OptionMergerTest < Test::Unit::TestCase end end end + + def test_nested_method_with_options_using_lamdba + local_lamdba = lambda { { :lambda => true } } + with_options(@options) do |o| + assert_equal @options.merge(local_lamdba.call), + o.method_with_options(local_lamdba).call + end + end # Needed when counting objects with the ObjectSpace def test_option_merger_class_method activesupport/test/option_merger_test.rb 8d8195dc2443755786d3a8598b7c2da1f08a38e7 David Heinemeier Hansson david@loudthinking.com http://github.com/rails/rails/commit/9eaa0a3449595d07fe2ada5c4c93ec226622147c 9eaa0a3449595d07fe2ada5c4c93ec226622147c 2008-11-15T07:48:14-08:00 2008-11-15T07:48:14-08:00 Added lambda merging to OptionMerger (especially useful with named_scope and with_options) [#740 state:committed] (Paweł Kondzior) 9bf645cc94377fcdc49846c1aadddf6b2dab0702 David Heinemeier Hansson david@loudthinking.com