riddl 0.99.207 → 0.99.208

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 07694842ff49cbfcf92bd87947f9a1f0dd80eed8
4
- data.tar.gz: 874a1c3b9513dadbd5d1b2463d83e50a15b99f09
3
+ metadata.gz: 9d3d8a028142cbc6511bf308b7b3a7d4e576453c
4
+ data.tar.gz: 154a17cdbd86c485bbd5a9c93a42b606c4dd8476
5
5
  SHA512:
6
- metadata.gz: bc528735babe08fba33c3aaf3c9d798ffa056e7b41080f0436b0fd00066b82066db9262c86724a933e96136e6595ba635b86a4ceacce1320505717c2597dc9dd
7
- data.tar.gz: b3b85afe019ca055368c162e631c107dc63dd09019a65f455a8c8675e576a180c7e71fd88bc0f1aa3ed4ed34fbd7b26fafd57f78bcea06d194194372405799d1
6
+ metadata.gz: c2efc1ca1d994220c39d1428f82f9c5b5b81000edd2d1d559d0f542160e727954196631082a53023c8a9f617efa4d0e632f34ad9314b80394af6d4e9e917b326
7
+ data.tar.gz: 9d134df9cbaff81ce7d6cdc64358fb565a8e6bd454d3b7dd60dd04353b6b0ce41a3fe36091dfb68c27a7c217b2ae54b7f61dc5cae17c4cfd02fcb455a2c1a491
@@ -337,7 +337,7 @@ module Riddl
337
337
  @riddl_pinfo.gsub!(/\?(.*)/).each do
338
338
  @riddl_query_string = $1; ''
339
339
  end
340
- @riddl_matching_path = @riddl_paths.find{ |e| e[1] =~ @riddl_pinfo }
340
+ @riddl_matching_path = @riddl_paths.find{ |e| @riddl_pinfo.match(e[1]).to_s.length == @riddl_pinfo.length }
341
341
 
342
342
  if @riddl_matching_path
343
343
  @riddl_method = @riddl_env.find('string(/message/xr:operation)').downcase
@@ -389,7 +389,7 @@ module Riddl
389
389
  @riddl_status = 404
390
390
 
391
391
  @riddl_pinfo = Riddl::Protocols::Utils::unescape(@riddl_env["PATH_INFO"].gsub(/\/+/,'/'))
392
- @riddl_matching_path = @riddl_paths.map{ |e| e[1] =~ @riddl_pinfo; $~ ? [$~.to_s.length,e] : nil }.compact.max{|e| e[0]}[1] rescue nil
392
+ @riddl_matching_path = @riddl_paths.find{ |e| @riddl_pinfo.match(e[1]).to_s.length == @riddl_pinfo.length }
393
393
 
394
394
  if @riddl_matching_path
395
395
  @riddl_query_string = @riddl_env['QUERY_STRING']
@@ -22,7 +22,11 @@ module Riddl
22
22
  def rpaths(res,what='',rewhat='')
23
23
  #{{{
24
24
  what += what == '' ? '/' : res.path
25
- rewhat += rewhat == '' ? '/' : '(' + res.path + ')'
25
+ if res.recursive
26
+ rewhat += rewhat == '' ? '/' : '(' + res.path + ')(\/(' + res.path + '))*'
27
+ else
28
+ rewhat += rewhat == '' ? '/' : '(' + res.path + ')'
29
+ end
26
30
  ret = [[what,rewhat,res.recursive]]
27
31
  res.resources.each do |name,r|
28
32
  ret += rpaths(r,what == '/' ? what : what + '/',rewhat == '/' ? rewhat : rewhat + '/')
data/riddl.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "riddl"
3
- s.version = "0.99.207"
3
+ s.version = "0.99.208"
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.license = "LGPL-3"
6
6
  s.summary = "restful interface description and declaration language: tools and client/server libs"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: riddl
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.99.207
4
+ version: 0.99.208
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler