Permalink
Browse files

Allow symbols for :path resource(s) option [#5306 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
  • Loading branch information...
1 parent 4329146 commit 771d2f918fc87bdd4f83e6666fd816e9f0dcedfb @pixeltrix pixeltrix committed with josevalim Aug 20, 2010
Showing with 21 additions and 2 deletions.
  1. +2 −2 actionpack/lib/action_dispatch/routing/mapper.rb
  2. +19 −0 actionpack/test/dispatch/routing_test.rb
View
4 actionpack/lib/action_dispatch/routing/mapper.rb
@@ -473,7 +473,7 @@ class Resource #:nodoc:
def initialize(entities, options = {})
@name = entities.to_s
- @path = options.delete(:path) || @name
+ @path = (options.delete(:path) || @name).to_s
@controller = (options.delete(:controller) || @name).to_s
@as = options.delete(:as)
@options = options
@@ -537,7 +537,7 @@ class SingletonResource < Resource #:nodoc:
def initialize(entities, options)
@name = entities.to_s
- @path = options.delete(:path) || @name
+ @path = (options.delete(:path) || @name).to_s
@controller = (options.delete(:controller) || plural).to_s
@as = options.delete(:as)
@options = options
View
19 actionpack/test/dispatch/routing_test.rb
@@ -385,6 +385,9 @@ def self.matches?(request)
end
end
+ resources :wiki_pages, :path => :pages
+ resource :wiki_account, :path => :my_account
+
scope :only => :show do
namespace :only do
resources :sectors, :only => :index do
@@ -1984,6 +1987,22 @@ def test_resource_constraints_are_pushed_to_scope
end
end
+ def test_resources_path_can_be_a_symbol
+ with_test_routes do
+ get '/pages'
+ assert_equal 'wiki_pages#index', @response.body
+ assert_equal '/pages', wiki_pages_path
+
+ get '/pages/Ruby_on_Rails'
+ assert_equal 'wiki_pages#show', @response.body
+ assert_equal '/pages/Ruby_on_Rails', wiki_page_path(:id => 'Ruby_on_Rails')
+
+ get '/my_account'
+ assert_equal 'wiki_accounts#show', @response.body
+ assert_equal '/my_account', wiki_account_path
+ end
+ end
+
private
def with_test_routes
yield

0 comments on commit 771d2f9

Please sign in to comment.