riddl 0.99.203 → 0.99.204

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf0162d634ac9500c331947de6ff39cd506e24c5
-  data.tar.gz: e70f25eb9171ca113b168814f731368f3c9aa8f8
+  metadata.gz: d6ce6cefa51a55659fe1c1cdc6c29cfa48bc04cc
+  data.tar.gz: 26b83b96c5b50ee44868e39a75ba7feec4ff6499
 SHA512:
-  metadata.gz: 389305809f05730a3a5c4c2e7efd1af1dc78a3924048737a4ff17325d67ecd845ed1980adf2d48295ab38c5924ec01c2d3020847487aabef0506a9e0d09dfc60
-  data.tar.gz: ab8b23348578760e119e741b7a0823460ad6e3de6a7d37ad4c287390a0c83100f77ec93d6a216d9c704df8c2a657b266e0a646076a73a231f686cd80e7311b0d
+  metadata.gz: eecedc55e5f5965e17510d9c0923c27526ded13a3da44baf81b3ceeb4dd9b5212e644671fc8f1df942bd00621dfc1a12312335f26b61c08244e32e331c1f914c
+  data.tar.gz: 5940de37387c79cc3f42fe38a6e3a0dc4509d3ef2ade78b2981231b229d94b3457db83ebf028f34644f15bb86f4cbc4f2b19ee7c4671b428d5cddd85c8548c9d

data/lib/ruby/riddl/wrapper.rb

@@ -8,8 +8,7 @@ module Riddl
     class WrapperUtils
       def get_resource_deep(path,pres)
         #{{{
-        path.split('/(').each do |pa|
-          pa.chop!
+        path.split('/').each do |pa|
           next if pa == ""
           if pres.resources.has_key?(pa)
             pres = pres.resources[pa]
@@ -20,12 +19,13 @@ module Riddl
         pres
         #}}}
       end
-      def rpaths(res,what,finalize=false)
+      def rpaths(res,what='',rewhat='')
         #{{{
-        what += what == '' ? '/' : (finalize ? '(' + res.path + ')' : res.path)
-        ret = [[what,res.recursive]]
+        what += what == '' ? '/' : res.path
+        rewhat += rewhat == '' ? '/' : '(' + res.path + ')'
+        ret = [[what,rewhat,res.recursive]]
         res.resources.each do |name,r|
-          ret += rpaths(r,what == '/' ? what : what + '/',finalize)
+          ret += rpaths(r,what == '/' ? what : what + '/',rewhat == '/' ? rewhat : rewhat + '/')
         end
         ret.sort!
         ret
@@ -270,7 +270,7 @@ module Riddl
       tmp = @description.paths if @is_description 
       tmp = @declaration.paths if @is_declaration
       tmp.map do |t|
-        [t[0],Regexp.new("^" + t[0].gsub(/\{\}/,"[^/]+") + (t[1] ? '\/?' : '\/?$'))]
+        [t[0],Regexp.new("^" + t[1].gsub(/\{\}/,"[^/]+") + (t[2] ? '\/?' : '\/?$'))]
       end
       #}}}
     end

data/lib/ruby/riddl/wrapper/declaration.rb

@@ -11,7 +11,7 @@ module Riddl
         get_resource_deep(path,@facade.resource)
       end  
       def paths
-        rpaths(@facade.resource,'',true)
+        rpaths(@facade.resource)
       end
       
       def description_xml
@@ -81,7 +81,7 @@ module Riddl
             desres = des.find("des:resource").first
             if everywhere
               @tiles.map do |til| # extract all currently existing paths for all tiles
-                rpaths(til.resource,'').map{|a,b| a}
+                rpaths(til.resource).map{|a,b| a}
               end.flatten.uniq.each do |path| # apply current to all paths
                 int = Interface.new(lname,path,lpath,"/",des)
                 rec = desres.attributes['recursive']

data/lib/ruby/riddl/wrapper/description.rb

@@ -7,7 +7,7 @@ module Riddl
     class Description < WrapperUtils
 
       def paths(res=@resource,what='')
-        rpaths(res,what,true)
+        rpaths(res,what)
       end
       def get_resource(path)
         get_resource_deep(path,@resource)

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.203"
+  s.version          = "0.99.204"
   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.203
+  version: 0.99.204
 platform: ruby
 authors:
 - Juergen eTM Mangler