cleanup, slightly cheaper arbitrary calculations

http_router.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest', '~> 2.0.0'
   s.add_development_dependency 'code_stats'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'sinatra'
   s.add_development_dependency 'rbench'
   s.add_development_dependency 'phocus'
   s.add_development_dependency 'bundler',  '~> 1.0.0'

lib/http_router.rb

@@ -57,6 +57,7 @@ def call(env, perform_call = true)
       supported_methods = (@known_methods - [env['REQUEST_METHOD']]).select do |m| 
         test_env = Rack::Request.new(rack_request.env.clone)
         test_env.env['REQUEST_METHOD'] = m
+        test_env.env['HTTP_ROUTER_405_TESTING_ACCEPTANCE'] = true
         test_request = Request.new(test_env.path_info, test_env, false)
         catch(:success) { @root[test_request] }
       end

lib/http_router/node.rb

@@ -127,9 +127,9 @@ def add_request(opts)
       next_requests
     end
 
-    def add_arbitrary(blk, param_names)
+    def add_arbitrary(blk, allow_partial, param_names)
       @arbitrary ||= []
-      @arbitrary << Arbitrary.new(@router, blk, param_names)
+      @arbitrary << Arbitrary.new(@router, allow_partial, blk, param_names)
       @arbitrary.last
     end
 

lib/http_router/node/arbitrary.rb

@@ -1,15 +1,17 @@
 class HttpRouter
   class Node
     class Arbitrary < Node
-      def initialize(router, blk, param_names)
-        @router, @blk, @param_names = router, blk, param_names
+      def initialize(router, allow_partial, blk, param_names)
+        @router, @allow_partial, @blk, @param_names = router, allow_partial, blk, param_names
       end
 
       def [](request)
-        request = request.clone
-        request.continue = proc { |state| destination(request) if state }
-        params = @param_names.nil? ? {} : Hash[@param_names.zip(request.params)]
-        @blk.call(request, params)
+        if request.path.empty? or (request.path.size == 1 and request.path[0] == '') or @allow_partial
+          request = request.clone
+          request.continue = proc { |state| destination(request) if state }
+          params = @param_names.nil? ? {} : Hash[@param_names.zip(request.params)]
+          @blk.call(request, params)
+        end
       end
     end
   end

lib/http_router/node/request.rb

@@ -49,13 +49,11 @@ def add_linear(matcher)
       end
 
       def [](request)
-        matched = false
         if @request_method
           val = request.rack_request.send(@request_method.to_sym)
           @linear.each { |(matcher, node)| node[request] if matcher === val }
           @lookup[val][request] if @lookup.key?(val)
           @catchall[request] if @catchall
-          matched = @lookup.key?(val) || !@catchall.nil?
         else
           super(request)
         end

lib/http_router/route.rb

@@ -236,7 +236,7 @@ def add_non_path_to_tree(node, path, names)
       else
         [node]
       end
-      @arbitrary.each{|a| nodes.map!{|n| n.add_arbitrary(a, names)} } if @arbitrary
+      @arbitrary.each{|a| nodes.map!{|n| n.add_arbitrary(a, @match_partially, names)} } if @arbitrary
       path_obj = Path.new(self, path, names)
       nodes.each{|n| n.add_destination(path_obj)}
       path_obj