Skip to content
Browse files

Make optimized named routes respect all reserved options and tie it i…

…nto UrlRewriter::RESERVED_OPTIONS so it's DRY

Signed-off-by: Michael Koziarski <michael@koziarski.com>
  • Loading branch information...
1 parent 60d6f25 commit 917428bcce7bb22241bfc07daa5d0ddf9d107775 @gtd gtd committed with NZKoz Nov 14, 2008
View
8 actionpack/lib/action_controller/routing/optimisations.rb
@@ -106,12 +106,8 @@ def generation_code
# argument
class PositionalArgumentsWithAdditionalParams < PositionalArguments
def guard_conditions
- [
- "args.size == #{route.segment_keys.size + 1}",
- "!args.last.has_key?(:anchor)",
- "!args.last.has_key?(:port)",
- "!args.last.has_key?(:host)"
- ]
+ ["args.size == #{route.segment_keys.size + 1}"] +
+ UrlRewriter::RESERVED_OPTIONS.collect{ |key| "!args.last.has_key?(:#{key})" }
end
# This case uses almost the same code as positional arguments,
View
1 actionpack/lib/action_controller/routing/route_set.rb
@@ -168,6 +168,7 @@ def define_url_helper(route, name, kind, options)
#
@module.module_eval <<-end_eval # We use module_eval to avoid leaks
def #{selector}(*args)
+
#{generate_optimisation_block(route, kind)}
opts = if args.empty? || Hash === args.first
View
12 actionpack/test/controller/routing_test.rb
@@ -706,12 +706,13 @@ def url_for(options)
port = options.delete(:port) || 80
port_string = port == 80 ? '' : ":#{port}"
- host = options.delete(:host) || "named.route.test"
- anchor = "##{options.delete(:anchor)}" if options.key?(:anchor)
+ protocol = options.delete(:protocol) || "http"
+ host = options.delete(:host) || "named.route.test"
+ anchor = "##{options.delete(:anchor)}" if options.key?(:anchor)
path = routes.generate(options)
- only_path ? "#{path}#{anchor}" : "http://#{host}#{port_string}#{path}#{anchor}"
+ only_path ? "#{path}#{anchor}" : "#{protocol}://#{host}#{port_string}#{path}#{anchor}"
end
def request
@@ -1726,6 +1727,11 @@ def test_named_route_url_method_with_host
assert_equal "http://some.example.com/people/5", controller.send(:show_url, 5, :host=>"some.example.com")
end
+ def test_named_route_url_method_with_protocol
+ controller = setup_named_route_test
+ assert_equal "https://named.route.test/people/5", controller.send(:show_url, 5, :protocol => "https")
+ end
+
def test_named_route_url_method_with_ordered_parameters
controller = setup_named_route_test
assert_equal "http://named.route.test/people/go/7/hello/joe/5",

0 comments on commit 917428b

Please sign in to comment.
Something went wrong with that request. Please try again.