riddl 0.103 → 0.109

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c0661d1fa0c6aff0b54ffdfbec1090c8741944219a8ba2e304acecf07d97b7b
-  data.tar.gz: 2beac525a71017e0a558a155fa61d54dc0bec133063253d7b7460311c2d89ee6
+  metadata.gz: 7ef16321d5a3ac3dc117ebf4562401cdc45e882c7a8c063b4794c6c78f6ba8d3
+  data.tar.gz: 6be7c41b5557344d86283ff1b9908fca893e6eab8e93d6bd760d8b4945d53f96
 SHA512:
-  metadata.gz: 75d47eb2d1e59cfa43199f468c706b1e06109149082f136b57faec2b3516dd5b724827edbd6a60198d5a27bd816c55ddf0063678436e645d72a406541708c646
-  data.tar.gz: 1f267f56fa67c847b3e146c9d2fc5918065094e0071990c46e7ffdb93083907f69812dab816770139c844e3323e6bb1abdb4d225d934b0aa00095e95f5e35e17
+  metadata.gz: 852e1cec180f864000e6a3b23592d5b325d5b45ce9bb00dfd410d0fab32f72daa40febb3bfedbf0070ad4316c1b83691b6d9631b64be3520e33530718cd27449
+  data.tar.gz: 90541d947a00b4104b4e57c24e62e6e849b7995041e15503477c491cd6138d2554e5251ef8292d990913ba437da42c31f08a525157794c6ca93420746ee31f10

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

@@ -136,6 +136,11 @@ module Riddl
               EM.stop
             end
           end
+          [:HUP].each do |signal|
+            Signal.trap(signal) do
+              EM.stop
+            end
+          end
 
           if @riddl_opts[:parallel]
             EM.defer do
@@ -228,7 +233,7 @@ module Riddl
       @riddl_res = Rack::Response.new
       @riddl_status = 404
 
-      @riddl_pinfo = @riddl_env["PATH_INFO"].gsub(/\/+/,'/')
+      @riddl_pinfo = Riddl::Protocols::Utils::unescape(@riddl_env["PATH_INFO"].gsub(/\/+/,'/'))
       @riddl_matching_path = @riddl_paths.find{ |e| @riddl_pinfo.match(e[1]).to_s.length == @riddl_pinfo.length }
 
       if @riddl_matching_path

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.103"
+  s.version          = "0.109"
   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.103'
+  version: '0.109'
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
 - Florian 'Solo' Stertz
 - Sonja Biedermann
-autorequire: 
+autorequire:
 bindir: tools
 cert_chain: []
-date: 2020-10-03 00:00:00.000000000 Z
+date: 2020-11-04 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
@@ -533,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
@@ -548,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'