1 files changed, 28 insertions, 25 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index ab13fb14ce..9b52598648 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1056,14 +1056,14 @@ module ActionDispatch
         class Resource #:nodoc:
           attr_reader :controller, :path, :options, :param
 
-          def initialize(entities, api_only = false, options = {})
+          def initialize(entities, api_only, shallow, options = {})
             @name       = entities.to_s
             @path       = (options[:path] || @name).to_s
             @controller = (options[:controller] || @name).to_s
             @as         = options[:as]
             @param      = (options[:param] || :id).to_sym
             @options    = options
-            @shallow    = false
+            @shallow    = shallow
             @api_only   = api_only
           end
 
@@ -1129,17 +1129,13 @@ module ActionDispatch
             "#{path}/:#{nested_param}"
           end
 
-          def shallow=(value)
-            @shallow = value
-          end
-
           def shallow?
             @shallow
           end
         end
 
         class SingletonResource < Resource #:nodoc:
-          def initialize(entities, api_only, options)
+          def initialize(entities, api_only, shallow, options)
             super
             @as         = nil
             @controller = (options[:controller] || plural).to_s
@@ -1201,7 +1197,7 @@ module ActionDispatch
             return self
           end
 
-          resource_scope(:resource, SingletonResource.new(resources.pop, api_only?, options)) do
+          resource_scope(:resource, SingletonResource.new(resources.pop, api_only?, @scope[:shallow], options)) do
             yield if block_given?
 
             concerns(options[:concerns]) if options[:concerns]
@@ -1359,7 +1355,7 @@ module ActionDispatch
             return self
           end
 
-          resource_scope(:resources, Resource.new(resources.pop, api_only?, options)) do
+          resource_scope(:resources, Resource.new(resources.pop, api_only?, @scope[:shallow], options)) do
             yield if block_given?
 
             concerns(options[:concerns]) if options[:concerns]
@@ -1687,15 +1683,12 @@ module ActionDispatch
           end
 
           def resource_scope(kind, resource) #:nodoc:
-            resource.shallow = @scope[:shallow]
             @scope = @scope.new(:scope_level_resource => resource)
-            @nesting.push(resource)
 
             with_scope_level(kind) do
-              controller_scope(parent_resource.resource_scope) { yield }
+              controller_scope(resource.resource_scope) { yield }
             end
           ensure
-            @nesting.pop
             @scope = @scope.parent
           end
 
@@ -1708,12 +1701,10 @@ module ActionDispatch
             options
           end
 
-          def nesting_depth #:nodoc:
-            @nesting.size
-          end
-
           def shallow_nesting_depth #:nodoc:
-            @nesting.count(&:shallow?)
+            @scope.find_all { |node|
+              node.frame[:scope_level_resource]
+            }.count { |node| node.frame[:scope_level_resource].shallow? }
           end
 
           def param_constraint? #:nodoc:
@@ -1936,7 +1927,7 @@ module ActionDispatch
 
         attr_reader :parent, :scope_level
 
-        def initialize(hash, parent = {}, scope_level = nil)
+        def initialize(hash, parent = NULL, scope_level = nil)
           @hash = hash
           @parent = parent
           @scope_level = scope_level
@@ -1983,24 +1974,36 @@ module ActionDispatch
           self.class.new hash, self, scope_level
         end
 
+        EMPTY_HASH = {}.freeze
         def new_level(level)
-          self.class.new(self, self, level)
+          self.class.new(EMPTY_HASH, self, level)
         end
 
-        def fetch(key, &block)
-          @hash.fetch(key, &block)
+        def [](key)
+          scope = find { |node| node.frame.key? key }
+          scope && scope.frame[key]
         end
 
-        def [](key)
-          @hash.fetch(key) { @parent[key] }
+        include Enumerable
+
+        def each
+          node = self
+          loop do
+            break if node.equal? NULL
+            yield node
+            node = node.parent
+          end
         end
+
+        def frame; @hash; end
+
+        NULL = Scope.new(nil, nil)
       end
 
       def initialize(set) #:nodoc:
         @set = set
         @scope = Scope.new({ :path_names => @set.resources_path_names })
         @concerns = {}
-        @nesting = []
       end
 
       include Base