mholling-subdomain_routes 0.3.0 → 0.3.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 0
+:patch: 1
 :major: 0
 :minor: 3

data/lib/subdomain_routes/url_writer.rb

@@ -9,7 +9,7 @@ module SubdomainRoutes
       ActionController::Routing::Routes.subdomain_procs
     end
 
-    def rewrite_subdomain_options(options, host)
+    def rewrite_subdomain_options(options, host, port = nil, protocol = nil)
       if subdomains = options[:subdomains]
         old_subdomain, domain = split_host(host)
         options_subdomain = options.has_key?(:subdomain) ? options[:subdomain].to_param.to_s.downcase : nil
@@ -36,6 +36,8 @@ module SubdomainRoutes
         unless new_subdomain == old_subdomain
           options[:only_path] = false
           options[:host] = [ new_subdomain, domain ].reject(&:blank?).join('.')
+          options[:port] ||= port if port
+          options[:protocol] ||= protocol if protocol
         end
         options.delete(:subdomain)
       end
@@ -50,11 +52,13 @@ module SubdomainRoutes
     end
 
     def url_for_with_subdomains(options)
-      host = options[:host] || default_url_options[:host]
+      host     = options[:host]     || default_url_options[:host]
+      port     = options[:port]     || default_url_options[:port]
+      protocol = options[:protocol] || default_url_options[:protocol]
       if options[:subdomains] && host.blank?
         raise HostNotSupplied, "Missing host to link to! Please provide :host parameter or set default_url_options[:host]"
       end
-      rewrite_subdomain_options(options, host)
+      rewrite_subdomain_options(options, host, port, protocol)
       url_for_without_subdomains(options)
     end
   end
@@ -68,11 +72,13 @@ module SubdomainRoutes
     end
     
     def rewrite_with_subdomains(options)
-      host = options[:host] || @request.host
+      host     = options[:host]     || @request.host
+      protocol = options[:protocol] || (@request.ssl? ? @request.protocol : nil)
+      port     = options[:port]     || (@request.port_string =~ /:(\d+)$/ ? $1.to_i : nil)
       if options[:subdomains] && host.blank?
         raise HostNotSupplied, "Missing host to link to!"
       end
-      rewrite_subdomain_options(options, host)
+      rewrite_subdomain_options(options, host, port, protocol)
       rewrite_without_subdomains(options)
     end
   end

data/spec/spec_helper.rb

@@ -34,32 +34,37 @@ def recognize_path(request)
   ActionController::Routing::Routes.recognize_path(request.path, ActionController::Routing::Routes.extract_request_environment(request))
 end
 
-def in_controller_with_host(host, &block)
+def in_controller_with_host(host, options = {}, &block)
   spec = self
   Class.new(ActionView::TestCase::TestController) do
     include Spec::Matchers
   end.new.instance_eval do
     request.host = host
+    request.instance_eval do
+      @env.merge! 'HTTPS' => 'on','SERVER_PORT' => 443 if options[:protocol] =~ /^https(:\/\/)?$/
+      @env.merge! 'SERVER_PORT'=> options[:port] if options[:port]
+    end
     copy_instance_variables_from(spec)
     instance_eval(&block)
   end
 end
 
-def in_object_with_host(host, &block)
+def in_object_with_host(host, options = {}, &block)
   spec = self
   Class.new do
     include Spec::Matchers
     include ActionController::UrlWriter
   end.new.instance_eval do
     self.class.default_url_options = { :host => host }
+    self.class.default_url_options.merge! options.slice(:port, :protocol)
     copy_instance_variables_from(spec)
     instance_eval(&block)
   end
 end
 
-def with_host(host, &block)
-  in_controller_with_host(host, &block)
-  in_object_with_host(host, &block)
+def with_host(host, options = {}, &block)
+  in_controller_with_host(host, options.dup, &block)
+  in_object_with_host(host, options.dup, &block)
 end
 
 ActiveRecord::Base.class_eval do

data/spec/url_writing_spec.rb

@@ -62,6 +62,16 @@ describe "URL writing" do
           url_for(@path_options).should == "http://#{host}/users"
         end
       end
+      
+      [ [ "port",     { :port     => 8080    }, "http://#{host}:8080/users" ],
+        [ "protocol", { :protocol => "https" }, "https://#{host}/users"     ] ].each do |variant, options, url|
+        it "should preserve the #{variant} when forcing the host" do
+          with_host "other.example.com", options do
+            users_path.should == url
+            url_for(@path_options).should == url
+          end
+        end
+      end
   
       context "and a subdomain different from the host subdomain is explicitly requested" do
         it "should change the host if the requested subdomain matches" do
@@ -137,6 +147,26 @@ describe "URL writing" do
             end
           end
         end
+
+        it "should preserve the port when changing the host" do
+          [ [ subdomains.first, hosts.first, hosts.last ],
+            [ subdomains.last, hosts.last, hosts.first ] ].each do |subdomain, new_host, old_host|
+            with_host(old_host, :port => 8080) do
+              items_path(:subdomain => subdomain).should == "http://#{new_host}:8080/items"
+              url_for(@path_options.merge(:subdomain => subdomain)).should == "http://#{new_host}:8080/items"
+            end
+          end
+        end
+
+        it "should preserve the protocol when changing the host" do
+          [ [ subdomains.first, hosts.first, hosts.last ],
+            [ subdomains.last, hosts.last, hosts.first ] ].each do |subdomain, new_host, old_host|
+            with_host(old_host, :protocol => "https") do
+              items_path(:subdomain => subdomain).should == "https://#{new_host}/items"
+              url_for(@path_options.merge(:subdomain => subdomain)).should == "https://#{new_host}/items"
+            end
+          end
+        end
           
         it "should raise a routing error if the requested subdomain doesn't match" do
           [ [ hosts.first, hosts.last ],
@@ -180,7 +210,7 @@ describe "URL writing" do
            url_for(@path_options).should == "/events"
       end
     end
-  
+    
     it "should force the host if the object has a different to_param from the current subdomain" do
       with_host "example.com" do
          city_events_url(@boston).should == "http://boston.example.com/events"
@@ -189,6 +219,18 @@ describe "URL writing" do
            url_for(@path_options).should == "http://boston.example.com/events"
       end
     end
+    
+    [ [ "port",     { :port     => 8080    }, "http://boston.example.com:8080/events" ],
+      [ "protocol", { :protocol => "https" }, "https://boston.example.com/events"     ] ].each do |variant, options, url|
+      it "should preserve the #{variant} when forcing the host" do
+        with_host "example.com", options do
+           city_events_url(@boston).should == url
+          city_events_path(@boston).should == url
+              url_for(@url_options).should == url
+             url_for(@path_options).should == url
+        end
+      end
+    end
   
     it "should raise an error if the object to_param is an invalid subdomain" do
       @newyork = City.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mholling-subdomain_routes
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Matthew Hollingworth
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-25 00:00:00 -07:00
+date: 2009-09-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,7 +59,6 @@ files:
 - spec/validations_spec.rb
 has_rdoc: false
 homepage: http://github.com/mholling/subdomain_routes
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -80,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A Rails library for incorporating subdomains into route generation and recognition.