Skip to content
Browse files

Re-enable Routing optimisation code for _url methods, add defined?(re…

…quest) to the guard conditions

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7673 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 8c33359 commit 9660360d6b48574c558110758be1e42c01333343 @NZKoz NZKoz committed Sep 28, 2007
View
8 actionpack/lib/action_controller/routing_optimisation.rb
@@ -44,7 +44,7 @@ def source_code
# Temporarily disabled :url optimisation pending proper solution to
# Issues around request.host etc.
def applicable?
- kind != :url
+ true
end
end
@@ -60,9 +60,9 @@ def guard_condition
# if they're using foo_url(:id=>2) it's one
# argument, but we don't want to generate /foos/id2
if number_of_arguments == 1
- "args.size == 1 && !args.first.is_a?(Hash)"
+ "defined?(request) && args.size == 1 && !args.first.is_a?(Hash)"
else
- "args.size == #{number_of_arguments}"
+ "defined?(request) && args.size == #{number_of_arguments}"
end
end
@@ -97,7 +97,7 @@ def generation_code
# argument
class PositionalArgumentsWithAdditionalParams < PositionalArguments
def guard_condition
- "args.size == #{route.segment_keys.size + 1}"
+ "defined?(request) && args.size == #{route.segment_keys.size + 1}"
end
# This case uses almost the Use the same code as positional arguments,
View
6 actionpack/lib/action_controller/url_rewriter.rb
@@ -21,13 +21,9 @@ module UrlWriter
self.default_url_options = {}
def self.included(base) #:nodoc:
- original_optimise = ActionController::Routing.optimise_named_routes
- ActionController::Routing.optimise_named_routes = false
- ActionController::Routing::Routes.install_helpers base, :regenerate
+ ActionController::Routing::Routes.install_helpers base
base.mattr_accessor :default_url_options
base.default_url_options ||= default_url_options
- ensure
- ActionController::Routing.optimise_named_routes = original_optimise
end
# Generate a url based on the options provided, default_url_options and the
View
26 actionpack/test/controller/routing_test.rb
@@ -175,6 +175,15 @@ def test_basic_named_route
x.send(:home_url))
end
+ def test_basic_named_route_with_relative_url_root
+ rs.add_named_route :home, '', :controller => 'content', :action => 'list'
+ x = setup_for_named_route
+ x.relative_url_root="/foo"
+ assert_equal("http://named.route.test/foo/",
+ x.send(:home_url))
+ assert_equal "/foo/", x.send(:home_path)
+ end
+
def test_named_route_with_option
rs.add_named_route :page, 'page/:title', :controller => 'content', :action => 'show_page'
x = setup_for_named_route
@@ -228,7 +237,7 @@ def test_named_route_root
end
x = setup_for_named_route
assert_equal("http://named.route.test/", x.send(:root_url))
- assert_equal("/relative/", x.send(:root_path))
+ assert_equal("/", x.send(:root_path))
end
def test_named_route_with_regexps
@@ -281,7 +290,7 @@ def test_paths_slashes_unescaped_with_ordered_parameters
# No / to %2F in URI, only for query params.
x = setup_for_named_route
- assert_equal("/relative/file/hello/world", x.send(:path_path, 'hello/world'))
+ assert_equal("/file/hello/world", x.send(:path_path, 'hello/world'))
end
def test_non_controllers_cannot_be_matched
@@ -899,11 +908,16 @@ def url_for(options)
def request
@request ||= MockRequest.new(:host => "named.route.test", :method => :get)
end
+
+ def relative_url_root=(value)
+ request.relative_url_root=value
+ end
end
class MockRequest
- attr_accessor :path, :path_parameters, :host, :subdomains, :domain, :method
-
+ attr_accessor :path, :path_parameters, :host, :subdomains, :domain,
+ :method, :relative_url_root
+
def initialize(values={})
values.each { |key, value| send("#{key}=", value) }
if values[:host]
@@ -919,10 +933,6 @@ def protocol
def host_with_port
(subdomains * '.') + '.' + domain
end
-
- def relative_url_root
- '/relative'
- end
end
class RouteTest < Test::Unit::TestCase

0 comments on commit 9660360

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