http_router 0.7.6 → 0.7.7

data/lib/http_router.rb

@@ -104,21 +104,21 @@ class HttpRouter
   # Returns the route object.
   def options(path, opts = {}, &app); add_with_request_method(path, :options, opts, &app); end
 
-  def recognize(env)
-    call(env, false)
+  def recognize(env, &blk)
+    call(env, false, &blk)
   end
 
   # Rack compatible #call. If matching route is found, and +dest+ value responds to #call, processing will pass to the matched route. Otherwise,
   # the default application will be called. The router will be available in the env under the key <tt>router</tt>. And parameters matched will
   # be available under the key <tt>router.params</tt>.
-  def call(env, perform_call = true)
+  def call(env, perform_call = true, &blk)
     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
     else
-      request = Request.new(rack_request.path_info, rack_request, perform_call)
+      request = Request.new(rack_request.path_info, rack_request, perform_call, &blk)
       response = catch(:success) { @root[request] }
       if response
         response

data/lib/http_router/request.rb

@@ -1,9 +1,10 @@
 class HttpRouter
   class Request
+    attr_reader :acceptance_test
     attr_accessor :path, :params, :rack_request, :extra_env, :continue
     alias_method :rack, :rack_request
-    def initialize(path, rack_request, perform_call)
-      @rack_request, @perform_call = rack_request, perform_call
+    def initialize(path, rack_request, perform_call, &acceptance_test)
+      @rack_request, @perform_call, @acceptance_test = rack_request, perform_call, acceptance_test
       @path = (path[0] == ?/ ? path[1, path.size] : path).split(/\//)
       @path << '' if path.size > 1 && path[-1] == ?/
       @extra_env = {}

data/lib/http_router/response.rb

@@ -1,6 +1,7 @@
 class HttpRouter
   class Response < Struct.new(:request, :path)
     attr_reader :params
+    attr_accessor :acceptance_response
     def initialize(request, path)
       super(request, path)
       @params = path.hashify_params(request.params)

data/lib/http_router/route.rb

@@ -271,6 +271,10 @@ class HttpRouter
             end
             response = path_obj.route.dest.call(env)
             router.pass_on_response(response) ? throw(:pass) : throw(:success, response)
+          elsif req.acceptance_test
+            response = Response.new(req, path_obj)
+            req.acceptance_test[response]
+            throw :success, response if response.acceptance_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.6'
+  VERSION = '0.7.7'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 7
-  - 6
-  version: 0.7.6
+  - 7
+  version: 0.7.7
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 -07:00
+date: 2011-05-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency