diff options
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index e283cf0403..48fb7edd67 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -328,13 +328,14 @@ module ActionDispatch def initialize(entities, options = {}) entities = entities.to_s + @options = options @plural = entities.pluralize @singular = entities.singularize end def name - plural + @options[:as] || plural end def controller @@ -360,7 +361,7 @@ module ActionDispatch end def name - singular + @options[:as] || singular end end @@ -373,7 +374,7 @@ module ActionDispatch return self end - resource = SingletonResource.new(resources.pop) + resource = SingletonResource.new(resources.pop, options) if @scope[:scope_level] == :resources nested do @@ -407,7 +408,7 @@ module ActionDispatch return self end - resource = Resource.new(resources.pop) + resource = Resource.new(resources.pop, options) if @scope[:scope_level] == :resources nested do |