riddl 0.111 → 0.117

data/lib/ruby/riddl/client.rb

@@ -355,6 +355,7 @@ unless Module.constants.include?('CLIENT_INCLUDED')
               :headers        => headers,
               :body           => tmp.read,
               :ssl_verifypeer => false
+              #:followlocation => true
             }
             if url.user && url.password
               opts[:username] = Protocols::Utils::unescape(url.user)

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

@@ -67,6 +67,9 @@
       <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://riddl.org/ns/common-patterns/notifications-producer/2.0">
         <start>
           <element name="subscription">
+            <attribute name="id">
+              <data type="string"/>
+            </attribute>
             <optional>
               <attribute name="url">
                 <data type="string"/>
@@ -96,7 +99,26 @@
     </parameter>
   </message>
 
-  <message name="subscribe">
+  <message name="create_subscription">
+    <optional>
+      <parameter name="id" type="string"/>
+    </optional>
+    <optional>
+      <parameter name="url" type="string"/>
+    </optional>
+    <oneOrMore>
+      <parameter name="topic" type="string"/>
+      <choice>
+        <parameter name="votes" type="string">
+          <param name="pattern">([\w-_]+,)*([\w-_]+)</param>
+        </parameter>
+        <parameter name="events" type="string">
+          <param name="pattern">([\w-_]+,)*([\w-_]+)</param>
+        </parameter>
+      </choice>
+    </oneOrMore>
+  </message>
+  <message name="change_subscription">
     <optional>
       <parameter name="url" type="string"/>
     </optional>
@@ -141,10 +163,10 @@
       </resource>
       <resource relative="subscriptions">
         <get in="*" out="subscriptions"/>
-        <post in="subscribe" out="acknowledgment"/>
+        <post in="create_subscription" out="acknowledgment"/>
         <resource>
           <get out="subscription"/>
-          <put in="subscribe"/>
+          <put in="change_subscription"/>
           <delete/>
           <resource relative="sse">
             <sse/>

data/lib/ruby/riddl/server.rb

@@ -178,7 +178,7 @@ module Riddl
           @riddl_res['Content-Length'] = '0'
           @riddl_status = 200
         else
-          @riddl_log.write "501: the #{@riddl_method} parameters are not matching anything in the description.\n"
+          @riddl_log.write "501: a #{@riddl_method} with the these parameters is not part in the description (xml).\n"
           @riddl_status = 501 # not implemented?!
         end
       else
@@ -253,6 +253,9 @@ module Riddl
           @riddl_env['HTTP_CONTENT_ID'],
           @riddl_env['HTTP_RIDDL_TYPE']
         ).params
+        if @riddl_opts[:http_debug]
+          pp @riddl_parameters
+        end
 
         @riddl_method = @riddl_env['REQUEST_METHOD'].downcase
         @riddl_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-producer/2.0/producer.xml

@@ -67,6 +67,9 @@
       <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://riddl.org/ns/common-patterns/notifications-producer/2.0">
         <start>
           <element name="subscription">
+            <attribute name="id">
+              <data type="string"/>
+            </attribute>
             <optional>
               <attribute name="url">
                 <data type="string"/>
@@ -96,7 +99,26 @@
     </parameter>
   </message>
 
-  <message name="subscribe">
+  <message name="create_subscription">
+    <optional>
+      <parameter name="id" type="string"/>
+    </optional>
+    <optional>
+      <parameter name="url" type="string"/>
+    </optional>
+    <oneOrMore>
+      <parameter name="topic" type="string"/>
+      <choice>
+        <parameter name="votes" type="string">
+          <param name="pattern">([\w-_]+,)*([\w-_]+)</param>
+        </parameter>
+        <parameter name="events" type="string">
+          <param name="pattern">([\w-_]+,)*([\w-_]+)</param>
+        </parameter>
+      </choice>
+    </oneOrMore>
+  </message>
+  <message name="change_subscription">
     <optional>
       <parameter name="url" type="string"/>
     </optional>
@@ -141,10 +163,10 @@
       </resource>
       <resource relative="subscriptions">
         <get in="*" out="subscriptions"/>
-        <post in="subscribe" out="acknowledgment"/>
+        <post in="create_subscription" out="acknowledgment"/>
         <resource>
           <get out="subscription"/>
-          <put in="subscribe"/>
+          <put in="change_subscription"/>
           <delete/>
           <resource relative="sse">
             <sse/>

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.111"
+  s.version          = "0.117"
   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.111'
+  version: '0.117'
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemonite
@@ -548,18 +548,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: 'restful interface description and declaration language: tools and client/server
   libs'
 test_files:
-- test/tc_properties.rb
+- test/tc_declaration-distributed.rb
 - test/tc_declaration-hybrid.rb
 - test/tc_declaration-local.rb
 - test/tc_helloworld.rb
 - test/tc_library.rb
-- test/tc_declaration-distributed.rb
-- test/tc_websocket.rb
 - test/tc_producer.rb
+- test/tc_properties.rb
+- test/tc_websocket.rb
 - test/smartrunner.rb