http_router 0.6.1 → 0.6.2

data/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'

data/lib/http_router.rb

@@ -57,7 +57,8 @@ class HttpRouter
       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_request = Request.new(test_env.path_info, test_env, false)
+        test_env.env['HTTP_ROUTER_405_TESTING_ACCEPTANCE'] = true
+        test_request = Request.new(test_env.path_info, test_env, 405)
         catch(:success) { @root[test_request] }
       end
       supported_methods.empty? ? @default_app.call(env) : [405, {'Allow' => supported_methods.sort.join(", ")}, []]

data/lib/http_router/node.rb

@@ -62,7 +62,7 @@ class HttpRouter
       arbitrary(request_obj)
       if match_partially or request_obj.path.empty?
         @destination && @destination.each do |d|
-          if d.route.match_partially? or request_obj.path.empty? or (@router.ignore_trailing_slash? and request_obj.path.size == 1 and request_obj.path.last == '')
+          if request_obj.path.empty? or d.route.match_partially? or (@router.ignore_trailing_slash? and request_obj.path.size == 1 and request_obj.path.last == '')
             if request_obj.perform_call
               env = request_obj.rack_request.dup.env
               env['router.params'] ||= {}
@@ -127,9 +127,9 @@ class HttpRouter
       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
   

data/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

data/lib/http_router/node/request.rb

@@ -49,13 +49,11 @@ class HttpRouter
       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

data/lib/http_router/request.rb

@@ -1,6 +1,5 @@
 class HttpRouter
   class Request
-    attr_reader :perform_call
     attr_accessor :path, :params, :rack_request, :extra_env, :continue
     alias_method :rack, :rack_request
     def initialize(path, rack_request, perform_call)
@@ -11,6 +10,14 @@ class HttpRouter
       @params = []
     end
 
+    def perform_call
+      @perform_call == true
+    end
+
+    def testing_405?
+      @perform_call == 405
+    end
+
     def to_s
       "request path, #{path.inspect}"
     end

data/lib/http_router/route.rb

@@ -236,7 +236,7 @@ class HttpRouter
       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

data/lib/http_router/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-20 00:00:00 -07:00
+date: 2011-03-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,7 +95,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: rbench
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -109,7 +109,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rbench
+  name: phocus
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -122,24 +122,10 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: phocus
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -151,7 +137,7 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 description: This library allows you to recognize and build URLs in a Rack application. As well it contains an interface for use within Sinatra.
 email: joshbuddy@gmail.com
 executables: []