http_router 0.7.0 → 0.7.1

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Joshua Hull, http://github.com/joshbuddy/http_router
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/http_router.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.summary = "A kick-ass HTTP router for use in Rack"
   s.description = "This library allows you to recognize and build URLs in a Rack application."
   s.email = %q{joshbuddy@gmail.com}
-  s.extra_rdoc_files = ['README.md']
+  s.extra_rdoc_files = ['README.md', 'LICENSE']
   s.files = `git ls-files`.split("\n")
   s.homepage = %q{http://github.com/joshbuddy/http_router}
   s.rdoc_options = ["--charset=UTF-8"]

data/lib/http_router/route.rb

@@ -265,7 +265,8 @@ class HttpRouter
                 env["PATH_INFO"] = ''
                 env["SCRIPT_NAME"] += req.rack_request.path_info
               end
-              throw :success, @app.call(env)
+              response = @app.call(env)
+              router.pass_on_response(response) ? throw(:pass) : throw(:success, response)
             else
               throw :success, Response.new(req, path_obj)
             end

data/lib/http_router/version.rb

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

data/lib/http_router.rb

@@ -58,19 +58,22 @@ class HttpRouter
   #
   # Returns the route object.
   def add(path, opts = {}, &app)
-    route = case path
-    when Regexp
-      RegexRoute.new(self, path, opts)
-    else
-      Route.new(self, path, opts)
-    end
-    add_route(route)
+    route = add_route((Regexp === path ? RegexRoute : Route).new(self, path, opts))
     route.to(app) if app
     route
   end
 
   def add_route(route)
     @routes << route
+    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+.

data/test/test_recognize.rb

@@ -20,6 +20,23 @@ class TestRecognition < MiniTest::Unit::TestCase
     assert_body 'working', router.call(Rack::MockRequest.env_for('/'))
   end
 
+  def test_passing_with_cascade
+    passed, working = router {
+      add('/').to { |env| [200, {'X-Cascade' => 'pass'}, ['pass']] }
+      add('/').to { |env| [200, {}, ['working']] }
+    }
+    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

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -07:00
+date: 2011-04-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -162,11 +162,12 @@ extensions: []
 
 extra_rdoc_files: 
 - README.md
+- LICENSE
 files: 
 - .gitignore
 - .rspec
-- CHANGELOG
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - benchmarks/gen2.rb

data/CHANGELOG

@@ -1,28 +0,0 @@
-== 0.3.2
-
-* Made the sinatra extension Ruby 1.9.2 compatible (Matt Aimonetti, 05fb162)
-
-== 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)
-* Removed useless test in request method adding (Joshua Hull, bcaade2)
-
-== 0.2.5
-
-* Walk entire tree looking for possible request_methods to return on 405 if a match isn't achieved. (Joshua Hull, 3e8631f)
-* Upgraded deps + spec running (Joshua Hull, fcefce9)
-* Simplified route cloning (Joshua Hull, 4b0ff59)
-* Added partial matching to route cloning (Joshua Hull, d1a57d8)
-* Merge branch 'master' of github.com:joshbuddy/http_router (Joshua Hull, 7f42a27)
-* Convert to Tumbler (Joshua Hull, 295e6a2)
-* Updates cloning (Daniel Neighman, 37178bf)
-* Add Rack::urlmap replacement (Joshua Hull, 2868044)
-* Added scheme example (Joshua Hull, f23da20)
-* Added static example (Joshua Hull, df54ee0)
-