http_router 0.7.2 → 0.7.3

data/Rakefile

@@ -114,4 +114,4 @@ Rake::RDocTask.new do |rd|
 end
 
 require 'code_stats'
-CodeStats::Tasks.new(:reporting_depth => 3)
+CodeStats::Tasks.new

data/benchmarks/gen2.rb

@@ -1,14 +1,16 @@
 require 'rubygems'
 require 'rbench'
 #require 'lib/usher'
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
 require 'lib/http_router'
 
 u = HttpRouter.new
-u.add('/simple')                                                                                     .name(:simple).compile
-u.add('/simple/:variable')                                                                           .name(:one_variable).compile
-u.add('/simple/:var1/:var2/:var3')                                                                   .name(:three_variables).compile
-u.add('/simple/:v1/:v2/:v3/:v4/:v5/:v6/:v7/:v8')                                                     .name(:eight_variables).compile
-u.add('/with_condition/:cond1/:cond2').matching(:cond1 => /^\d+$/, :cond2 => /^[a-z]+$/)             .name(:two_conditions).compile
+u.add('/simple')                                                                                     .name(:simple).send(:compile)
+u.add('/simple/:variable')                                                                           .name(:one_variable).send(:compile)
+u.add('/simple/:var1/:var2/:var3')                                                                   .name(:three_variables).send(:compile)
+u.add('/simple/:v1/:v2/:v3/:v4/:v5/:v6/:v7/:v8')                                                     .name(:eight_variables).send(:compile)
+u.add('/with_condition/:cond1/:cond2').matching(:cond1 => /^\d+$/, :cond2 => /^[a-z]+$/)             .name(:two_conditions).send(:compile)
 
 TIMES = 50_000
 

data/benchmarks/rec2.rb

@@ -25,7 +25,7 @@ puts Benchmark.measure {
   puts "u.routes.size: #{u.routes.size}"
 }
 #
-TIMES = 50_000
+TIMES = 10_000
 
 #simple_env = 
 #simple2_env = 
@@ -34,7 +34,7 @@ TIMES = 50_000
 #simple_and_dynamic_env1 = Rack::MockRequest.env_for('/rails/controller/action/id')
 #simple_and_dynamic_env2 = Rack::MockRequest.env_for('/greedy/controller/action/id')
 #simple_and_dynamic_env3 = Rack::MockRequest.env_for('/greedy/hey.hello.html')
-5.times {
+#5.times {
   RBench.run(TIMES) do
 
     report "2 levels, static" do
@@ -62,5 +62,5 @@ TIMES = 50_000
     #end
 
   end
-}
+#}
 puts `ps -o rss= -p #{Process.pid}`.to_i

data/lib/http_router.rb

@@ -11,7 +11,7 @@ require 'http_router/optional_compiler'
 
 class HttpRouter
 
-  attr_reader :root, :routes, :known_methods, :named_routes, :request_methods
+  attr_reader :root, :routes, :known_methods, :named_routes
   attr_accessor :default_app, :url_mount
 
   # Raised when a Route is not able to be generated.
@@ -29,7 +29,6 @@ class HttpRouter
   # * :ignore_trailing_slash -- Ignore a trailing / when attempting to match. Defaults to +true+.
   # * :redirect_trailing_slash -- On trailing /, redirect to the same path without the /. Defaults to +false+.
   # * :known_methods -- Array of http methods tested for 405s.
-  # * :request_methods -- Array of methods to use on request
   def initialize(*args, &blk)
     default_app, options     = args.first.is_a?(Hash) ? [nil, args.first] : [args.first, args[1]]
     @options = options
@@ -37,7 +36,6 @@ class HttpRouter
     @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
     @known_methods           = Set.new(options && options[:known_methods] || [])
-    @request_methods         = options && options[:request_methods] || [:host, :scheme, :request_method, :user_agent]
     reset!
     instance_eval(&blk) if blk
   end
@@ -123,14 +121,7 @@ class HttpRouter
       request = Request.new(rack_request.path_info, rack_request, perform_call)
       response = catch(:success) { @root[request] }
       if response.nil?
-        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, 405)
-          catch(:success) { @root[test_request] }
-        end
-        supported_methods.empty? ? (perform_call ? @default_app.call(env) : nil) : [405, {'Allow' => supported_methods.sort.join(", ")}, []]
+        no_response(env, perform_call)
       elsif response
         response
       elsif perform_call
@@ -203,6 +194,17 @@ class HttpRouter
   end
 
   private
+  def no_response(env, perform_call = true)
+    supported_methods = (@known_methods - [env['REQUEST_METHOD']]).select do |m|
+      test_env = ::Rack::Request.new(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, 405)
+      catch(:success) { @root[test_request] }
+    end
+    supported_methods.empty? ? (perform_call ? @default_app.call(env) : nil) : [405, {'Allow' => supported_methods.sort.join(", ")}, []]
+  end
+
   def add_with_request_method(path, method, opts = {}, &app)
     route = add(path, opts).send(method.to_sym)
     route.to(app) if app

data/lib/http_router/node.rb

@@ -18,8 +18,7 @@ class HttpRouter
     end
 
     def [](request)
-      @matchers.each {|m| m[request] }
-      nil
+      @matchers.each {|m| m[request] }; nil
     end
 
     def add_variable
@@ -66,11 +65,8 @@ class HttpRouter
     end
 
     def unescape(val)
-      val.to_s.gsub(/((?:%[0-9a-fA-F]{2})+)/n){ [$1.delete('%')].pack('H*') }
-    end
-
-    def join_whole_path(request)
-      request.path * '/'
+      val.to_s.gsub!(/((?:%[0-9a-fA-F]{2})+)/n){ [$1.delete('%')].pack('H*') }
+      val
     end
   end
 end

data/lib/http_router/node/arbitrary.rb

@@ -8,10 +8,12 @@ class HttpRouter
 
       def [](request)
         if request.path.empty? or (request.path.size == 1 and request.path[0] == '') or @allow_partial
-          request = request.clone
-          request.continue = proc { |state| super(request) if state }
-          params = @param_names.nil? ? {} : Hash[@param_names.zip(request.params)]
-          @blk.call(request, params)
+          catch(:pass) do
+            request = request.clone
+            request.continue = proc { |state| super(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/free_regex.rb

@@ -8,7 +8,7 @@ class HttpRouter
       end
 
       def [](request)
-        whole_path = "/#{join_whole_path(request)}"
+        whole_path = "/#{request.joined_path}"
         if match = @matcher.match(whole_path) and match[0].size == whole_path.size
           request = request.clone
           request.extra_env['router.regex_match'] = match

data/lib/http_router/node/spanning_regex.rb

@@ -2,7 +2,7 @@ class HttpRouter
   class Node
     class SpanningRegex < Regex
       def [](request)
-        whole_path = join_whole_path(request)
+        whole_path = request.joined_path
         if match = @matcher.match(whole_path) and match.begin(0).zero?
           request = request.clone
           add_params(request, match)

data/lib/http_router/regex_route.rb

@@ -2,6 +2,7 @@ class HttpRouter
   class RegexRoute < Route
     def initialize(router, path, opts = {})
       @router, @original_path, @opts = router, path, opts
+      process_opts
     end
 
     def compile

data/lib/http_router/request.rb

@@ -10,6 +10,10 @@ class HttpRouter
       @params = []
     end
 
+    def joined_path
+      @path * '/'
+    end
+
     def perform_call
       @perform_call == true
     end

data/lib/http_router/route.rb

@@ -10,19 +10,22 @@ class HttpRouter
       @original_path = path
       @path = path
       @opts = opts
-      @arbitrary = opts[:arbitrary] || opts[:__arbitrary__]
-      @conditions = opts[:conditions] || opts[:__conditions__] || {}
-      name(opts[:name]) if opts.key?(:name)
-      @opts.merge!(opts[:matching]) if opts[:matching]
       @matches_with = {}
       @default_values = opts[:default_values] || {}
       if @original_path[-1] == ?*
         @match_partially = true
         path.slice!(-1)
-      elsif opts.key?(:partial)
-        @match_partially = opts[:partial]
       end
       @paths = OptionalCompiler.new(path).paths
+      process_opts
+    end
+
+    def process_opts
+      @arbitrary = @opts[:arbitrary] || @opts[:__arbitrary__]
+      @conditions = @opts[:conditions] || @opts[:__conditions__] || {}
+      @opts.merge!(@opts[:matching]) if @opts[:matching]
+      @match_partially = @opts[:partial] if @match_partially.nil? && @opts.key?(:partial)
+      name(@opts[:name]) if @opts.key?(:name)
     end
 
     def as_options
@@ -252,29 +255,27 @@ class HttpRouter
     private
     def add_non_path_to_tree(node, path, names)
       path_obj = Path.new(self, path, names)
-      destination = Proc.new { |req, use_partial_matching|
-        if (use_partial_matching or req.path.empty?)
-          if req.path.empty? or match_partially? or (@router.ignore_trailing_slash? and req.path.size == 1 and req.path.last == '')
-            if req.perform_call
-              env = req.rack_request.dup.env
-              env['router.params'] ||= {}
-              env['router.params'].merge!(path_obj.hashify_params(req.params))
-              matched = if match_partially?
-                env['PATH_INFO'] = "/#{req.path.join('/')}"
-                env['SCRIPT_NAME'] += req.rack_request.path_info[0, req.rack_request.path_info.size - env['PATH_INFO'].size]
-              else
-                env["PATH_INFO"] = ''
-                env["SCRIPT_NAME"] += req.rack_request.path_info
-              end
-              response = path_obj.route.dest.call(env)
-              router.pass_on_response(response) ? throw(:pass) : throw(:success, response)
+      destination = Proc.new do |req, params|
+        if req.path.empty? or match_partially? or (@router.ignore_trailing_slash? and req.path.size == 1 and req.path.last == '')
+          if req.perform_call
+            env = req.rack_request.dup.env
+            env['router.params'] ||= {}
+            env['router.params'].merge!(path_obj.hashify_params(req.params))
+            matched = if match_partially?
+              env['PATH_INFO'] = "/#{req.path.join('/')}"
+              env['SCRIPT_NAME'] += req.rack_request.path_info[0, req.rack_request.path_info.size - env['PATH_INFO'].size]
             else
-              throw :success, Response.new(req, path_obj)
+              env["PATH_INFO"] = ''
+              env["SCRIPT_NAME"] += req.rack_request.path_info
             end
+            response = path_obj.route.dest.call(env)
+            router.pass_on_response(response) ? throw(:pass) : throw(:success, response)
+          else
+            throw :success, Response.new(req, path_obj)
           end
         end
-      }
-      node = node.add_request(@conditions) if @conditions && !@conditions.empty?
+      end
+      node = node.add_request(@conditions) unless @conditions.empty?
       @arbitrary.each{|a| node = node.add_arbitrary(a, match_partially?, names)} if @arbitrary
       node.add_destination(destination, @match_partially)
       if dest.respond_to?(:url_mount=)

data/lib/http_router/version.rb

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

data/test/test_arbitrary.rb

@@ -48,6 +48,14 @@ class TestArbitrary < MiniTest::Unit::TestCase
     assert_route r, '/test', {:test => 'test'}
   end
 
+  def test_passing
+    never, route = router {
+      add('test').arbitrary(Proc.new{|req, params| throw :pass })
+      add("test")
+    }
+    assert_route route, 'http://lovelove:8080/test'
+  end
+
   def test_continue
     no, yes = router {
       add('test').arbitrary_with_continue{|req, p| req.continue[false]}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -07:00
+date: 2011-04-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency