riddl 0.130 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0742891c48e4c361fd8b4fdcdf7abfeb0004b87b9459b84833aa5f41ec28a142'
-  data.tar.gz: 3a3ccce0767ac8efccb9c8277730e3d669e8a484d33aeb93a62e48032c656778
+  metadata.gz: 2fe9cdeb848b915475bf5f3c80230f639ef0c5e69385ef9d7cb86a4548aecfea
+  data.tar.gz: 4ac9fa0466fe4ab7572283c5f21ac2534ac0c0edcf47c34303bb21f329c053e9
 SHA512:
-  metadata.gz: 6a781d0b86a3025b5a3273cc6808bd834edbe41a5633880a76b913df90c3ff109a0bc3fd4b326f99d6943ce04a4e8107850b538738ed1cc2dd69d1b420b758ab
-  data.tar.gz: 795bdb0f17a9e12b6b1a99ad9fd58e4b2fe845fa4e48f95448ddc3dac8f029a7cf364d5dc287a86221a4178fdd1fd7bb38a95b6f1c644a6c47a356be76aa3636
+  metadata.gz: '08d2255f871869b12d2bfdcff552d4439b4f83b2b65bb7a81ff72c0169349159a5fb1b0bce77de2251358e883d1cde3c5070ffb633db1b85a457c95512975d40'
+  data.tar.gz: 8a83b5170d7d2c4b3259590843754eded7f30aadf97912ee5a8d7dd13c3ea60158fc28343bc695806d1ee2a8cf127a01e3b62631eb3f91b2c2d144a5ac2fecf9

data/examples/properties/server.properties.xml

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

data/examples/recursive/description.xml

@@ -0,0 +1,20 @@
+<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="test">
+    <parameter name="test" mimetype="text/plain"/>
+  </message>
+  <message name="sub">
+    <parameter name="sub" mimetype="text/plain"/>
+  </message>
+
+  <resource>
+    <get out="test"/>
+    <resource relative="hello" recursive="true">
+      <get out="test"/>
+      <resource relative="sub">
+        <get out="test"/>
+      </resource>
+    </resource>
+  </resource>
+
+</description>

data/examples/recursive/server.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/ruby
+require 'pp'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server')
+
+class Test < Riddl::Implementation
+  def response
+    Riddl::Parameter::Complex.new("test","text/plain") do
+      <<-END
+        hello #{@r.length}
+      END
+    end
+  end
+end
+
+class Sub < Riddl::Implementation
+  def response
+    Riddl::Parameter::Complex.new("sub","text/plain") do
+      <<-END
+        sub #{@r.length}
+      END
+    end
+  end
+end
+
+
+Riddl::Server.new(File.dirname(__FILE__) + '/description.xml', :port => 9001, :bind => '::') do
+  accessible_description true
+
+  on resource do
+    run Test if get
+    on resource "hello" do
+      run Test if get
+      on resource "sub" do
+        run Sub if get
+      end
+    end
+  end
+end.loop!

data/examples/sse/sample.html

@@ -5,7 +5,7 @@
 
   <script type="text/javascript">
     function init() {
-      es = new EventSource('http://localhost:9292/');
+      es = new EventSource('https://echo.bpm.in.tum.de/ssetest/');
       es.onopen = function() {
         output("onopen");
       };

data/examples/sse/server.rb

@@ -4,32 +4,41 @@ require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server'
 
 class Bar < Riddl::Implementation
   def response
+    $connections.each do |c|
+      c.send('some data')
+    end
     Riddl::Parameter::Complex.new("return","text/plain","hello world")
   end
 end
 
+$connections = []
+
 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
+    # 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|
-        send("oasch #{i}")
-        sleep 1
-      end
-      close
-    end
+    $connections << self
   end
 
   def onclose
     puts "Connection closed"
+    $connections.delete(self)
   end
 end
 
 Riddl::Server.new(File.dirname(__FILE__) + '/description.xml', :port => 9292) do
   cross_site_xhr true
 
+  parallel do
+    loop do
+      $connections.each do |c|
+        c.send('heartbeat')
+      end
+      sleep 15
+    end
+  end
+
   on resource do
     run Bar if get
     run Bar if get 'rrrr'

data/examples/websocket/client.rb

@@ -6,17 +6,18 @@ ep = Riddl::Client.interface('http://localhost:9292/',File.join(__dir__,'/descri
 test = ep.resource('/')
 
 test.ws do |conn|
-  conn.on :open do
-    ### called on connection
-    conn.send "Hello world"
-    conn.send "done"
-  end
 
   conn.on :error do |e|
     ### called on error
     puts "Got error: #{e}"
   end
 
+  conn.on :open do
+    ### called on connection
+    conn.send "Hello world"
+    conn.send "done"
+  end
+
   conn.on :message do |msg|
     ### called when server responds
     puts "<#{msg.data}>"
@@ -30,4 +31,5 @@ test.ws do |conn|
     puts "gone"
     EM::stop_event_loop
   end
+
 end

data/examples/websocket/client.sh

@@ -0,0 +1,9 @@
+curl --include \
+     --no-buffer \
+     --header "Connection: Upgrade" \
+     --header "Upgrade: websocket" \
+     --header "Host: localhost:9292" \
+     --header "Origin: http://localhost:9292" \
+     --header "Sec-WebSocket-Key: SGVsbG8sIHdvcmxkIQ==" \
+     --header "Sec-WebSocket-Version: 13" \
+     http://localhost:9292/

data/lib/ruby/riddl/client.rb

@@ -151,8 +151,10 @@ unless Module.constants.include?('CLIENT_INCLUDED')
         attr_reader :rpath
 
         def ws(&blk) #{{{
-          EM.run do
-            conn = Faye::WebSocket::Client.new((@base + @rpath).sub(/^http/,'ws'))
+          EM.run {
+            url = (@base + @rpath).sub(/^http/,'ws')
+            url = url.sub(/:\/\/localhost/,'://127.0.0.1')
+            conn = Faye::WebSocket::Client.new(url)
 
             if @options[:debug]
               conn.on :error do |e|
@@ -161,7 +163,7 @@ unless Module.constants.include?('CLIENT_INCLUDED')
             end
 
             blk.call(conn)
-          end
+          }
         end #}}}
 
         def get(parameters = []) #{{{
@@ -354,8 +356,8 @@ unless Module.constants.include?('CLIENT_INCLUDED')
               :method         => riddl_method,
               :headers        => headers,
               :body           => tmp.read,
-              :ssl_verifypeer => false
-              #:followlocation => true
+              :ssl_verifypeer => false,
+              :followlocation => true
             }
             if url.user && url.password
               opts[:username] = Protocols::Utils::unescape(url.user)

data/lib/ruby/riddl/ns/common-patterns/properties/1.0/properties.schema.xsl

@@ -2,7 +2,7 @@
 <xsl:stylesheet version="1.0" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:p="http://riddl.org/ns/common-patterns/properties/1.0">
   <xsl:output method="xml" indent="yes"/>
 
-  <xsl:template match="/p:properties">
+  <xsl:template match="/p:properties" priority="1">
     <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://riddl.org/ns/common-patterns/properties/1.0">
 
       <start>

data/lib/ruby/riddl/ns/description/1.0/description.rng

@@ -203,6 +203,12 @@
   </define>
 
   <define name="riddl-resource-recursive-choice">
+  <!--
+    It was a choice when no resources inside recursive resources were allowed.
+    Beacause i doubted that worked.
+    But it works just fine.
+    Maybe its bad for facades but i cant find cases for that.
+    Please report them if you find them.
     <choice>
       <attribute name="recursive">
         <data type="boolean"/>
@@ -210,7 +216,13 @@
       <group>
         <ref name="riddl-resource-sub"/>
       </group>
-    </choice>
+    </choice-->
+    <optional>
+      <attribute name="recursive">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <ref name="riddl-resource-sub"/>
   </define>
 
   <define name="riddl-resource-dynamic">

data/ns/common-patterns/properties/1.0/properties.schema.xsl

@@ -2,7 +2,7 @@
 <xsl:stylesheet version="1.0" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:p="http://riddl.org/ns/common-patterns/properties/1.0">
   <xsl:output method="xml" indent="yes"/>
 
-  <xsl:template match="/p:properties">
+  <xsl:template match="/p:properties" priority="1">
     <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://riddl.org/ns/common-patterns/properties/1.0">
 
       <start>

data/ns/description/1.0/description.rng

@@ -203,6 +203,12 @@
   </define>
 
   <define name="riddl-resource-recursive-choice">
+  <!--
+    It was a choice when no resources inside recursive resources were allowed.
+    Beacause i doubted that worked.
+    But it works just fine.
+    Maybe its bad for facades but i cant find cases for that.
+    Please report them if you find them.
     <choice>
       <attribute name="recursive">
         <data type="boolean"/>
@@ -210,7 +216,13 @@
       <group>
         <ref name="riddl-resource-sub"/>
       </group>
-    </choice>
+    </choice-->
+    <optional>
+      <attribute name="recursive">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <ref name="riddl-resource-sub"/>
   </define>
 
   <define name="riddl-resource-dynamic">

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.130"
+  s.version          = "1.0.1"
   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.130'
+  version: 1.0.1
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2023-03-21 00:00:00.000000000 Z
+date: 2024-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemonite
@@ -406,6 +406,8 @@ files:
 - examples/propnew/server.properties.schema
 - examples/propnew/server.properties.xml
 - examples/propnew/test
+- examples/recursive/description.xml
+- examples/recursive/server.rb
 - examples/simulate/test.rb
 - examples/sse/description.xml
 - examples/sse/sample.html
@@ -417,6 +419,7 @@ files:
 - examples/twitter/twitpic.xml
 - examples/twitter/twitter.xml
 - examples/websocket/client.rb
+- examples/websocket/client.sh
 - examples/websocket/description.xml
 - examples/websocket/sample.html
 - examples/websocket/server.rb
@@ -551,7 +554,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: 'Restful Interface Description and Declaration Language: tools and client/server