0
@@ -67,10 +67,9 @@ module ActionController
0
         options = options.dup
0
 
0
         if options[:namespace]
0
-          options[:controller] = "#{options[:path_prefix]}/#{options[:controller]}"
0
+          options[:controller] = "#{options.delete(:namespace).sub(/\/$/, '')}/#{options[:controller]}"
0
           options.delete(:path_prefix)
0
           options.delete(:name_prefix)
0
-          options.delete(:namespace)
0
         end
0
 
0
         requirements = (options.delete(:requirements) || {}).dup

0
@@ -2039,6 +2039,26 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
0
       Object.send(:remove_const, :Api)
0
     end
0
 
0
+    def test_namespace_with_path_prefix
0
+      Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
0
+
0
+      set.draw do |map|
0
+
0
+        map.namespace 'api', :path_prefix => 'prefix' do |api|
0
+          api.route 'inventory', :controller => "products", :action => 'inventory'
0
+        end
0
+
0
+      end
0
+
0
+      request.path = "/prefix/inventory"
0
+      request.method = :get
0
+      assert_nothing_raised { set.recognize(request) }
0
+      assert_equal("api/products", request.path_parameters[:controller])
0
+      assert_equal("inventory", request.path_parameters[:action])
0
+    ensure
0
+      Object.send(:remove_const, :Api)
0
+    end
0
+
0
     def test_generate_finds_best_fit
0
       set.draw do |map|
0
         map.connect "/people", :controller => "people", :action => "index"