rack-jet_router 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c763fbc224d9c9c21718bf685203b35694c20f3b
-  data.tar.gz: 56bc71a1d83180f2970f1d95985fc8b2fa9b91bc
+  metadata.gz: dbed04ca4adfdce5a3e82234dd6182e18519dc62
+  data.tar.gz: bdec9db77792ffba5bca3e05ae4bf62f35cbf555
 SHA512:
-  metadata.gz: b72f539eb7750a754daea1189aa0035e8010a93d7debf74ef7f6a4b927223daf19f4bfbf0165192aab08c0e395289fabc423ee4690e6ab0ff0417603185334f1
-  data.tar.gz: 565dcf52b9c34e81803474de3c212f2b2b92d543a85057f3ab7959764f724b1ea2a5dc07c11caa4aca06a79aa318410000dabb98001ef4e0cbad4aaaa711fe11
+  metadata.gz: 0d90ffbb230351b7f0054d7d382b377dca41832cbfe2a47d6793c0ac88dbc075104535bf4529a6e1c50251365faadefb8d1fa02342d7104420cd8eb6316ea495
+  data.tar.gz: af141052683402fd8dedc4538b548bab59c816714e423236fe83cd70d2865f77337f5c6b9e0d93380e49fe4547995e36f256943be6426a20b1d04a82cfe69697

data/README.md

@@ -1,6 +1,6 @@
 # Rack::JetRouter
 
-($Release: 1.1.1 $)
+($Release: 1.2.0 $)
 
 Rack::JetRouter is crazy-fast router library for Rack application,
 derived from [Keight.rb](https://github.com/kwatch/keight/tree/ruby).
@@ -10,22 +10,40 @@ Rack::JetRouter requires Ruby >= 2.0.
 
 ## Benchmark
 
-Benchmark script is [here](https://github.com/kwatch/rack-jet_router/blob/dev/bench/bench.rb).
+Benchmark script is [here](https://github.com/kwatch/rack-jet_router/blob/release/bench/bench.rb).
 
-### JetRouter vs. Rack vs. Sinatra vs. Keight.rb:
+| Name               | Version |
+| ------------------ | ------- |
+| Ruby               | 2.3.1   |
+| Rack               | 1.6.4   |
+| Rack::JetRouter    | 1.2.0   |
+| Rack::Multiplexer  | 0.0.8   |
+| Sinatra            | 1.4.6   |
+| Keight.rb          | 0.3.0   |
+| Hanami             | 0.8.0   |
+
+(Macbook Air, Intel Core i7 1.7GHz, OS X EL Capitan)
+
+
+### JetRouter vs. Rack vs. Sinatra vs. Keight.rb vs. Hanami:
 
 ```
-## Ranking                         usec/req  Graph (longer=faster)
-(Rack plain)  /api/aaa01             1.0619  ***************
-(Rack plain)  /api/aaa01/123         0.8729  ******************
-(R::Req+Res)  /api/aaa01             9.5361  **
-(R::Req+Res)  /api/aaa01/123         9.5321  **
-(JetRouter)   /api/aaa01             1.3231  ************
-(JetRouter)   /api/aaa01/123         5.9796  ***
-(Keight.rb)   /api/aaa01             6.4314  **
-(Keight.rb)   /api/aaa01/123        10.2339  **
-(Sinatra)     /api/aaa01           104.7575
-(Sinatra)     /api/aaa01/123       115.8220
+## Ranking                             real
+(Rack plain)  /api/aaa01             0.9316 (100.0%) ********************
+(Rack plain)  /api/aaa01/123         1.0222 ( 91.1%) ******************
+(JetRouter)   /api/aaa01             1.4191 ( 65.6%) *************
+(JetRouter)   /api/aaa01/123         6.0146 ( 15.5%) ***
+(Multiplexer) /api/aaa01             6.1026 ( 15.3%) ***
+(Keight.rb)   /api/aaa01             7.2330 ( 12.9%) ***
+(R::Req+Res)  /api/aaa01            10.7835 (  8.6%) **
+(R::Req+Res)  /api/aaa01/123        10.8412 (  8.6%) **
+(Keight.rb)   /api/aaa01/123        10.8708 (  8.6%) **
+(Hanami::Router) /api/zzz26         11.5185 (  8.1%) **
+(Hanami::Router) /api/aaa01         11.7033 (  8.0%) **
+(Hanami::Router) /api/aaa01/123     17.9229 (  5.2%) *
+(Multiplexer) /api/aaa01/123        18.6987 (  5.0%) *
+(Sinatra)     /api/aaa01           109.7597 (  0.8%) 
+(Sinatra)     /api/aaa01/123       121.3258 (  0.8%) 
 ```
 
 * If URL path has no path parameter (such as `/api/hello`),
@@ -34,6 +52,7 @@ Benchmark script is [here](https://github.com/kwatch/rack-jet_router/blob/dev/be
   Rack::JetRouter becomes slower, but it is enough small (about 6usec/req).
 * Overhead of Rack::JetRouter is smaller than that of Rack::Reqeuast +
   Rack::Response.
+* Hanami is a litte slow.
 * Sinatra is too slow.
 
 
@@ -41,17 +60,18 @@ Benchmark script is [here](https://github.com/kwatch/rack-jet_router/blob/dev/be
 
 ```
 ## Ranking                         usec/req  Graph (longer=faster)
-(JetRouter)   /api/aaa01             1.3231  ************
-(JetRouter)   /api/aaa01/123         5.9796  ***
-(JetRouter)   /api/zzz26             1.4089  ***********
-(JetRouter)   /api/zzz26/789         6.5142  **
-(Multiplexer) /api/aaa01             5.9073  ***
-(Multiplexer) /api/aaa01/123        18.2102  *
-(Multiplexer) /api/zzz26            24.4013  *
-(Multiplexer) /api/zzz26/789        36.1558
+(JetRouter)   /api/aaa01             1.4191 ( 65.6%) *************
+(JetRouter)   /api/zzz26             1.4300 ( 65.1%) *************
+(JetRouter)   /api/aaa01/123         6.0146 ( 15.5%) ***
+(Multiplexer) /api/aaa01             6.1026 ( 15.3%) ***
+(JetRouter)   /api/zzz26/789         6.9102 ( 13.5%) ***
+(Multiplexer) /api/aaa01/123        18.6987 (  5.0%) *
+(Multiplexer) /api/zzz26            30.7618 (  3.0%) *
+(Multiplexer) /api/zzz26/789        42.6660 (  2.2%) 
 ```
 
-* JetRouter is about 3~5 times faster than Rack::Multiplexer.
+* JetRouter is about 4~6 times faster than Rack::Multiplexer.
+* Rack::Multiplexer is getting worse in promotion to the number of URL paths.
 
 
 ## Examples
@@ -199,6 +219,18 @@ end
 ```
 
 
+### Auto-redirection.
+
+Rack::JetRouter implements auto-redirection.
+
+* When `/foo` is provided and `/foo/` is requested, then Rack::JetRouter redirects to `/foo` automatically.
+* When `/foo/` is provided and `/foo` is requested, then Rack::JetRouter redirects to `/foo/` automatically.
+
+Notice that auto-redirection is occurred only on `GET` or `HEAD` methods, because
+browser cannot handle redirection on `POST`, `PUT`, and `DELETE` methods correctly.
+Don't depend on auto-redirection feature so much.
+
+
 ### Variable URL Path Cache
 
 It is useful to classify URL path patterns into two types: fixed and variable.
@@ -249,7 +281,7 @@ Above methods are invoked from `Rack::JetRouter#call()`.
 
 ## Copyright and License
 
-$Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
+$Copyright: copyright(c) 2015-2016 kuwata-lab.com all rights reserved $
 
 $License: MIT License $
 
@@ -257,6 +289,19 @@ $License: MIT License $
 ## History
 
 
+### 2016-10-16: Release 1.2.0
+
+* Change auto-redirection to be occurred only on GET or HEAD methods.
+* Code is rewrited, especially around `Rack::JetRouter#compile_mapping()`.
+* Update benchmark script to support `Hanabi::Router`.
+
+
+### 2015-12-29: Release 1.1.1
+
+* Fix benchmark script.
+* Fix document.
+
+
 ### 2015-12-28: Release 1.1.0
 
 * **NOTICE** `Rack::JetRouter#find()` is renamed to `#lookup()`.<br>

data/lib/rack/jet_router.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.1.1 $
+### $Release: 1.2.0 $
 ### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -55,7 +55,7 @@ module Rack
   ##
   class JetRouter
 
-    RELEASE = '$Release: 1.1.1 $'.split()[1]
+    RELEASE = '$Release: 1.2.0 $'.split()[1]
 
     def initialize(mapping, urlpath_cache_size: 0,
                             enable_urlpath_param_range: true)
@@ -64,12 +64,15 @@ module Rack
       (@urlpath_rexp,          # ex: {'/api/books'=>BooksApp}
        @fixed_urlpath_dict,    # ex: [[%r'\A/api/books/([^./]+)\z', ['id'], BookApp]]
        @variable_urlpath_list, # ex: %r'\A(?:/api(?:/books(?:/[^./]+(\z))))\z'
+       @all_entrypoints,       # ex: [['/api/books', BooksAPI'], ['/api/orders', OrdersAPI]]
       ) = compile_mapping(mapping)
       ## cache for variable urlpath (= containg urlpath parameters)
       @urlpath_cache_size = urlpath_cache_size
       @variable_urlpath_cache = urlpath_cache_size > 0 ? {} : nil
     end
 
+    attr_reader :urlpath_rexp
+
     ## Finds rack app according to PATH_INFO and REQUEST_METHOD and invokes it.
     def call(env)
       #; [!fpw8x] finds mapped app according to env['PATH_INFO'].
@@ -77,10 +80,15 @@ module Rack
       app, urlpath_params = lookup(req_path)
       #; [!wxt2g] guesses correct urlpath and redirects to it automaticaly when request path not found.
       #; [!3vsua] doesn't redict automatically when request path is '/'.
-      unless app || req_path == '/'
+      if ! app && should_redirect?(env)
         location = req_path =~ /\/\z/ ? req_path[0..-2] : req_path + '/'
         app, urlpath_params = lookup(location)
-        return redirect_to(location) if app
+        if app
+          #; [!hyk62] adds QUERY_STRING to redirect location.
+          qs = env['QUERY_STRING']
+          location = "#{location}?#{qs}" if qs && ! qs.empty?
+          return redirect_to(location)
+        end
       end
       #; [!30x0k] returns 404 when request urlpath not found.
       return error_not_found(env) unless app
@@ -143,6 +151,12 @@ module Rack
 
     alias find lookup      # :nodoc:      # for backward compatilibity
 
+    ## Yields pair of urlpath pattern and app.
+    def each(&block)
+      #; [!ep0pw] yields pair of urlpath pattern and app.
+      @all_entrypoints.each(&block)
+    end
+
     protected
 
     ## Returns [404, {...}, [...]]. Override in subclass if necessary.
@@ -157,6 +171,18 @@ module Rack
       return [405, {"Content-Type"=>"text/plain"}, ["405 Method Not Allowed"]]
     end
 
+    ## Returns false when request path is '/' or request method is not GET nor HEAD.
+    ## (It is not recommended to redirect when request method is POST, PUT or DELETE,
+    ##  because browser doesn't handle redirect correctly on those methods.)
+    def should_redirect?(env)
+      #; [!dsu34] returns false when request path is '/'.
+      #; [!ycpqj] returns true when request method is GET or HEAD.
+      #; [!7q8xu] returns false when request method is POST, PUT or DELETE.
+      return false if env['PATH_INFO'] == '/'
+      req_method = env['REQUEST_METHOD']
+      return req_method == 'GET' || req_method == 'HEAD'
+    end
+
     ## Returns [301, {"Location"=>location, ...}, [...]]. Override in subclass if necessary.
     def redirect_to(location)
       content = "Redirect to #{location}"
@@ -188,73 +214,73 @@ module Rack
 
     ## Compiles urlpath mapping. Called from '#initialize()'.
     def compile_mapping(mapping)
-      rexp_buf          = ['\A']
-      fixed_urlpaths    = {}  # ex: {'/api/books'=>BooksApp}
-      variable_urlpaths = []  # ex: [[%r'\A/api/books/([^./]+)\z', ['id'], BookApp]]
-      _compile_array(mapping, rexp_buf, '', '',
-                      fixed_urlpaths, variable_urlpaths)
-      ## ex: %r'\A(?:/api(?:/books(?:/[^./]+(\z)|/[^./]+/edit(\z))))\z'
-      rexp_buf << '\z'
-      urlpath_rexp = Regexp.new(rexp_buf.join())
+      ## entry points which has no urlpath parameters
+      ## ex:
+      ##   { '/'           => HomeApp,
+      ##     '/api/books'  => BooksApp,
+      ##     '/api/authors => AuthorsApp,
+      ##   }
+      dict = {}
+      ## entry points which has one or more urlpath parameters
+      ## ex:
+      ##   [
+      ##     [%r!\A/api/books/([^./]+)\z!,   ["id"], BookApp,   (11..-1)],
+      ##     [%r!\A/api/authors/([^./]+)\z!, ["id"], AuthorApp, (12..-1)],
+      ##   ]
+      list = []
+      #
+      all = []
+      rexp_str = _compile_mapping(mapping, "", "") do |entry_point|
+        obj, urlpath_pat, urlpath_rexp, param_names = entry_point
+        all << [urlpath_pat, obj]
+        if urlpath_rexp
+          range = @enable_urlpath_param_range ? range_of_urlpath_param(urlpath_pat) : nil
+          list << [urlpath_rexp, param_names, obj, range]
+        else
+          dict[urlpath_pat] = obj
+        end
+      end
+      ## ex: %r!^A(?:api(?:/books/[^./]+(\z)|/authors/[^./]+(\z)))\z!
+      urlpath_rexp = Regexp.new("\\A#{rexp_str}\\z")
       #; [!xzo7k] returns regexp, hash, and array.
-      return urlpath_rexp, fixed_urlpaths, variable_urlpaths
+      return urlpath_rexp, dict, list, all
     end
 
-    def _compile_array(mapping, rexp_buf, base_urlpath_pat, urlpath_pat,
-                       fixed_dict, variable_list)
-      rexp_str, _ = compile_urlpath_pattern(urlpath_pat, false)
-      rexp_buf << rexp_str
-      rexp_buf << '(?:'
-      len = rexp_buf.length
-      mapping.each do |child_urlpath_pat, obj|
-        rexp_buf << '|' if rexp_buf.length != len
-        curr_urlpath_pat = "#{base_urlpath_pat}#{urlpath_pat}"
+    def _compile_mapping(mapping, base_urlpath, parent_urlpath, &block)
+      arr = []
+      mapping.each do |urlpath, obj|
+        full_urlpath = "#{base_urlpath}#{urlpath}"
         #; [!ospaf] accepts nested mapping.
         if obj.is_a?(Array)
-          _compile_array(obj, rexp_buf, curr_urlpath_pat, child_urlpath_pat,
-                         fixed_dict, variable_list)
+          rexp_str = _compile_mapping(obj, full_urlpath, urlpath, &block)
         #; [!2ktpf] handles end-point.
         else
-          _compile_object(obj, rexp_buf, curr_urlpath_pat, child_urlpath_pat,
-                          fixed_dict, variable_list)
+          #; [!guhdc] if mapping dict is specified...
+          if obj.is_a?(Hash)
+            obj = normalize_mapping_keys(obj)
+          end
+          #; [!vfytw] handles urlpath pattern as variable when urlpath param exists.
+          full_urlpath_rexp_str, param_names = compile_urlpath_pattern(full_urlpath, true)
+          if param_names   # has urlpath params
+            full_urlpath_rexp = Regexp.new("\\A#{full_urlpath_rexp_str}\\z")
+            rexp_str, _ = compile_urlpath_pattern(urlpath, false)
+            rexp_str << '(\z)'
+            entry_point = [obj, full_urlpath, full_urlpath_rexp, param_names]
+          #; [!l63vu] handles urlpath pattern as fixed when no urlpath params.
+          else             # has no urlpath params
+            entry_point = [obj, full_urlpath, nil, nil]
+          end
+          yield entry_point
         end
+        arr << rexp_str if rexp_str
       end
-      #; [!gfxgr] deletes unnecessary grouping.
-      if rexp_buf.length == len
-        x = rexp_buf.pop()    # delete '(?:'
-        x == '(?:'  or raise "assertion failed"
-        #; [!pv2au] deletes unnecessary urlpath regexp.
-        x = rexp_buf.pop()    # delete rexp_str
-        x == rexp_str  or raise "assertion failed"
-      #; [!bh9lo] deletes unnecessary grouping which contains only an element.
-      elsif rexp_buf.length == len + 1
-        rexp_buf[-2] == '(?:'  or raise "assertion failed: rexp_buf[-2]=#{rexp_buf[-2].inspect}"
-        rexp_buf[-2] = ''
-      else
-        rexp_buf << ')'
-      end
-    end
-
-    def _compile_object(obj, rexp_buf, base_urlpath_pat, urlpath_pat,
-                        fixed_dict, variable_list)
-      #; [!guhdc] if mapping dict is specified...
-      if obj.is_a?(Hash)
-        obj = normalize_mapping_keys(obj)
-      end
-      #; [!l63vu] handles urlpath pattern as fixed when no urlpath params.
-      full_urlpath_pat = "#{base_urlpath_pat}#{urlpath_pat}"
-      full_urlpath_rexp_str, param_names = compile_urlpath_pattern(full_urlpath_pat, true)
-      fixed_pattern = param_names.nil?
-      if fixed_pattern
-        fixed_dict[full_urlpath_pat] = obj
-      #; [!vfytw] handles urlpath pattern as variable when urlpath param exists.
-      else
-        rexp_str, _ = compile_urlpath_pattern(urlpath_pat, false)
-        rexp_buf << (rexp_str << '(\z)')
-        full_urlpath_rexp = Regexp.new("\\A#{full_urlpath_rexp_str}\\z")
-        range = @enable_urlpath_param_range ? range_of_urlpath_param(full_urlpath_pat) : nil
-        variable_list << [full_urlpath_rexp, param_names, obj, range]
-      end
+      #; [!pv2au] deletes unnecessary urlpath regexp.
+      return nil if arr.empty?
+      #; [!bh9lo] deletes unnecessary grouping.
+      parent_urlpath_rexp_str, _ = compile_urlpath_pattern(parent_urlpath, false)
+      return "#{parent_urlpath_rexp_str}#{arr[0]}" if arr.length == 1
+      #; [!iza1g] adds grouping if necessary.
+      return "#{parent_urlpath_rexp_str}(?:#{arr.join('|')})"
     end
 
     ## Compiles '/books/:id' into ['/books/([^./]+)', ["id"]].

data/rack-jet_router.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "rack-jet_router"
-  spec.version       = '$Release: 1.1.1 $'.split()[1]
+  spec.version       = '$Release: 1.2.0 $'.split()[1]
   spec.authors       = ["makoto kuwata"]
   spec.email         = ["kwa(at)kuwata-lab.com"]
 

data/test/rack/jet_router_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.1.1 $
+### $Release: 1.2.0 $
 ### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -154,23 +154,39 @@ describe Rack::JetRouter do
       end
     end
 
-    it "[!gfxgr] deletes unnecessary grouping." do
+    it "[!iza1g] adds grouping if necessary." do
       mapping = [
-        ['/'               , welcome_app],
-        ['/api/books'      , book_list_api],
+        ['/api', [
+          ['/books', [
+            ['/:id'        , book_show_api],
+          ]],
+        ]],
+        ['/admin', [
+          ['/books', [
+            ['/:id'        , admin_book_show_app],
+          ]],
+        ]],
       ]
       expected = '
           \A
+              (?:
+              /api
+                      /books
+                          /[^./]+(\z)
+              |
+              /admin
+                      /books
+                          /[^./]+(\z)
+              )
           \z
       '.gsub(/\s+/, '')
       jet_router.instance_exec(self) do |_|
         rexp, dict, list = compile_mapping(mapping)
         _.ok {rexp} == Regexp.new(expected)
-        _.ok {dict} == {
-          '/'                => welcome_app,
-          '/api/books'       => book_list_api,
-        }
+        _.ok {dict} == {}
         _.ok {list} == [
+          [%r'\A/api/books/([^./]+)\z',  ['id'], book_show_api, (11..-1)],
+          [%r'\A/admin/books/([^./]+)\z',  ['id'], admin_book_show_app, (13..-1)],
         ]
       end
     end
@@ -188,17 +204,7 @@ describe Rack::JetRouter do
           ]],
         ]],
       ]
-      expected = '
-          \A
-          (?:
-              /api
-                  (?:
-                      /books2
-                          /[^./]+(\z)
-                  )
-          )
-          \z
-      '.gsub(/\s+/, '')
+      expected = '\A/api/books2/[^./]+(\z)\z'
       jet_router.instance_exec(self) do |_|
         rexp, dict, list = compile_mapping(mapping)
         _.ok {rexp} == Regexp.new(expected)
@@ -213,7 +219,7 @@ describe Rack::JetRouter do
       end
     end
 
-    it "[!bh9lo] deletes unnecessary grouping which contains only an element." do
+    it "[!bh9lo] deletes unnecessary grouping." do
       mapping = [
         ['/api', [
           ['/books', [
@@ -223,13 +229,9 @@ describe Rack::JetRouter do
       ]
       expected = '
           \A
-          (?:
-              /api
-                  (?:
-                      /books
-                          /[^./]+(\z)
-                  )
-          )
+            /api
+              /books
+                /[^./]+(\z)
           \z
       '.gsub(/\s+/, '')
       jet_router.instance_exec(self) do |_|
@@ -318,16 +320,10 @@ describe Rack::JetRouter do
       ]
       expected = '
           \A
-          (?:
               /admin
-                  (?:
-                      /api
-                          (?:
-                              /books
-                                  /[^./]+(\z)
-                          )
-                  )
-          )
+                  /api
+                      /books
+                          /[^./]+(\z)
           \z
       '.gsub(/\s+/, '')
       jet_router.instance_exec(self) do |_|
@@ -379,6 +375,38 @@ describe Rack::JetRouter do
   end
 
 
+  describe '#should_redirect?' do
+
+    it "[!dsu34] returns false when request path is '/'." do
+      jet_router.instance_exec(self) do |_|
+        _.ok {should_redirect?(_.new_env('GET'   , '/'))} == false
+        _.ok {should_redirect?(_.new_env('POST'  , '/'))} == false
+        _.ok {should_redirect?(_.new_env('PUT'   , '/'))} == false
+        _.ok {should_redirect?(_.new_env('DELETE', '/'))} == false
+        _.ok {should_redirect?(_.new_env('HEAD'  , '/'))} == false
+        _.ok {should_redirect?(_.new_env('PATCH' , '/'))} == false
+      end
+    end
+
+    it "[!ycpqj] returns true when request method is GET or HEAD." do
+      jet_router.instance_exec(self) do |_|
+        _.ok {should_redirect?(_.new_env('GET'   , '/index'))} == true
+        _.ok {should_redirect?(_.new_env('HEAD'  , '/index'))} == true
+      end
+    end
+
+    it "[!7q8xu] returns false when request method is POST, PUT or DELETE." do
+      jet_router.instance_exec(self) do |_|
+        _.ok {should_redirect?(_.new_env('POST'  , '/index'))} == false
+        _.ok {should_redirect?(_.new_env('PUT'   , '/index'))} == false
+        _.ok {should_redirect?(_.new_env('DELETE', '/index'))} == false
+        _.ok {should_redirect?(_.new_env('PATCH' , '/index'))} == false
+      end
+    end
+
+  end
+
+
   describe '#error_not_found()' do
 
     it "[!mlruv] returns 404 response." do
@@ -422,9 +450,8 @@ describe Rack::JetRouter do
                     )
             |
                 /admin
-                    (?:/books
+                    /books
                         /[^./]+(\z)
-                    )
             )
             \z
         '.gsub(/\s+/, '')
@@ -591,6 +618,13 @@ describe Rack::JetRouter do
       ok {r.call(new_env(:GET, '/'))} == [404, {"Content-Type"=>"text/plain"}, ["404 Not Found"]]
     end
 
+    it "[!hyk62] adds QUERY_STRING to redirect location." do
+      headers = {"Content-Type"=>"text/plain", "Location"=>"/api/books?x=1&y=2"}
+      content = "Redirect to /api/books?x=1&y=2"
+      env = new_env(:GET, '/api/books/', {"QUERY_STRING"=>"x=1&y=2"})
+      ok {jet_router.call(env)} == [301, headers, [content]]
+    end
+
     it "[!30x0k] returns 404 when request urlpath not found." do
       expected = [404, {"Content-Type"=>"text/plain"}, ["404 Not Found"]]
       ok {jet_router.call(new_env(:GET, '/xxx'))} == expected
@@ -654,6 +688,28 @@ describe Rack::JetRouter do
   end
 
 
+  describe '#each()' do
+
+    it "[!ep0pw] yields pair of urlpath pattern and app." do
+      arr = []
+      jet_router.each do |upath, app|
+        arr << [upath, app]
+      end
+      ok {arr[0]} == ["/", welcome_app]
+      ok {arr[1]} == ["/index.html", welcome_app]
+      ok {arr[2]} == ["/api/books", book_list_api]
+      ok {arr[3]} == ["/api/books/new", book_new_api]
+      ok {arr[4]} == ["/api/books/:id", book_show_api]
+      ok {arr[5]} == ["/api/books/:id/edit", book_edit_api]
+      ok {arr[6]} == ["/api/books/:book_id/comments", comment_create_api]
+      ok {arr[7]} == ["/api/books/:book_id/comments/:comment_id", comment_update_api]
+      ok {arr[8]} == ["/admin/books", {"GET"=>admin_book_list_app, "POST"=>admin_book_create_app}]
+      ok {arr[9]} == ["/admin/books/:id", {"GET"=>admin_book_show_app, "PUT"=>admin_book_update_app, "DELETE"=>admin_book_delete_app}]
+    end
+
+  end
+
+
   describe 'REQUEST_METHODS' do
 
     it "[!haggu] contains available request methods." do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-jet_router
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - makoto kuwata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler