riddl 0.107 → 0.112

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="key" type="string"/>
+    <parameter name="type" fixed="event"/>
     <parameter name="topic" type="string">
       <param name="pattern">[\w_/]+</param>
     </parameter>
@@ -12,9 +12,6 @@
       <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,7 +33,7 @@ module Riddl
         end
       end
 
-      def trigger_on_open(); @closed = false; @app.onopen;  end
+      def trigger_on_open(); @closed = false; res = @app.onopen; res ? true : false; end
       def trigger_on_close;  @closed = true;  @app.onclose; end
 
       def initialize(app, env)
@@ -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

@@ -233,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/lib/ruby/riddl/wrapper/messageparser.rb

@@ -55,9 +55,11 @@ module Riddl
 
         if b.class == Riddl::Parameter::Simple && (a.attributes['fixed'] || a.attributes['type'])
           b.name = a.attributes['name'] if @numparams == 1
-          if (b.name == a.attributes['name'] || a.attributes['name'] == '*')
+          if (b.name == a.attributes['name'] || a.attributes['name'] == '*') && match_simple(a,b.value)
             @mistp += 1
-            return match_simple(a,b.value)
+            return true
+          else
+            return false
           end
         end
         if b.class == Riddl::Parameter::Complex && a.attributes['mimetype']

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="key" type="string"/>
+    <parameter name="type" fixed="event"/>
     <parameter name="topic" type="string">
       <param name="pattern">[\w_/]+</param>
     </parameter>
@@ -12,9 +12,6 @@
       <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.107"
+  s.version          = "0.112"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: '0.107'
+  version: '0.112'
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemonite
@@ -411,6 +411,7 @@ files:
 - examples/twitter/README
 - examples/twitter/client.rb
 - examples/twitter/declaration.xml
+- examples/twitter/timeline.rb
 - examples/twitter/twitpic.xml
 - examples/twitter/twitter.xml
 - examples/websocket/client.rb