aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-07-26 17:45:34 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-07-26 17:45:34 -0700
commit7868cf8a655ede2003c00ce3a1351da2a01cae5c (patch)
treeda30085d7944f07cbd0e67949dda879bf97762e5 /actionpack/lib
parentba43b9bf5f8a85759939462944f4994c9b1e1ac9 (diff)
downloadrails-7868cf8a655ede2003c00ce3a1351da2a01cae5c.tar.gz
rails-7868cf8a655ede2003c00ce3a1351da2a01cae5c.tar.bz2
rails-7868cf8a655ede2003c00ce3a1351da2a01cae5c.zip
use regular ruby rather than clever ruby
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index ee4d405ce7..187e2a8a74 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -105,13 +105,13 @@ module ActionDispatch
# controllers with default routes like :controller/:action/:id(.:format), e.g:
# GET /admin/products/show/1
# => { :controller => 'admin/products', :action => 'show', :id => '1' }
- @options.reverse_merge!(:controller => /.+?/)
+ @options[:controller] ||= /.+?/
end
# Add a constraint for wildcard route to make it non-greedy and match the
# optional format part of the route by default
if path.match(WILDCARD_PATH) && @options[:format] != false
- @options.reverse_merge!(:"#{$1}" => /.+?/)
+ @options[$1.to_sym] ||= /.+?/
end
if @options[:format] == false
@@ -264,7 +264,7 @@ module ActionDispatch
# because this means it will be matched first. As this is the most popular route
# of most Rails applications, this is beneficial.
def root(options = {})
- match '/', options.reverse_merge(:as => :root)
+ match '/', { :as => :root }.merge(options)
end
# Matches a url pattern to one or more routes. Any symbols in a pattern