riddl 0.102 → 0.108

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02d6544bef02c48146f11bcce856f60a78b782678028a61d877c8e191b26a9c3
-  data.tar.gz: 03f040ece9e74f900ecb93e4961afe7a8f26951b84f33a083c9acc2f30cca1c0
+  metadata.gz: ba99e4436e3ca77f2ccd22e783ced04c42b84a2a3a90e5dc767b3912a0fe15b5
+  data.tar.gz: e6b7abac2cd99448e958a61748b2e16c39896747fb4011921ca67f2b53ac6ae1
 SHA512:
-  metadata.gz: 405ed0327b0e51c6dba40b3e08476fce1f3888d05719e3741ec67d75d2061106c8a41d75e0c09beb2318e9ac06cbf49e922389737e614906be14c033e6daabf5
-  data.tar.gz: 89ecf78f0fb11bf552bc9fd8d1b4bb5585c04c266903c19531544e7fe15679f9b617d89e6263d2805d583bb80c5cf6fe69a498fb4c6642164cb9ac859c33fc1b
+  metadata.gz: 3855116333b18322255d788c92e3003c37813167266d24d15ca4d048113b4c57014c5eb8d8048e8492679a42f585bc86dcd04aee0d60982a135d4a4761adf946
+  data.tar.gz: c81120e0746794963fbe8c59498eb5fe15330c63149144a3800d6477402b7b41d88b710786ddf55b266737933a07737cd3f537a622d1533e1e09d45907161149

data/examples/properties/server.properties.xml

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

data/examples/sse/description.xml

@@ -8,7 +8,7 @@
     <parameter name="age" type="integer"/>
     <parameter name="bla" type="string"/>
   </message>
-  <message name=xxxxx">
+  <message name="xxxxx">
     <parameter name="degree" type="integer"/>
     <parameter name="bla" type="string"/>
   </message>

data/examples/sse/server.rb

@@ -10,6 +10,8 @@ end
 
 class Echo < Riddl::SSEImplementation
   def onopen
+    // if true (or any object for that matter) is returned, then 200 is sent
+    // if false (or nil) is returned 404, the sse is denied
     puts "Connection established"
     Thread.new do
       1.upto 10 do |i|

data/lib/ruby/riddl/client.rb

@@ -16,6 +16,7 @@ require 'digest/md5'
 
 class StringIO #{{{
   def continue_timeout; nil; end
+  def empty?; size == 0; end
 end #}}}
 
 class SignalWait #{{{

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

@@ -1,7 +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">
 
   <message name="event">
-    <parameter name="type" fixed="event"/>
+    <parameter name="key" type="string"/>
     <parameter name="topic" type="string">
       <param name="pattern">[\w_/]+</param>
     </parameter>
@@ -12,6 +12,9 @@
       <parameter name="notification" type="string"/>
       <parameter name="notification" mimetype="application/json"/>
     </choice>
+    <optional>
+      <parameter name="fingerprint-with-consumer-secret" type="string"/>
+    </optional>
   </message>
 
   <message name="vote">

data/lib/ruby/riddl/protocols/sse.rb

@@ -33,8 +33,8 @@ module Riddl
         end
       end
 
-      def trigger_on_open();          @closed = false; @app.onopen;               end
-      def trigger_on_close;           @closed = true;  @app.onclose;              end
+      def trigger_on_open(); @closed = false; @app.onopen;  end
+      def trigger_on_close;  @closed = true;  @app.onclose; end
 
       def initialize(app, env)
         @app = app
@@ -56,8 +56,12 @@ module Riddl
           headers['Access-Control-Max-Age'] = '0'
         end
 				EventMachine::next_tick {
-					@env['async.callback'].call [200, headers, @body]
-          trigger_on_open
+          if trigger_on_open
+            @env['async.callback'].call [200, headers, @body]
+          else
+            @body.fail
+            @env['async.callback'].call [404, headers, {}]
+          end
 				}
       end
 

data/lib/ruby/riddl/server.rb

@@ -129,6 +129,14 @@ module Riddl
           end
 
           [:INT, :TERM].each do |signal|
+            Signal.trap(signal) do
+              if @riddl_opts[:cleanup]
+                @riddl_opts[:cleanup].call
+              end
+              EM.stop
+            end
+          end
+          [:HUP].each do |signal|
             Signal.trap(signal) do
               EM.stop
             end
@@ -140,7 +148,6 @@ module Riddl
             end
           end
         end
-
       rescue => e
         if @riddl_opts[:custom_protocol] && !@riddl_opts[:http_only]
           @riddl_opts[:custom_protocol].error_handling(e)
@@ -152,6 +159,9 @@ module Riddl
     def parallel(&blk)
       @riddl_opts[:parallel] = blk
     end
+    def cleanup(&blk)
+      @riddl_opts[:cleanup] = blk
+    end
 
     def call(env)# {{{
       dup.__http_call(env)

data/ns/common-patterns/notifications-consumer/2.0/consumer.xml

@@ -1,7 +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">
 
   <message name="event">
-    <parameter name="type" fixed="event"/>
+    <parameter name="key" type="string"/>
     <parameter name="topic" type="string">
       <param name="pattern">[\w_/]+</param>
     </parameter>
@@ -12,6 +12,9 @@
       <parameter name="notification" type="string"/>
       <parameter name="notification" mimetype="application/json"/>
     </choice>
+    <optional>
+      <parameter name="fingerprint-with-consumer-secret" type="string"/>
+    </optional>
   </message>
 
   <message name="vote">

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.102"
+  s.version          = "0.108"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>=2.2.0'
 
-  s.add_runtime_dependency 'daemonite', '~>0.5', '>=0.5.9'
+  s.add_runtime_dependency 'daemonite', '~>0.6', '>=0.6.0'
   s.add_runtime_dependency 'typhoeus', '~>1.3'
   s.add_runtime_dependency 'xml-smart', '>=0.4.3', '~>0'
   s.add_runtime_dependency 'rdf-smart', '>=0.0.160', '~>0'

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: '0.102'
+  version: '0.108'
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
 - Florian 'Solo' Stertz
 - Sonja Biedermann
-autorequire: 
+autorequire:
 bindir: tools
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemonite
@@ -18,20 +18,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -395,7 +395,6 @@ files:
 - examples/pass-test/structure.xml
 - examples/properties/description.conf
 - examples/properties/description.rb
-- examples/properties/properties.schema.xsl
 - examples/properties/properties.xml
 - examples/properties/server.properties.schema
 - examples/properties/server.properties.xml
@@ -534,7 +533,7 @@ homepage: http://www.wst.univie.ac.at/communities/riddl/
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib/ruby
@@ -549,8 +548,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: 'restful interface description and declaration language: tools and client/server
   libs'

data/examples/properties/properties.schema.xsl

@@ -1 +0,0 @@
-../../ns/common-patterns/properties/1.0/properties.schema.xsl