From e10f26f9e90f2fe6c4cd18f70c1e559f2250da56 Mon Sep 17 00:00:00 2001
From: Andrew White <andyw@pixeltrix.co.uk>
Date: Fri, 11 Apr 2014 10:20:54 +0100
Subject: Only make deeply nested routes shallow when parent is shallow

Since `:shallow` may be set at any point in the resource nesting we should
only make the new and collection routes shallow when the parent is shallow.

This is a bit of a hack but until the mapper is refactored to an object graph
instead of a hash of merged values it's the best we can do.

Fixes #14684.
---
 actionpack/lib/action_dispatch/routing/mapper.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 6f0b49cf28..77718a14c1 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -995,6 +995,7 @@ module ActionDispatch
             @as         = options[:as]
             @param      = (options[:param] || :id).to_sym
             @options    = options
+            @shallow    = false
           end
 
           def default_actions
@@ -1055,6 +1056,13 @@ module ActionDispatch
             "#{path}/:#{nested_param}"
           end
 
+          def shallow=(value)
+            @shallow = value
+          end
+
+          def shallow?
+            @shallow
+          end
         end
 
         class SingletonResource < Resource #:nodoc:
@@ -1361,7 +1369,7 @@ module ActionDispatch
           end
 
           with_scope_level(:nested) do
-            if shallow? && nesting_depth > 1
+            if shallow? && shallow_nesting_depth > 1
               shallow_scope(parent_resource.nested_scope, nested_options) { yield }
             else
               scope(parent_resource.nested_scope, nested_options) { yield }
@@ -1576,6 +1584,7 @@ module ActionDispatch
           end
 
           def resource_scope(kind, resource) #:nodoc:
+            resource.shallow = @scope[:shallow]
             old_resource, @scope[:scope_level_resource] = @scope[:scope_level_resource], resource
             @nesting.push(resource)
 
@@ -1600,6 +1609,10 @@ module ActionDispatch
             @nesting.size
           end
 
+          def shallow_nesting_depth #:nodoc:
+            @nesting.select(&:shallow?).size
+          end
+
           def param_constraint? #:nodoc:
             @scope[:constraints] && @scope[:constraints][parent_resource.param].is_a?(Regexp)
           end
-- 
cgit v1.2.3