http_router 0.8.2 → 0.8.3

data/benchmarks/rec2.rb

@@ -36,6 +36,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')
+u.call(Rack::MockRequest.env_for('/simple')).first == 200 or raise
 5.times {
   RBench.run(TIMES) do
 

data/lib/http_router.rb

@@ -70,14 +70,6 @@ class HttpRouter
     route
   end
 
-  def pass_on_response(response)
-    response[1]['X-Cascade'] == 'pass'
-  end
-
-  def set_pass_on_response(&blk)
-    extend(Module.new { define_method(:pass_on_response, &blk) })
-  end
-
   # Adds a path that only responds to the request method +GET+.
   #
   # Returns the route object.
@@ -108,21 +100,21 @@ class HttpRouter
   # Returns the route object.
   def options(path, opts = {}, &app); add_with_request_method(path, :options, opts, &app); end
 
-  def recognize(env, &blk)
-    call(env, false, &blk)
+  def recognize(env)
+    call(env, false)
   end
 
   # Rack compatible #call. If matching route is found, and +dest+ value responds to #call, processing will pass to the matched route. Otherwise,
   # the default application will be called. The router will be available in the env under the key <tt>router</tt>. And parameters matched will
   # be available under the key <tt>router.params</tt>.
-  def call(env, perform_call = true, &blk)
+  def call(env, perform_call = true)
     rack_request = ::Rack::Request.new(env)
     if redirect_trailing_slash? && (rack_request.head? || rack_request.get?) && rack_request.path_info[-1] == ?/
       response = ::Rack::Response.new
       response.redirect(request.path_info[0, request.path_info.size - 1], 302)
       response.finish
     else
-      request = Request.new(rack_request.path_info, rack_request, perform_call, &blk)
+      request = Request.new(rack_request.path_info, rack_request, perform_call)
       response = catch(:success) { @root[request] }
       if response
         response
@@ -169,6 +161,14 @@ class HttpRouter
     end
   end
 
+  def process_destination(destination, env)
+    destination.call(env)
+  end
+
+  def pass_on_response(response)
+    response[1]['X-Cascade'] == 'pass'
+  end
+
   # Ignore trailing slash feature enabled? See #initialize for details.
   def ignore_trailing_slash?
     @ignore_trailing_slash

data/lib/http_router/node.rb

@@ -72,6 +72,11 @@ class HttpRouter
       end
     end
 
+    def inject_root_ivar(name, val)
+      root.instance_variable_set(name, val)
+    end
+
+
     def add(matcher)
       @matchers << matcher unless matcher.usable?(@matchers.last)
       @matchers.last

data/lib/http_router/node/destination.rb

@@ -13,11 +13,28 @@ class HttpRouter
       end
 
       def to_code
-        b, method_name = @blk, :"blk_#{router.next_counter}"
-        inject_root_methods { define_method(method_name) { b } }
+        path = blk
+        path_ivar = :"@path_#{router.next_counter}"
+        inject_root_ivar(path_ivar, blk)
         "#{"if request.path_finished?" unless @allow_partial}
-          request.passed_with = catch(:pass) do
-            #{method_name}[request, #{@param_names.nil? || @param_names.empty? ? 'nil' : "Hash[#{@param_names.inspect}.zip(request.params)]"}]
+          catch(:pass) do
+            #{"if request.path.empty?#{" or (request.path.size == 1 and request.path.first == '')" if @router.ignore_trailing_slash?}" unless @allow_partial}
+              if request.perform_call
+                env = request.rack_request.dup.env
+                env['router.params'] ||= {}
+                #{"env['router.params'].merge!(Hash[#{path.param_names.inspect}.zip(request.params)])" if path.dynamic?}
+                #{@allow_partial ? "
+                  env['PATH_INFO'] = \"/\#{request.path.join('/')}\"
+                  env['SCRIPT_NAME'] += request.rack_request.path_info[0, request.rack_request.path_info.size - env['PATH_INFO'].size]" : 
+                  "env['PATH_INFO'] = ''
+                  env['SCRIPT_NAME'] += request.rack_request.path_info"
+                }
+                response = @router.process_destination(#{path_ivar}.route.dest, env)
+                router.pass_on_response(response) ? throw(:pass) : throw(:success, response)
+              else
+                throw :success, Response.new(request, #{path_ivar})
+              end
+            #{"end" unless @allow_partial}
           end
         #{"end" unless @allow_partial}"
       end

data/lib/http_router/node/lookup.rb

@@ -15,6 +15,8 @@ class HttpRouter
       end
 
       def to_code
+        lookup_ivar = :"@lookup_#{router.next_counter}"
+        inject_root_ivar(lookup_ivar, @map)
         inject_root_methods @map.keys.map {|k| 
           method = :"lookup_#{object_id}_#{k.hash}"
           "define_method(#{method.inspect}) do |request|
@@ -23,10 +25,7 @@ class HttpRouter
             request.path.unshift part
           end"}.join("\n")
         code = "
-        unless request.path_finished?
-          m = \"lookup_#{object_id}_\#{request.path.first.hash}\"
-          send(m, request) if respond_to?(m)
-        end
+        send(\"lookup_#{object_id}_\#{request.path.first.hash}\", request) if !request.path_finished? && #{lookup_ivar}.key?(request.path.first)
         "
       end
     end

data/lib/http_router/path.rb

@@ -1,7 +1,8 @@
 require 'uri'
 class HttpRouter
   class Path
-    attr_reader :route, :param_names
+    attr_reader :route, :param_names, :dynamic
+    alias_method :dynamic?, :dynamic
     def initialize(route, path, param_names = [])
       @route, @path, @param_names, @dynamic = route, path, param_names, !param_names.empty?
       duplicate_param_names = param_names.dup.uniq!

data/lib/http_router/request.rb

@@ -1,10 +1,9 @@
 class HttpRouter
   class Request
-    attr_reader :acceptance_test
     attr_accessor :path, :params, :rack_request, :extra_env, :continue, :passed_with
     alias_method :rack, :rack_request
-    def initialize(path, rack_request, perform_call, &acceptance_test)
-      @rack_request, @perform_call, @acceptance_test = rack_request, perform_call, acceptance_test
+    def initialize(path, rack_request, perform_call)
+      @rack_request, @perform_call = rack_request, perform_call
       @path = URI.unescape(path).split(/\//)
       @path.shift if @path.first == ''
       @path.push('') if path[-1] == ?/

data/lib/http_router/response.rb

@@ -1,7 +1,6 @@
 class HttpRouter
   class Response < Struct.new(:request, :path)
     attr_reader :params
-    attr_accessor :acceptance_response
     def initialize(request, path)
       super(request, path)
       @params = path.hashify_params(request.params)

data/lib/http_router/route.rb

@@ -256,33 +256,9 @@ class HttpRouter
     private
     def add_non_path_to_tree(node, path, names)
       path_obj = Path.new(self, path, names)
-      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
-              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)
-          elsif req.acceptance_test
-            response = Response.new(req, path_obj)
-            req.passed_with = catch(:pass) { req.acceptance_test[response] }
-            throw :success, response if response.acceptance_response
-          else
-            throw :success, Response.new(req, path_obj)
-          end
-        end
-      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)
+      node.add_destination(path_obj, @match_partially)
       if dest.respond_to?(:url_mount=)
         urlmount = UrlMount.new(@original_path, @default_values)
         urlmount.url_mount = router.url_mount if router.url_mount

data/lib/http_router/version.rb

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

data/test/test_recognize.rb

@@ -44,15 +44,6 @@ class TestRecognition < MiniTest::Unit::TestCase
     assert_body 'working', router.call(Rack::MockRequest.env_for('/'))
   end
 
-  def test_passing_with_custom_pass_wrapper
-    passed, working = router {
-      add('/').to { |env| [404, {}, ['pass']] }
-      add('/').to { |env| [200, {}, ['working']] }
-    }
-    router.set_pass_on_response {|response| response.first == 404}
-    assert_body 'working', router.call(Rack::MockRequest.env_for('/'))
-  end
-
   def test_optional
     route = router {
       add 'one(/two(/three(/four)(/five)))'

metadata

@@ -2,116 +2,116 @@
 name: http_router
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
-- Joshua Hull
+  - Joshua Hull
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 -07:00
+date: 2011-06-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: url_mount
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.2.1
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: minitest
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.0.0
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: code_stats
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.7
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rbench
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: phocus
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: thin
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.2.8
-  type: :development
-  version_requirements: *id009
+  - !ruby/object:Gem::Dependency 
+    name: rack
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.0.0
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: url_mount
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.2.1
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: minitest
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 2.0.0
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: code_stats
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.8.7
+    type: :development
+    version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: rbench
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id006
+  - !ruby/object:Gem::Dependency 
+    name: phocus
+    prerelease: false
+    requirement: &id007 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id007
+  - !ruby/object:Gem::Dependency 
+    name: bundler
+    prerelease: false
+    requirement: &id008 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.0.0
+    type: :development
+    version_requirements: *id008
+  - !ruby/object:Gem::Dependency 
+    name: thin
+    prerelease: false
+    requirement: &id009 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 1.2.8
+    type: :development
+    version_requirements: *id009
 description: This library allows you to recognize and build URLs in a Rack application.
 email: joshbuddy@gmail.com
 executables: []
@@ -119,94 +119,94 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.md
-- LICENSE
+  - README.md
+  - LICENSE
 files: 
-- .gitignore
-- .rspec
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
-- benchmarks/gen2.rb
-- benchmarks/generation_bm.rb
-- benchmarks/rack_mount.rb
-- benchmarks/rack_recognition_bm.rb
-- benchmarks/rec2.rb
-- benchmarks/recognition_bm.rb
-- examples/glob.ru
-- examples/rack_mapper.ru
-- examples/simple.ru
-- examples/static/config.ru
-- examples/static/favicon.ico
-- examples/static/images/cat1.jpg
-- examples/static/images/cat2.jpg
-- examples/static/images/cat3.jpg
-- examples/variable.ru
-- examples/variable_with_regex.ru
-- http_router.gemspec
-- lib/http_router.rb
-- lib/http_router/node.rb
-- lib/http_router/node/arbitrary.rb
-- lib/http_router/node/destination.rb
-- lib/http_router/node/free_regex.rb
-- lib/http_router/node/glob.rb
-- lib/http_router/node/glob_regex.rb
-- lib/http_router/node/lookup.rb
-- lib/http_router/node/regex.rb
-- lib/http_router/node/request.rb
-- lib/http_router/node/root.rb
-- lib/http_router/node/spanning_regex.rb
-- lib/http_router/node/variable.rb
-- lib/http_router/optional_compiler.rb
-- lib/http_router/path.rb
-- lib/http_router/rack.rb
-- lib/http_router/rack/builder.rb
-- lib/http_router/rack/url_map.rb
-- lib/http_router/regex_route.rb
-- lib/http_router/request.rb
-- lib/http_router/response.rb
-- lib/http_router/route.rb
-- lib/http_router/version.rb
-- test/helper.rb
-- test/rack/test_dispatch.rb
-- test/rack/test_route.rb
-- test/rack/test_urlmap.rb
-- test/test_arbitrary.rb
-- test/test_generate.rb
-- test/test_greedy.rb
-- test/test_interstitial.rb
-- test/test_misc.rb
-- test/test_mounting.rb
-- test/test_recognize.rb
-- test/test_request.rb
-- test/test_trailing_slash.rb
-- test/test_variable.rb
+  - .gitignore
+  - .rspec
+  - Gemfile
+  - LICENSE
+  - README.md
+  - Rakefile
+  - benchmarks/gen2.rb
+  - benchmarks/generation_bm.rb
+  - benchmarks/rack_mount.rb
+  - benchmarks/rack_recognition_bm.rb
+  - benchmarks/rec2.rb
+  - benchmarks/recognition_bm.rb
+  - examples/glob.ru
+  - examples/rack_mapper.ru
+  - examples/simple.ru
+  - examples/static/config.ru
+  - examples/static/favicon.ico
+  - examples/static/images/cat1.jpg
+  - examples/static/images/cat2.jpg
+  - examples/static/images/cat3.jpg
+  - examples/variable.ru
+  - examples/variable_with_regex.ru
+  - http_router.gemspec
+  - lib/http_router.rb
+  - lib/http_router/node.rb
+  - lib/http_router/node/arbitrary.rb
+  - lib/http_router/node/destination.rb
+  - lib/http_router/node/free_regex.rb
+  - lib/http_router/node/glob.rb
+  - lib/http_router/node/glob_regex.rb
+  - lib/http_router/node/lookup.rb
+  - lib/http_router/node/regex.rb
+  - lib/http_router/node/request.rb
+  - lib/http_router/node/root.rb
+  - lib/http_router/node/spanning_regex.rb
+  - lib/http_router/node/variable.rb
+  - lib/http_router/optional_compiler.rb
+  - lib/http_router/path.rb
+  - lib/http_router/rack.rb
+  - lib/http_router/rack/builder.rb
+  - lib/http_router/rack/url_map.rb
+  - lib/http_router/regex_route.rb
+  - lib/http_router/request.rb
+  - lib/http_router/response.rb
+  - lib/http_router/route.rb
+  - lib/http_router/version.rb
+  - test/helper.rb
+  - test/rack/test_dispatch.rb
+  - test/rack/test_route.rb
+  - test/rack/test_urlmap.rb
+  - test/test_arbitrary.rb
+  - test/test_generate.rb
+  - test/test_greedy.rb
+  - test/test_interstitial.rb
+  - test/test_misc.rb
+  - test/test_mounting.rb
+  - test/test_recognize.rb
+  - test/test_request.rb
+  - test/test_trailing_slash.rb
+  - test/test_variable.rb
 has_rdoc: true
 homepage: http://github.com/joshbuddy/http_router
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: http_router
-rubygems_version: 1.6.2
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: A kick-ass HTTP router for use in Rack