diff options
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/routing.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 173457ace0..c1b08dc927 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -90,7 +90,7 @@ module ActionController #:nodoc: private def page_cache_path(path) - page_cache_directory + path + ".html" + page_cache_directory + (path.empty? ? "/index" : path) + ".html" end end diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 18645ae4e0..a806b995c0 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -211,11 +211,14 @@ module ActionController # Note that we *do* return immediately if def generate(options, request) raise RoutingError, "There are no routes defined!" if @routes.empty? + options = options.symbolize_keys defaults = request.path_parameters.symbolize_keys expand_controller_path!(options, defaults) defaults.delete_if {|k, v| options.key?(k) && options[k].nil?} # Remove defaults that have been manually cleared using :name => nil + options = defaults if options.empty? # Get back the current url if no options was passed + failures = [] selected = nil self.each do |route| |