diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2010-06-22 17:26:35 -0300 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-06-22 23:37:49 +0200 |
commit | aacb83143f24ff44c046d18930270d650efffec5 (patch) | |
tree | 1fc390395eb61408df1cd00aec092d455117c2a0 /actionpack/lib/action_dispatch | |
parent | fef5cf92ed883daf663299258549bc7aa454db1e (diff) | |
download | rails-aacb83143f24ff44c046d18930270d650efffec5.tar.gz rails-aacb83143f24ff44c046d18930270d650efffec5.tar.bz2 rails-aacb83143f24ff44c046d18930270d650efffec5.zip |
Allow namespace accept options in routes [#4936 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index e0d18b74d8..77740b0f53 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -346,9 +346,11 @@ module ActionDispatch 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 @@ module ActionDispatch end end - def namespace(path) + def namespace(path, options = {}) if resource_scope? nested { super } else |