rack-jet_router 1.3.0 → 1.4.0

data/test/router_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.3.0 $
+### $Release: 1.4.0 $
 ### $Copyright: copyright(c) 2015 kwatch@gmail.com $
 ### $License: MIT License $
 ###
@@ -35,6 +35,8 @@ Oktest.scope do
     admin_book_delete_app  = proc {|env| [200, {}, ["admin_book_delete_app"]]}
     admin_book_edit_app    = proc {|env| [200, {}, ["admin_book_edit_app"]]}
     #
+    staticfile_app   = proc {|env| [200, {}, ["staticfile_app"]]}
+    #
     whole_urlpath_mapping = [
       ['/'              , welcome_app],
       ['/index.html'    , welcome_app],
@@ -56,6 +58,7 @@ Oktest.scope do
           ['/:id'       , {:GET=>admin_book_show_app, :PUT=>admin_book_update_app, :DELETE=>admin_book_delete_app}],
         ]],
       ]],
+      ['/static/*filepath', {:GET=>staticfile_app}],
     ]
 
     def new_env(req_method, req_path, opts={})
@@ -250,6 +253,9 @@ Oktest.scope do
              "PUT"    => admin_book_update_app,
              "DELETE" => admin_book_delete_app,
            }],
+          ["/static/*filepath", {
+             "GET"    => staticfile_app,
+           }],
         ]
       end
 
@@ -277,10 +283,45 @@ Oktest.scope do
         end
       end
 
+      spec "[!ec0av] treats '/foo(.html|.json)' as three fixed urlpaths." do
+        mapping = {
+          "/api/books(.html|.json)" => book_list_api,
+        }
+        router = Rack::JetRouter.new(mapping)
+        router.instance_exec(self) do |_|
+          _.ok {@fixed_endpoints} == {
+            "/api/books"      => book_list_api,
+            "/api/books.html" => book_list_api,
+            "/api/books.json" => book_list_api,
+          }
+          _.ok {@variable_endpoints} == []
+        end
+      end
+
+      spec "[!ylyi0] stores '/foo' as fixed path when path pattern is '/foo(.:format)'." do
+        mapping = {
+          "/api/books(.json|.:format|.html)" => book_list_api,
+        }
+        router = Rack::JetRouter.new(mapping)
+        router.instance_exec(self) do |_|
+          _.ok {@fixed_endpoints} == {
+            "/api/books"      => book_list_api,
+            "/api/books.json" => book_list_api,
+            "/api/books.html" => book_list_api,
+          }
+          _.ok {@variable_endpoints} == [
+            [%r!\A/api/books(?:\.([^./?]+))?\z!,
+             ["format"], book_list_api, nil, nil],
+          ]
+        end
+
+      end
+
       spec "[!saa1a] compiles compound urlpath regexp." do
         id = '[^./?]+'
         z  = '(\z)'
-        ok {@router.urlpath_rexp} == %r!\A/a(?:pi/books/#{id}(?:#{z}|/(?:edit#{z}|comments(?:#{z}|/#{id}#{z})))|dmin/books/#{id}#{z})\z!
+        expected = %r!\A/(?:a(?:pi/books/#{id}(?:#{z}|/(?:edit#{z}|comments(?:#{z}|/#{id}#{z})))|dmin/books/#{id}#{z})|static/.*(\z))\z!
+        ok {@router.urlpath_rexp} == expected
       end
 
       spec "[!f1d7s] builds variable endpoint list." do
@@ -292,11 +333,12 @@ Oktest.scope do
         }
         @router.instance_exec(self) do |_|
           _.ok {@variable_endpoints} == [
-            [%r'\A/api/books/(#{id})\z',      ['id'], book_show_api, (11..-1)],
-            [%r'\A/api/books/(#{id})/edit\z', ['id'], book_edit_api, (11..-6)],
-            [%r'\A/api/books/(#{id})/comments\z',          ['book_id'], comment_create_api, (11..-10)],
-            [%r'\A/api/books/(#{id})/comments/(#{id})\z', ['book_id', 'comment_id'], comment_update_api, nil],
-            [%r'\A/admin/books/(#{id})\z', ['id'], map2, (13..-1)],
+            [%r'\A/api/books/(#{id})\z',      ['id'], book_show_api, (11..-1), nil],
+            [%r'\A/api/books/(#{id})/edit\z', ['id'], book_edit_api, (11..-6), nil],
+            [%r'\A/api/books/(#{id})/comments\z',         ['book_id'], comment_create_api, (11..-10), nil],
+            [%r'\A/api/books/(#{id})/comments/(#{id})\z', ['book_id', 'comment_id'], comment_update_api, (11..-1), '/comments/'],
+            [%r'\A/admin/books/(#{id})\z', ['id'], map2, (13..-1), nil],
+            [%r'\A/static/(.*)\z', ['filepath'], {"GET"=>staticfile_app}, (8..-1), nil],
           ]
         end
       end

data/test/shared.rb

@@ -10,6 +10,6 @@ require 'rack/jet_router'
 class Map < Hash
 end
 
-def Map(**kwargs)
-  return Map.new.update(kwargs)
+def Map(dict={}, **kwargs)
+  return Map.new.update(dict.merge(kwargs))
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-jet_router
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - kwatch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-09 00:00:00.000000000 Z
+date: 2024-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oktest