Added lambda merging to OptionMerger (especially useful with named_sc…

…ope and with_options) [#740 state:committed] (Paweł Kondzior)

activesupport/lib/active_support/option_merger.rb

@@ -10,7 +10,13 @@ def initialize(context, options)
 
     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/test/option_merger_test.rb

@@ -64,6 +64,14 @@ def test_nested_method_with_options_containing_hashes_going_deep
       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