Permalink
Browse files

Allow namespace accept options in routes [#4936 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
  • Loading branch information...
1 parent fef5cf9 commit aacb83143f24ff44c046d18930270d650efffec5 @carlosantoniodasilva carlosantoniodasilva committed with josevalim Jun 22, 2010
Showing with 17 additions and 3 deletions.
  1. +5 −3 actionpack/lib/action_dispatch/routing/mapper.rb
  2. +12 −0 actionpack/test/dispatch/routing_test.rb
@@ -346,9 +346,11 @@ def controller(controller)
scope(controller.to_sym) { yield }
end
- def namespace(path)
+ def namespace(path, options = {})
path = path.to_s
- scope(:path => path, :as => path, :module => path, :shallow_path => path, :shallow_prefix => path) { yield }
+ options = { :path => path, :as => path, :module => path,
+ :shallow_path => path, :shallow_prefix => path }.merge!(options)
+ scope(options) { yield }
end
def constraints(constraints = {})
@@ -686,7 +688,7 @@ def nested
end
end
- def namespace(path)
+ def namespace(path, options = {})
if resource_scope?
nested { super }
else
@@ -242,6 +242,10 @@ def self.matches?(request)
end
end
+ namespace :users, :path => 'usuarios' do
+ root :to => 'home#index'
+ end
+
controller :articles do
scope '/articles', :as => 'article' do
scope :path => '/:title', :title => /[a-z]+/, :as => :with_title do
@@ -932,6 +936,14 @@ def test_namespace_nested_in_resources
end
end
+ def test_namespace_with_options
+ with_test_routes do
+ get '/usuarios'
+ assert_equal '/usuarios', users_root_path
+ assert_equal 'users/home#index', @response.body
+ end
+ end
+
def test_articles_with_id
with_test_routes do
get '/articles/rails/1'

0 comments on commit aacb831

Please sign in to comment.