@@ -54,14 +54,15 @@ module SubdomainFu # Rewrites the subdomain of the host unless they are equivalent (i.e. mirrors of each other) def self.rewrite_host_for_subdomains(subdomain, host) - unless needs_rewrite?(subdomain, host) - if has_subdomain?(subdomain) || preferred_mirror?(subdomain_from(host)) + if needs_rewrite?(subdomain, host) + change_subdomain_of_host(subdomain || SubdomainFu.preferred_mirror, host) + else + if has_subdomain?(subdomain) || preferred_mirror?(subdomain_from(host)) || + (subdomain.nil? && has_subdomain?(subdomain_from(host))) host else change_subdomain_of_host(SubdomainFu.preferred_mirror, host) end - else - change_subdomain_of_host(subdomain || SubdomainFu.preferred_mirror, host) end end @@ -101,7 +102,6 @@ module SubdomainFu end protected - def current_subdomain SubdomainFu.current_subdomain(request) end lib/subdomain-fu.rb @@ -98,11 +98,15 @@ describe "SubdomainFu" do it "should remove the subdomain if passed false when it's not a mirror" do SubdomainFu.rewrite_host_for_subdomains(false,"cool.localhost").should == "localhost" end - + it "should not remove the subdomain if passed false when it is a mirror" do SubdomainFu.rewrite_host_for_subdomains(false,"www.localhost").should == "www.localhost" end + it "should not remove the subdomain if passed nil when it's not a mirror" do + SubdomainFu.rewrite_host_for_subdomains(nil,"cool.localhost").should == "cool.localhost" + end + describe "when preferred_mirror is false" do before do SubdomainFu.preferred_mirror = false @@ -111,6 +115,10 @@ describe "SubdomainFu" do it "should remove the subdomain if passed false when it is a mirror" do SubdomainFu.rewrite_host_for_subdomains(false,"www.localhost").should == "localhost" end + + it "should not remove the subdomain if passed nil when it's not a mirror" do + SubdomainFu.rewrite_host_for_subdomains(nil,"cool.localhost").should == "cool.localhost" + end end end @@ -176,6 +184,7 @@ describe "SubdomainFu" do end it { SubdomainFu.needs_rewrite?(false,"www.localhost").should be_true } + it { SubdomainFu.needs_rewrite?(nil,"awesome.localhost").should be_false } end end end \ No newline at end of file spec/subdomain_fu_spec.rb @@ -117,6 +117,11 @@ describe "SubdomainFu URL Writing" do needs_subdomain_url.should == "http://www.testapp.com/needs_subdomain" end + it "should work when passed in a paramable object and no subdomain to a _url" do + default_url_options[:host] = "awesome.testapp.com" + foo_url(Paramed.new("something")).should == "http://awesome.testapp.com/foos/something" + 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 60d86ad414634f4822835cdc0851a6939c90c586 Eric Lindvall eric@5stops.com http://github.com/mbleigh/subdomain-fu/commit/a141cdabb13cae9ed0cb416c111ae0a6125eef5b a141cdabb13cae9ed0cb416c111ae0a6125eef5b 2009-05-26T06:34:13-07:00 2009-05-26T00:01:42-07:00 Add another test case for param-based URL generation. Signed-off-by: Michael Bleigh <michael@intridea.com> 999e111e308251edc135e513d1a8b233dfe25971 Michael Bleigh michael@intridea.com