http_router 0.8.6 → 0.8.7

data/README.md

@@ -25,7 +25,6 @@ Takes the following options:
 
 * `:default_app` - The default #call made on non-matches. Defaults to a 404 generator.
 * `:ignore_trailing_slash` - Ignores the trailing slash when matching. Defaults to true.
-* `:redirect_trailing_slash` - Redirect on trailing slash matches to non-trailing slash paths. Defaults to false.
 * `:middleware` - Perform matching without deferring to matched route. Defaults to false.
 
 ### `#add(name, options)`

data/benchmarks/rec2.rb

@@ -7,6 +7,18 @@ require 'http_router'
 #require 'http_router'
 
 u = HttpRouter.new
+
+#puts Benchmark.measure {
+#  ('aa'..'nn').each do |first|
+#    ('a'..'n').each do |second|
+#      u.add("/#{first}/#{second}").to {|env| [200, {'Content-type'=>'text/html'}, []]}
+#    end
+#  end
+#  puts "u.routes.size: #{u.routes.size}"
+#}
+
+u.add('/').to {|env| [200, {'Content-type'=>'text/html'}, []]}
+
 u.add('/simple').to {|env| [200, {'Content-type'=>'text/html'}, []]}
 u.add('/simple/again').to {|env| [200, {'Content-type'=>'text/html'}, []]}
 #u.add('/simple/again/and/again').compile.to {|env| [200, {'Content-type'=>'text/html'}, []]}
@@ -15,17 +27,6 @@ u.add('/dynamic/:variable').to {|env| [200, {'Content-type'=>'text/html'}, []]}
 #u.add('/greedy/:greed').matching(:greed => /.*/).compile.to {|env| [200, {'Content-type'=>'text/html'}, []]}
 #u.add('/greedy/hey.:greed.html').to {|env| [200, {'Content-type'=>'text/html'}, []]}
 
-u.compile rescue nil
-
-puts Benchmark.measure {
-  ('aa'..'nn').each do |first|
-    ('a'..'n').each do |second|
-      u.add("/#{first}/#{second}").to {|env| [200, {'Content-type'=>'text/html'}, []]}
-    end
-  end
-#
-  puts "u.routes.size: #{u.routes.size}"
-}
 #
 TIMES = 50_000
 
@@ -40,11 +41,15 @@ u.call(Rack::MockRequest.env_for('/simple')).first == 200 or raise
 5.times {
   RBench.run(TIMES) do
 
+    report "1 levels, static" do
+      u.call(Rack::MockRequest.env_for('/')).first == 200 or raise
+    end
+
     report "2 levels, static" do
       u.call(Rack::MockRequest.env_for('/simple')).first == 200 or raise
     end
 
-    report "4 levels, static" do
+    report "3 levels, static" do
       u.call(Rack::MockRequest.env_for('/simple/again')).first == 200 or raise
     end
 
@@ -52,7 +57,7 @@ u.call(Rack::MockRequest.env_for('/simple')).first == 200 or raise
     #  u.call(simple3_env).first == 200 or raise
     #end
 
-    report "4 levels, 1 dynamic" do
+    report "1 static, 1 dynamic" do
       u.call(Rack::MockRequest.env_for('/dynamic/anything')).first == 200 or raise
     end
 

data/lib/http_router.rb

@@ -10,16 +10,13 @@ require 'http_router/route'
 require 'http_router/path'
 require 'http_router/rack'
 require 'http_router/regex_route'
-require 'http_router/optional_compiler'
 
 class HttpRouter
 
   attr_reader :root, :routes, :known_methods, :named_routes, :nodes
   attr_accessor :default_app, :url_mount
 
-  # Raised when a Route is not able to be generated.
-  UngeneratableRouteException = Class.new(RuntimeError)
-  # Raised when a Route is generated that isn't valid.
+  # Raised when a url is not able to be generated for the given parameters
   InvalidRouteException       = Class.new(RuntimeError)
   # Raised when a Route is not able to be generated due to a missing parameter.
   MissingParameterException   = Class.new(RuntimeError)
@@ -109,22 +106,16 @@ class HttpRouter
   # be available under the key <tt>router.params</tt>.
   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
+    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)
     else
-      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)
-      else
-        nil
-      end
+      nil
     end
   end
 
@@ -155,9 +146,9 @@ class HttpRouter
   #   # ==> "/123.html?fun=inthesun"
   def url(route, *args)
     case route
-    when Symbol then @named_routes.key?(route) ? @named_routes[route].url(*args) : raise(UngeneratableRouteException)
+    when Symbol then @named_routes.key?(route) ? @named_routes[route].url(*args) : raise(InvalidRouteException)
     when Route  then route.url(*args)
-    else raise UngeneratableRouteException
+    else raise InvalidRouteException
     end
   end
 

data/lib/http_router/node/destination.rb

@@ -18,6 +18,12 @@ class HttpRouter
         inject_root_ivar(path_ivar, blk)
         "#{"if request.path_finished?" unless @allow_partial}
           catch(:pass) do
+            #{"if request.path.size == 1 && request.path.first == '' && (request.rack_request.head? || request.rack_request.get?) && request.rack_request.path_info[-1] == ?/
+              response = ::Rack::Response.new
+              response.redirect(request.rack_request.path_info[0, request.rack_request.path_info.size - 1], 302)
+              throw :success, response.finish
+            end" if @router.redirect_trailing_slash?}
+
             #{"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

data/lib/http_router/node/lookup.rb

@@ -17,15 +17,16 @@ class HttpRouter
       def to_code
         lookup_ivar = :"@lookup_#{router.next_counter}"
         inject_root_ivar(lookup_ivar, @map)
+        method_prefix = "lookup_#{router.next_counter} "
         inject_root_methods @map.keys.map {|k| 
-          method = :"lookup_#{object_id} #{k}"
+          method = :"#{method_prefix}#{k}"
           "define_method(#{method.inspect}) do |request|
             part = request.path.shift
             #{@map[k].map{|n| n.to_code} * "\n"}
             request.path.unshift part
           end"}.join("\n")
         code = "
-        send(\"lookup_#{object_id} \#{request.path.first}\", request) if !request.path_finished? && #{lookup_ivar}.key?(request.path.first)
+        send(\"#{method_prefix}\#{request.path.first}\", request) if !request.path_finished? && #{lookup_ivar}.key?(request.path.first)
         "
       end
     end

data/lib/http_router/path.rb

@@ -27,11 +27,11 @@ class HttpRouter
           new_part
         }
         @path_validation_regex = Regexp.new("^#{@path_validation_regex}$")
-        instance_eval "
+        instance_eval <<-EOT, __FILE__, __LINE__ + 1
         def raw_url(args,options)
           \"#{code}\"
         end
-        ", __FILE__, __LINE__
+        EOT
       end
     end
 
@@ -52,7 +52,7 @@ class HttpRouter
 
     private
     def raw_url(args, options)
-      raise UngeneratableRouteException
+      raise InvalidRouteException
     end
   end
 end

data/lib/http_router/route.rb

@@ -1,4 +1,3 @@
-
 class HttpRouter
   class Route
     attr_reader :default_values, :matches_with, :router, :path, :conditions
@@ -6,7 +5,6 @@ class HttpRouter
     def initialize(router, path, opts = {})
       @router = router
       @original_path = path
-      @path = path
       @opts = opts
       @matches_with = {}
       @default_values = opts[:default_values] || {}
@@ -14,7 +12,6 @@ class HttpRouter
         @match_partially = true
         path.slice!(-1)
       end
-      @paths = OptionalCompiler.new(path).paths
       process_opts
     end
 
@@ -149,14 +146,14 @@ class HttpRouter
       else
         matching_path(args, options)
       end
-      raise UngeneratableRouteException unless path
+      raise InvalidRouteException unless path
       result, params = path.url(args, options)
       mount_point = router.url_mount && router.url_mount.url(options)
       mount_point ? [File.join(mount_point, result), params] : [result, params]
     end
 
     def significant_variable_names
-      @significant_variable_names ||= @path.scan(/(^|[^\\])[:\*]([a-zA-Z0-9_]+)/).map{|p| p.last.to_sym}
+      @significant_variable_names ||= @original_path.scan(/(^|[^\\])[:\*]([a-zA-Z0-9_]+)/).map{|p| p.last.to_sym}
     end
 
     def matching_path(params, other_hash = nil)
@@ -192,7 +189,25 @@ class HttpRouter
 
     def compile
       return if @compiled
-      @paths.map! do |path|
+      start_index, end_index = 0, 1
+      raw_paths, chars = [""], @original_path.split('')
+      until chars.empty?
+      case fc = chars.first[0]
+        when ?(
+          chars.shift
+          (start_index...end_index).each { |path_index| raw_paths << raw_paths[path_index].dup }
+          start_index = end_index
+          end_index = raw_paths.size
+        when ?)
+          chars.shift
+          start_index -= end_index - start_index
+        else
+          c = if chars[0][0] == ?\\ && (chars[1][0] == ?( || chars[1][0] == ?)); chars.shift; chars.shift; else; chars.shift; end
+          (start_index...end_index).each { |path_index| raw_paths[path_index] << c } 
+        end
+      end
+      raw_paths.reverse!
+      @paths = raw_paths.map do |path|
         param_names = []
         node = @router.root
         path.split(/\//).each do |part|

data/lib/http_router/version.rb

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

data/test/test_generate.rb

@@ -59,7 +59,7 @@ class TestGenerate < MiniTest::Unit::TestCase
     assert_generate '/var/fooz', "/:var1(/:var2)", 'var', 'fooz'
     assert_generate '/var',      "/:var1(/:var2)", :var1 => 'var'
     assert_generate '/var/fooz', "/:var1(/:var2)", :var1 => 'var', :var2 => 'fooz'
-    assert_raises(HttpRouter::UngeneratableRouteException) { router.url(router.add("/:var1(/:var2)").to(:test), :var2 => 'fooz') }
+    assert_raises(HttpRouter::InvalidRouteException) { router.url(router.add("/:var1(/:var2)").to(:test), :var2 => 'fooz') }
   end
 
   def test_optionals_with_format

data/test/test_misc.rb

@@ -26,4 +26,11 @@ class TestMisc < MiniTest::Unit::TestCase
     r.reset!
     assert !r.recognize(Rack::MockRequest.env_for('/hi'))
   end
+
+  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"]
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 8
-  - 6
-  version: 0.8.6
+  - 7
+  version: 0.8.7
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 -07:00
+date: 2011-06-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -202,7 +202,6 @@ files:
 - 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
@@ -213,9 +212,7 @@ files:
 - 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

data/lib/http_router/optional_compiler.rb

@@ -1,37 +0,0 @@
-class HttpRouter
-  class OptionalCompiler
-    attr_reader :paths
-    def initialize(path)
-      @start_index, @end_index = 0, 1
-      @paths, @chars = [""], path.split('')
-      until @chars.empty?
-      case @chars.first[0]
-        when ?( then @chars.shift and double_paths
-        when ?) then @chars.shift and half_paths
-        when ?\\
-          @chars[1] == ?( || @chars[1] == ?) ? @chars.shift : add_to_current_set(@chars.shift)
-          add_to_current_set(@chars.shift)
-        else
-          add_to_current_set(@chars.shift)
-        end
-      end
-      @paths.reverse!
-    end
-
-    private
-    def add_to_current_set(c)
-      (@start_index...@end_index).each { |path_index| @paths[path_index] << c }
-    end
-
-    # over current working set, double @paths
-    def double_paths 
-      (@start_index...@end_index).each { |path_index| @paths << @paths[path_index].dup }
-      @start_index = @end_index
-      @end_index = @paths.size
-    end
-
-    def half_paths
-      @start_index -= @end_index - @start_index
-    end
-  end
-end

data/test/rack/test_dispatch.rb

@@ -1,120 +0,0 @@
-#describe "HttpRouter route dispatching with redirect_on_trailing_delimiters" do
-#  before(:each) do
-#    @route_set = HttpRouter.new(:redirect_trailing_slash => true)
-#    @route_set.extend(CallWithMockRequestMixin)
-#    @app = MockApp.new("Hello World!")
-#    @route_set.add('/sample').to(@app)
-#  end
-#
-#  it "should dispatch a request" do
-#    response = @route_set.call_with_mock_request('/sample/')
-#    response.headers["Location"].should == "/sample"
-#  end
-#
-#end
-#
-#describe "HttpRouter route dispatching" do
-#  before(:each) do
-#    @route_set = HttpRouter.new(:redirect_trailing_slash => true)
-#    @route_set.extend(CallWithMockRequestMixin)
-#    @app = MockApp.new("Hello World!")
-#  end
-#
-#  describe "HTTP GET" do
-#    before(:each) do
-#      @route_set.reset!
-#      @route_set.add('/sample').request_method('GET').to(@app)
-#    end
-#
-#    it "should dispatch a request" do
-#      response = @route_set.call_with_mock_request
-#      response.body.should eql("Hello World!")
-#    end
-#
-#    it "should write router.params" do
-#      response = @route_set.call_with_mock_request
-#      @app.env["router.params"].should == {}
-#    end
-#
-#    it "should write router.params for default values" do
-#      @route_set.add("/foobar", :default_values => {:hi => :there}).compile
-#      response = @route_set.call_with_mock_request("/foobar")
-#      env = Rack::MockRequest.env_for("/foobar")
-#      @route_set.call(env)
-#      env['router.params'].should == {:hi => :there}
-#    end
-#  end
-#
-#  describe "HTTP POST" do
-#    before(:each) do
-#      @route_set.reset!
-#      @route_set.add('/sample').post.to(@app)
-#      @route_set.add('/sample').to(MockApp.new("You shouldn't get here if you are using POST"))
-#    end
-#
-#    it "should dispatch a POST request" do
-#      response = @route_set.call_with_mock_request('/sample', 'POST')
-#      response.body.should eql("Hello World!")
-#    end
-#
-#    it "shouldn't dispatch a GET request" do
-#      response = @route_set.call_with_mock_request('/sample', 'GET')
-#      response.body.should eql("You shouldn't get here if you are using POST")
-#    end
-#
-#    it "should write router.params" do
-#      response = @route_set.call_with_mock_request("/sample", 'POST')
-#      @app.env["router.params"].should == {}
-#    end
-#  end
-#
-#  it "should returns HTTP 405 if the method mis-matches" do
-#    @route_set.reset!
-#    @route_set.post('/sample').to(@app)
-#    @route_set.put('/sample').to(@app)
-#    response = @route_set.call_with_mock_request('/sample', 'GET')
-#    response.status.should eql(405)
-#    response['Allow'].should == 'POST, PUT'
-#  end
-#
-#  it "should returns HTTP 404 if route doesn't exist" do
-#    response = @route_set.call_with_mock_request("/not-existing-url")
-#    response.status.should eql(404)
-#  end
-#
-#  describe "shortcuts" do
-#    describe "get" do
-#      before(:each) do
-#        @route_set.reset!
-#        @route_set.get('/sample').head.to(@app)
-#      end
-#
-#      it "should dispatch a GET request" do
-#        response = @route_set.call_with_mock_request("/sample", "GET")
-#        response.body.should eql("Hello World!")
-#      end
-#
-#      it "should dispatch a HEAD request" do
-#        response = @route_set.call_with_mock_request("/sample", "HEAD")
-#        response.body.should eql("Hello World!")
-#      end
-#    end
-#  end
-#
-#  describe "non rack app destinations" do
-#    it "should route to a default application when using a hash" do
-#      $captures = []
-#      @default_app = lambda do |e|
-#        $captures << :default
-#        Rack::Response.new("Default").finish
-#      end
-#      @router = HttpRouter.new
-#      @router.default(@default_app)
-#      @router.add("/default").to(:action => "default")
-#      response = @router.call(Rack::MockRequest.env_for("/default"))
-#      $captures.should == [:default]
-#    end
-#  end
-#
-#end
-#

data/test/rack/test_urlmap.rb

@@ -1,12 +0,0 @@
-class TestRackUrlmap < MiniTest::Unit::TestCase
-
-  #def test_map_urls
-  #  HttpRouter::Rack.override_rack_urlmap!
-  #  map = Rack::URLMap.new(
-  #    "http://www.example.org/test" => proc {|env| [200, {}, ['test']]},
-  #    "http://www.example.org/:test" => proc {|env| [200, {}, ['variable']]}
-  #  )
-  #  assert_equal 'test',     map.call(Rack::MockRequest.env_for('http://www.example.org/test')).last.join
-  #  assert_equal 'variable', map.call(Rack::MockRequest.env_for('http://www.example.org/whhhaaa')).last.join
-  #end
-end