Browse files

use regular ruby rather than clever ruby

  • Loading branch information...
1 parent f445bb2 commit a704fd4ea9b8ac86f57d357bd8e2a555b69edca9 @tenderlove tenderlove committed with fxn Jul 27, 2011
Showing with 3 additions and 3 deletions.
  1. +3 −3 actionpack/lib/action_dispatch/routing/mapper.rb
View
6 actionpack/lib/action_dispatch/routing/mapper.rb
@@ -105,13 +105,13 @@ def normalize_path(path)
# 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 Base
# 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

0 comments on commit a704fd4

Please sign in to comment.