http_router 0.3.16 → 0.3.17

data/lib/http_router/node.rb

@@ -45,13 +45,25 @@ class HttpRouter
  
     def add_to_linear(val)
       create_linear
-      if @linear.assoc(val)
+      n = if @linear.assoc(val)
         @linear.assoc(val).last
       else
         new_node = router.node
         @linear << [val, new_node]
         new_node
       end
+      @linear.sort!{|a, b|
+        if a.first.respond_to?(:priority) and b.first.respond_to?(:priority)
+          b.first.priority <=> a.first.priority
+        elsif a.first.respond_to?(:priority)
+          -1
+        elsif b.first.respond_to?(:priority)
+          1
+        else
+          0
+        end
+      }
+      n
     end
    
     def add_arbitrary(procs)

data/lib/http_router/route.rb

@@ -258,6 +258,10 @@ class HttpRouter
       mount_point.nil? ? result : File.join(mount_point, result)
     end
 
+    def significant_variable_names
+      @significant_variable_names ||= @path.scan(/(^|[^\\])[:\*]([a-zA-Z0-9_]+)/).map{|p| p.last.to_sym}
+    end
+
     private
 
     attr_reader :router
@@ -336,15 +340,12 @@ class HttpRouter
       end
     end
 
-    def significant_variable_names
-      @significant_variable_names ||= @path.scan(/(^|[^\\])[:\*]([a-zA-Z0-9_]+)/).map{|p| p.last.to_sym}
-    end
-
     def generate_interstitial_parts(part)
       part_segments = part.scan(/:[a-zA-Z_0-9]+|[^:]+/)
+      priority = 0
       if part_segments.size > 1
         index = 0
-        part_segments.map do |seg|
+        segs = part_segments.map do |seg|
           new_seg = if seg[0] == ?:
             next_index = index + 1
             v_name = seg[1, seg.size].to_sym
@@ -352,8 +353,9 @@ 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
+            priority += 1
             router.variable(v_name, scan_regex)
           else
             /^#{Regexp.quote(seg)}/
@@ -361,6 +363,8 @@ class HttpRouter
           index += 1
           new_seg
         end
+        segs.each { |seg| seg.priority = priority if seg.respond_to?(:priority=) }
+        segs
       else
         part
       end

data/lib/http_router/variable.rb

@@ -1,11 +1,13 @@
 class HttpRouter
   class Variable
     attr_reader :name, :matches_with
+    attr_accessor :priority
 
     def initialize(router, name, matches_with = nil)
       @router = router
       @name = name
       @matches_with = matches_with
+      @priority = 0
     end
 
     def matches?(parts)

data/lib/http_router/version.rb

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

data/spec/recognize_spec.rb

@@ -383,6 +383,20 @@ describe "HttpRouter#recognize" do
       response.params_as_hash[:greed].should == 'greedyboy'
     end
 
+    it "should distinguish between very similar looking routes" do
+      @router.add('/:var1').to(:test1)
+      @router.add('/:var1-:var2').to(:test2)
+      @router.add('/:var1-:var2-:var3').to(:test3)
+      @router.add('/:var1-:var2-:var3-:var4').to(:test4)
+      @router.add('/:var1-:var2-:var3-:var4-:var5').to(:test5)
+      @router.add('/:var1-:var2-:var3-:var4-:var5-:var6').to(:test6)
+      @router.recognize(Rack::MockRequest.env_for('/one')).dest.should == :test1
+      @router.recognize(Rack::MockRequest.env_for('/one-value')).dest.should == :test2
+      @router.recognize(Rack::MockRequest.env_for('/one-value-time')).dest.should == :test3
+      @router.recognize(Rack::MockRequest.env_for('/one-value-time-one')).dest.should == :test4
+      @router.recognize(Rack::MockRequest.env_for('/one-value-time-one-variable')).dest.should == :test5
+      @router.recognize(Rack::MockRequest.env_for('/one-value-time-one-value-time')).dest.should == :test6
+    end
   end
 
   context("with dynamic greedy paths") do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 3
-  - 16
-  version: 0.3.16
+  - 17
+  version: 0.3.17
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 -04:00
+date: 2010-09-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency