http_router 0.2.5 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.3.0
+
+* Unescape param values (Joshua Hull, d7a6a1f)
+* Removed useless test in request method adding (Joshua Hull, bcaade2)
+
 == 0.2.5
 
 * Walk entire tree looking for possible request_methods to return on 405 if a match isn't achieved. (Joshua Hull, 3e8631f)

data/lib/ext/rack/uri_escape.rb

@@ -18,7 +18,7 @@ end unless Rack::Utils.respond_to?(:uri_escape!)
 
 module Rack::Utils
   def uri_unescape(s)
-    gsub(/((?:%[0-9a-fA-F]{2})+)/n){
+    s.to_s.gsub(/((?:%[0-9a-fA-F]{2})+)/n){
       [$1.delete('%')].pack('H*')
     }
   end

data/lib/http_router/node.rb

@@ -98,34 +98,30 @@ class HttpRouter
           
           for current_node_index in (0...current_nodes.size)
             current_node = current_nodes.at(current_node_index)
-            if request_options.key?(method)  #we care about the method
-              unless current_node.request_method
-                current_node.request_method = method
-              end
-              case RequestNode::RequestMethods.index(method) <=> RequestNode::RequestMethods.index(current_node.request_method)
-              when 0 #use this node
-                if request_options[method].is_a?(Regexp)
-                  new_node = router.request_node
-                  current_nodes[current_node_index] = new_node
-                  current_node.create_linear
-                  current_node.linear << [request_options[method], new_node]
-                elsif request_options[method].is_a?(Array)
-                  current_node.create_lookup
-                  current_nodes[current_node_index] = request_options[method].map{|val| current_node.lookup[val] ||= router.request_node}
-                else
-                  current_node.create_lookup
-                  current_nodes[current_node_index] = (current_node.lookup[request_options[method]] ||= router.request_node)
-                end
-              when 1 #this node is farther ahead
-                current_nodes[current_node_index] = (current_node.catchall ||= router.request_node)
-              when -1 #this method is more important than the current node
-                next_node = current_node.dup
-                current_node.reset!
-                current_node.request_method = method
-                redo
+            unless current_node.request_method
+              current_node.request_method = method
+            end
+            case RequestNode::RequestMethods.index(method) <=> RequestNode::RequestMethods.index(current_node.request_method)
+            when 0 #use this node
+              if request_options[method].is_a?(Regexp)
+                new_node = router.request_node
+                current_nodes[current_node_index] = new_node
+                current_node.create_linear
+                current_node.linear << [request_options[method], new_node]
+              elsif request_options[method].is_a?(Array)
+                current_node.create_lookup
+                current_nodes[current_node_index] = request_options[method].map{|val| current_node.lookup[val] ||= router.request_node}
+              else
+                current_node.create_lookup
+                current_nodes[current_node_index] = (current_node.lookup[request_options[method]] ||= router.request_node)
               end
-            else
-              current_node.catchall ||= router.request_node
+            when 1 #this node is farther ahead
+              current_nodes[current_node_index] = (current_node.catchall ||= router.request_node)
+            when -1 #this method is more important than the current node
+              next_node = current_node.dup
+              current_node.reset!
+              current_node.request_method = method
+              redo
             end
           end
           current_nodes.flatten!
@@ -152,7 +148,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 << tester.consume(match, dupped_parts)
+              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))
               parts.replace(dupped_parts) if response = node.find_on_parts(request, dupped_parts, params, alternate_request_methods)
             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])
@@ -167,7 +163,7 @@ class HttpRouter
           parts.shift
           return match.find_on_parts(request, parts, params, alternate_request_methods)
         elsif @catchall
-          params << @catchall.variable.consume(nil, parts)
+          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))
           return @catchall.find_on_parts(request, parts, params, alternate_request_methods)
         end
       end

data/lib/http_router/version.rb

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

data/spec/recognize_spec.rb

@@ -99,15 +99,6 @@ describe "HttpRouter#recognize" do
     end
   end
 
-  context "with variables" do
-    it "should recognize" do
-      @router.add("/foo").to(:test1)
-      @router.add("/foo/:id").to(:test2)
-      @router.recognize(Rack::MockRequest.env_for('/foo')).dest.should == :test1
-      @router.recognize(Rack::MockRequest.env_for('/foo/id')).dest.should == :test2
-    end
-  end
-
   context "with missing leading /" do
     it "should recognize" do
       @router.add("foo").to(:test1)
@@ -179,7 +170,22 @@ describe "HttpRouter#recognize" do
   end
 
   context("with dynamic paths") do
+    it "should recognize /foo/:id and /foo" do
+      @router.add("/foo/:id").to(:test2)
+      @router.add("/foo").to(:test1)
+      @router.recognize(Rack::MockRequest.env_for('/foo')).dest.should == :test1
+      @router.recognize(Rack::MockRequest.env_for('/foo/id')).dest.should == :test2
+    end
+
     it "should recognize '/:variable'" do
+      route = @router.add('/:variable').to(:test)
+      response = @router.recognize(Rack::MockRequest.env_for('/%E6%AE%BA%E3%81%99'))
+      response.route.should == route
+      response.params.should == ["\346\256\272\343\201\231"]
+      response.params_as_hash[:variable].should == "\346\256\272\343\201\231"
+    end
+
+    it "should recognize '/:variable' and URI unescape variables" do
       route = @router.add('/:variable').to(:test)
       response = @router.recognize(Rack::MockRequest.env_for('/value'))
       response.route.should == route
@@ -242,6 +248,7 @@ describe "HttpRouter#recognize" do
         response.route.should == route
         response.params.should == [['one', 'two', 'three']]
       end
+
       it "should recognize with a regexp" do
         route = @router.add('/test/*variable/anymore').matching(:variable => /\d+/).to(:test)
         response = @router.recognize(Rack::MockRequest.env_for('/test/123/345/567/anymore'))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 5
-  version: 0.2.5
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 -04:00
+date: 2010-06-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,10 +30,10 @@ dependencies:
         - 0
         version: "1.0"
   requirement: *id001
-  type: :runtime
   name: rack
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,10 +46,10 @@ dependencies:
         - 1
         version: 0.2.1
   requirement: *id002
-  type: :runtime
   name: url_mount
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,10 +60,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id003
-  type: :development
   name: rspec
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,10 +74,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
-  type: :development
   name: rake
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -89,10 +88,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id005
-  type: :development
   name: sinatra
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -103,10 +102,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id006
-  type: :development
   name: rbench
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -119,8 +118,9 @@ dependencies:
         - 11
         version: 0.0.11
   requirement: *id007
-  type: :development
   name: tumbler
+  prerelease: false
+  type: :development
 description: A kick-ass HTTP router for use in Rack & Sinatra
 email: joshbuddy@gmail.com
 executables: []