mbleigh-subdomain-fu 0.0.2 → 0.0.3

data/lib/subdomain-fu.rb

@@ -1,4 +1,4 @@
-#require 'subdomain_fu/routing_extensions'
+require 'subdomain_fu/routing_extensions'
 require 'subdomain_fu/url_rewriter'
 
 module SubdomainFu
@@ -74,8 +74,9 @@ module SubdomainFu
       (!SubdomainFu.has_subdomain?(subdomain) && !SubdomainFu.has_subdomain?(SubdomainFu.subdomain_from(host)))
   end
   
-  def self.needs_rewrite?(subdomain, host)
-    subdomain = nil if subdomain.blank? 
+  def self.needs_rewrite?(subdomain, host)    
+    return false if subdomain.nil?
+    subdomain = nil if subdomain.blank?
     (!has_subdomain?(subdomain) && subdomain != SubdomainFu.preferred_mirror && SubdomainFu.preferred_mirror != nil) || 
       !same_subdomain?(subdomain, host)
   end

data/lib/subdomain_fu/routing_extensions.rb

@@ -30,4 +30,5 @@ module SubdomainFu
 end
 
 ActionController::Routing::RouteSet.send :include, SubdomainFu::RouteSetExtensions
-ActionController::Routing::Route.send :include, SubdomainFu::RouteExtensions
+ActionController::Routing::Route.send :include, SubdomainFu::RouteExtensions
+ActionController::UrlRewriter::RESERVED_OPTIONS << :subdomain

data/lib/subdomain_fu/url_rewriter.rb

@@ -26,4 +26,20 @@ module ActionController
     end
     alias_method_chain :rewrite_url, :subdomains
   end
+  
+  # hack for http://www.portallabs.com/blog/?p=8
+  module Routing
+    module Optimisation
+      class PositionalArgumentsWithAdditionalParams
+        def guard_condition_with_subdomains
+          # don't allow optimisation if a subdomain is present - fixes a problem
+          # with the subdomain appearing in the query instead of being rewritten
+          # see http://mbleigh.lighthouseapp.com/projects/13148/tickets/8-improper-generated-urls-with-named-routes-for-a-singular-resource
+          guard_condition_without_subdomains + " && !args.last.has_key?(:subdomain)"
+        end
+
+        alias_method_chain :guard_condition, :subdomains
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -17,6 +17,15 @@ ActionController::Routing::Routes.draw do |map|
     fu.resources :bars
   end
   
+  map.connect '/', :controller => "site", :action => "home", :conditions => {:subdomain => false}
+  map.connect '/', :controller => "app", :action => "home", :conditions => {:subdomain => true}
+  map.connect '/', :controller => "mobile", :action => "home", :conditions => {:subdomain => "m"}
+  
+  map.connect '/subdomain_here', :controller => "app", :action => "success", :conditions => {:subdomain => true}
+  map.connect '/no_subdomain_here', :controller => "site", :action => "success", :conditions => {:subdomain => false}
+  map.connect '/m_subdomain_here', :controller => "mobile", :action => "success", :conditions => {:subdomain => "m"}
+  map.connect '/numbers_only_here', :controller => "numbers", :action => "success", :conditions => {:subdomain => /[0-9]+/}
+  
   map.connect '/:controller/:action/:id'
 end
 

data/spec/subdomain_fu_spec.rb

@@ -43,6 +43,8 @@ describe "SubdomainFu" do
   describe "#subdomain_from" do
     it "should return the subdomain based on the TLD of the current environment" do
       SubdomainFu.subdomain_from("awesome.localhost").should == "awesome"
+      SubdomainFu.tld_size = 2
+      SubdomainFu.subdomain_from("awesome.localhost.co.uk").should == "awesome"
       SubdomainFu.tld_size = 1
       SubdomainFu.subdomain_from("awesome.localhost.com").should == "awesome"
       SubdomainFu.tld_size = 0
@@ -75,12 +77,12 @@ describe "SubdomainFu" do
       SubdomainFu.rewrite_host_for_subdomains("cool","www.localhost").should == "cool.localhost"
     end
     
-    it "should remove the subdomain if passed nil when it's not a mirror" do
-      SubdomainFu.rewrite_host_for_subdomains(nil,"cool.localhost").should == "localhost"
+    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 nil when it is a mirror" do
-      SubdomainFu.rewrite_host_for_subdomains(nil,"www.localhost").should == "www.localhost"
+    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
   end
   

data/spec/url_rewriter_spec.rb

@@ -42,6 +42,21 @@ describe "SubdomainFu URL Writing" do
     it "should should force the full url, even with _path" do
       needs_subdomain_path(:subdomain => "awesome").should == needs_subdomain_url(:subdomain => "awesome")
     end
+    
+    it "should not force the full url if it's the same as the current subdomain" do
+      default_url_options[:host] = "awesome.testapp.com"
+      needs_subdomain_path(:subdomain => "awesome").should == "/needs_subdomain"
+    end
+    
+    it "should not force the full url if the current subdomain is nil and so is the target" do
+      needs_subdomain_path(:subdomain => nil).should == "/needs_subdomain"
+    end
+    
+    it "should not force the full url if no :subdomain option is given" do
+      needs_subdomain_path.should == "/needs_subdomain"
+      default_url_options[:host] = "awesome.testapp.com"
+      needs_subdomain_path.should == "/needs_subdomain"
+    end
   end
   
   describe "Resourced Routes" do

data/subdomain-fu.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "subdomain-fu"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   s.date = "2008-06-25"
   s.summary = "Provides a simple solution for route handling and linking between subdomains in a Rails application."
   s.email = "michael@intridea.com"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mbleigh-subdomain-fu
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Michael Bleigh