http_router 0.9.7 → 0.10.0

data/lib/http_router.rb

@@ -24,8 +24,6 @@ class HttpRouter
   DoubleCompileError          = Class.new(RuntimeError)
   # Raised an invalid request value is used
   InvalidRequestValueError    = Class.new(RuntimeError)
-  # Raised when there are extra parameters passed in to #url
-  TooManyParametersException  = Class.new(RuntimeError)
 
   # Creates a new HttpRouter.
   # Can be called with either <tt>HttpRouter.new(proc{|env| ... }, { .. options .. })</tt> or with the first argument omitted.
@@ -104,7 +102,8 @@ class HttpRouter
   # Returns the route object.
   def options(path, opts = {}, &app); add_with_request_method(path, :options, opts, &app); end
 
-  # Performs recoginition without actually calling the application.
+  # Performs recoginition without actually calling the application and returns an array of all
+  # matching routes or nil if no match was found.
   def recognize(env)
     call(env, false)
   end
@@ -116,14 +115,10 @@ class HttpRouter
     rack_request = ::Rack::Request.new(env)
     request = Request.new(rack_request.path_info, rack_request, perform_call)
     response = catch(:success) { @root[request] }
-    if response
-      response
-    elsif response.nil?
-      no_response(env, perform_call)
-    elsif perform_call
-      @default_app.call(env)
+    if perform_call
+      response or no_response(env)
     else
-      nil
+      request.matches.empty? ? nil : request.matches
     end
   end
 
@@ -207,25 +202,17 @@ class HttpRouter
     env['PATH_INFO'] = ''
   end
 
-  def no_response(env, perform_call = true)
+  def no_response(env)
     supported_methods = @known_methods.select do |m|
       next if m == env['REQUEST_METHOD']
       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] }
+      @root[test_request]
+      !test_request.matches.empty?
     end
-    supported_methods.empty? ? (perform_call ? @default_app.call(env) : nil) : [405, {'Allow' => supported_methods.sort.join(", ")}, []]
-  end
-
-  def to_s
-    "#<HttpRouter:0x#{object_id.to_s(16)} number of routes (#{routes.size}) ignore_trailing_slash? (#{ignore_trailing_slash?}) redirect_trailing_slash? (#{redirect_trailing_slash?}) known_methods (#{known_methods.to_a.join(', ')})>"
-  end
-
-  def inspect
-    head = to_s
-    "#{to_s}\n#{'=' * head.size}\n#{@root.inspect}"
+    supported_methods.empty? ? @default_app.call(env) : [405, {'Allow' => supported_methods.sort.join(", ")}, []]
   end
 
   private

data/lib/http_router/node.rb

@@ -64,27 +64,6 @@ class HttpRouter
       false
     end
 
-    def inspect
-      ins = "#{' ' * depth}#{inspect_label}"
-      body = inspect_matchers_body
-      unless body =~ /^\s*$/
-        ins << "\n" << body
-      end
-      ins
-    end
-
-    def inspect_label
-      "#{self.class.name.split("::").last} (#{@matchers.size} matchers)"
-    end
-
-    def inspect_matchers_body
-      @matchers.map{ |m| m.inspect}.join("\n")
-    end
-
-    def depth
-      @parent.send(:depth) + 1
-    end
-
     private
     def inject_root_methods(code = nil, &blk)
       code ? root.methods_module.module_eval(code) : root.methods_module.module_eval(&blk)

data/lib/http_router/node/lookup.rb

@@ -14,16 +14,6 @@ class HttpRouter
         other.class == self.class
       end
 
-      def inspect_matchers_body
-        @map.map { |key, values|
-          ins = "#{' ' * depth}when #{key.inspect}:\n"
-          ins << values.map{|v| v.inspect}.join("\n") }.join("\n")
-      end
-
-      def inspect_label
-        "#{self.class.name}"
-      end
-
       def to_code
         lookup_ivar = inject_root_ivar(@map)
         method_prefix = "lookup_#{root.next_counter} "

data/lib/http_router/node/path.rb

@@ -42,7 +42,7 @@ class HttpRouter
                 response = @router.process_destination_path(#{path_ivar}, env)
                 router.pass_on_response(response) ? throw(:pass) : throw(:success, response)
               else
-                throw :success, Response.new(request, #{path_ivar})
+                request.matched_route(Response.new(request, #{path_ivar}))
               end
             #{"end" unless route.match_partially?}
           end
@@ -53,10 +53,6 @@ class HttpRouter
         other == self
       end
 
-      def inspect_label
-        "Path: #{original_path.inspect} for route #{route.named || 'unnamed route'} to #{route.dest.inspect}"
-      end
-
       private
       def raw_url(args, options)
         raise InvalidRouteException

data/lib/http_router/node/request.rb

@@ -36,10 +36,6 @@ class HttpRouter
         code << "\n  #{super}\nend"
       end
 
-      def inspect_label
-        "#{self.class.name.split("::").last} #{opts.inspect} (#{@matchers.size} matchers)"
-      end
-
       private
       def to_code_condition(k, v)
         case v

data/lib/http_router/node/root.rb

@@ -28,14 +28,6 @@ class HttpRouter
         name
       end
 
-      def depth
-        0
-      end
-
-      def inspect_label
-        "Root (#{@matchers.size} matchers)"
-      end
-
       private
       def compile
         root.extend(root.methods_module)

data/lib/http_router/request.rb

@@ -1,6 +1,7 @@
 class HttpRouter
   class Request
     attr_accessor :path, :params, :rack_request, :extra_env, :continue, :passed_with
+    attr_reader :matches
     alias_method :rack, :rack_request
     def initialize(path, rack_request, perform_call)
       @rack_request, @perform_call = rack_request, perform_call
@@ -9,12 +10,17 @@ class HttpRouter
       @path.push('') if path[-1] == ?/
       @extra_env = {}
       @params = []
+      @matches = []
     end
 
     def joined_path
       @path * '/'
     end
 
+    def matched_route(response)
+      @matches << response
+    end
+
     def perform_call
       @perform_call == true
     end

data/lib/http_router/version.rb

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

data/test/test_misc.rb

@@ -30,8 +30,22 @@ class TestMisc < MiniTest::Unit::TestCase
   def test_redirect_trailing_slash
     r = HttpRouter.new(:redirect_trailing_slash => true) { add('/hi').to(:test) }
     response = r.recognize(Rack::MockRequest.env_for('/hi/'))
-    assert 304, response[0]
-    assert "/hi", response[1]["Location"]
+    assert_equal nil, response
+  end
+
+  def test_multi_recognize
+    r1, r2, r3, r4 = router {
+      add('/hi/there')
+      add('/:var/:var2')
+      add('/hi/:var2')
+      add('/:var1/there')
+    }
+    response = router.recognize(Rack::MockRequest.env_for('/hi/there'))
+    assert_equal [r1, r2, r3, r4], response.map{|resp| resp.path.route}
+    response = router.recognize(Rack::MockRequest.env_for('/hi/var'))
+    assert_equal [r2, r3], response.map{|resp| resp.path.route}
+    response = router.recognize(Rack::MockRequest.env_for('/you/there'))
+    assert_equal [r2, r4], response.map{|resp| resp.path.route}
   end
 
   def test_multi_name_gen
@@ -50,7 +64,7 @@ class TestMisc < MiniTest::Unit::TestCase
     assert_equal '/test/var', r.url(:route, "var")
   end
 
-  def test_too_many_params
+  def test_regex_generation
     r = HttpRouter.new
     r.add(%r|/test/.*|, :path_for_generation => '/test/:variable').name(:route).default_destination
     assert_equal '/test/var', r.url(:route, "var")
@@ -58,12 +72,6 @@ class TestMisc < MiniTest::Unit::TestCase
     assert_raises(HttpRouter::InvalidRouteException) { r.url(:route) }
   end
 
-  def test_too_many_args
-    r = HttpRouter.new
-    r.add('/').name(:route).default_destination
-    assert_raises(HttpRouter::TooManyParametersException) { r.url(:route, "hi") }
-  end
-
   def test_public_interface
     methods = HttpRouter.public_instance_methods.map(&:to_sym)
     assert methods.include?(:url_mount)
@@ -78,14 +86,4 @@ class TestMisc < MiniTest::Unit::TestCase
     assert methods.include?(:rewrite_partial_path_info)
     assert methods.include?(:rewrite_path_info)
   end
-
-  def test_to_s_and_inspect
-    router = HttpRouter.new
-    router.add('/').to(:test)
-    router.add('/test').to(:test2)
-    router.post('/test').to(:test3)
-    assert router.to_s.match(/^#<HttpRouter:0x[0-9a-f]+ number of routes \(3\) ignore_trailing_slash\? \(true\) redirect_trailing_slash\? \(false\) known_methods \(POST\)>$/)
-    assert router.inspect.match(/^#<HttpRouter:0x[0-9a-f]+ number of routes \(3\) ignore_trailing_slash\? \(true\) redirect_trailing_slash\? \(false\) known_methods \(POST\)>/)
-    assert router.inspect.match(/Path: "\/test" for route unnamed route to :test3/)
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 55
   prerelease: 
   segments: 
   - 0
-  - 9
-  - 7
-  version: 0.9.7
+  - 10
+  - 0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,13 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 -07:00
+date: 2011-08-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +31,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  requirement: *id001
+  name: rack
   type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: url_mount
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,12 +47,12 @@ dependencies:
         - 2
         - 1
         version: 0.2.1
+  requirement: *id002
+  name: url_mount
   type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,12 +63,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
+  requirement: *id003
+  name: minitest
   type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: code_stats
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,12 +77,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id004
+  name: code_stats
   type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,12 +93,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
+  requirement: *id005
+  name: rake
   type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rbench
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -108,12 +107,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id006
+  name: rbench
   type: :development
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -122,12 +121,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id007
+  name: json
   type: :development
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: phocus
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -136,12 +135,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id008
+  name: phocus
   type: :development
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -152,12 +151,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  requirement: *id009
+  name: bundler
   type: :development
-  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -168,8 +167,9 @@ dependencies:
         - 2
         - 8
         version: 1.2.8
+  requirement: *id010
+  name: thin
   type: :development
-  version_requirements: *id010
 description: This library allows you to recognize and build URLs in a Rack application.
 email: joshbuddy@gmail.com
 executables: []