From e852daa6976cc6b6b28ad0c80a188c06e226df3c Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 10 Aug 2015 15:31:33 -0700
Subject: pull `defaults` extraction up the stack.

Now we can see where `defaults` options originate
---
 actionpack/lib/action_dispatch/routing/mapper.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index b13eb1d897..a0d12144c4 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -70,7 +70,7 @@ module ActionDispatch
           options.delete :shallow_prefix
           options.delete :shallow
 
-          defaults = (scope[:defaults] || {}).merge options.delete(:defaults) || {}
+          defaults = (scope[:defaults] || {}).dup
 
           new scope, set, path, defaults, as, options
         end
@@ -684,7 +684,11 @@ module ActionDispatch
           def map_method(method, args, &block)
             options = args.extract_options!
             options[:via] = method
-            match(*args, options, &block)
+            if options.key?(:defaults)
+              defaults(options.delete(:defaults)) { match(*args, options, &block) }
+            else
+              match(*args, options, &block)
+            end
             self
           end
       end
-- 
cgit v1.2.3