http_router 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/http_router/node.rb

@@ -140,35 +140,38 @@ class HttpRouter
     end
 
     def find_on_parts(request, parts, params)
-      if @linear && !@linear.empty?
-        whole_path = parts.join('/')
-        next_node = @linear.find do |(tester, node)|
-          if tester.is_a?(Regexp) and match = tester.match(whole_path) #and match.index == 0 TODO
-            whole_path.slice!(0,match[0].size)
-            parts.replace(router.split(whole_path))
-            node
-          elsif tester.respond_to?(:matches) and new_params = tester.matches(request.env, parts, whole_path)
-            params << new_params
-            node
-          else
-            nil
+      if !parts.empty?
+        if @linear && !@linear.empty?
+          whole_path = parts.join('/')
+          next_node = @linear.find do |(tester, node)|
+            if tester.is_a?(Regexp) and match = tester.match(whole_path) #and match.index == 0 TODO
+              whole_path.slice!(0,match[0].size)
+              parts.replace(router.split(whole_path))
+              node
+            elsif tester.respond_to?(:matches) and new_params = tester.matches(request.env, parts, whole_path)
+              params << new_params
+              node
+            else
+              nil
+            end
+          end
+          if next_node and match = next_node.last.find_on_parts(request, parts, params)
+            return match
           end
         end
-        if next_node and match = next_node.last.find_on_parts(request, parts, params)
-          return match
+        if match = @lookup && @lookup[parts.first]
+          parts.shift
+          return match.find_on_parts(request, parts, params)
+        elsif @catchall
+          params << @catchall.variable.matches(request.env, parts, whole_path)
+          parts.shift
+          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 match = @lookup && @lookup[parts.first]
-        parts.shift
-        match.find_on_parts(request, parts, params)
-      elsif @catchall
-        params << @catchall.variable.matches(request.env, parts, whole_path)
-        parts.shift
-        @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
-        find_on_parts(request, parts, params)
-      elsif request_node
+      if request_node
         request_node.find_on_request_methods(request)
       elsif arbitrary_node
         arbitrary_node.find_on_arbitrary(request)

data/lib/http_router/route.rb

@@ -1,7 +1,7 @@
 class HttpRouter
   class Route
     attr_reader :dest, :paths
-    attr_accessor :trailing_slash_ignore, :partially_match, :default_values
+    attr_accessor :trailing_slash_ignore, :partially_match, :default_values, :router
 
     def initialize(base, path)
       @router = base
@@ -47,7 +47,8 @@ class HttpRouter
 
     def name(name)
       @name = name
-      router.named_routes[name] = self
+      router.named_routes[@name] = self if @name && compiled?
+      self
     end
 
     def default(v)
@@ -127,8 +128,9 @@ class HttpRouter
       !@paths.nil?
     end
   
-    def compile
-      unless @paths
+    def compile(force = false)
+      if force || @paths.nil?
+        router.named_routes[@name] = self if @name
         @paths = compile_paths
         @paths.each_with_index do |p1, i|
           @paths[i+1, @paths.size].each do |p2|

data/lib/http_router.rb

@@ -26,11 +26,13 @@ class HttpRouter
   end
 
   def initialize(options = nil, &block)
+    @options = options
     @default_app = options && options[:default_app] || proc{|env| ::Rack::Response.new("Not Found", 404).finish }
     @ignore_trailing_slash   = options && options.key?(:ignore_trailing_slash) ? options[:ignore_trailing_slash] : true
     @redirect_trailing_slash = options && options.key?(:redirect_trailing_slash) ? options[:redirect_trailing_slash] : false
     @routes = []
     @named_routes = {}
+    @init_block = block
     reset!
     instance_eval(&block) if block
   end
@@ -145,6 +147,17 @@ class HttpRouter
     Glob.new(self, *args)
   end
 
+  def dup
+    dup_router = HttpRouter.new(@options, &@init_block)
+    @routes.each do |r|
+      new_route = r.dup
+      new_route.router = dup_router
+      dup_router.routes << new_route
+      new_route.compile(true)
+    end
+    dup_router
+  end
+
   private
 
   def consume_path!(request, response)

data/spec/misc_spec.rb

@@ -15,9 +15,11 @@ describe "HttpRouter" do
   end
 
   context "instance_eval block" do
-    #HttpRouter.new {
-    #  add('/test').to :test
-    #}.recognize(Rack::MockRequest.env_for('/test', :method => 'GET')).dest.should == :test
+    it "run the routes" do
+      HttpRouter.new {
+        add('/test').to :test
+      }.recognize(Rack::MockRequest.env_for('/test', :method => 'GET')).dest.should == :test
+    end
   end
 
   context "exceptions" do
@@ -34,4 +36,22 @@ describe "HttpRouter" do
     end
 
   end
+
+  context "dupping" do
+    it "run the routes" do
+      pending
+      r1 = HttpRouter.new {
+        add('/test').name(:test_route).to :test
+      }
+      r2 = r1.dup
+      r2.add('/test2').to(:test2)
+      r1.recognize(Rack::MockRequest.env_for('/test2')).should be_nil
+      r2.recognize(Rack::MockRequest.env_for('/test2')).should_not be_nil
+      
+      r1.named_routes[:test_route].should == r1.routes.first
+      r2.named_routes[:test_route].should == r2.routes.first
+    end
+  end
+
+
 end

data/spec/recognize_spec.rb

@@ -89,6 +89,15 @@ describe "HttpRouter#recognize" do
 
   end
 
+  context "variables" do
+    it "should recognize a simple variable" do
+      @router.add("/foo").to(:test1)
+      @router.add("/foo/:id").to(:test2)
+      @router.recognize(Rack::MockRequest.env_for('/foo')).dest.should == :test1
+      @router.recognize(Rack::MockRequest.env_for('/foo/id')).dest.should == :test2
+    end
+  end
+
   context "request methods" do
     it "should pick a specific request_method" do
       route = @router.post("/test").to(:test)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Joshua Hull