http_router 0.3.14 → 0.3.15

data/lib/http_router/node.rb

@@ -136,7 +136,9 @@ class HttpRouter
 
     def find_on_parts(request, parts, params)
       if parts and !parts.empty?
-        return potential if potential = potential_match(request, parts, params)
+        if potential = potential_match(request, parts, params)
+          return potential
+        end
         if @linear && !@linear.empty?
           response = nil
           dupped_parts = nil
@@ -196,14 +198,7 @@ class HttpRouter
       end
     
       def potential_match(request, parts, params)
-        if parts.size == 1 and parts.first == ''
-          potential = find_on_parts(request, [], params)
-          if potential and (router.ignore_trailing_slash? or potential.value && potential.value.route.trailing_slash_ignore?)
-            parts.shift
-            potential
-          end
-        end
-        nil
+        parts.size == 1 and parts.first == '' and potential = find_on_parts(request, nil, params) and (router.ignore_trailing_slash? or (potential.value and potential.value.route.trailing_slash_ignore?)) and parts.shift ? potential : nil
       end
   end
 

data/lib/http_router/version.rb

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

data/spec/recognize_spec.rb

@@ -109,10 +109,20 @@ describe "HttpRouter#recognize" do
         route = @router.add("/test").to(:test)
         @router.recognize(Rack::MockRequest.env_for('/test/')).should be_nil
       end
+
       it "should not capture normally" do
         route = @router.add("/:test").to(:test)
         @router.recognize(Rack::MockRequest.env_for('/test/')).params.first.should == 'test'
       end
+      
+      it "should recognize trailing slashes when there are other more specific routes near by" do
+        @router = HttpRouter.new
+        route = @router.add("/foo").to(:foo)
+        route = @router.add("/foo/:bar/:id").to(:foo_bar)
+        @router.recognize(Rack::MockRequest.env_for('/foo')).dest.should == :foo
+        @router.recognize(Rack::MockRequest.env_for('/foo/')).dest.should == :foo
+        @router.recognize(Rack::MockRequest.env_for('/foo/5/10')).dest.should == :foo_bar
+      end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 3
-  - 14
-  version: 0.3.14
+  - 15
+  version: 0.3.15
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 -07:00
+date: 2010-09-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency