http_router 0.7.9 → 0.7.10

data/http_router.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'url_mount',    '~> 0.2.1'
   s.add_development_dependency 'minitest', '~> 2.0.0'
   s.add_development_dependency 'code_stats'
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake',     '~> 0.8.7'
   s.add_development_dependency 'rbench'
   s.add_development_dependency 'phocus'
   s.add_development_dependency 'bundler',  '~> 1.0.0'

data/lib/http_router/node.rb

@@ -54,8 +54,7 @@ class HttpRouter
     end
 
     def add_lookup(part)
-      add(Lookup.new(@router))
-      @matchers.last.add(part)
+      add(Lookup.new(@router)).add(part)
     end
 
     def usable?(other)

data/lib/http_router/node/destination.rb

@@ -8,7 +8,7 @@ class HttpRouter
 
       def [](request)
         if request.path.empty? or (request.path.size == 1 and request.path[0] == '') or @allow_partial
-          catch(:pass) do
+          request.passed_with = catch(:pass) do
             request = request.clone
             request.continue = proc { |state| destination(request) if state }
             params = @param_names.nil? ? {} : Hash[@param_names.zip(request.params)]

data/lib/http_router/path.rb

@@ -1,3 +1,4 @@
+require 'uri'
 class HttpRouter
   class Path
     attr_reader :route, :param_names
@@ -41,8 +42,7 @@ class HttpRouter
       path = raw_url(args, options)
       raise InvalidRouteException if path !~ @path_validation_regex
       raise TooManyParametersException unless args.empty?
-      uri_escape!(path)
-      [path, options]
+      [URI.escape(path), options]
     end
 
     def original_path
@@ -53,9 +53,5 @@ class HttpRouter
     def raw_url(args, options)
       raise UngeneratableRouteException
     end
-
-    def uri_escape!(s)
-      s.to_s.gsub!(/([^:\/?\[\]\-_~\.!\$&'\(\)\*\+,;=@a-zA-Z0-9]+)/n) { "%#{$1.unpack('H2'*$1.size).join('%').upcase}" }
-    end
   end
 end

data/lib/http_router/request.rb

@@ -1,7 +1,7 @@
 class HttpRouter
   class Request
     attr_reader :acceptance_test
-    attr_accessor :path, :params, :rack_request, :extra_env, :continue
+    attr_accessor :path, :params, :rack_request, :extra_env, :continue, :passed_with
     alias_method :rack, :rack_request
     def initialize(path, rack_request, perform_call, &acceptance_test)
       @rack_request, @perform_call, @acceptance_test = rack_request, perform_call, acceptance_test

data/lib/http_router/route.rb

@@ -120,6 +120,7 @@ class HttpRouter
     def delete;  request_method('DELETE');  end
     def head;    request_method('HEAD');    end
     def options; request_method('OPTIONS'); end
+    def patch;   request_method('PATCH'); end
 
     def arbitrary(blk = nil, &blk2)
       arbitrary_with_continue { |req, params|
@@ -273,7 +274,7 @@ class HttpRouter
             router.pass_on_response(response) ? throw(:pass) : throw(:success, response)
           elsif req.acceptance_test
             response = Response.new(req, path_obj)
-            catch(:pass) { req.acceptance_test[response] }
+            req.passed_with = catch(:pass) { req.acceptance_test[response] }
             throw :success, response if response.acceptance_response
           else
             throw :success, Response.new(req, path_obj)

data/lib/http_router/version.rb

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

data/test/helper.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'minitest/autorun'
 require 'phocus'
 

data/test/test_generate.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class TestGenerate < MiniTest::Unit::TestCase
 
   def test_static
@@ -86,6 +87,10 @@ class TestGenerate < MiniTest::Unit::TestCase
     assert_generate '/url', "/url(/:var)", :var => nil
   end
 
+  def test_unicode
+    assert_generate '/%C3%A4', "/:var", :var => 'ä'
+  end
+
   def test_raise
     r = router { add(':var').matching(:var => /\d+/) }
     assert_raises(HttpRouter::InvalidRouteException) { router.url(r, 'asd') }

data/test/test_recognize.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class TestRecognition < MiniTest::Unit::TestCase
   def test_empty
     assert_route router.add(''),              '/'

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 9
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 -07:00
+date: 2011-05-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
         version: 0.2.1
   type: :runtime
   version_requirements: *id002
@@ -58,11 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
   type: :development
   version_requirements: *id003
@@ -74,9 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -86,12 +63,9 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+        version: 0.8.7
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -102,9 +76,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -116,9 +87,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -130,11 +98,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id008
@@ -146,11 +109,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 2
-        - 8
         version: 1.2.8
   type: :development
   version_requirements: *id009
@@ -237,18 +195,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []