mholling-subdomain_routes 0.2.2 → 0.2.3

data/VERSION.yml

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

data/lib/subdomain_routes/routes.rb

@@ -4,7 +4,7 @@ module SubdomainRoutes
       include SplitHost
       
       def self.included(base)
-        [ :extract_request_environment, :add_route ].each { |method| base.alias_method_chain method, :subdomains }
+        [ :extract_request_environment, :add_route, :raise_named_route_error ].each { |method| base.alias_method_chain method, :subdomains }
       end
       
       def extract_request_environment_with_subdomains(request)
@@ -21,6 +21,20 @@ module SubdomainRoutes
         end
         with_options(options) { |routes| routes.add_route_without_subdomains(*args) }
       end
+
+      def raise_named_route_error_with_subdomains(options, named_route, named_route_name)
+        unless named_route.conditions[:subdomains].is_a?(Symbol)
+          raise_named_route_error_without_subdomains(options, named_route, named_route_name)
+        else
+          begin
+            options.delete(named_route.conditions[:subdomains])
+            raise_named_route_error_without_subdomains(options, named_route, named_route_name)
+          rescue ActionController::RoutingError => e
+            e.message << " You may also need to specify #{named_route.conditions[:subdomains].inspect} for the subdomain."
+            raise e
+          end
+        end
+      end
       
       def reserved_subdomains
         routes.map(&:reserved_subdomains).flatten.uniq
@@ -29,7 +43,7 @@ module SubdomainRoutes
   
     module Route
       def self.included(base)
-        [ :recognition_conditions, :segment_keys, :recognition_extraction ].each { |method| base.alias_method_chain method, :subdomains }
+        [ :recognition_conditions, :generation_extraction, :segment_keys, :recognition_extraction ].each { |method| base.alias_method_chain method, :subdomains }
       end
       
       def recognition_conditions_with_subdomains
@@ -43,9 +57,17 @@ module SubdomainRoutes
         result
       end
       
+      def generation_extraction_with_subdomains
+        results = [ generation_extraction_without_subdomains ]
+        if conditions[:subdomains].is_a?(Symbol)
+          results << "return [nil,nil] unless hash.delete(#{conditions[:subdomains].inspect})"
+        end
+        results.compact * "\n"
+      end
+                  
       def segment_keys_with_subdomains
         result = segment_keys_without_subdomains
-        result.unshift(:subdomain) if conditions[:subdomains].is_a? Symbol
+        result.unshift(conditions[:subdomains]) if conditions[:subdomains].is_a? Symbol
         result
       end
       

data/lib/subdomain_routes/url_writer.rb

@@ -12,21 +12,23 @@ module SubdomainRoutes
     def rewrite_subdomain_options(options, host)
       if subdomains = options[:subdomains]
         old_subdomain, domain = split_host(host)
-        new_subdomain = options.has_key?(:subdomain) ? options[:subdomain].to_param.to_s.downcase : old_subdomain
+        options_subdomain = options.has_key?(:subdomain) ? options[:subdomain].to_param.to_s.downcase : nil
+        new_subdomain = options_subdomain || old_subdomain
         begin
           case subdomains
           when Array
             unless subdomains.include? new_subdomain
-              if subdomains.size > 1 || options.has_key?(:subdomain)
+              if subdomains.size > 1 || options_subdomain
                 raise ActionController::RoutingError, "expected subdomain in #{subdomains.inspect}, instead got subdomain #{new_subdomain.inspect}"
               else
                 new_subdomain = subdomains.first
               end
             end
           when Symbol
+            new_subdomain = options[subdomains].to_param.to_s.downcase
             unless new_subdomain.blank? || SubdomainRoutes.valid_subdomain?(new_subdomain)
               raise ActionController::RoutingError, "subdomain #{new_subdomain.inspect} is invalid"
-            end            
+            end
           end            
         rescue ActionController::RoutingError => e
           raise ActionController::RoutingError, "Route for #{options.inspect} failed to generate (#{e.message})"
@@ -65,7 +67,7 @@ module SubdomainRoutes
       base::RESERVED_OPTIONS << :subdomain # untested!
     end
     
-    def rewrite_with_subdomains(options)      
+    def rewrite_with_subdomains(options)
       host = options[:host] || @request.host
       if options[:subdomains] && host.blank?
         raise HostNotSupplied, "Missing host to link to!"

data/spec/url_writing_spec.rb

@@ -168,7 +168,7 @@ describe "URL writing" do
       @boston = City.new
       @boston.stub!(:new_record?).and_return(false)
       @boston.stub!(:to_param).and_return("boston")
-      @url_options = { :controller => "city/events", :action => "index", :subdomains => :city_id, :subdomain => @boston.to_param }
+      @url_options = { :controller => "city/events", :action => "index", :subdomains => :city_id, :city_id => @boston }
       @path_options = @url_options.merge(:only_path => true)
     end
 
@@ -197,8 +197,8 @@ describe "URL writing" do
       with_host "www.example.com" do
         lambda {  city_events_url(@newyork) }.should raise_error(ActionController::RoutingError)
         lambda { city_events_path(@newyork) }.should raise_error(ActionController::RoutingError)
-        lambda {   url_for(@url_options.merge(:subdomain => @newyork.to_param)) }.should raise_error(ActionController::RoutingError)
-        lambda {  url_for(@path_options.merge(:subdomain => @newyork.to_param)) }.should raise_error(ActionController::RoutingError)
+        lambda {  url_for(@url_options.merge(:city_id => @newyork)) }.should raise_error(ActionController::RoutingError)
+        lambda { url_for(@path_options.merge(:city_id => @newyork)) }.should raise_error(ActionController::RoutingError)
       end
     end
       
@@ -208,5 +208,13 @@ describe "URL writing" do
         city_events_path(@boston, :subdomain => :canberra).should == "http://boston.example.com/events"
       end
     end
+    
+    it "should raise a routing error if no subdomain object is supplied to the named route" do
+      with_host "www.example.com" do
+        [ lambda { city_events_url }, lambda { city_event_url("id") } ].each do |lamb|
+          lamb.should raise_error(ActionController::RoutingError) { |e| e.message.should include ":city_id" }
+        end
+      end
+    end
   end
 end

metadata

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