usher 0.6.1 → 0.6.2

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
-:patch: 1
+:patch: 2
 :major: 0
 :minor: 6

data/lib/usher/interface/rack.rb

@@ -4,6 +4,24 @@ require File.join(File.dirname(__FILE__), 'rack', 'route')
 class Usher
   module Interface
     class Rack
+      
+      ENV_KEY_RESPONSE = 'usher.response'
+      ENV_KEY_PARAMS = 'usher.params'
+      
+      class Middleware
+        
+        def initialize(app, router)
+          @app = app
+          @router = router
+        end
+        
+        def call(env)
+          @router.call(env)
+          @app.call(env)
+        end
+        
+      end
+      
       class Builder < ::Rack::Builder
         def initialize(&block)
           @usher = Usher::Interface::Rack.new
@@ -37,12 +55,17 @@ class Usher
 
       attr_reader :router
 
-      def initialize(app = nil, &blk)
+      def initialize(app = nil, options = nil, &blk)
         @_app = app || lambda { |env| ::Rack::Response.new("No route found", 404).finish }
         @router = Usher.new(:request_methods => [:request_method, :host, :port, :scheme], :generator => Usher::Util::Generators::URL.new)
+        @use_destinations = options && options.key?(:use_destinations) ? options[:use_destinations] : true
         instance_eval(&blk) if blk
       end
 
+      def use_destinations?
+        @use_destinations
+      end
+
       def dup
         new_one = super
         original = self
@@ -114,13 +137,14 @@ class Usher
       #
       # @api plugin
       def after_match(request, response)
-        params = response.path.route.default_values ?
-          response.path.route.default_values.merge(Hash[*response.params.flatten]) :
-          Hash[*response.params.flatten]
+        params = response.path.route.default_values ? response.path.route.default_values.merge(response.params_as_hash) : response.params_as_hash
         
-        request.env['usher.params'] ?
-          request.env['usher.params'].merge!(params) :
-          (request.env['usher.params'] = params)
+        request.env[ENV_KEY_RESPONSE] ||= []
+        request.env[ENV_KEY_RESPONSE] << response
+
+        request.env[ENV_KEY_PARAMS] ?
+          request.env[ENV_KEY_PARAMS].merge!(params) :
+          (request.env[ENV_KEY_PARAMS] = params)
         
         # consume the path_info to the script_name
         # response.remaining_path
@@ -135,7 +159,7 @@ class Usher
       #
       # @api private
       def determine_respondant(response)
-        response && response.destination || _app
+        use_destinations? && response && response.destination || _app
       end
 
       # Consume the path from path_info to script_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: usher
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 -05:00
+date: 2010-01-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency