riddl 0.100.6 → 0.100.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dfaffabbc8caecb6ad865f2911d9a09d1cd9166ef6d13fc756d430ec9609eb4
-  data.tar.gz: 8d89bfa9870e6466156b09d01650e323a8737639d8c961ee40cc2c0748c182ea
+  metadata.gz: 272e61fed76e43508e7b783fcf2c08175e74b72a71d93ec2c5dee8ed4a7d1309
+  data.tar.gz: c5f7ced005c31ac2d81d875cb8c54e3d2297f21ab74487a8793ec837be710097
 SHA512:
-  metadata.gz: 2f0d67ad9554f9d59cbc0d67fedc3a8d87372ee4a9cb9a4da8e1587ff6d1aea972820da74f201081e9784b343d8c6136f696234ef939c1fa5621d524aee22399
-  data.tar.gz: 85c548ac1686d1857ceeb8cff4bcec8a0229252955ed4081e287e7c6de67acf6912dccb0e2f5222e0b1b9fa653d52020d91d8597d7a5033e6165785357d5551c
+  metadata.gz: 2183a99aa51742b3c496f1d7fa50d380026aa0fe4002d5a666d004372b89e4ce5f29849b56a772c6d03e861ba999eb3d7aef7edcaf65b54f80a77beef9b52a4e
+  data.tar.gz: 87d2afdc8e26cbd6d0284326ca2da4f811333bf437b6d223db2353dbe83a7a9a3c5a7a44982937872648fd0e25ba539e6908072397293fe58300c96ec04b9e13

data/lib/ruby/riddl/utils/docoverlay.html

@@ -80,8 +80,8 @@
         var t = $('#breadcrumblink')[0];
         var link = "";
         _.each(pathele,function(e){
-          link = link + "/" + e; 
-          var clone = document.importNode(t.content, true); 
+          link = link + "/" + e;
+          var clone = document.importNode(t.content, true);
           $('a',clone).attr('href',link + "/?doc=true");
           $('a',clone).text(e);
           $('#breadcrumb').append(clone);
@@ -112,17 +112,17 @@
                   var relt = _.trim(rell);
                 }
                 var t = $('#subresourceitem')[0];
-                var clone = document.importNode(t.content, true); 
+                var clone = document.importNode(t.content, true);
                 $('a',clone).attr('href','./' + rell + '/?doc=true');
                 if (relt != "") {
                   $('a',clone).text(relt);
                 }
                 if (sum) { $('.content',clone).text(sum); }
-                $('#subresources .anchor').append(clone); 
+                $('#subresources .anchor').append(clone);
               });
             }
 
-            var oprs = $('description > resource > get, description > resource > post, description > resource > put, description > resource > delete, description > resource > request',data);
+            var oprs = $('description > resource > get, description > resource > post, description > resource > put, description > resource > patch, description > resource > delete, description > resource > request',data);
             if (oprs.length == 0) {
               $('#operations').remove();
             } else {
@@ -144,7 +144,7 @@
                     tinmess = mess;
                     _.each(mess.attributes,function(attr){
                       if (attr.localName == 'example' && attr.namespaceURI == "http://riddl.org/ns/documentation/1.0") {
-                        ex = attr.nodeValue; 
+                        ex = attr.nodeValue;
                       }
                     });
                   });
@@ -160,7 +160,7 @@
 
                 // Overview
                 var t = $('#operationitem')[0];
-                var clone = document.importNode(t.content, true); 
+                var clone = document.importNode(t.content, true);
                 $('.what .link',clone).text(whatl);
                 $('.what .link',clone).attr('href','#' + (whatl + '_' + whatd).replace(/ /g,'_'));
                 $('.what .details',clone).text(whatd);
@@ -173,11 +173,11 @@
                   $('.what .try',clone).remove();
                 }
                 if (sum) { $('.content',clone).text(sum); }
-                $('#operations .anchor').append(clone); 
+                $('#operations .anchor').append(clone);
 
                 //Details
                 var t = $('#operationsec')[0];
-                var clone = document.importNode(t.content, true); 
+                var clone = document.importNode(t.content, true);
                 $('.what',clone).text(whatl + ' ' + whatd);
                 $('.what',clone).attr('id',(whatl + '_' + whatd).replace(/ /g,'_'));
                 if (_.trim(details) == "") {
@@ -191,7 +191,7 @@
                   } else {
                     $('.try a',clone).attr('href','?' + ex);
                     $('.try a',clone).text('?' + ex);
-                  } 
+                  }
                 } else {
                   $('.try',clone).remove();
                 }
@@ -206,13 +206,13 @@
                 } else {
                   $('.output',clone).remove();
                 }
-                $('#operations').append(clone); 
+                $('#operations').append(clone);
               });
             }
           }
         });
       });
-    //]]></script> 
+    //]]></script>
   </head>
   <body>
     <template id="breadcrumblink"><span> / </span><a href=""></a></template>
@@ -235,19 +235,19 @@
     </template>
 
     <nav id="breadcrumb">[<a href="/">TOP</a>]</nav>
-    <section id="main"></section> 
+    <section id="main"></section>
     <section id="subresources">
       <h1>Sub-Resources</h1>
       <p>From here on you can go to the following sub resources:</p>
       <ul class="anchor"></ul>
-    </section> 
+    </section>
     <section id="operations">
       <h1>Operations</h1>
       <section>
         <p>For this resource the following operations are possible:</p>
         <ul class="anchor"></ul>
       </section>
-    </section> 
+    </section>
   </body>
 </html>
 

data/lib/ruby/riddl/utils/properties.rb

@@ -437,6 +437,7 @@ module Riddl
           property = @r[1]
           value    = @p.detect{|p| p.name == 'value'}; value = value.nil? ? value : value.value
           content  = @p.detect{|p| p.name == 'content'}; content = content.nil? ? content : content.value
+          content  = content.read if content.respond_to? :read
           minor    = @r[2]
 
           unless backend.modifiable?(property)
@@ -459,13 +460,14 @@ module Riddl
           end
 
           newstuff = value.nil? ? XML::Smart.string(content).root.children : value
+
           backend.modify do |doc|
             nodes = doc.root.find(path)
             nodes.each do |ele|
               if value.nil?
                 newstuff.each do |child|
-                  path = File.basename(child.path)
-                  subele = ele.find(path).first
+                  cpath = File.basename(child.path)
+                  subele = ele.find("p:" + cpath).first
                   if subele
                     subele.replace_by(child)
                   else

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

@@ -148,7 +148,7 @@ module Riddl
               elsif teh_first.class == RequestTransformation && teh_last.class == RequestTransformation && teh_last.out.nil?
                 #2: first transform + last transform -> merge transformations
                 ret = RequestTransformation.new_from_transformation(teh_first.trans,teh_last.trans,teh_first.custom)
-              elsif teh_first.class == RequestPass  
+              elsif teh_first.class == RequestPass
                 if r.size > (fcount + 1)
                   teh_first = r[fcount+=1]
                   success = false
@@ -246,7 +246,7 @@ module Riddl
         def description_xml_string_analyse(messages,t,k,m)
  #{{{
           result = ''
-          if %w{get post put delete websocket}.include?(k)
+          if %w{get post put patch delete websocket}.include?(k)
             result << t + "<#{k} "
           else
             result << t + "<request method=\"#{k}\" "
@@ -276,7 +276,7 @@ module Riddl
             m.custom.each do |e|
               result << e.dump + "\n"
             end
-            if %w{get post put delete websocket}.include?(k)
+            if %w{get post put patch delete websocket}.include?(k)
               result << t + "</#{k}>"
             else
               result << t + "</request>\n"

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

@@ -22,7 +22,7 @@ module Riddl
           h_ifield = {}; h_pfield = {}
           h_ofield = {}; h_tfield = {}
           h_cfield = {}
-          tres.find("des:get|des:put|des:delete|des:post|des:request").each do |mt|
+          tres.find("des:get|des:put|des:patch|des:delete|des:post|des:request").each do |mt|
             mn = (mt.attributes['type'].nil? ? mt.qname.to_s : mt.attributes['type'])
 
             h_ifield[mn] ||= {}; h_pfield[mn] ||= {}

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.100.6"
+  s.version          = "0.100.7"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   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.100.6
+  version: 0.100.7
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemonite