riddl 0.112 → 0.113

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15d7463d1e607ba87b699d916ddcf25ece52a6e9ca19be153a637748da1c9e87
-  data.tar.gz: 455f950f53982fb012bb6d7f0fb11afb66d032f7a9b71233c8c40fd565ecc8a8
+  metadata.gz: 699493c759c420f9708c290b5ceb389b991845691227964a93b8c446c9b74041
+  data.tar.gz: fce44440a2750a3c6d60b459c0599815d75c04af980dc426bb2426382eaac7eb
 SHA512:
-  metadata.gz: 57ce500bdd4a305f8d459f2454ba1b5711c96ead5496ee3960ccf341e1328f145249df5652c8875d4d89dcce35f32c76af8ed38a998f3b9c41ec34760239a979
-  data.tar.gz: 8a4e78b08f3fcc79fbfc6ce27233434a769ce341818546fd0eb9c7181101db7820b8da80abe6f299edd11880f5d24a65316951373fff135b1adbf332b5fe4161
+  metadata.gz: 9e26099fe2a874cd534cf36cf4dba45b982f49bb97dc65849488f01ba25883850b419f799833081b1557bebf0396dbc2d84b7faf9080afa58fd49e4c5898a719
+  data.tar.gz: 7859746d3bdffc03741442a4b00ea3dcc516d4d7b5b205b1d98fe90fc3563ca309e040b5f5ac9f4b252405f1a56a226fff69b4c7715b355268b00ef198e511d5

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

@@ -96,7 +96,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 +160,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/ns/common-patterns/notifications-producer/2.0/producer.xml

@@ -96,7 +96,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 +160,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.112"
+  s.version          = "0.113"
   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.112'
+  version: '0.113'
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemonite
@@ -411,7 +411,6 @@ 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
@@ -549,7 +548,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: 'restful interface description and declaration language: tools and client/server

data/examples/twitter/timeline.rb

@@ -1,76 +0,0 @@
-#!/usr/bin/ruby
-require '../../lib/ruby/riddl/client'
-require 'json'
-
-twitter = Riddl::Client.interface("https://api.twitter.com/","twitter.xml")
-
-### Base
-consumer_key      = File.read(File.expand_path(File.dirname(__FILE__) + '/.twitter.consumer_key')).strip
-consumer_secret   = File.read(File.expand_path(File.dirname(__FILE__) + '/.twitter.consumer_secret')).strip
-file_user_id      = File.expand_path(File.dirname(__FILE__) + '/.twitter.user_id')
-file_token        = File.expand_path(File.dirname(__FILE__) + '/.twitter.token')
-file_token_secret = File.expand_path(File.dirname(__FILE__) + '/.twitter.token_secret')
-
-### When token and secret already saved, skip this part
-if !File.exists?(file_token) && !File.exists?(file_token_secret)
-  ### go to request token resource and set necessary role options
-  resource = twitter.resource("/oauth/request_token")
-  params = [
-    Riddl::Option.new(:consumer_key,consumer_key),
-    Riddl::Option.new(:consumer_secret,consumer_secret)
-  ]
-
-  ### simulate request token
-  # puts resource.simulate_post(params).read
-
-  ### get request token and save it to variables
-  status, response, headers = resource.post params
-  token = response.oauth_token
-  token_secret = response.oauth_token_secret
-
-  ### send user away for authorization
-  puts "Authorize at https://twitter.com/oauth/authorize?oauth_token=#{token}"
-  print "Insert verifier here: "
-  verifier = STDIN.gets.strip # wait for verifier
-
-  ### exchange the token for an access token and save the results
-  resource = twitter.resource("/oauth/access_token")
-  status, response, headers = resource.post [
-    Riddl::Option.new(:consumer_key,consumer_key),
-    Riddl::Option.new(:consumer_secret,consumer_secret),
-    Riddl::Option.new(:token,token),
-    Riddl::Option.new(:verifier,verifier),
-    Riddl::Option.new(:token_secret,token_secret)
-  ]
-  user_id = response.user_id
-  token = response.oauth_token
-  token_secret = response.oauth_token_secret
-
-  File.open(file_user_id,'w'){|f|f.write response.oauth_token}
-  File.open(file_token,'w'){|f|f.write response.oauth_token}
-  File.open(file_token_secret,'w'){|f|f.write response.oauth_token_secret}
-else
-  user_id = File.read(file_user_id).strip
-  token = File.read(file_token).strip
-  token_secret = File.read(file_token_secret).strip
-end
-
-### Show single tweet
-#tweet = 258251258941554688 # some stuff
-#status, res = twitter.resource("/1.1/statuses/show.json").get [
-#    Riddl::Parameter::Simple.new("id",tweet),
-#    Riddl::Option.new(:consumer_key,consumer_key),
-#    Riddl::Option.new(:consumer_secret,consumer_secret),
-#    Riddl::Option.new(:token,token),
-#    Riddl::Option.new(:token_secret,token_secret)
-#]
-#puts status
-
-### Show timeline
-status, res = twitter.resource("/1.1/statuses/user_timeline.json").get [
-    Riddl::Option.new(:consumer_key,consumer_key),
-    Riddl::Option.new(:consumer_secret,consumer_secret),
-    Riddl::Option.new(:token,token),
-    Riddl::Option.new(:token_secret,token_secret)
-]
-tweets = JSON::parse(res[0].value.read)