webrick-route_servlet 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3daa5a8732ad22ccf5d3fa8de8bbffe66bc4d2a8
-  data.tar.gz: 55ef5e254e4a9e207ee2bfd1f132e622df21affd
+  metadata.gz: 28c27202030d498528554f283d477a4bb1113b2a
+  data.tar.gz: 2113772a490ba1735b1fc206da9b47c43240745b
 SHA512:
-  metadata.gz: a990d6a1013aad2b4f2b7ee1578bf1361ddda5d881426ef23d015f36067f01f59d132e272c5444ac1fe451185ed98650fae592570dbcc29d753989ae822d0f74
-  data.tar.gz: 3cd331027c4bc683fcb7631225bb9b5ab5e5fa173094be769617755689d8943a3f5edad21cc51e531dd11847301424fd73b55c32f0568c779e4e439ed13a694f
+  metadata.gz: a7c1f897aef431f4d452671a14ccc0c3af2c72a1468c4a9d78b758b81e116d7f6646bccd833204ec426d0c95344ec3ff414e00957d86cfb1aae317a6eb86a810
+  data.tar.gz: 91f0b18a85e00d1a3bee469d7030c7ca6d7d0b2281b062b3a2a510f964b72171c6ac65c399d43aae73b701cf7d89de2ae37a8c36bf48cecbbaa162f64d730f40

data/lib/webrick/route_servlet.rb

@@ -148,13 +148,17 @@ module WEBrick
         unless Regexp===re
           # normalize slash
           re = re.to_s.gsub(%r#/{2,}#, "/")
+
           # escape
           re = re.gsub(/([\.\-?*+\\^$])/, '\\\\\1')
+
           # start end regexp
           re = re.sub(%r#^/?#, "^/").sub(%r#/?$#, '/?$')
+
           # normalize parentheses
           re = re.gsub(")", ")?")
-          # constrain named capture
+
+          # constrain named capture ':'
           constraints = request_options[:constraints] || request_options
           keys = re.scan(%r#:([^/()\.]+)#).map(&:first).sort{|a,b| b.length <=> a.length}
           keys.each do |key|
@@ -164,6 +168,17 @@ module WEBrick
             end
             re = re.gsub(":#{key}", value_re.to_s)
           end
+
+          # constrain named capture '*'
+          keys = re.scan(%r#\\\*([^/()\.]+)#).map(&:first).sort{|a,b| b.length <=> a.length}
+          keys.each do |key|
+            value_re = Regexp.new("(?<#{key}>.+?)")
+            if constraints.respond_to?(:[]) && Regexp===constraints[key.to_sym]
+              value_re = /(?<#{key}>#{constraints[key.to_sym]})/
+            end
+            re = re.gsub("\\*#{key}", value_re.to_s)
+          end
+
           re = Regexp.new(re)
         end
         re

data/lib/webrick/route_servlet/version.rb

@@ -1,5 +1,5 @@
 module WEBrick
   module RouteServlet
-    VERSION = "1.2.8"
+    VERSION = "1.2.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webrick-route_servlet
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Yoshida Tetsuya