Permalink
Browse files

Axe "best fit" generation support

  • Loading branch information...
1 parent df6617b commit 911acc10de483e0d7a9e6b3c475aeaecad49bfc5 @josh josh committed Aug 15, 2009
Showing with 2 additions and 39 deletions.
  1. +2 −27 actionpack/lib/action_controller/routing/route_set.rb
  2. +0 −12 actionpack/test/controller/routing_test.rb
@@ -407,22 +407,9 @@ def generate(options, recall = {}, method=:generate)
# don't use the recalled keys when determining which routes to check
routes = routes_by_controller[controller][action][options.reject {|k,v| !v}.keys.sort_by { |x| x.object_id }]
- routes[1].each_with_index do |route, index|
+ routes.each_with_index do |route, index|
results = route.__send__(method, options, merged, expire_on)
if results && (!results.is_a?(Array) || results.first)
-
- # Compare results with Rails 3.0 behavior
- if routes[0][index] != route
- routes[0].each do |route2|
- new_results = route2.__send__(method, options, merged, expire_on)
- if new_results && (!new_results.is_a?(Array) || new_results.first)
- ActiveSupport::Deprecation.warn "The URL you generated will use the first matching route in routes.rb rather than the \"best\" match. " +
- "In Rails 3.0 #{new_results} would of been generated instead of #{results}"
- break
- end
- end
- end
-
return results
end
end
@@ -463,10 +450,7 @@ def routes_by_controller
@routes_by_controller ||= Hash.new do |controller_hash, controller|
controller_hash[controller] = Hash.new do |action_hash, action|
action_hash[action] = Hash.new do |key_hash, keys|
- key_hash[keys] = [
- routes_for_controller_and_action_and_keys(controller, action, keys),
- deprecated_routes_for_controller_and_action_and_keys(controller, action, keys)
- ]
+ key_hash[keys] = routes_for_controller_and_action_and_keys(controller, action, keys)
end
end
end
@@ -487,15 +471,6 @@ def routes_for_controller_and_action_and_keys(controller, action, keys)
end
end
- def deprecated_routes_for_controller_and_action_and_keys(controller, action, keys)
- selected = routes.select do |route|
- route.matches_controller_and_action? controller, action
- end
- selected.sort_by do |route|
- (keys - route.significant_keys).length
- end
- end
-
# Subclasses and plugins may override this method to extract further attributes
# from the request, for use by route conditions and such.
def extract_request_environment(request)
@@ -1411,18 +1411,6 @@ def test_namespace_with_blank_path_prefix
Object.send(:remove_const, :Api)
end
- def test_generate_finds_best_fit
- set.draw do |map|
- map.connect "/people", :controller => "people", :action => "index"
- map.connect "/ws/people", :controller => "people", :action => "index", :ws => true
- end
-
- assert_deprecated {
- url = set.generate(:controller => "people", :action => "index", :ws => true)
- assert_equal "/ws/people", url
- }
- end
-
def test_generate_changes_controller_module
set.draw { |map| map.connect ':controller/:action/:id' }
current = { :controller => "bling/bloop", :action => "bap", :id => 9 }

0 comments on commit 911acc1

Please sign in to comment.