riddl 0.101.22 → 0.103

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba13a4622c2280b047206d4f73776cfe5d4d131be46f7ec3a76fca785d920e0f
-  data.tar.gz: f0302103e937d8bbd1cd381e0a8bf6ac1153a781dd26247caa6648dd14891b61
+  metadata.gz: 6c0661d1fa0c6aff0b54ffdfbec1090c8741944219a8ba2e304acecf07d97b7b
+  data.tar.gz: 2beac525a71017e0a558a155fa61d54dc0bec133063253d7b7460311c2d89ee6
 SHA512:
-  metadata.gz: bc2590d22b774ad177e7b3edbcd23df629ac98b46e338fd10f081f5055efe6803fcc46509df2d2b907959447cfe524124756284e0127c22350fdc5ea3c485196
-  data.tar.gz: 5131b5d2f0ebc8139a962e4300c83501eeda8572932c7c2fdca4a986fae4bf128c6a8567aadd69127a0701fc7fa621681cae6aa4e2d835f1bb819ca7bf7c44a5
+  metadata.gz: 75d47eb2d1e59cfa43199f468c706b1e06109149082f136b57faec2b3516dd5b724827edbd6a60198d5a27bd816c55ddf0063678436e645d72a406541708c646
+  data.tar.gz: 1f267f56fa67c847b3e146c9d2fc5918065094e0071990c46e7ffdb93083907f69812dab816770139c844e3323e6bb1abdb4d225d934b0aa00095e95f5e35e17

data/examples/declaration-server-distributed/declaration.rb

@@ -1,4 +1,4 @@
 #!/usr/bin/ruby
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server')
 
-Riddl::Server.new(File.dirname(__FILE__) + '/declaration.xml', :port => 9297).loop!
+Riddl::Server.new(File.dirname(__FILE__) + '/declaration.xml', :port => 9004).loop!

data/examples/declaration-server-distributed/declaration.xml

@@ -1,13 +1,13 @@
 <declaration xmlns="http://riddl.org/ns/declaration/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <interface name="main" location="http://localhost:9296">
+  <interface name="main" location="http://localhost:9003">
     <xi:include href="main.xml"/>
   </interface>
-  <interface name="properties" location="http://localhost:9295">
+  <interface name="properties" location="http://localhost:9002">
     <xi:include href="properties.xml"/>
   </interface>
-  <interface name="xsloverlay" location='http://localhost:9294'>
+  <interface name="xsloverlay" location='http://localhost:9001'>
     <xi:include href="xsloverlay.xml"/>
-  </interface>  
+  </interface>
 
   <facade>
     <tile>

data/examples/declaration-server-distributed/main.rb

@@ -20,16 +20,16 @@ class Info < Riddl::Implementation
   end
 end
 
-Riddl::Server.new(File.dirname(__FILE__) + '/main.xml', :port => 9296) do
+Riddl::Server.new(File.dirname(__FILE__) + '/main.xml', :port => 9003) do
   on resource do
     run Riddl::Utils::FileServe, 'instances/instances.xml' if get '*'
     on resource do
       run Info if get
-    end  
+    end
     on resource 'xsls' do
       on resource do
         run Riddl::Utils::FileServe, "xsls"  if get
-      end  
-    end  
+      end
+    end
   end
 end.loop!

data/examples/declaration-server-distributed/properties.rb

@@ -3,17 +3,17 @@ require 'pp'
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server')
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/properties')
 
-Riddl::Server.new(File.dirname(__FILE__) + '/properties.xml', :port => 9295) do
+Riddl::Server.new(File.dirname(__FILE__) + '/properties.xml', :port => 9002) do
   on resource do |r|
     ### header RIDDL_DECLARATION_PATH holds the full path used in the declaration
     ### from there we get the instance, which is not present in the path used for properties
     properties = if r[:h]['RIDDL_DECLARATION_PATH']
       @riddl_opts[:basepath] + '/instances/' + r[:h]['RIDDL_DECLARATION_PATH'].split('/')[1] + '/properties.xml'
-    else 
+    else
       @riddl_opts[:basepath] + '/instances/1/properties.xml'
-    end  
-    backend = Riddl::Utils::Properties::Backend.new( 
-      @riddl_opts[:basepath] + '/instances/properties.schema', 
+    end
+    backend = Riddl::Utils::Properties::Backend.new(
+      @riddl_opts[:basepath] + '/instances/properties.schema',
       properties
     )
 

data/examples/declaration-server-distributed/xsloverlay.rb

@@ -3,7 +3,7 @@ require 'pp'
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server')
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/xsloverlay')
 
-Riddl::Server.new(File.dirname(__FILE__) + '/xsloverlay.xml', :port => 9294) do
+Riddl::Server.new(File.dirname(__FILE__) + '/xsloverlay.xml', :port => 9001) do
   on resource do
     run Riddl::Utils::XSLOverlay, "/xsls/instances.xsl"  if get && declaration_resource == '/'
     run Riddl::Utils::XSLOverlay, "/xsls/info.xsl"       if get && declaration_resource == '/{}'

data/examples/declaration-server-hybrid/declaration.rb

@@ -21,25 +21,25 @@ class Info < Riddl::Implementation
   end
 end
 
-Riddl::Server.new(File.dirname(__FILE__) + '/declaration.xml', :port => 9297) do
+Riddl::Server.new(File.dirname(__FILE__) + '/declaration.xml', :port => 9002) do
   accessible_description true
 
   interface 'main' do
     run Riddl::Utils::FileServe, 'instances/instances.xml' if get '*'
     on resource do
       run Info if get
-    end  
+    end
     on resource 'xsls' do
       on resource do
         run Riddl::Utils::FileServe, "xsls"  if get
-      end  
-    end  
+      end
+    end
   end
 
   interface 'properties' do |r|
     properties = @riddl_opts[:basepath] + '/instances/' + r[:h]['RIDDL_DECLARATION_PATH'].split('/')[1] + '/properties.xml'
-    backend = Riddl::Utils::Properties::Backend.new( 
-      @riddl_opts[:basepath] + '/instances/properties.schema', 
+    backend = Riddl::Utils::Properties::Backend.new(
+      @riddl_opts[:basepath] + '/instances/properties.schema',
       properties
     )
 

data/examples/declaration-server-hybrid/declaration.xml

@@ -5,9 +5,9 @@
   <interface name="properties">
     <xi:include href="properties.xml"/>
   </interface>
-  <interface name="xsloverlay" location='http://localhost:9294'>
+  <interface name="xsloverlay" location='http://localhost:9001'>
     <xi:include href="xsloverlay.xml"/>
-  </interface>  
+  </interface>
 
   <facade>
     <tile>

data/examples/declaration-server-hybrid/xsloverlay.rb

@@ -3,7 +3,7 @@ require 'pp'
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server')
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/xsloverlay')
 
-Riddl::Server.new(File.dirname(__FILE__) + '/xsloverlay.xml', :port => 9294) do
+Riddl::Server.new(File.dirname(__FILE__) + '/xsloverlay.xml', :port => 9001) do
   # accessible_description true
 
   on resource do

data/examples/declaration-server-local/declaration.rb

@@ -5,12 +5,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/p
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/xsloverlay')
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/fileserve')
 
-Riddl::Server.new(File.dirname(__FILE__) + '/declaration.xml', :port => 9292) do
+Riddl::Server.new(File.dirname(__FILE__) + '/declaration.xml', :port => 9001) do
   accessible_description true
 
-  backend = Riddl::Utils::Properties::Backend.new( 
-    @riddl_opts[:basepath] + '/server.properties.schema', 
-    @riddl_opts[:basepath] + '/server.properties.xml' 
+  backend = Riddl::Utils::Properties::Backend.new(
+    @riddl_opts[:basepath] + '/server.properties.schema',
+    @riddl_opts[:basepath] + '/server.properties.xml'
   )
 
   interface 'main' do
@@ -20,7 +20,7 @@ Riddl::Server.new(File.dirname(__FILE__) + '/declaration.xml', :port => 9292) do
   interface 'xsls' do |r|
     on resource do
       run Riddl::Utils::FileServe, "xsls" if get
-    end  
+    end
   end
 
   interface 'xsloverlay' do

data/examples/declaration-test/main.rb

@@ -7,24 +7,24 @@ class A < Riddl::Implementation
   def response
     Riddl::Parameter::Simple.new("x","1")
   end
-end  
+end
 class B < Riddl::Implementation
   def response
     Riddl::Parameter::Simple.new("y","1")
   end
-end  
+end
 class C < Riddl::Implementation
   def response
     Riddl::Parameter::Simple.new("z","1")
   end
-end  
+end
 class S < Riddl::Implementation
   def response
     @p # return input parameters unchanged
   end
-end  
+end
 
-Riddl::Server.new("main.xml", :port => 9201) do
+Riddl::Server.new("main.xml", :port => 9001) do
   process_out false
   logger Riddl::CommonLogger.new("Main","main.log")
   on resource do

data/examples/downloadify/client.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server')
 
-srv = Riddl::Client.interface("http://localhost:9299","server.declaration.xml")
+srv = Riddl::Client.interface("http://localhost:9001","server.declaration.xml")
 
 status, ret = srv.resource('/test.txt').post [
   Riddl::Parameter::Simple.new("mimetype","text/plain"),

data/examples/downloadify/server.rb

@@ -2,13 +2,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server')
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/downloadify')
 
-Riddl::Server.new(::File.dirname(__FILE__) + '/server.declaration.xml', :port => 9299) do
+Riddl::Server.new(::File.dirname(__FILE__) + '/server.declaration.xml', :port => 9001) do
   accessible_description true
 
   interface "main" do
   end
 
-  interface "downloadify" do 
+  interface "downloadify" do
     on resource do
       run Riddl::Utils::Downloadify if get 'dfin'
       run Riddl::Utils::Downloadify if post 'dfin'

data/examples/flickr/declaration.xml

@@ -2,7 +2,7 @@
   <interface name="main" location="http://api.flickr.com/services">
     <xi:include href="Flickr/flickr.xml"/>
   </interface>
-  <interface name="exif" location="http://localhost:9292">
+  <interface name="exif" location="http://localhost:9001">
     <xi:include href="Exif/exif.xml"/>
   </interface>
 

data/examples/helloworld/declaration-definition_goal.xml

@@ -2,9 +2,7 @@
 <description xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <message name="hello">
     <parameter name="return" mimetype="text/plain" handler="http://riddl.org/ns/handlers/plain-type">
-      <plain type="string">
-        <param name="pattern">hello .+</param>
-      </plain>
+      <pattern>hello .+</pattern>
     </parameter>
   </message>
   <message name="hello-form">

data/examples/helloworld/description.xml

@@ -2,9 +2,7 @@
 
   <message name="hello">
     <parameter name="return" mimetype="text/plain" handler="http://riddl.org/ns/handlers/plain-type">
-      <plain type="string">
-        <param name="pattern">hello .+</param>
-      </plain>
+      <pattern>hello .+</pattern>
     </parameter>
   </message>
   <message name="hello-form">
@@ -22,15 +20,15 @@
   	<parameter name="type" type="string">
       <choice>
         <value>html</value>
-      </choice>  
-    </parameter>  
+      </choice>
+    </parameter>
   </message>
 
   <resource>
     <post in="hello"/>
     <post in="hello-form"/>
     <get in="*" out="hello-form"/>
-    <get in="type-html" out="hello-list-html"/> 
+    <get in="type-html" out="hello-list-html"/>
     <resource>
       <get in="*" out="hello"/>
       <put in="hello" out="hello"/>
@@ -43,5 +41,5 @@
       <post in="hello"/>
     </resource>
   </resource>
-  
+
 </description>

data/examples/library/description.xml

@@ -4,7 +4,7 @@
     <!--header name="Library" type="positiveInteger"/-->
     <oneOrMore>
       <parameter name="author" type="string"/>
-    </oneOrMore>  
+    </oneOrMore>
     <parameter name="title" type="string"/>
   </message>
   <message name="list-of-books">
@@ -13,9 +13,9 @@
     </parameter>
   </message>
   <message name="book-description-form">
-    <oneOrMore> 
+    <oneOrMore>
       <parameter name="author" type="string"/>
-    </oneOrMore>  
+    </oneOrMore>
     <parameter name="title" type="string"/>
   </message>
   <message name="book-description">
@@ -25,7 +25,7 @@
   </message>
   <message name="book-id">
     <parameter name="book-id" mimetype="text/plain" handler="http://riddl.org/ns/handlers/plain-type">
-      <plain type="positiveInteger"/>
+      <pattern>\d+</pattern>
     </parameter>
   </message>
 
@@ -75,6 +75,6 @@
     <resource relative="about">
       <get in="*" out="main-output"/>
     </resource>
-  </resource>  
+  </resource>
 
 </description>

data/examples/library/server.rb

@@ -34,7 +34,7 @@ class BookDescription < Riddl::Implementation
   end
 end
 
-Riddl::Server.new(File.dirname(__FILE__) + '/description.xml', :port => 9292, :bind => '::') do
+Riddl::Server.new(File.dirname(__FILE__) + '/description.xml', :port => 9001, :bind => '::') do
   accessible_description true
 
   on resource do

data/examples/notifications/producer.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server'
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/fileserve')
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/notifications_producer')
 
-Riddl::Server.new(::File.dirname(__FILE__) + '/producer.declaration.xml', :port => 9291) do
+Riddl::Server.new(::File.dirname(__FILE__) + '/producer.declaration.xml', :port => 9001) do
   accessible_description true
   backend =  Riddl::Utils::Notifications::Producer::Backend.new(
     ::File.dirname(__FILE__) + '/topics.xml',
@@ -14,7 +14,7 @@ Riddl::Server.new(::File.dirname(__FILE__) + '/producer.declaration.xml', :port
     run Riddl::Utils::FileServe, "implementation/index.html" if get
     on resource 'oliver' do
       run Riddl::Utils::FileServe, "implementation/oliver.html" if get
-    end  
+    end
     on resource 'juergen' do
       run Riddl::Utils::FileServe, "implementation/juergen.html" if get
     end
@@ -22,5 +22,5 @@ Riddl::Server.new(::File.dirname(__FILE__) + '/producer.declaration.xml', :port
 
   interface 'main' do |r|
     use Riddl::Utils::Notifications::Producer::implementation(backend,nil,@riddl_opts[:mode])
-  end  
+  end
 end.loop!

data/examples/properties/server.properties.xml

@@ -11,6 +11,6 @@
   </endpoints>
   <handlerwrapper>Test</handlerwrapper>
   <description>lala</description>
-  <state>stopped</state>
+  <state changed="2020-10-01T20:41:21+02:00">stopped</state>
   <transformation>xxx</transformation>
 </properties>

data/lib/ruby/riddl/handlers/plain-type.rb

@@ -4,18 +4,19 @@ module Riddl
       def self::handle(what,hinfo)
         if what.class == Riddl::Parameter::Tempfile
           w = what.read
-        else  
+        else
           w = what
-        end  
+        end
         begin
-          re = Regexp.new(hinfo)
-        rescue  
+          hi = XML::Smart::string(hinfo)
+          re = Regexp.new(hi.root.text)
+        rescue
           return false
         end
         w =~ re
       end
     end
-  end  
-end  
+  end
+end
 
 Riddl::Handlers::add("http://riddl.org/ns/handlers/plain-type",Riddl::Handlers::PlainType)

data/lib/ruby/riddl/ns/common-patterns/notifications-consumer/2.0/consumer.xml

@@ -30,7 +30,7 @@
   </message>
 
   <message name="acknowledgment">
-    <optional>
+    <choice>
       <parameter name="continue" type="string">
         <choice>
           <value>true</value>
@@ -38,7 +38,10 @@
           <value>callback</value>
         </choice>
       </parameter>
-    </optional>
+      <parameter name="continue" mimetype="text/plain" handler="http://riddl.org/ns/handlers/plain-type">
+        <pattern>^(true|false|callback)$</pattern>
+      </parameter>
+    </choice>
   </message>
 
   <resource pattern="http://riddl.org/ns/common-patterns/notifications-consumer/2.0">

data/lib/ruby/riddl/protocols/http/parser.rb

@@ -34,9 +34,16 @@ module Riddl
             body = ''
           end
 
-          if content_length == 0 && name == ''
+          if content_length == 0
+            bufsize = 16384
+            until input.eof?
+              c = input.read(bufsize)
+              raise EOFError, "bad content body"  if c.nil? || c.empty?
+              body << c
+              content_length -= c.size
+            end
             body << input.read
-          else  
+          else
             bufsize = 16384
             until content_length <= 0
               c = input.read(bufsize < content_length ? bufsize : content_length)
@@ -131,7 +138,7 @@ module Riddl
             @params << Parameter::Complex.new(name, ctype, body, filename, head)
           elsif !filename && ctype
             body.rewind
-            
+
             # Generic multipart cases, not coming from a form
             @params << Parameter::Complex.new(name, ctype, body, nil, head)
           else
@@ -170,7 +177,7 @@ module Riddl
           elsif FORM_CONTENT_TYPES.include?(media_type)
             # sub is a fix for Safari Ajax postings that always append \0
             parse_nested_query(input.read.sub(/\0\z/, ''),:body)
-          else 
+          else
             parse_content(input,content_type,content_length.to_i,content_disposition||'',content_id||'',riddl_type||'')
           end
 
@@ -187,4 +194,4 @@ module Riddl
       end
     end
   end
-end  
+end