http_router 0.3.12 → 0.3.13

data/lib/http_router.rb

@@ -1,6 +1,6 @@
 require 'rack'
+require 'set'
 require 'url_mount'
-require 'ext/rack/uri_escape'
 require 'http_router/node'
 require 'http_router/root'
 require 'http_router/variable'
@@ -55,7 +55,6 @@ class HttpRouter
   # * :middleware -- On recognition, store the route Response in env['router.response'] and always call the default app. Defaults to +false+.
   def initialize(*args, &block)
     default_app, options = args.first.is_a?(Hash) ? [nil, args.first] : [args.first, args[1]]
-
     @options                   = options
     @default_app               = default_app || options && options[:default_app] || proc{|env| Rack::Response.new("Not Found", 404).finish }
     @ignore_trailing_slash     = options && options.key?(:ignore_trailing_slash) ? options[:ignore_trailing_slash] : true
@@ -190,10 +189,10 @@ class HttpRouter
     else
       env['router'] = self
       if response = recognize(request) and !@middleware
-        if response.matched? && response.route.dest && response.route.dest.respond_to?(:call)
+        if response.matched? && response.route.dest
           process_params(env, response)
           consume_path!(request, response) if response.partial_match?
-          return response.route.dest.call(env)
+          return response.route.dest.call(env) if response.route.dest.respond_to?(:call)
         elsif !response.matched?
           return [response.status, response.headers, []]
         end
@@ -256,11 +255,19 @@ class HttpRouter
     Parts.new(path)
   end
 
+  def self.uri_escape!(s)
+    s.to_s.gsub!(/([^:\/?\[\]\-_~\.!\$&'\(\)\*\+,;=@a-zA-Z0-9]+)/n) { "%#{$1.unpack('H2'*$1.size).join('%').upcase}" }
+  end
+
+  def self.uri_unescape(s)
+    s.to_s.gsub(/((?:%[0-9a-fA-F]{2})+)/n){ [$1.delete('%')].pack('H*') }
+  end
+
   private
 
   def consume_path!(request, response)
     request.env["SCRIPT_NAME"] = (request.env["SCRIPT_NAME"] + response.matched_path)
-    request.env["PATH_INFO"] = response.remaining_path || ""
+    request.env["PATH_INFO"] = response.remaining_path.nil? || response.remaining_path == '' ? '/' : response.remaining_path
   end
 
   def process_params(env, response)

data/lib/http_router/node.rb

@@ -149,7 +149,7 @@ class HttpRouter
           next_node = @linear.find do |(tester, node)|
             if tester.respond_to?(:matches?) and match = tester.matches?(parts)
               dupped_parts = parts.dup
-              params.push((val = tester.consume(match, dupped_parts) and val.is_a?(Array)) ? val.map{|v| Rack::Utils.uri_unescape(v)} : Rack::Utils.uri_unescape(val))
+              params.push((val = tester.consume(match, dupped_parts) and val.is_a?(Array)) ? val.map{|v| HttpRouter.uri_unescape(v)} : HttpRouter.uri_unescape(val))
               parts.replace(dupped_parts) if response = node.find_on_parts(request, dupped_parts, params)
             elsif tester.respond_to?(:match) and match = tester.match(parts.whole_path) and match.begin(0) == 0
               dupped_parts = router.split(parts.whole_path[match[0].size, parts.whole_path.size])
@@ -164,7 +164,7 @@ class HttpRouter
           parts.shift
           return match.find_on_parts(request, parts, params)
         elsif @catchall
-          params.push((val = @catchall.variable.consume(nil, parts) and val.is_a?(Array)) ? val.map{|v| Rack::Utils.uri_unescape(v)} : Rack::Utils.uri_unescape(val))
+          params.push((val = @catchall.variable.consume(nil, parts) and val.is_a?(Array)) ? val.map{|v| HttpRouter.uri_unescape(v)} : HttpRouter.uri_unescape(val))
           return @catchall.find_on_parts(request, parts, params)
         end
       end

data/lib/http_router/path.rb

@@ -46,7 +46,7 @@ class HttpRouter
       path = raw_url(args, options)
       raise InvalidRouteException.new if path !~ @path_validation_regex
       raise TooManyParametersException.new unless args.empty?
-      Rack::Utils.uri_escape!(path)
+      HttpRouter.uri_escape!(path)
       generate_querystring(path, options)
       path
     end

data/lib/http_router/response.rb

@@ -39,7 +39,7 @@ class HttpRouter
       alias_method :destination, :dest
 
       def partial_match?
-        remaining_path || route.partially_match?
+        route.partially_match?
       end
     end
   end

data/lib/http_router/version.rb

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

data/spec/recognize_spec.rb

@@ -40,12 +40,20 @@ describe "HttpRouter#recognize" do
     end
 
     context("with partial matching") do
-      it "should match partially or completely" do
-        route = @router.add("/test*").to(:test)
-        @router.recognize(Rack::MockRequest.env_for('/test')).route.should == route
-        response = @router.recognize(Rack::MockRequest.env_for('/test/optional'))
-        response.route.should == route
-        response.remaining_path.should == '/optional'
+      before(:each) do
+        route = @router.add("/test*").to{|env| []}
+      end
+      
+      it "should match partially" do
+        route = @router.add("/test*").to{|env| env['PATH_INFO'].should == '/optional'; [200, {}, []]}
+        response = @router.call(Rack::MockRequest.env_for('/test/optional'))
+        response[0].should == 200
+      end
+
+      it "should match partially and use / for rest if the route matched completely" do
+        route = @router.add("/test*").to{|env| env['PATH_INFO'].should == '/'; [200, {}, []]}
+        response = @router.call(Rack::MockRequest.env_for('/test'))
+        response[0].should == 200
       end
 
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 3
-  - 12
-  version: 0.3.12
+  - 13
+  version: 0.3.13
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 -07:00
+date: 2010-08-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -171,7 +171,6 @@ files:
 - http_router.gemspec
 - lib/ext/rack/rack_mapper.rb
 - lib/ext/rack/rack_urlmap.rb
-- lib/ext/rack/uri_escape.rb
 - lib/http_router.rb
 - lib/http_router/glob.rb
 - lib/http_router/interface/sinatra.rb

data/lib/ext/rack/uri_escape.rb

@@ -1,26 +0,0 @@
-module Rack::Utils
-  def uri_escape(s)
-    s.to_s.gsub(/([^:\/?\[\]\-_~\.!\$&'\(\)\*\+,;=@a-zA-Z0-9]+)/n) {
-      '%'<<$1.unpack('H2'*$1.size).join('%').upcase
-    }
-  end
-  module_function :uri_escape
-end unless Rack::Utils.respond_to?(:uri_escape)
-
-module Rack::Utils
-  def uri_escape!(s)
-    s.to_s.gsub!(/([^:\/?\[\]\-_~\.!\$&'\(\)\*\+,;=@a-zA-Z0-9]+)/n) {
-      '%'<<$1.unpack('H2'*$1.size).join('%').upcase
-    }
-  end
-  module_function :uri_escape!
-end unless Rack::Utils.respond_to?(:uri_escape!)
-
-module Rack::Utils
-  def uri_unescape(s)
-    s.to_s.gsub(/((?:%[0-9a-fA-F]{2})+)/n){
-      [$1.delete('%')].pack('H*')
-    }
-  end
-  module_function :uri_unescape
-end unless Rack::Utils.respond_to?(:uri_unescape)