riddl 0.99.207 → 0.99.208

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07694842ff49cbfcf92bd87947f9a1f0dd80eed8
-  data.tar.gz: 874a1c3b9513dadbd5d1b2463d83e50a15b99f09
+  metadata.gz: 9d3d8a028142cbc6511bf308b7b3a7d4e576453c
+  data.tar.gz: 154a17cdbd86c485bbd5a9c93a42b606c4dd8476
 SHA512:
-  metadata.gz: bc528735babe08fba33c3aaf3c9d798ffa056e7b41080f0436b0fd00066b82066db9262c86724a933e96136e6595ba635b86a4ceacce1320505717c2597dc9dd
-  data.tar.gz: b3b85afe019ca055368c162e631c107dc63dd09019a65f455a8c8675e576a180c7e71fd88bc0f1aa3ed4ed34fbd7b26fafd57f78bcea06d194194372405799d1
+  metadata.gz: c2efc1ca1d994220c39d1428f82f9c5b5b81000edd2d1d559d0f542160e727954196631082a53023c8a9f617efa4d0e632f34ad9314b80394af6d4e9e917b326
+  data.tar.gz: 9d134df9cbaff81ce7d6cdc64358fb565a8e6bd454d3b7dd60dd04353b6b0ce41a3fe36091dfb68c27a7c217b2ae54b7f61dc5cae17c4cfd02fcb455a2c1a491

data/lib/ruby/riddl/server.rb

@@ -337,7 +337,7 @@ module Riddl
       @riddl_pinfo.gsub!(/\?(.*)/).each do
         @riddl_query_string = $1; ''
       end
-      @riddl_matching_path = @riddl_paths.find{ |e| e[1] =~ @riddl_pinfo }
+      @riddl_matching_path = @riddl_paths.find{ |e| @riddl_pinfo.match(e[1]).to_s.length == @riddl_pinfo.length }
 
       if @riddl_matching_path
         @riddl_method = @riddl_env.find('string(/message/xr:operation)').downcase
@@ -389,7 +389,7 @@ module Riddl
       @riddl_status = 404
 
       @riddl_pinfo = Riddl::Protocols::Utils::unescape(@riddl_env["PATH_INFO"].gsub(/\/+/,'/'))
-      @riddl_matching_path = @riddl_paths.map{ |e| e[1] =~ @riddl_pinfo; $~ ? [$~.to_s.length,e] : nil }.compact.max{|e| e[0]}[1] rescue nil
+      @riddl_matching_path = @riddl_paths.find{ |e| @riddl_pinfo.match(e[1]).to_s.length == @riddl_pinfo.length }
 
       if @riddl_matching_path
         @riddl_query_string = @riddl_env['QUERY_STRING']

data/lib/ruby/riddl/wrapper.rb

@@ -22,7 +22,11 @@ module Riddl
       def rpaths(res,what='',rewhat='')
         #{{{
         what += what == '' ? '/' : res.path
-        rewhat += rewhat == '' ? '/' : '(' + res.path + ')'
+        if res.recursive
+          rewhat += rewhat == '' ? '/' : '(' + res.path + ')(\/(' + res.path + '))*'
+        else
+          rewhat += rewhat == '' ? '/' : '(' + res.path + ')'
+        end
         ret = [[what,rewhat,res.recursive]]
         res.resources.each do |name,r|
           ret += rpaths(r,what == '/' ? what : what + '/',rewhat == '/' ? rewhat : rewhat + '/')

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.207"
+  s.version          = "0.99.208"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.207
+  version: 0.99.208
 platform: ruby
 authors:
 - Juergen eTM Mangler