Don't force pluralization of controller name when defining a resource [#4980 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
This commit is contained in:
parent
bba19603c2
commit
9a6fc9a540
@ -443,7 +443,7 @@ def self.default_actions
|
|||||||
def initialize(entities, options = {})
|
def initialize(entities, options = {})
|
||||||
@name = entities.to_s
|
@name = entities.to_s
|
||||||
@path = options.delete(:path) || @name
|
@path = options.delete(:path) || @name
|
||||||
@controller = options.delete(:controller) || @name.to_s.pluralize
|
@controller = (options.delete(:controller) || @name).to_s
|
||||||
@as = options.delete(:as)
|
@as = options.delete(:as)
|
||||||
@options = options
|
@options = options
|
||||||
end
|
end
|
||||||
@ -547,6 +547,14 @@ def self.default_actions
|
|||||||
[:show, :create, :update, :destroy, :new, :edit]
|
[:show, :create, :update, :destroy, :new, :edit]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def initialize(entities, options)
|
||||||
|
@name = entities.to_s
|
||||||
|
@path = options.delete(:path) || @name
|
||||||
|
@controller = (options.delete(:controller) || @name.to_s.pluralize).to_s
|
||||||
|
@as = options.delete(:as)
|
||||||
|
@options = options
|
||||||
|
end
|
||||||
|
|
||||||
def member_name
|
def member_name
|
||||||
name
|
name
|
||||||
end
|
end
|
||||||
|
@ -318,6 +318,8 @@ def self.matches?(request)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
resources :content
|
||||||
|
|
||||||
match '/:locale/*file.:format', :to => 'files#show', :file => /path\/to\/existing\/file/
|
match '/:locale/*file.:format', :to => 'files#show', :file => /path\/to\/existing\/file/
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -1457,6 +1459,13 @@ def test_glob_parameter_accepts_regexp
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_resources_controller_name_is_not_pluralized
|
||||||
|
with_test_routes do
|
||||||
|
get '/content'
|
||||||
|
assert_equal 'content#index', @response.body
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
def with_test_routes
|
def with_test_routes
|
||||||
yield
|
yield
|
||||||
|
Loading…
Reference in New Issue
Block a user