rack_interface.rb in usher-0.5.1

- old
+ new
@@ -2,36 +2,54 @@
 
 class Usher
   module Interface
     class RackInterface
       
-      attr_accessor :routes
-      
       def initialize(&blk)
-        @routes = Usher.new(:request_methods => [:method, :host, :port, :scheme])
-        @generator = Usher::Generators::URL.new(@routes)
+        @router = Usher.new(:request_methods => [:method, :host, :port, :scheme], :generator => Usher::Util::Generators::URL.new)
         instance_eval(&blk) if blk
       end
       
       def add(path, options = nil)
-        @routes.add_route(path, options)
+        @router.add_route(path, options)
       end
+      
+      def parent_route=(route)
+        @router.parent_route = route
+      end
+      
+      def parent_route
+        @router.parent_route
+      end
 
       def reset!
-        @routes.reset!
+        @router.reset!
       end
 
       def call(env)
-        response = @routes.recognize(Rack::Request.new(env))
-        params = {}
-        response.params.each{ |hk| params[hk.first] = hk.last}
-        env['usher.params'] = params
-        response.path.route.destination.call(env)
+        env['usher.params'] ||= {}
+        response = @router.recognize(request = Rack::Request.new(env), request.path_info)
+        if response.nil?
+          body = "No route found"
+          headers = {"Content-Type" => "text/plain", "Content-Length" => body.length.to_s}
+          [404, headers, [body]]
+        else
+          params = response.path.route.default_values || {}
+          response.params.each{ |hk| params[hk.first] = hk.last}
+          
+          # consume the path_info to the script_name response.remaining_path
+          env["SCRIPT_NAME"] << response.matched_path   || ""
+          env["PATH_INFO"] = response.remaining_path    || ""
+                    
+          env['usher.params'].merge!(params)
+          
+          response.path.route.destination.call(env)
+        end
       end
 
       def generate(route, params = nil, options = nil)
-        @generator.generate(route, params, options)
+        @usher.generator.generate(route, params, options)
       end
 
     end
   end
-end
\ No newline at end of file
+end