riddl 0.99.209 → 0.99.210

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a09958851c3d72d1bd539ccc1b8e236917f2c3b
-  data.tar.gz: 328c47ad7802b4516a059c61f531535d96baf80d
+  metadata.gz: d987ba3153ddd4aed09c49d19d3f1f215fac5f2a
+  data.tar.gz: 81d2e1b295d19278a38ac57856d918b499eeee18
 SHA512:
-  metadata.gz: b302daa4b3ef2505b64f63d8ec7fb9093b8f95b0245e38a9da43d166076bf0036509cce5ee7d2c60ae025e34dbcb4bda3540baac28b7128b07e01c9371c203ef
-  data.tar.gz: 3de64c01df01dac35e258f16e4ee60f3bb0a415d725b59ab71e06c94b1228d194e3989faba49394e3daac80efb51c28557f55e9f0335189fc683a4318e24d3be
+  metadata.gz: 1995a0ed8cf92c555b896861cfbdd0588622e1bbe608cec2170bb3020973123bd760b53c0730d1643abbba1082241cbd9c3c9fdefe8473a36f102055e7e0cbb3
+  data.tar.gz: ef36ba2b110e3cef939ae8797065818e9f8a12c4b50b624442aa5052c9339ad339d522ce7f0da34c594720f073068bb3ed9f950c0fcbea0c2d9425658df22270

data/examples/pass-test/ara.xml

@@ -0,0 +1,13 @@
+<description datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:doc="http://riddl.org/ns/documentation/1.0">
+
+  <message name="aaaa">
+    <parameter name="aaaa" type="string">
+      <param name="pattern">\d{4}[SW]</param>
+    </parameter>
+  </message>
+
+  <resource>
+    <get out="aaaa"/>
+  </resource>
+
+</description>

data/examples/pass-test/middleware.xml

@@ -0,0 +1,25 @@
+<declaration xmlns="http://riddl.org/ns/declaration/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <interface name="structure">
+    <xi:include href="structure.xml"/>
+  </interface>
+  <interface name="oauth2-univie-client">
+    <xi:include href="oc.xml"/>
+  </interface>
+  <interface name="ara">
+    <xi:include href="ara.xml"/>
+  </interface>
+
+  <facade>
+    <tile>
+      <layer name="oauth2-univie-client">
+        <apply-to>/**/*</apply-to>
+      </layer>
+      <layer name="structure"/>
+    </tile>
+    <tile>
+      <layer name="ara">
+        <apply-to>/**/*</apply-to>
+      </layer>
+    </tile>
+  </facade>
+</declaration>

data/examples/pass-test/oc.xml

@@ -0,0 +1,7 @@
+<description datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:doc="http://riddl.org/ns/documentation/1.0">
+
+  <resource>
+    <get pass="*"/>
+  </resource>
+
+</description>

data/examples/pass-test/structure.xml

@@ -0,0 +1,19 @@
+<description datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:doc="http://riddl.org/ns/documentation/1.0">
+
+  <message name="currentsemester">
+    <parameter name="return" type="string">
+      <param name="pattern">\d{4}[SW]</param>
+    </parameter>
+  </message>
+
+
+  <resource>
+    <resource relative="currentsemester">
+      <get in="*" out="currentsemester"/>
+      <resource relative="currentsemester">
+        <get in="*" out="currentsemester"/>
+      </resource>
+    </resource>
+  </resource>
+
+</description>

data/lib/ruby/riddl/client.rb

@@ -300,7 +300,7 @@ unless Module.constants.include?('CLIENT_INCLUDED')
 
           qparams = extract_qparams(parameters,riddl_method.downcase)
 
-          res = response = nil
+          response = nil
           if @wrapper.nil? || @wrapper.description? || (@wrapper.declaration? && !@base.nil?)
             status, response, response_headers = make_request(@base + @rpath,riddl_method,parameters,headers,qparams,simulate,riddl_message && riddl_message.out ? true : false)
             return response if simulate
@@ -360,14 +360,13 @@ unless Module.constants.include?('CLIENT_INCLUDED')
             req = Riddl::Client::HTTPRequest.new(riddl_method,url.path,parameters,headers,qs)
             return req.simulate if simulate
 
-            res = response = nil
+            response = nil
 
             http = Net::HTTP.new(url.host, url.port)
             if url.class == URI::HTTPS
               http.use_ssl = true
               http.verify_mode = OpenSSL::SSL::VERIFY_NONE
             end  
-            deb = nil
             if @options[:debug]
               http.set_debug_output @options[:debug]
             end  

data/lib/ruby/riddl/ns/declaration/1.0/declaration.rng

@@ -53,11 +53,6 @@
     <attribute name="name">
       <ref name="riddl-datatype-name"/>
     </attribute>
-    <optional>
-      <attribute name="everywhere">
-        <data type="boolean"/>
-      </attribute>  
-    </optional>  
     <zeroOrMore>
       <element name="apply-to">
         <ref name="riddl-datatype-pathtemplate"/>

data/lib/ruby/riddl/wrapper.rb

@@ -124,7 +124,7 @@ module Riddl
         @doc.root.prepend("dec:interface",:name=>"riddldescription").add XML::Smart::open_unprotected(RIDDL_DESCRIPTION_SHOW).root
         @doc.root.prepend("dec:interface",:name=>"riddlresourcedescription").add XML::Smart::open_unprotected(RIDDL_DESCRIPTION_RESOURCE_SHOW).root
         @doc.root.find("dec:facade").first.append('dec:tile').append("layer",:name => "riddldescription")
-        @doc.root.find("dec:facade").first.append('dec:tile').append("layer",:name => "riddlresourcedescription",:everywhere => 'true')
+        @doc.root.find("dec:facade").first.append('dec:tile').append("layer",:name => "riddlresourcedescription").append("apply-to","/**/*")
       end  
 
       @declaration = @description = nil

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

@@ -71,34 +71,44 @@ module Riddl
           @tiles << (til = Tile.new)
           res = til.base_path(tile.attributes['path'] || '/')
           # res.clean! # for overlapping tiles, each tile gets an empty path TODO
+          later = []
           tile.find("dec:layer").each_with_index do |layer,index|
             apply_to = layer.find("dec:apply-to")
             block = layer.find("dec:block")
 
-            everywhere = layer.attributes['everywhere'] == 'true'
             lname = layer.attributes['name']
             lpath, des = @interfaces[lname]
             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}
-              end.flatten.uniq.each do |path| # apply current to all paths
-                int = Interface.new(lname,path,lpath,"/",des)
-                rec = desres.attributes['recursive']
-                til.add_description(des,desres,path,index,int,block,rec)
-              end
+            if apply_to.empty?
+              int = Interface.new(lname,"/",lpath,"/",des)
+              rec = desres.attributes['recursive']
+              til.add_description(des,desres,"/",index,int,block,rec)
             else
-              if apply_to.empty?
-                int = Interface.new(lname,"/",lpath,"/",des)
-                rec = desres.attributes['recursive']
-                til.add_description(des,desres,"/",index,int,block,rec)
-              else
-                apply_to.each do |at|
+              apply_to.each do |at|
+                t = at.to_s.sub(/^\/*/,'').split(/(?<!\*\*)\//)
+                if t.last == "**/*" || t.last == "*"
+                  later << [des,desres,lname,lpath,at.to_s.strip,index,block,t.last == "**/*" ? :descendants : :children]
+                else  
                   int = Interface.new(lname,at.to_s,lpath,"/",des)
                   til.add_description(des,desres,at.to_s,index,int,block)
                 end
               end
-            end  
+            end
+          end
+          paths = @tiles.map do |til| # extract all currently existing paths for all tiles
+            rpaths(til.resource).map{|a,b| a}
+          end.flatten.uniq
+          later.each do |lat|
+            mpath = lat[4].gsub(/\/\*\*\/\*$/,'').gsub(/\/\*$/,'')
+            paths.each do |path|
+              pbefore, pafter = path[0..mpath.length].chop, path[mpath.length+1..-1]
+              if mpath == pbefore 
+                if (lat[7] == :descendants && pafter != '') || (lat[7] == :children && !pafter.nil? && pafter != '' && pafter !~ /\//)
+                  int = Interface.new(lat[2],path,lat[3],"/",lat[1])
+                  til.add_description(lat[0],lat[1],path,lat[5],int,lat[6])
+                end  
+              end
+            end
           end
           til.compose!
         end

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

@@ -58,16 +58,10 @@ module Riddl
             fac.composition[method] += s
           end  
           res.resources.each do |path,r|
-            if !fac.resources.has_key?(path) && path != '**/*' && path != '*'
+            if !fac.resources.has_key?(path)
               fac.resources[path] = Riddl::Wrapper::Description::Resource.new(path,r.recursive)
             end
-            if path == '**/*'
-              merge_tiles_to_all(r,fac)
-            elsif path == '*'
-              merge_tiles_to_layer(r,fac)
-            else
-              merge_tiles(r,fac.resources[path])
-            end
+            merge_tiles(r,fac.resources[path])
           end
           #}}}
         end

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

@@ -16,9 +16,9 @@ module Riddl
         end
 
         def real_path(real)
-          t = @top.sub(/^\/*/,'').split(/(?<!\*\*)\//)
-          real = real.sub(/^\/*/,'').split('/')
-          real = t.last == "**/*" ? [] : real[t.length..-1]
+          t = @top.split('/')
+          real = real.split('/')
+          real = real[t.length..-1]
           '/' + real.join('/')
         end
 

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

@@ -76,7 +76,7 @@ module Riddl
 
         def add_path(path,pres,rec=nil)
           #{{{
-          path.split(/(?<!\/\*\*)\//).each do |pa| # match a slash not preceeded by **
+          path.split('/').each do |pa|
             next if pa == ""
             unless pres.resources.has_key?(pa)
               pres.resources[pa] = Riddl::Wrapper::Description::Resource.new(pa,rec.nil? ? false : true)

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

@@ -33,7 +33,7 @@ module Riddl
             method = m.attributes['method'] || m.qname.name
             add_request_star_out(index,interface,des,method,m.attributes['out'],m.find('*|text()'))
           end
-          desres.find("des:*[not(name()='resource') and not(name()='websocket') and not(@in)]").each do |m|
+          desres.find("des:*[not(name()='resource') and not(name()='websocket') and not(@in) and not(@pass)]").each do |m|
             method = m.attributes['method'] || m.qname.name
             add_request_star_out(index,interface,des,method,m.attributes['out'],m.find('*|text()'))
           end

data/ns/declaration/1.0/declaration.rng

@@ -53,11 +53,6 @@
     <attribute name="name">
       <ref name="riddl-datatype-name"/>
     </attribute>
-    <optional>
-      <attribute name="everywhere">
-        <data type="boolean"/>
-      </attribute>  
-    </optional>  
     <zeroOrMore>
       <element name="apply-to">
         <ref name="riddl-datatype-pathtemplate"/>

data/riddl.gemspec

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

data/test/smartrunner.rb

@@ -30,7 +30,7 @@ module ServerCase
           begin
             TCPSocket.new('localhost', s.port)
             up = true
-          rescue => e
+          rescue
             sleep 0.2
           end  
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.209
+  version: 0.99.210
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart
@@ -352,6 +352,10 @@ files:
 - examples/notifications/topics.xml
 - examples/oauth/oauth.rb
 - examples/oauth/oauth.xml
+- examples/pass-test/ara.xml
+- examples/pass-test/middleware.xml
+- examples/pass-test/oc.xml
+- examples/pass-test/structure.xml
 - examples/properties/description.conf
 - examples/properties/description.rb
 - examples/properties/properties.xml