http_router 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/http_router/node.rb

@@ -138,8 +138,15 @@ class HttpRouter
     end
 
     def find_on_parts(request, parts, params)
-      unless parts.empty?
+      if parts and !parts.empty?
         whole_path = parts.join('/')
+        if parts.size == 1 and parts.first == ''
+          potential_match = find_on_parts(request, [], params)
+          if potential_match and (router.ignore_trailing_slash? or potential_match.value && potential_match.value.route.trailing_slash_ignore?)
+            parts.shift
+            return potential_match
+          end
+        end
         if @linear && !@linear.empty?
           response = nil
           dupped_parts = nil
@@ -163,9 +170,6 @@ class HttpRouter
         elsif @catchall
           params << @catchall.variable.consume(parts, whole_path)
           return @catchall.find_on_parts(request, parts, params)
-        elsif parts.size == 1 && parts.first == '' && (value && value.route.trailing_slash_ignore? || router.ignore_trailing_slash?)
-          parts.shift
-          return find_on_parts(request, parts, params)
         end
       end
       if request_node

data/lib/http_router/route.rb

@@ -108,6 +108,7 @@ class HttpRouter
         @conditions.key?(k) ?
           @conditions[k] << v :
           @conditions[k] = Array(v)
+        @conditions[k].flatten!
       end
       self
     end
@@ -304,7 +305,7 @@ class HttpRouter
             scan_regex = if next_index == part_segments.size
               matcher || /^[^\/]+/
             else
-              /^#{matcher || '.*?'}(?=#{Regexp.quote(part_segments[next_index])})/
+              /^#{matcher || '[^\/]*?'}(?=#{Regexp.quote(part_segments[next_index])})/
             end
             router.variable(v_name, scan_regex)
           else

data/spec/rack/dispatch_spec.rb

@@ -80,7 +80,7 @@ describe "HttpRouter route dispatching" do
     describe "get" do
       before(:each) do
         route_set.reset!
-        route_set.get('/sample').to(@app)
+        route_set.get('/sample').head.to(@app)
       end
 
       it "should dispatch a GET request" do
@@ -89,7 +89,6 @@ describe "HttpRouter route dispatching" do
       end
 
       it "should dispatch a HEAD request" do
-        pending
         response = route_set.call_with_mock_request("/sample", "HEAD")
         response.body.should eql("Hello World!")
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-30 00:00:00 +09:00
+date: 2010-05-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency