diff options
author | José Valim <jose.valim@gmail.com> | 2010-02-17 18:43:24 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-02-17 18:43:42 +0100 |
commit | 7189e3c8816ea4dc88c09bdd109c4a503fc5c4dc (patch) | |
tree | dc5744deb20347e1e80ca20733e6642ea2daac46 /actionpack/lib/action_dispatch/routing/mapper.rb | |
parent | d0454e57661ceeaebd6f3fce4a608ec624257b19 (diff) | |
download | rails-7189e3c8816ea4dc88c09bdd109c4a503fc5c4dc.tar.gz rails-7189e3c8816ea4dc88c09bdd109c4a503fc5c4dc.tar.bz2 rails-7189e3c8816ea4dc88c09bdd109c4a503fc5c4dc.zip |
Rename router internal option :namespace to :controller_namespace which is its real purpose.
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 0e9291490c..bead321c9c 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -283,7 +283,7 @@ module ActionDispatch end def namespace(path) - scope(path.to_s, :name_prefix => path.to_s, :namespace => path.to_s) { yield } + scope(path.to_s, :name_prefix => path.to_s, :controller_namespace => path.to_s) { yield } end def constraints(constraints = {}) @@ -318,12 +318,12 @@ module ActionDispatch parent ? "#{parent}_#{child}" : child end - def merge_namespace_scope(parent, child) + def merge_controller_namespace_scope(parent, child) parent ? "#{parent}/#{child}" : child end def merge_controller_scope(parent, child) - @scope[:namespace] ? "#{@scope[:namespace]}/#{child}" : child + @scope[:controller_namespace] ? "#{@scope[:controller_namespace]}/#{child}" : child end def merge_resources_path_names_scope(parent, child) |