From 31fbbb7faccba25b2e3b5e10b8fca1468579d629 Mon Sep 17 00:00:00 2001
From: Chris Arcand <chris@chrisarcand.com>
Date: Thu, 21 Jul 2016 15:59:05 -0500
Subject: Fix 'defaults' option for root route

The merging of the 'defaults' option was moved up the stack in e852daa
This allows us to see where these options originate from the standard
HttpHelpers (get, post, patch, put, delete)

Unfortunately this move didn't incorporate the 'root' method, which has
always allowed the same 'defaults' option before.
---
 actionpack/lib/action_dispatch/routing/mapper.rb |  9 ++++++++-
 actionpack/test/dispatch/routing_test.rb         | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 73b4864e45..fd68d4f185 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1923,7 +1923,14 @@ to this:
 
         def match_root_route(options)
           name = has_named_route?(:root) ? nil : :root
-          match '/', { :as => name, :via => :get }.merge!(options)
+          defaults_option = options.delete(:defaults)
+          args = ['/', { :as => name, :via => :get }.merge!(options)]
+
+          if defaults_option
+            defaults(defaults_option) { match(*args) }
+          else
+            match(*args)
+          end
         end
       end
 
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 5298e63fef..2fe40de583 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -1759,6 +1759,24 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal 1, @request.params[:page]
   end
 
+  def test_keyed_default_string_params_with_root
+    draw do
+      root :to => 'pages#show', :defaults => { :id => 'home' }
+    end
+
+    get '/'
+    assert_equal 'home', @request.params[:id]
+  end
+
+  def test_default_string_params_with_root
+    draw do
+      root :to => 'pages#show', :id => 'home'
+    end
+
+    get '/'
+    assert_equal 'home', @request.params[:id]
+  end
+
   def test_resource_constraints
     draw do
       resources :products, :constraints => { :id => /\d{4}/ } do
-- 
cgit v1.2.3


From 2a946da9bbccfbd1e52b1164f4f4a77d5dbe3c10 Mon Sep 17 00:00:00 2001
From: Chris Arcand <chris@chrisarcand.com>
Date: Thu, 21 Jul 2016 16:10:42 -0500
Subject: Update changelog

---
 actionpack/CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index d50cbaee38..12430ca965 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,10 @@
+*   Fix 'defaults' option for root route
+
+    A regression from some refactoring for the 5.0 release, this change
+    fixes the use of 'defaults' (default parameters) in the 'root' routing method
+
+    *Chris Arcand*
+
 *   Check `request.path_parameters` encoding at the point they're set.
 
     Check for any non-UTF8 characters in path parameters at the point they're
-- 
cgit v1.2.3