usher 0.5.5 → 0.5.6

data/VERSION.yml

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

data/lib/usher/interface/rack_interface.rb

@@ -62,8 +62,8 @@ class Usher
         determine_respondant(response).call(env)
       end
 
-      def generate(route, params = nil, options = nil)
-        @usher.generator.generate(route, params, options)
+      def generate(route, options = nil)
+        @router.generator.generate(route, options)
       end
 
       # Allows a hook to be placed for sub classes to make use of between matching
@@ -71,14 +71,17 @@ class Usher
       #
       # @api plugin
       def after_match(env, response)
-        env['usher.params'] ||= {}
-        params = response.path.route.default_values || {}
-        response.params.each{|hk| params[hk.first] = hk.last}
-        env['usher.params'].merge!(params)
-
-        # consume the path_info to the script_name response.remaining_path
-        env["SCRIPT_NAME"] << response.matched_path   || ""
-        env["PATH_INFO"] = response.remaining_path    || ""
+        params = response.path.route.default_values ?
+          response.path.route.default_values.merge(Hash[response.params]) :
+          Hash[response.params]
+        
+        env['usher.params'] ?
+          env['usher.params'].merge!(params) :
+          env['usher.params'] = params
+        
+        # consume the path_info to the script_name
+        # response.remaining_path
+        consume_path!(env, response) if response.partial_match?
       end
 
       # Determines which application to respond with.
@@ -89,10 +92,19 @@ class Usher
       #
       # @api private
       def determine_respondant(response)
-        return app if response.nil?
-        respondant = response.path.route.destination
-        respondant = app unless respondant.respond_to?(:call)
-        respondant
+        unless response
+          app
+        else
+          respondant = response.path.route.destination
+          respondant = app unless respondant.respond_to?(:call)
+          respondant
+        end
+      end
+
+      # Consume the path from path_info to script_name
+      def consume_path!(env, response)
+        env["SCRIPT_NAME"] = (env["SCRIPT_NAME"] + response.matched_path)   || ""
+        env["PATH_INFO"] = response.remaining_path    || ""
       end
     end
   end

data/lib/usher/interface/rails3_interface.rb

@@ -26,12 +26,13 @@ class Usher
         @configurations_files << file
       end
       
-      def reload!
+      def reload
         @usher.reset!
         @configurations_files.each do |c|
           Kernel.load(c)
         end
       end
+      alias_method :reload!, :reload
       
       def call(env)
         request = ActionDispatch::Request.new(env)

data/lib/usher/node.rb

@@ -4,7 +4,11 @@ class Usher
 
   class Node
     
-    Response = Struct.new(:path, :params, :remaining_path, :matched_path)
+    class Response < Struct.new(:path, :params, :remaining_path, :matched_path)
+      def partial_match?
+        !remaining_path.nil?
+      end
+    end
     
     attr_reader :normal, :greedy, :request
     attr_accessor :terminates, :request_method_type, :parent, :value, :request_methods

data/spec/private/rack/dispatch_spec.rb

@@ -90,10 +90,10 @@ describe "Usher (for rack) route dispatching" do
     end
 
     describe "SCRIPT_NAME & PATH_INFO" do
-      it "should update the script name for a fully consumed route" do
+      it "shouldn't update the script name for a fully consumed route" do
         @app.should_receive(:call).once.with do |e|
-          e['SCRIPT_NAME'].should == "/foo"
-          e['PATH_INFO'].should   == ""
+          e['SCRIPT_NAME'].should == ""
+          e['PATH_INFO'].should   == "/foo"
         end
         route_set.call(Rack::MockRequest.env_for("/foo"))
       end
@@ -117,6 +117,12 @@ describe "Usher (for rack) route dispatching" do
         route_set.call(Rack::MockRequest.env_for("/foo/bar/bad/leftovers"))
       end
 
+      it "should not modify SCRIPT_NAME in place since thin freezes it" do
+        @app.should_receive(:call).once
+        env = Rack::MockRequest.env_for("/foo/bar/good")
+        env["SCRIPT_NAME"] = "".freeze
+        route_set.call(env)
+      end
     end
 
     describe "dupping" do

data/spec/private/rack/generate_spec.rb

@@ -0,0 +1,41 @@
+require 'lib/usher'
+require 'rack'
+
+require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+route_set = Usher::Interface.for(:rack)
+route_set.extend(CallWithMockRequestMixin)
+
+describe "Usher (for rack) route generation" do
+  before(:each) do
+    route_set.reset!
+    @app = MockApp.new("Hello World!")
+    route_set.add("/fixed").name(:fixed)
+    route_set.add("/simple/:simple_var")
+    route_set.add("/named/simple/:named_simple_var").name(:simple)
+    route_set.add("/optional(/:optional_var)")
+    route_set.add("/named/optional(/:named_optional_var)").name(:optional)
+  end
+  
+  describe "named routes" do
+    it "should generate a fixed path" do
+      route_set.generate(:fixed).should == "/fixed"
+    end
+    
+    it "should generate a basic path route" do
+      route_set.generate(nil, :simple_var => "simple_var").should == "/simple/simple_var"
+    end
+
+    it "should generate a named path route" do
+      route_set.generate(:simple, :named_simple_var => "the_var").should == "/named/simple/the_var"
+    end
+
+    it "should generate a route with options" do
+      route_set.generate(nil, :optional_var => "var").should == "/optional/var"
+    end
+
+    it "should generate a named route with options" do
+      route_set.generate(:optional).should == "/named/optional"
+      route_set.generate(:optional, :named_optional_var => "the_var").should == "/named/optional/the_var"
+    end
+  end
+end

data/spec/private/recognize_spec.rb

@@ -223,6 +223,13 @@ describe "Usher route recognition" do
       route_set.recognize(build_request({:method => 'post', :path => '/foo/bar'})).should.nil?
     end
 
+    it "should not match partially when a route is not set as partially matched" do
+      route = route_set.add_route("/foo", :foo => :bar)
+      route_set.recognize(build_request(:path => "/foo")).path.route.should == route
+      route_set.recognize(build_request(:path => "/foo/bar")).should be_nil
+    end
+    
+
   end
 
   describe "dup safety" do
@@ -271,4 +278,4 @@ describe "Usher route recognition" do
     end
     
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: usher
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Joshua Hull
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-05 00:00:00 -04:00
+date: 2009-09-15 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,6 +68,7 @@ files:
 - spec/private/parser_spec.rb
 - spec/private/path_spec.rb
 - spec/private/rack/dispatch_spec.rb
+- spec/private/rack/generate_spec.rb
 - spec/private/rails2_2/compat.rb
 - spec/private/rails2_2/generate_spec.rb
 - spec/private/rails2_2/path_spec.rb
@@ -115,6 +116,7 @@ test_files:
 - spec/private/parser_spec.rb
 - spec/private/path_spec.rb
 - spec/private/rack/dispatch_spec.rb
+- spec/private/rack/generate_spec.rb
 - spec/private/rails2_2/compat.rb
 - spec/private/rails2_2/generate_spec.rb
 - spec/private/rails2_2/path_spec.rb