riddl 0.99.187 → 0.99.188

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2a66a5fae23e728695a686b2d059ac4b3ba65ce
-  data.tar.gz: fc0060b340bee403e33bc45962c41cde11d4e1d2
+  metadata.gz: 5b01c46ef0a3f9949f0460a86dcb158c5364da1d
+  data.tar.gz: 17f8127d8a75e5f07d14d6aaf5f10a0a02cfb82b
 SHA512:
-  metadata.gz: b37e33a0dc5d8d358ca6730745fa0f27536f1e5acea5ddcaf3fc97d8d6f5d632869da73927098944dd85e6efb55fbd73ddcd92021f1f7fc2f0bd83eac790c2f5
-  data.tar.gz: 6c0af2e2474e1a7bbe2caedefb54396a4ffb0efd73e6a4cab7d773b200f805534f0fa81c83807309406900a9ab3f54ef4b03e79b7445c0169b714f788bb2720a
+  metadata.gz: 46aee5876655c5e0986acb3a7ca2ee3b43558dd7351ff4628612e745b1060e810d42af0d9da98e51a2e0c2419d5e34617bfca5e851d8d8e3cf6f5480f23212af
+  data.tar.gz: ba3ff8c03b896081b9986a02844f78b7fcfadebde58798733484f806178d46357a1a01f38d3414e623902ddd7e84e3482a7c5b83072a56e5a5547b720480e478

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

@@ -101,7 +101,7 @@
                 var whatd = tin == "*" ? '' : '( ' + tin + ' )';
                     whatd += tout ? ' : ' +  tout : '';
 
-                var ex = "";
+                var ex = null;
                 var tinmess = "";
                 if (tin && tin != "*") {
                   $('description > message[name="' + tin + '"]',data).each(function(k,mess){
@@ -113,6 +113,7 @@
                     });
                   });
                 }
+                if ($('example',ele).length > 0) { ex = $('example',ele).text(); }
                 var toutmess = "";
                 if (tout && tout != "*") {
                   $('description > message[name="' + tout + '"]',data).each(function(k,mess){
@@ -126,8 +127,11 @@
                 $('.what .link',clone).text(whatl);
                 $('.what .link',clone).attr('href','#' + (whatl + '_' + whatd).replace(/ /g,'_'));
                 $('.what .details',clone).text(whatd);
-                if (ex != "") {
-                  $('.what .try a',clone).attr('href','?' + ex);
+                if (ex != null) {
+                  if (ex == "")
+                    $('.what .try a',clone).attr('href',window.location.pathname);
+                  else
+                    $('.what .try a',clone).attr('href','?' + ex);
                 } else {
                   $('.what .try',clone).remove();
                 }
@@ -139,10 +143,18 @@
                 var clone = document.importNode(t.content, true); 
                 $('.what',clone).text(whatl + ' ' + whatd);
                 $('.what',clone).attr('id',(whatl + '_' + whatd).replace(/ /g,'_'));
-                $('.text',clone).text(details == "" ? sum : marked(details));
-                if (ex != "") {
-                  $('.try a',clone).attr('href','?' + ex);
-                  $('.try a',clone).text('?' + ex);
+                if (_.trim(details) == "") {
+                  $('.text',clone).text(sum);
+                } else {
+                  $('.text',clone).append(marked(details));
+                }
+                if (ex != null) {
+                  if (ex == "") {
+                    $('.try a',clone).attr('href',window.location.pathname);
+                  } else {
+                    $('.try a',clone).attr('href','?' + ex);
+                    $('.try a',clone).text('?' + ex);
+                  } 
                 } else {
                   $('.try',clone).remove();
                 }
@@ -172,7 +184,7 @@
     <template id="operationsec">
       <section>
         <h2 class="what" id=""></h2>
-        <p class="try">Example: <a href=""></a></p>
+        <p class="try">Example: <a href=""><i>no parameters</i></a></p>
         <p class="text"></p>
         <div class="input">
           <h3>Input</h3>

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

@@ -0,0 +1,40 @@
+require 'mime/types'
+require 'charlock_holmes'
+require 'digest/md5'
+require 'xml/smart'
+
+module Riddl
+  module Utils
+    class XMLServe < Riddl::Implementation
+      def response
+        path = File.file?(@a[0]) ? @a[0] : nil
+        xpath = @a[1]
+
+        if path.nil? || File.directory?(path)
+          @status = 404
+          return []
+        end
+        if File.exists?(path)
+          mtime = File.mtime(path)
+          @headers << Riddl::Header.new("Last-Modified",mtime.httpdate)
+          @headers << Riddl::Header.new("Cache-Control","max-age=15552000, public")
+          @headers << Riddl::Header.new("ETag",Digest::MD5.hexdigest(mtime.httpdate))
+          htime = @env["HTTP_IF_MODIFIED_SINCE"].nil? ? Time.at(0) : Time.parse(@env["HTTP_IF_MODIFIED_SINCE"])
+          if htime == mtime
+            @headers << Riddl::Header.new("Connection","close")
+            @status = 304 # Not modified
+            return []
+          else 
+            if xpath 
+              res = XML::Smart.open(path).find(xpath)
+              return Riddl::Parameter::Complex.new('file','text/xml',res.any? ? res.first.dump : '<empty/>')
+            else
+              return Riddl::Parameter::Complex.new('file','text/xml',File.open(path,'r'))
+            end
+          end  
+        end
+        @status = 404
+      end  
+    end
+  end  
+end  

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.187"
+  s.version          = "0.99.188"
   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.187
+  version: 0.99.188
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart
@@ -426,6 +426,7 @@ files:
 - lib/ruby/riddl/utils/notifications_producer.rb
 - lib/ruby/riddl/utils/properties.rb
 - lib/ruby/riddl/utils/turtle.rb
+- lib/ruby/riddl/utils/xmlserve.rb
 - lib/ruby/riddl/utils/xsloverlay.rb
 - lib/ruby/riddl/wrapper.rb
 - lib/ruby/riddl/wrapper/declaration.rb