http_router 0.6.8 → 0.6.9

data/http_router.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rbench'
   s.add_development_dependency 'phocus'
   s.add_development_dependency 'bundler',  '~> 1.0.0'
-  s.add_development_dependency 'thin',  '~> 1.2.7'
+  s.add_development_dependency 'thin',  '= 1.2.8'
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/http_router/optional_compiler.rb

@@ -8,7 +8,7 @@ class HttpRouter
       case @chars.first[0]
         when ?( then @chars.shift and double_paths
         when ?) then @chars.shift and half_paths
-        when ?\\ 
+        when ?\\
           @chars[1] == ?( || @chars[1] == ?) ? @chars.shift : add_to_current_set(@chars.shift)
           add_to_current_set(@chars.shift)
         else

data/lib/http_router/route.rb

@@ -1,4 +1,5 @@
 require 'url_mount'
+require 'uri'
 
 class HttpRouter
   class Route
@@ -209,7 +210,7 @@ class HttpRouter
               matches_with[name.to_sym] = @opts[name.to_sym]
               @opts[name.to_sym] ? node.add_spanning_match(@opts.delete(name.to_sym)) : node.add_glob
             else
-              node.add_lookup(parts[0])
+              node.add_lookup(URI.encode(parts[0]))
             end
           else
             capturing_indicies = []
@@ -238,7 +239,7 @@ class HttpRouter
                 "(#{(@opts[name] || '.*?')})"
               else
                 priority += part.size
-                Regexp.quote(part)
+                Regexp.quote(URI.encode(part))
               end
             end
             node = spans ? node.add_spanning_match(Regexp.new("#{regex}$"), capturing_indicies, priority, splitting_indicies) :

data/lib/http_router/version.rb

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

data/lib/http_router.rb

@@ -33,7 +33,7 @@ class HttpRouter
   def initialize(*args, &blk)
     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 }
+    @default_app             = default_app || options && options[:default_app] || proc{|env| ::Rack::Response.new("Not Found", 404, {'X-Cascade' => 'pass'}).finish }
     @ignore_trailing_slash   = options && options.key?(:ignore_trailing_slash) ? options[:ignore_trailing_slash] : true
     @redirect_trailing_slash = options && options.key?(:redirect_trailing_slash) ? options[:redirect_trailing_slash] : false
     @known_methods           = Set.new(options && options[:known_methods] || [])
@@ -119,7 +119,7 @@ class HttpRouter
     else
       request = Request.new(rack_request.path_info, rack_request, perform_call)
       response = catch(:success) { @root[request] }
-      if !response
+      if response.nil?
         supported_methods = (@known_methods - [env['REQUEST_METHOD']]).select do |m| 
           test_env = ::Rack::Request.new(rack_request.env.clone)
           test_env.env['REQUEST_METHOD'] = m
@@ -127,11 +127,13 @@ class HttpRouter
           test_request = Request.new(test_env.path_info, test_env, 405)
           catch(:success) { @root[test_request] }
         end
-        supported_methods.empty? ? @default_app.call(env) : [405, {'Allow' => supported_methods.sort.join(", ")}, []]
+        supported_methods.empty? ? (perform_call ? @default_app.call(env) : nil) : [405, {'Allow' => supported_methods.sort.join(", ")}, []]
       elsif response
         response
-      else
+      elsif perform_call
         @default_app.call(env)
+      else
+        nil
       end
     end
   end

data/test/test_generate.rb

@@ -96,10 +96,10 @@ class TestGenerate < MiniTest::Unit::TestCase
   end
   
   def test_hash
-    assert_generate '/var?foo[az]=baz&foo[ar]=bar', '/var', :foo => {:az => 'baz', :ar => 'bar'}
+    assert_generate '/var?foo[az]=baz', '/var', :foo => {:az => 'baz'}
   end
   
   def test_hash_with_array
-    assert_generate '/var?foo[az]=baz&foo[ar][]=bar&foo[ar][]=barz', '/var', :foo => {:az => 'baz', :ar => ['bar', 'barz']}
+    assert_generate '/var?foo[ar][]=bar', '/var', :foo => {:ar => ['bar']}
   end
 end

data/test/test_misc.rb

@@ -1,15 +1,13 @@
 class TestMisc < MiniTest::Unit::TestCase
   def test_cloning
-    r1 = HttpRouter.new {
-      add('/test').name(:test_route).to :test
-    }
+    r1 = HttpRouter.new { add('/test').name(:test_route).to(:test) }
     r2 = r1.clone
 
     r2.add('/test2').name(:test).to(:test2)
     assert_equal 2, r2.routes.size
 
-    assert_equal 404, r1.recognize(Rack::Request.new(Rack::MockRequest.env_for('/test2'))).first
-    assert r2.recognize(Rack::Request.new(Rack::MockRequest.env_for('/test2')))
+    assert_equal nil, r1.recognize(Rack::Request.new(Rack::MockRequest.env_for('/test2')))
+    assert r2.recognize(Rack::MockRequest.env_for('/test2'))
     assert_equal r1.routes.first, r1.named_routes[:test_route]
     assert_equal r2.routes.first, r2.named_routes[:test_route]
 

data/test/test_recognize.rb

@@ -35,6 +35,10 @@ class TestRecognition < MiniTest::Unit::TestCase
     assert_route router.add('/test\*variable'), '/test*variable'
   end
 
+  def test_unicode
+    assert_route router.add('/føø'), '/f%C3%B8%C3%B8'
+  end
+
   def test_partial
     router.add("/test*").to { |env| Rack::Response.new(env['PATH_INFO']).finish }
     assert_body '/optional', router.call(Rack::MockRequest.env_for('/test/optional'))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 6
-  - 8
-  version: 0.6.8
+  - 9
+  version: 0.6.9
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 -07:00
+date: 2011-04-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,14 +144,14 @@ dependencies:
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 15
         segments: 
         - 1
         - 2
-        - 7
-        version: 1.2.7
+        - 8
+        version: 1.2.8
   type: :development
   version_requirements: *id009
 description: This library allows you to recognize and build URLs in a Rack application.