diff options
author | Piotr Sarnacki <drogus@gmail.com> | 2010-07-02 00:29:20 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-07-02 01:51:03 +0200 |
commit | f7ba614c2db31933cbc12eda87518de3eca0228c (patch) | |
tree | 8aabbf6e719a3eff1eaec47988512eda3e8341b3 /actionpack/lib/action_dispatch/routing/route_set.rb | |
parent | f8720a04d129668c7554c1a7270fba5418510b47 (diff) | |
download | rails-f7ba614c2db31933cbc12eda87518de3eca0228c.tar.gz rails-f7ba614c2db31933cbc12eda87518de3eca0228c.tar.bz2 rails-f7ba614c2db31933cbc12eda87518de3eca0228c.zip |
Unify routes naming by renaming router to routes
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 5ecad6bc04..7248ed03f6 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -268,10 +268,10 @@ module ActionDispatch # Yes plz - JP included do routes.install_helpers(self) - singleton_class.send(:define_method, :_router) { routes } + singleton_class.send(:define_method, :_routes) { routes } end - define_method(:_router) { routes } + define_method(:_routes) { routes } end helpers @@ -474,7 +474,7 @@ module ActionDispatch path_options = yield(path_options) if block_given? path = generate(path_options, path_segments || {}) - # ROUTES TODO: This can be called directly, so script_name should probably be set in the router + # ROUTES TODO: This can be called directly, so script_name should probably be set in routes rewritten_url << (options[:trailing_slash] ? path.sub(/\?|\z/) { "/" + $& } : path) rewritten_url << "##{Rack::Mount::Utils.escape_uri(options[:anchor].to_param.to_s)}" if options[:anchor] |