mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
75b32a69a1
Commitf7ba614c2dimproved the internal consistency of the different means of accessing routes, but it introduced some problems at the level of code comments and user-visible strings. This commit applies fixes on three levels: Firstly, we remove or replace grammatically invalid constructs such as "a routes" or "a particular routes". Secondly, we make sure that we always use "the router DSL" or "the router syntax", because this has always been the official terminology. Finally, we make sure that we only use "routes" when referring to the application-specific set of routes that are defined in the "config/routes.rb" file, we use "router" when referring on a more abstract level to "the code in Rails used to handle routing", and we use "routing" when we need an adjective to apply to nouns such as "url_helpers. Again this is consistent with historical practice and other places in the documentation. Note that this is not a sweep over the entire codebase to ensure consistent usage of language; it is just a revision of the changes introduced in commitf7ba614c2d. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: José Valim <jose.valim@gmail.com>
28 lines
731 B
Ruby
28 lines
731 B
Ruby
module ActionController
|
|
module UrlFor
|
|
extend ActiveSupport::Concern
|
|
|
|
include ActionDispatch::Routing::UrlFor
|
|
|
|
def url_options
|
|
super.reverse_merge(
|
|
:host => request.host_with_port,
|
|
:protocol => request.protocol,
|
|
:_path_segments => request.symbolized_path_parameters
|
|
).merge(:script_name => request.script_name)
|
|
end
|
|
|
|
def _routes
|
|
raise "In order to use #url_for, you must include routing helpers explicitly. " \
|
|
"For instance, `include Rails.application.routes.url_helpers"
|
|
end
|
|
|
|
module ClassMethods
|
|
def action_methods
|
|
@action_methods ||= begin
|
|
super - _routes.named_routes.helper_names
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|