@@ -1,11 +1,11 @@ module ActionController module UrlWriter def url_for_with_subdomains(options) - unless SubdomainFu.needs_rewrite?(options[:subdomain], options[:host] || default_url_options[:host]) - options.delete(:subdomain) - else + if SubdomainFu.needs_rewrite?(options[:subdomain], options[:host] || default_url_options[:host]) || options[:only_path] == false options[:only_path] = false options[:host] = SubdomainFu.rewrite_host_for_subdomains(options.delete(:subdomain), options[:host] || default_url_options[:host]) + else + options.delete(:subdomain) end url_for_without_subdomains(options) end @@ -16,11 +16,11 @@ module ActionController private def rewrite_url_with_subdomains(options) - unless SubdomainFu.needs_rewrite?(options[:subdomain], options[:host] || @request.host_with_port) - options.delete(:subdomain) - else + if SubdomainFu.needs_rewrite?(options[:subdomain], options[:host] || @request.host_with_port) || options[:only_path] == false options[:only_path] = false options[:host] = SubdomainFu.rewrite_host_for_subdomains(options.delete(:subdomain), options[:host] || @request.host_with_port) + else + options.delete(:subdomain) end rewrite_url_without_subdomains(options) end lib/subdomain_fu/url_rewriter.rb @@ -112,6 +112,11 @@ describe "SubdomainFu URL Writing" do needs_subdomain_url(:subdomain => false).should == "http://www.testapp.com/needs_subdomain" end + it "should switch to the preferred mirror automatically" do + default_url_options[:host] = "testapp.com" + needs_subdomain_url.should == "http://www.testapp.com/needs_subdomain" + end + it "should force a switch to no subdomain on a mirror if preferred_mirror is false" do SubdomainFu.preferred_mirror = false default_url_options[:host] = "www.testapp.com" spec/url_rewriter_spec.rb dab049be969bc848e313bab45ff8ed029f6befdf Eric Lindvall eric@5stops.com http://github.com/mbleigh/subdomain-fu/commit/60d86ad414634f4822835cdc0851a6939c90c586 60d86ad414634f4822835cdc0851a6939c90c586 2009-05-26T06:33:37-07:00 2009-05-25T23:19:40-07:00 Rewrite URLs to use the preferred mirror if a full URL is being generated. Signed-off-by: Michael Bleigh <michael@intridea.com> b237e751c50e8bf3d7fa18184ba708200d5788a3 Michael Bleigh michael@intridea.com