Move name_prefix merging into Scoping concern

rails · Dec 8, 2009 · e86a82c · e86a82c
1 parent e600b41
commit e86a82c
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -258,7 +258,13 @@ def constraints(constraints = {})
 
         def match(*args)
           options = args.extract_options!
+
           options = (@scope[:options] || {}).merge(options)
+
+          if @scope[:name_prefix]
+            options[:as] = "#{@scope[:name_prefix]}#{options[:as]}"
+          end
+
           args.push(options)
           super(*args)
         end
@@ -391,9 +397,7 @@ def match(*args)
         validate_defaults!(app, defaults, segment_keys)
         app = Constraints.new(app, blocks)
 
-        name = @scope[:name_prefix] ? "#{@scope[:name_prefix]}#{options[:as]}" : options[:as]
-
-        @set.add_route(app, conditions, requirements, defaults, name)
+        @set.add_route(app, conditions, requirements, defaults, options[:as])
 
         self
       end