http_router 0.1.2 → 0.1.3

data/.gitignore

@@ -1,2 +1 @@
-benchmarks
 pkg

data/README.rdoc

@@ -20,6 +20,8 @@ This is very new code. Lots of stuff probably doesn't work right. I will likely
 
 == Usage
 
+Please see the examples directory for a bunch of awesome rackup file examples, with tonnes of commentary.
+
 === <tt>HttpRouter.new</tt>
 
 Takes the following options:

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/benchmarks/gen2.rb

@@ -0,0 +1,57 @@
+require 'rubygems'
+require 'rbench'
+#require 'lib/usher'
+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
+
+TIMES = 50_000
+
+RBench.run(TIMES) do
+
+  group "named" do
+    report "simple" do
+      u.url(:simple)
+    end
+
+    report "one variable (through array)" do
+      u.url(:one_variable, 'variable')
+    end
+
+    report "one variable (through hash)" do
+      u.url(:one_variable, :variable => 'variable')
+    end
+
+    report "three variable (through array)" do
+      u.url(:three_variables, 'var1', 'var2', 'var3')
+    end
+
+    report "three variable (through hash)" do
+      u.url(:three_variables, :var1 => 'var1', :var2 => 'var2', :var3 => 'var3')
+    end
+
+    report "eight variable (through array)" do
+      u.url(:eight_variables, 'var1', 'var2', 'var3', 'var4', 'var5', 'var6', 'var7', 'var8')
+    end
+
+    report "eight variable (through hash)" do
+      u.url(:eight_variables, :v1 => 'var1', :v2 => 'var2', :v3 => 'var3', :v4 => 'var4', :v5 => 'var5', :v6 => 'var6', :v7 => 'var7', :v8 => 'var8')
+    end
+
+    report "three variable + three extras" do
+      u.url(:three_variables, :var1 => 'var1', :var2 => 'var2', :var3 => 'var3', :var4 => 'var4', :var5 => 'var5', :var6 => 'var6')
+    end
+
+    report "three variable + five extras" do
+      u.url(:three_variables, :var1 => 'var1', :var2 => 'var2', :var3 => 'var3', :var4 => 'var4', :var5 => 'var5', :var6 => 'var6', :var7 => 'var7', :var8 => 'var8')
+    end
+  end
+
+end
+
+puts `ps -o rss= -p #{Process.pid}`.to_i

data/benchmarks/generation_bm.rb

@@ -0,0 +1,73 @@
+require 'rubygems'
+require 'rbench'
+#require 'lib/usher'
+require 'usher'
+
+u = Usher.new(:generator => Usher::Util::Generators::URL.new)
+u.add_route('/simple')                                                                                     .name(:simple)
+u.add_route('/simple/:variable')                                                                           .name(:one_variable)
+u.add_route('/simple/:var1/:var2/:var3')                                                                   .name(:three_variables)
+u.add_route('/simple/:v1/:v2/:v3/:v4/:v5/:v6/:v7/:v8')                                                     .name(:eight_variables)
+u.add_route('/with_condition/:cond1/:cond2', :requirements => {:cond1 => /^\d+$/, :cond2 => /^[a-z]+$/})   .name(:two_conditions)
+u.add_route('/with_condition/{:cond1,^\d+$}/{:cond2,^[a-z]+$}')                                            .name(:two_implicit_conditions)
+#u.add_route('/blog/:page', :default_values => {:page => 1})                                                .name(:default_value)
+#u.add_route('/blog', :default_values => {:page => 1})                                                      .name(:default_value_not_as_variable)
+#
+TIMES = 50_000
+
+RBench.run(TIMES) do
+
+  group "named" do
+    report "simple" do
+      u.generator.generate(:simple)
+    end
+
+    report "one variable (through array)" do
+      u.generator.generate(:one_variable, 'variable')
+    end
+
+    report "one variable (through hash)" do
+      u.generator.generate(:one_variable, :variable => 'variable')
+    end
+
+    report "three variable (through array)" do
+      u.generator.generate(:three_variables, ['var1', 'var2', 'var3'])
+    end
+
+    report "three variable (through hash)" do
+      u.generator.generate(:three_variables, :var1 => 'var1', :var2 => 'var2', :var3 => 'var3')
+    end
+
+    report "eight variable (through array)" do
+      u.generator.generate(:eight_variables, ['var1', 'var2', 'var3', 'var4', 'var5', 'var6', 'var7', 'var8'])
+    end
+
+    report "eight variable (through hash)" do
+      u.generator.generate(:eight_variables, :v1 => 'var1', :v2 => 'var2', :v3 => 'var3', :v4 => 'var4', :v5 => 'var5', :v6 => 'var6', :v7 => 'var7', :v8 => 'var8')
+    end
+
+    report "three variable + three extras" do
+      u.generator.generate(:three_variables, :var1 => 'var1', :var2 => 'var2', :var3 => 'var3', :var4 => 'var4', :var5 => 'var5', :var6 => 'var6')
+    end
+
+    report "three variable + five extras" do
+      u.generator.generate(:three_variables, :var1 => 'var1', :var2 => 'var2', :var3 => 'var3', :var4 => 'var4', :var5 => 'var5', :var6 => 'var6', :var7 => 'var7', :var8 => 'var8')
+    end
+
+  end
+
+  #group "defaults" do
+  #  report "default variable" do
+  #    u.generator.generate(:default_value)
+  #  end
+  #
+  #  report "default variable not represented in path" do
+  #    u.generator.generate(:default_value_not_as_variable)
+  #  end
+  #
+  #
+  #end
+
+
+end
+puts `ps -o rss= -p #{Process.pid}`.to_i

data/benchmarks/rack_mount.rb

@@ -0,0 +1,76 @@
+require 'rubygems'
+require 'rbench'
+require 'rack'
+require 'rack/mount'
+require '../usher/lib/usher'
+require 'lib/http_router'
+
+set = Rack::Mount::RouteSet.new do |set|
+  set.add_route(proc{|env| [200, {'Content-type'=>'text/html'}, []]}, {:path => '/simple'}, {}, :simple)
+  set.add_route(proc{|env| [200, {'Content-type'=>'text/html'}, []]}, {:path => '/simple/again'}, {}, :again)
+  set.add_route(proc{|env| [200, {'Content-type'=>'text/html'}, []]}, {:path => '/dynamic/:variable'}, {}, :variable)
+end
+
+u = Usher::Interface.for(:rack)
+u.add('/simple').to(proc{|env| [200, {'Content-type'=>'text/html'}, []]})
+u.add('/simple/again').to(proc{|env| [200, {'Content-type'=>'text/html'}, []]})
+u.add('/dynamic/anything').to(proc{|env| [200, {'Content-type'=>'text/html'}, []]})
+
+hr = HttpRouter.new
+hr.add('/simple').to(proc{|env| [200, {'Content-type'=>'text/html'}, []]})
+hr.add('/simple/again').to(proc{|env| [200, {'Content-type'=>'text/html'}, []]})
+hr.add('/dynamic/anything').to(proc{|env| [200, {'Content-type'=>'text/html'}, []]})
+
+TIMES = 50_000
+
+simple_env = Rack::MockRequest.env_for('/simple')
+simple2_env = Rack::MockRequest.env_for('/simple/again')
+simple_and_dynamic_env = Rack::MockRequest.env_for('/dynamic/anything')
+
+RBench.run(TIMES) do
+
+  report "2 levels, static" do
+    set.url(simple_env, :simple)
+  end
+
+  report "4 levels, static" do
+    set.url(simple_env, :again)
+  end
+
+  report "4 levels, 1 dynamic" do
+    set.url(simple_env, :variable, {:variable => 'onemore'})
+  end
+  
+end
+
+RBench.run(TIMES) do
+
+  report "2 levels, static" do
+    set.url(simple_env, :simple)
+  end
+
+  report "4 levels, static" do
+    set.url(simple_env, :again)
+  end
+
+  report "4 levels, 1 dynamic" do
+    set.url(simple_env, :variable, {:variable => 'onemore'})
+  end
+  
+end
+
+RBench.run(TIMES) do
+
+  report "2 levels, static" do
+    set.url(simple_env, :simple)
+  end
+
+  report "4 levels, static" do
+    set.url(simple_env, :again)
+  end
+
+  report "4 levels, 1 dynamic" do
+    set.url(simple_env, :variable, {:variable => 'onemore'})
+  end
+  
+end

data/benchmarks/rack_recognition_bm.rb

@@ -0,0 +1,50 @@
+require 'rubygems'
+require 'rbench'
+require '../usher/lib/usher'
+
+u = Usher::Interface.for(:rack)
+u.add('/simple').to(proc{|env| [200, {'Content-type'=>'text/html'}, []]})
+u.add('/simple/again').to(proc{|env| [200, {'Content-type'=>'text/html'}, []]})
+u.add('/simple/again/and/again').to(proc{|env| [200, {'Content-type'=>'text/html'}, []]})
+u.add('/dynamic/:variable').to(proc{|env| [200, {'Content-type'=>'text/html'}, []]})
+u.add('/rails/:controller/:action/:id').to(proc{|env| [200, {'Content-type'=>'text/html'}, []]})
+u.add('/greedy/{!greed,.*}').to(proc{|env| [200, {'Content-type'=>'text/html'}, []]})
+
+TIMES = 50_000
+
+simple_env = Rack::MockRequest.env_for('/simple')
+simple2_env = Rack::MockRequest.env_for('/simple/again')
+simple3_env = Rack::MockRequest.env_for('/simple/again/and/again')
+simple_and_dynamic_env = Rack::MockRequest.env_for('/dynamic/anything')
+simple_and_dynamic_env1 = Rack::MockRequest.env_for('/rails/controller/action/id')
+simple_and_dynamic_env2 = Rack::MockRequest.env_for('/greedy/controller/action/id')
+
+RBench.run(TIMES) do
+
+  report "2 levels, static" do
+    u.call(simple_env).first == 200 or raise
+  end
+
+  report "4 levels, static" do
+    u.call(simple2_env).first == 200 or raise
+  end
+  
+  report "8 levels, static" do
+    u.call(simple3_env).first == 200 or raise
+  end
+  
+  report "4 levels, 1 dynamic" do
+    u.call(simple_and_dynamic_env).first == 200 or raise
+  end
+  
+  report "8 levels, 3 dynamic" do
+    u.call(simple_and_dynamic_env1).first == 200 or raise
+  end
+  
+  report "4 levels, 1 greedy" do
+    u.call(simple_and_dynamic_env2).first == 200 or raise
+  end
+
+end
+
+puts `ps -o rss= -p #{Process.pid}`.to_i

data/benchmarks/rec2.rb

@@ -0,0 +1,62 @@
+require 'rubygems'
+require 'rbench'
+require 'lib/http_router'
+
+u = HttpRouter.new
+u.add('/simple').to {|env| [200, {'Content-type'=>'text/html'}, []]}
+u.add('/simple/again').compile.to {|env| [200, {'Content-type'=>'text/html'}, []]}
+u.add('/simple/again/and/again').compile.to {|env| [200, {'Content-type'=>'text/html'}, []]}
+u.add('/dynamic/:variable').compile.to {|env| [200, {'Content-type'=>'text/html'}, []]}
+u.add('/rails/:controller/:action/:id').compile.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'}, []]}
+
+#puts Benchmark.measure {
+#  ('aa'..'nn').each do |first|
+#    ('a'..'n').each do |second|
+#      u.add("/#{first}/#{second}").compile
+#    end
+#  end
+#
+#  puts "u.routes.size: #{u.routes.size}"
+#}
+#
+TIMES = 50_000
+
+simple_env = Rack::MockRequest.env_for('/simple')
+simple2_env = Rack::MockRequest.env_for('/simple/again')
+simple3_env = Rack::MockRequest.env_for('/simple/again/and/again')
+simple_and_dynamic_env = Rack::MockRequest.env_for('/dynamic/anything')
+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')
+
+RBench.run(TIMES) do
+
+  report "2 levels, static" do
+    u.call(simple_env).first == 200 or raise
+  end
+
+  report "4 levels, static" do
+    u.call(simple2_env).first == 200 or raise
+  end
+
+  report "8 levels, static" do
+    u.call(simple3_env).first == 200 or raise
+  end
+
+  report "4 levels, 1 dynamic" do
+    u.call(simple_and_dynamic_env).first == 200 or raise
+  end
+
+  report "8 levels, 3 dynamic" do
+    u.call(simple_and_dynamic_env1).first == 200 or raise
+  end
+
+  report "4 levels, 1 greedy" do
+    u.call(simple_and_dynamic_env2).first == 200 or raise
+  end
+
+end
+
+puts `ps -o rss= -p #{Process.pid}`.to_i

data/benchmarks/recognition_bm.rb

@@ -0,0 +1,41 @@
+require 'rubygems'
+require 'rbench'
+require 'usher'
+
+u = Usher.new(:generator => Usher::Util::Generators::URL.new)
+u.add_route('/simple')
+u.add_route('/simple/again')
+u.add_route('/simple/again/and/again')
+u.add_route('/dynamic/:variable')
+u.add_route('/rails/:controller/:action/:id')
+u.add_route('/greedy/{!greed,.*}')
+
+TIMES = 50_000
+
+RBench.run(TIMES) do
+
+  report "2 levels, static" do
+    u.recognize_path('/simple')
+  end
+
+  report "4 levels, static" do
+    u.recognize_path('/simple/again')
+  end
+
+  report "8 levels, static" do
+    u.recognize_path('/simple/again/and/again')
+  end
+
+  report "4 levels, 1 dynamic" do
+    u.recognize_path('/dynamic/anything')
+  end
+
+  report "8 levels, 3 dynamic" do
+    u.recognize_path('/rails/controller/action/id')
+  end
+
+  report "4 levels, 1 greedy" do
+    u.recognize_path('/greedy/controller/action/id')
+  end
+
+end

data/examples/glob.ru

@@ -0,0 +1,11 @@
+require 'http_router'
+
+run HttpRouter.new {
+  get('/*glob').to { |env| [200, {'Content-type' => 'text/plain'}, ["My glob is\n#{env['router.params'][:glob].map{|v| " * #{v}\n"}.join}"]]}
+}
+
+# crapbook-pro:~ joshua$ curl http://127.0.0.1:3000/123/345/123
+# My glob is
+#  * 123
+#  * 345
+#  * 123

data/examples/simple.ru

@@ -0,0 +1,8 @@
+require 'http_router'
+
+run HttpRouter.new {
+  get('/hi').to { |env| [200, {'Content-type' => 'text/plain'}, ["hi!\n"]]}
+}
+
+# crapbook-pro:~ joshua$ curl http://127.0.0.1:3000/hi
+# hi!

data/examples/simple_with_mapper.ru

@@ -0,0 +1,15 @@
+require 'http_router'
+HttpRouter.override_rack_mapper!
+
+map('/get/:id') { |env|
+  [200, {'Content-type' => 'text/plain'}, ["My id is #{env['router.params'][:id]}\n"]]
+}
+
+post('/get/:id') { |env|
+  [200, {'Content-type' => 'text/plain'}, ["My id is #{env['router.params'][:id]} and you posted!\n"]]
+}
+
+# crapbook-pro:~ joshua$ curl http://127.0.0.1:3000/get/123
+# My id is 123
+# crapbook-pro:~ joshua$ curl -X POST http://127.0.0.1:3000/get/123
+# My id is 123 and you posted!

data/examples/variable.ru

@@ -0,0 +1,9 @@
+require 'http_router'
+
+run HttpRouter.new {
+  get('/:variable').to { |env| [200, {'Content-type' => 'text/plain'}, ["my variables are\n#{env['router.params'].inspect}\n"]]}
+}
+
+# crapbook-pro:~ joshua$ curl http://127.0.0.1:3000/heyguys
+# my variables are
+# {:variable=>"heyguys"}

data/examples/variable_with_regex.ru

@@ -0,0 +1,10 @@
+require 'http_router'
+
+run HttpRouter.new {
+  get('/get/:id').matching(:id => /\d+/).to { |env| [200, {'Content-type' => 'text/plain'}, ["id is #{Integer(env['router.params'][:id]) * 2} * 2\n"]]}
+}
+
+# crapbook-pro:~ joshua$ curl http://127.0.0.1:3000/get/123
+# id is 246 * 2
+# crapbook-pro:~ joshua$ curl http://127.0.0.1:3000/get/asd
+# Not Found

data/lib/ext/rack/rack_mapper.rb

@@ -2,17 +2,20 @@
 # As well, add convenience methods for the request methods.
 class Rack::Builder
   def initialize(&block)
-    @router = HttpRouter.new
     super
   end
   
+  def router
+    @router ||= HttpRouter.new
+  end
+
   # Maps a path to a block.
   # @param path [String] Path to map to.
   # @param options [Hash] Options for added path.
   # @see HttpRouter#add
   def map(path, options = nil, &block)
-    @router.add(path).with_options(options).to(&block)
-    @ins << @router unless @ins.last == @router
+    router.add(path).with_options(options).to(&block)
+    @ins << router unless @ins.last == router
   end
 
   # Maps a path with request methods `HEAD` and `GET` to a block.
@@ -20,7 +23,7 @@ class Rack::Builder
   # @param options [Hash] Options for added path.
   # @see HttpRouter#add
   def get(path, options = nil, &block)
-    @router.get(path).with_options(options).to(&block)
+    router.get(path).with_options(options).to(&block)
   end
 
   # Maps a path with request methods `POST` to a block.
@@ -28,7 +31,7 @@ class Rack::Builder
   # @param options [Hash] Options for added path.
   # @see HttpRouter#add
   def post(path, options = nil, &block)
-    @router.post(path).with_options(options).to(&block)
+    router.post(path).with_options(options).to(&block)
   end
 
   # Maps a path with request methods `PUT` to a block.
@@ -36,7 +39,7 @@ class Rack::Builder
   # @param options [Hash] Options for added path.
   # @see HttpRouter#add
   def put(path, options = nil, &block)
-    @router.put(path).with_options(options).to(&block)
+    router.put(path).with_options(options).to(&block)
   end
 
   # Maps a path with request methods `DELETE` to a block.
@@ -44,7 +47,7 @@ class Rack::Builder
   # @param options [Hash] Options for added path.
   # @see HttpRouter#add
   def delete(path, options = nil, &block)
-    @router.delete(path).with_options(options).to(&block)
+    router.delete(path).with_options(options).to(&block)
   end
 
   # Maps a path with request methods `HEAD` to a block.
@@ -52,6 +55,6 @@ class Rack::Builder
   # @param options [Hash] Options for added path.
   # @see HttpRouter#add
   def head(path, options = nil, &block)
-    @router.head(path).with_options(options).to(&block)
+    router.head(path).with_options(options).to(&block)
   end
 end

data/lib/http_router/node.rb

@@ -17,19 +17,14 @@ class HttpRouter
     def add(val)
       if val.is_a?(Variable)
         if val.matches_with
-          new_node = router.node
-          create_linear
-          @linear << [val, new_node]
-          new_node
+          add_to_linear(val)
         else
           @catchall ||= router.node
           @catchall.variable = val
           @catchall
         end
       elsif val.is_a?(Regexp)
-        create_linear
-        @linear << [val, router.node]
-        @linear.last.last
+        add_to_linear(val)
       else
         create_lookup
         @lookup[val] ||= router.node
@@ -49,7 +44,18 @@ class HttpRouter
         [self]
       end
     end
-    
+ 
+    def add_to_linear(val)
+      create_linear
+      if @linear.assoc(val)
+        @linear.assoc(val).last
+      else
+        new_node = router.node
+        @linear << [val, new_node]
+        new_node
+      end
+    end
+   
     def add_arbitrary(procs)
       target = self
       if procs && !procs.empty?

data/lib/http_router.rb

@@ -21,6 +21,10 @@ class HttpRouter
 
   attr_reader :named_routes, :routes, :root
 
+  def self.override_rack_mapper!
+    require File.join('ext', 'rack', 'rack_mapper')
+  end
+
   def initialize(options = nil, &block)
     @default_app = options && options[:default_app] || proc{|env| ::Rack::Response.new("Not Found", 404).finish }
     @ignore_trailing_slash   = options && options.key?(:ignore_trailing_slash) ? options[:ignore_trailing_slash] : true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Joshua Hull
@@ -47,6 +47,17 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- 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/simple.ru
+- examples/simple_with_mapper.ru
+- examples/variable.ru
+- examples/variable_with_regex.ru
 - http_router.gemspec
 - lib/ext/rack/rack_mapper.rb
 - lib/ext/rack/uri_escape.rb