http_router 0.3.0 → 0.3.1

data/.gitignore

@@ -2,3 +2,4 @@ pkg
 *.gem
 .bundle
 rdoc
+Gemfile.lock

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 0.3.1
+
+* Node transplant in request tree building not working in all cases. (Joshua Hull, f82ae82)
+* Smaller set of benchmarks to match rack-mount (Joshua Hull, ca723e9)
+* Better 405 test that is order invariant. (Thanks Cored!) (Joshua Hull, 4ad40e6)
+
 == 0.3.0
 
 * Unescape param values (Joshua Hull, d7a6a1f)

data/benchmarks/rec2.rb

@@ -5,31 +5,31 @@ 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('/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('/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 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}"
-#}
+  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')
+#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')
+#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
 
@@ -41,21 +41,21 @@ RBench.run(TIMES) 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 "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
+  #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
 

data/lib/http_router/node.rb

@@ -121,6 +121,7 @@ class HttpRouter
               next_node = current_node.dup
               current_node.reset!
               current_node.request_method = method
+              current_node.catchall ||= next_node
               redo
             end
           end

data/lib/http_router/version.rb

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

data/spec/recognize_spec.rb

@@ -124,7 +124,11 @@ describe "HttpRouter#recognize" do
       @router.recognize(Rack::MockRequest.env_for('/test', :method => 'GET')).destination.should == :get
       @router.recognize(Rack::MockRequest.env_for('/test', :method => 'DELETE')).destination.should == :delete
       @router.recognize(Rack::MockRequest.env_for('/test', :method => 'PUT')).status.should == 405
-      @router.recognize(Rack::MockRequest.env_for('/test', :method => 'PUT')).headers['Allow'].should == "DELETE, GET, POST"
+      methods = @router.recognize(Rack::MockRequest.env_for('/test', :method => 'PUT')).headers['Allow'].split(/,\s+/)
+      methods.should include('DELETE')
+      methods.should include('GET')
+      methods.should include('POST')
+      methods.size.should == 3
       @router.recognize(Rack::MockRequest.env_for('/test.html', :method => 'POST')).destination.should == :post
       @router.recognize(Rack::MockRequest.env_for('/test.html', :method => 'GET')).destination.should == :get
       @router.recognize(Rack::MockRequest.env_for('/test.html', :method => 'DELETE')).destination.should == :delete
@@ -153,6 +157,18 @@ describe "HttpRouter#recognize" do
       @router.recognize(Rack::MockRequest.env_for('/test', :method => 'PUT')).route.named.should == :test_catchall
     end
 
+    it "should try multiple request method restrictions in both orders" do
+      @router.add("/test").host('host2').to(:host2)
+      @router.add("/test").post.to(:post)
+      @router.add("/test").host('host2').get.to(:host2_get)
+      @router.add("/test").post.host('host2').to(:host2_post)
+
+      @router.recognize(Rack::MockRequest.env_for('http://host2/test', :method => 'PUT')).dest.should == :host2
+      @router.recognize(Rack::MockRequest.env_for('http://host1/test', :method => 'POST')).dest.should == :post
+      @router.recognize(Rack::MockRequest.env_for('http://host2/test', :method => 'GET')).dest.should == :host2_get
+      @router.recognize(Rack::MockRequest.env_for('http://host2/test', :method => 'POST')).dest.should == :host2_post
+    end
+
     it "should try both specific and non-specifc routes" do
       @router.post("/test").host('host1').to(:post_host1)
       @router.add("/test").host('host2').to(:any_post2)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-27 00:00:00 -04:00
+date: 2010-06-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,10 +31,10 @@ dependencies:
         - 0
         version: "1.0"
   requirement: *id001
-  name: rack
-  prerelease: false
   type: :runtime
+  name: rack
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,10 +47,10 @@ dependencies:
         - 1
         version: 0.2.1
   requirement: *id002
-  name: url_mount
-  prerelease: false
   type: :runtime
+  name: url_mount
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -60,10 +61,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id003
-  name: rspec
-  prerelease: false
   type: :development
+  name: rspec
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -74,10 +75,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
-  name: rake
-  prerelease: false
   type: :development
+  name: rake
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -88,10 +89,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id005
-  name: sinatra
-  prerelease: false
   type: :development
+  name: sinatra
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -102,10 +103,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id006
-  name: rbench
-  prerelease: false
   type: :development
+  name: rbench
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -118,9 +119,8 @@ dependencies:
         - 11
         version: 0.0.11
   requirement: *id007
-  name: tumbler
-  prerelease: false
   type: :development
+  name: tumbler
 description: A kick-ass HTTP router for use in Rack & Sinatra
 email: joshbuddy@gmail.com
 executables: []
@@ -133,7 +133,6 @@ files:
 - .gitignore
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
 - README.rdoc
 - Rakefile
 - Tumbler

data/Gemfile.lock

@@ -1,59 +0,0 @@
---- 
-dependencies: 
-  url_mount: 
-    group: 
-    - :default
-    version: ">= 0.2.1"
-  rake: 
-    group: 
-    - :development
-    version: ">= 0"
-  tumbler: 
-    group: 
-    - :development
-    version: ">= 0.0.11"
-  rspec: 
-    group: 
-    - :development
-    version: ">= 0"
-  rack: 
-    group: 
-    - :default
-    version: ">= 1.0"
-  sinatra: 
-    group: 
-    - :development
-    version: ">= 0"
-  rbench: 
-    group: 
-    - :development
-    version: ">= 0"
-specs: 
-- rake: 
-    version: 0.8.7
-- blockenspiel: 
-    version: 0.3.3
-- bundler: 
-    version: 0.9.26
-- callsite: 
-    version: 0.0.2
-- json: 
-    version: 1.4.3
-- rack: 
-    version: 1.2.1
-- rbench: 
-    version: 0.2.3
-- rspec: 
-    version: 1.3.0
-- sinatra: 
-    version: "1.0"
-- versionomy: 
-    version: 0.4.0
-- tumbler: 
-    version: 0.0.11
-- url_mount: 
-    version: 0.2.1
-hash: df813dada9b96e269c9f2dc81627e29f1dcec5f4
-sources: 
-- Rubygems: 
-    uri: http://gemcutter.org