riddl 0.99.200 → 0.99.201

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c67aa38ff11dcb881b3ea8653e11d12da9611687
-  data.tar.gz: cb1bde4833c693dae96bd714d1d30b38e78b798a
+  metadata.gz: 21c0e9e4bba99ce37d3853069628442dfd21ed25
+  data.tar.gz: 034b4367ae7b1d1432695585fcaba8b172080e37
 SHA512:
-  metadata.gz: d5229e2f25d0b333031a6ee59e097056a9653f198924245d2f4b16c4914c37d6f8a25a5068696aa6c390be9fd7618f63dd2ea2a77a99dbfea266e28a53ce2a9f
-  data.tar.gz: c4743b2544bf733c8e24339c61503d19f895a6b8b3562d31ceb23f9e364362043597bf9f440973c6a540dd23c0ede4ab3a0367daf46f137b9d5bffb28cbae89c
+  metadata.gz: 46b8be50b6c6165955a95295719ec5fceaa6f4203d948e623340a96932b88b9ecd55c50fd641c190b1e816d31f49f9f54c14ed529d1cf271fcd30b5e70ad235e
+  data.tar.gz: 08e0bb4042364870e1c64b189cba34cc6e48a6827e255fc8e01d932e6745fe42f2917cf854d159fb67f39fe619334af8c47e519fcb1a15ba48006b8d04855b6b

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

@@ -21,6 +21,9 @@
         content: counter(h1counter) "." counter(h2counter) ".\0000a0\0000a0";
         counter-increment: h2counter;
       }
+      .code {
+        border: 1px dashed #425d73; background-color: #DEE6EE; margin:0px; padding: 0.5em 1em; font-family: monospace; font-size:0.9em;
+      }
     </style>
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
@@ -43,6 +46,33 @@
         return out;
       };
 
+      function docChildren(path,name,data){
+        var ret= [];
+        var subject = path ? $(path,data) : $(data);
+        subject.children().each(function(k,ele){
+          if (ele.localName == name && ele.namespaceURI == "http://riddl.org/ns/documentation/1.0") {
+            ret.push(ele);
+          }
+        });
+        return $(ret);
+      }
+
+      function codeFormat(temp) {
+        temp = temp.replace(/\&/g,"&amp;").replace(/\"/g,"&quot;").replace(/>/g,"&gt;").replace(/</g,"&lt;").replace(/'/g,"&apos;");
+        temp = temp.replace(/\t/g,'  ');
+        temp = temp.replace(/\r/g,'');
+        temp = temp.replace(/^$/g,' ');
+        temp = temp.replace(/^ */gm,function mf(m){
+          var tm = (m.length + 2) * 0.6 + 2 * 0.6;
+          return "<div style='text-indent:-" + tm + "em;margin-left:" + tm + "em'>" + (Array(m.length + 1).join("&#160;"));
+        });
+        temp = temp.replace(/  /g," &#160;");
+        temp = temp.replace(/\n/g,"</div>\n");
+        temp += "</div>\n";
+        temp = temp.replace(/href=&quot;([^&]+)&quot;/g,'href=&quot;<a href="/__doc_includes/$1">$1</a>&quot;')
+        return temp;
+      }
+
       $(document).ready(function(){
         var rpath = "<%= @h['RIDDL_DECLARATION_PATH'] %>";
         var pathele = _.compact(rpath.split('/'));
@@ -60,15 +90,16 @@
         $.ajax({
           url: rpath + "?riddl-resource-description",
           success: function(data){
-            $('#main').append(marked($('description > resource > documentation',data).text()));
+            $('#main').append(marked(docChildren('description > resource','documentation',data).text()));
 
             var subr = $('description > resource > resource',data);
             if (subr.length == 0) {
               $('#subresources').remove();
             } else {
               $('description > resource > resource',data).each(function(k,ele){
-                var sum = $('documentation',ele).attr('summary');
-                var exa = $('example',ele).length == 0 ? null :  $('example',ele).text();
+                var sum = docChildren(null,'documentation',ele).attr('summary');
+                var exa = docChildren(null,'example',ele);
+                    exa = exa.length == 0 ? null : exa.text();
                 if (exa) {
                   var rell = exa;
                   var relt = exa + ' (' + $(ele).attr('relative') + ')';
@@ -87,11 +118,11 @@
               });
             }
 
-            var oprs = $('description > resource > :not(documentation):not(resource):not(example)',data);
+            var oprs = $('description > resource > get, description > resource > post, description > resource > put, description > resource > delete, description > resource > request',data);
             if (oprs.length == 0) {
               $('#operations').remove();
             } else {
-              $('description > resource > :not(documentation):not(resource):not(example)',data).each(function(k,ele){
+              oprs.each(function(k,ele){
                 var sum = $('documentation',ele).attr('summary');
                 var details = $('documentation',ele).text();
                 var tin = $(ele).attr('in');
@@ -159,12 +190,12 @@
                 }
 
                 if (tin && tin != "*") {
-                  $('.input .message',clone).text(vkbeautify.xml($(tinmess).serializeXML()));
+                  $('.input .message',clone).html(codeFormat(vkbeautify.xml($(tinmess).serializeXML(),'  ')));
                 } else {
                   $('.input',clone).remove();
                 }
                 if (tout) {
-                  $('.output .message',clone).text(vkbeautify.xml($(toutmess).serializeXML()));
+                  $('.output .message',clone).html(codeFormat(vkbeautify.xml($(toutmess).serializeXML(),'  ')));
                 } else {
                   $('.output',clone).remove();
                 }
@@ -187,11 +218,11 @@
         <p class="text"></p>
         <div class="input">
           <h3>Input</h3>
-          <pre class='message'></pre>
+          <div class='message code'></div>
         </div>
         <div class="output">
           <h3>Output</h3>
-          <pre class='message'></pre>
+          <div class='message code'></div>
         </div>
       </section>
     </template>

data/lib/ruby/riddl/wrapper.rb

@@ -8,23 +8,24 @@ module Riddl
     class WrapperUtils
       def get_resource_deep(path,pres)
         #{{{
-        path.split('/').each do |pa|
+        path.split('/(').each do |pa|
+          pa.chop!
           next if pa == ""
           if pres.resources.has_key?(pa)
             pres = pres.resources[pa]
           else
             return nil
           end
-        end
+        end unless path == '/'
         pres
         #}}}
       end
-      def rpaths(res,what)
+      def rpaths(res,what,finalize=false)
         #{{{
-        what += what == '' ? '/' : res.path
+        what += what == '' ? '/' : (finalize ? '(' + res.path + ')' : res.path)
         ret = [[what,res.recursive]]
         res.resources.each do |name,r|
-          ret += rpaths(r,what == '/' ? what : what + '/')
+          ret += rpaths(r,what == '/' ? what : what + '/',finalize)
         end
         ret.sort!
         ret
@@ -265,6 +266,7 @@ module Riddl
       description
       declaration
       tmp = []
+
       tmp = @description.paths if @is_description 
       tmp = @declaration.paths if @is_declaration
       tmp.map do |t|

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,'')
+        rpaths(@facade.resource,'',true)
       end
       
       def description_xml

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

@@ -7,7 +7,7 @@ module Riddl
     class Description < WrapperUtils
 
       def paths(res=@resource,what='')
-        rpaths(res,what)
+        rpaths(res,what,true)
       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.200"
+  s.version          = "0.99.201"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.200
+  version: 0.99.201
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart