http_router 0.3.7 → 0.3.8

data/http_router.gemspec

@@ -7,7 +7,6 @@ Gem::Specification.new do |s|
   s.version = HttpRouter::VERSION
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Hull"]
-  s.date = '2010-07-31'
   s.summary = "A kick-ass HTTP router for use in Rack & Sinatra"
   s.description = "This library allows you to recognize and build URLs in a Rack application. As well it contains an interface for use within Sinatra."
   s.email = %q{joshbuddy@gmail.com}

data/lib/http_router/node.rb

@@ -205,29 +205,37 @@ class HttpRouter
 
     def find_on_request_methods(request, alternate_request_methods)
       if @request_method
+        request_method_satisfied = false
         request_value = request.send(request_method)
         if @linear && !@linear.empty?
           next_node = @linear.find do |(regexp, node)|
             regexp === request_value
           end
+          request_method_satisfied = true if next_node
           next_node &&= next_node.last.find_on_request_methods(request, alternate_request_methods)
           return next_node if next_node
         end
-        if @lookup and next_node = (@lookup[request_value] && @lookup[request_value].find_on_request_methods(request, alternate_request_methods))
-          return next_node
-        elsif next_node = (@catchall && @catchall.find_on_request_methods(request, alternate_request_methods))
-          return next_node
+        if @lookup and next_node = @lookup[request_value]
+          request_method_satisfied = true
+          next_node = next_node.find_on_request_methods(request, alternate_request_methods)
+          return next_node if next_node
+        end
+        if @catchall
+          request_method_satisfied = true
+          next_node = @catchall.find_on_request_methods(request, alternate_request_methods)
+          return next_node if next_node
+        end
+        if @request_method == :request_method
+          alternate_request_methods.concat(@lookup.keys)
+          alternate_request_methods.request_method_found ||= request_method_satisfied
         end
       end
-      
+
       if @arbitrary_node
         @arbitrary_node.find_on_arbitrary(request)
       elsif @value
         self
       else
-        if request_method == :request_method
-          alternate_request_methods.concat(@lookup.keys)
-        end
         nil
       end
     end

data/lib/http_router/root.rb

@@ -1,5 +1,9 @@
 class HttpRouter
   class Root < Node
+    class AlternativeRequestMethods < Array
+      attr_accessor :request_method_found
+    end
+    
     def add_path(path)
       node = path.parts.inject(self) { |node, part| node.add(part) }
       node
@@ -10,7 +14,8 @@ class HttpRouter
       parts = router.split(path)
       parts << '' if path[path.size - 1] == ?/
       params = []
-      alternate_request_methods = []
+      alternate_request_methods = AlternativeRequestMethods.new
+      alternate_request_methods.request_method_found = false
       process_response(
         find_on_parts(request, parts, params, alternate_request_methods),
         parts,
@@ -34,10 +39,10 @@ class HttpRouter
           nil
         end
       else
-        if alternate_request_methods.empty?
+        if alternate_request_methods.request_method_found or alternate_request_methods.empty?
           nil
         else
-          Response.unmatched(405, {"Allow" => alternate_request_methods.join(", ")})
+          Response.unmatched(405, {"Allow" => alternate_request_methods.uniq.join(", ")})
         end
       end
     end

data/lib/http_router/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 class HttpRouter #:nodoc
-  VERSION = '0.3.7'
+  VERSION = '0.3.8'
 end

data/spec/recognize_spec.rb

@@ -82,7 +82,6 @@ describe "HttpRouter#recognize" do
         response = @router.recognize(Rack::MockRequest.env_for('http://lovelove:8081/test'))
         response.dest.should == :test3
       end
-
     end
 
     context("with trailing slashes") do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-31 00:00:00 -07:00
+date: 2010-08-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency