riddl 0.101.26 → 0.102

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b0c69ed74aacd5d1e986311d0d84934c91a66e59224d6d3a0e3971a5397d411
-  data.tar.gz: fe9e202e7b2f42d8561e0eb0946254c4d9f9a5a6adf3d1dd1e9fe724968609be
+  metadata.gz: 02d6544bef02c48146f11bcce856f60a78b782678028a61d877c8e191b26a9c3
+  data.tar.gz: 03f040ece9e74f900ecb93e4961afe7a8f26951b84f33a083c9acc2f30cca1c0
 SHA512:
-  metadata.gz: 5969e8231531f20da2e5df34d3bb46043df109331bcd0ca4533ff4ed02cd0195cc733f89bff56c8525f22dc794a7d806676b8d8de02ab97a6c0cd0f8d0f32758
-  data.tar.gz: 10a8c256399af36f642ca6ecfdd3bbc2ad054bb2295999cfde8a9e9602f3eb7d11d57db8cebeb011858e1a5290bf115a29c4fb9547aa008f2fceaf0453dcd105
+  metadata.gz: 405ed0327b0e51c6dba40b3e08476fce1f3888d05719e3741ec67d75d2061106c8a41d75e0c09beb2318e9ac06cbf49e922389737e614906be14c033e6daabf5
+  data.tar.gz: 89ecf78f0fb11bf552bc9fd8d1b4bb5585c04c266903c19531544e7fe15679f9b617d89e6263d2805d583bb80c5cf6fe69a498fb4c6642164cb9ac859c33fc1b

data/examples/declaration-server-distributed/declaration.rb

@@ -1,4 +1,4 @@
 #!/usr/bin/ruby
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server')
 
-Riddl::Server.new(File.dirname(__FILE__) + '/declaration.xml', :port => 9297).loop!
+Riddl::Server.new(File.dirname(__FILE__) + '/declaration.xml', :port => 9004).loop!

data/examples/declaration-server-distributed/declaration.xml

@@ -1,13 +1,13 @@
 <declaration xmlns="http://riddl.org/ns/declaration/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <interface name="main" location="http://localhost:9296">
+  <interface name="main" location="http://localhost:9003">
     <xi:include href="main.xml"/>
   </interface>
-  <interface name="properties" location="http://localhost:9295">
+  <interface name="properties" location="http://localhost:9002">
     <xi:include href="properties.xml"/>
   </interface>
-  <interface name="xsloverlay" location='http://localhost:9294'>
+  <interface name="xsloverlay" location='http://localhost:9001'>
     <xi:include href="xsloverlay.xml"/>
-  </interface>  
+  </interface>
 
   <facade>
     <tile>

data/examples/declaration-server-distributed/main.rb

@@ -20,16 +20,16 @@ class Info < Riddl::Implementation
   end
 end
 
-Riddl::Server.new(File.dirname(__FILE__) + '/main.xml', :port => 9296) do
+Riddl::Server.new(File.dirname(__FILE__) + '/main.xml', :port => 9003) do
   on resource do
     run Riddl::Utils::FileServe, 'instances/instances.xml' if get '*'
     on resource do
       run Info if get
-    end  
+    end
     on resource 'xsls' do
       on resource do
         run Riddl::Utils::FileServe, "xsls"  if get
-      end  
-    end  
+      end
+    end
   end
 end.loop!

data/examples/declaration-server-distributed/properties.rb

@@ -3,17 +3,17 @@ require 'pp'
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server')
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/properties')
 
-Riddl::Server.new(File.dirname(__FILE__) + '/properties.xml', :port => 9295) do
+Riddl::Server.new(File.dirname(__FILE__) + '/properties.xml', :port => 9002) do
   on resource do |r|
     ### header RIDDL_DECLARATION_PATH holds the full path used in the declaration
     ### from there we get the instance, which is not present in the path used for properties
     properties = if r[:h]['RIDDL_DECLARATION_PATH']
       @riddl_opts[:basepath] + '/instances/' + r[:h]['RIDDL_DECLARATION_PATH'].split('/')[1] + '/properties.xml'
-    else 
+    else
       @riddl_opts[:basepath] + '/instances/1/properties.xml'
-    end  
-    backend = Riddl::Utils::Properties::Backend.new( 
-      @riddl_opts[:basepath] + '/instances/properties.schema', 
+    end
+    backend = Riddl::Utils::Properties::Backend.new(
+      @riddl_opts[:basepath] + '/instances/properties.schema',
       properties
     )
 

data/examples/declaration-server-distributed/xsloverlay.rb

@@ -3,7 +3,7 @@ require 'pp'
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server')
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/xsloverlay')
 
-Riddl::Server.new(File.dirname(__FILE__) + '/xsloverlay.xml', :port => 9294) do
+Riddl::Server.new(File.dirname(__FILE__) + '/xsloverlay.xml', :port => 9001) do
   on resource do
     run Riddl::Utils::XSLOverlay, "/xsls/instances.xsl"  if get && declaration_resource == '/'
     run Riddl::Utils::XSLOverlay, "/xsls/info.xsl"       if get && declaration_resource == '/{}'

data/examples/declaration-server-hybrid/declaration.rb

@@ -21,25 +21,25 @@ class Info < Riddl::Implementation
   end
 end
 
-Riddl::Server.new(File.dirname(__FILE__) + '/declaration.xml', :port => 9297) do
+Riddl::Server.new(File.dirname(__FILE__) + '/declaration.xml', :port => 9002) do
   accessible_description true
 
   interface 'main' do
     run Riddl::Utils::FileServe, 'instances/instances.xml' if get '*'
     on resource do
       run Info if get
-    end  
+    end
     on resource 'xsls' do
       on resource do
         run Riddl::Utils::FileServe, "xsls"  if get
-      end  
-    end  
+      end
+    end
   end
 
   interface 'properties' do |r|
     properties = @riddl_opts[:basepath] + '/instances/' + r[:h]['RIDDL_DECLARATION_PATH'].split('/')[1] + '/properties.xml'
-    backend = Riddl::Utils::Properties::Backend.new( 
-      @riddl_opts[:basepath] + '/instances/properties.schema', 
+    backend = Riddl::Utils::Properties::Backend.new(
+      @riddl_opts[:basepath] + '/instances/properties.schema',
       properties
     )
 

data/examples/declaration-server-hybrid/declaration.xml

@@ -5,9 +5,9 @@
   <interface name="properties">
     <xi:include href="properties.xml"/>
   </interface>
-  <interface name="xsloverlay" location='http://localhost:9294'>
+  <interface name="xsloverlay" location='http://localhost:9001'>
     <xi:include href="xsloverlay.xml"/>
-  </interface>  
+  </interface>
 
   <facade>
     <tile>

data/examples/declaration-server-hybrid/xsloverlay.rb

@@ -3,7 +3,7 @@ require 'pp'
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server')
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/xsloverlay')
 
-Riddl::Server.new(File.dirname(__FILE__) + '/xsloverlay.xml', :port => 9294) do
+Riddl::Server.new(File.dirname(__FILE__) + '/xsloverlay.xml', :port => 9001) do
   # accessible_description true
 
   on resource do

data/examples/declaration-server-local/declaration.rb

@@ -5,12 +5,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/p
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/xsloverlay')
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/fileserve')
 
-Riddl::Server.new(File.dirname(__FILE__) + '/declaration.xml', :port => 9292) do
+Riddl::Server.new(File.dirname(__FILE__) + '/declaration.xml', :port => 9001) do
   accessible_description true
 
-  backend = Riddl::Utils::Properties::Backend.new( 
-    @riddl_opts[:basepath] + '/server.properties.schema', 
-    @riddl_opts[:basepath] + '/server.properties.xml' 
+  backend = Riddl::Utils::Properties::Backend.new(
+    @riddl_opts[:basepath] + '/server.properties.schema',
+    @riddl_opts[:basepath] + '/server.properties.xml'
   )
 
   interface 'main' do
@@ -20,7 +20,7 @@ Riddl::Server.new(File.dirname(__FILE__) + '/declaration.xml', :port => 9292) do
   interface 'xsls' do |r|
     on resource do
       run Riddl::Utils::FileServe, "xsls" if get
-    end  
+    end
   end
 
   interface 'xsloverlay' do

data/examples/declaration-test/main.rb

@@ -7,24 +7,24 @@ class A < Riddl::Implementation
   def response
     Riddl::Parameter::Simple.new("x","1")
   end
-end  
+end
 class B < Riddl::Implementation
   def response
     Riddl::Parameter::Simple.new("y","1")
   end
-end  
+end
 class C < Riddl::Implementation
   def response
     Riddl::Parameter::Simple.new("z","1")
   end
-end  
+end
 class S < Riddl::Implementation
   def response
     @p # return input parameters unchanged
   end
-end  
+end
 
-Riddl::Server.new("main.xml", :port => 9201) do
+Riddl::Server.new("main.xml", :port => 9001) do
   process_out false
   logger Riddl::CommonLogger.new("Main","main.log")
   on resource do

data/examples/downloadify/client.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server')
 
-srv = Riddl::Client.interface("http://localhost:9299","server.declaration.xml")
+srv = Riddl::Client.interface("http://localhost:9001","server.declaration.xml")
 
 status, ret = srv.resource('/test.txt').post [
   Riddl::Parameter::Simple.new("mimetype","text/plain"),

data/examples/downloadify/server.rb

@@ -2,13 +2,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server')
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/downloadify')
 
-Riddl::Server.new(::File.dirname(__FILE__) + '/server.declaration.xml', :port => 9299) do
+Riddl::Server.new(::File.dirname(__FILE__) + '/server.declaration.xml', :port => 9001) do
   accessible_description true
 
   interface "main" do
   end
 
-  interface "downloadify" do 
+  interface "downloadify" do
     on resource do
       run Riddl::Utils::Downloadify if get 'dfin'
       run Riddl::Utils::Downloadify if post 'dfin'

data/examples/flickr/declaration.xml

@@ -2,7 +2,7 @@
   <interface name="main" location="http://api.flickr.com/services">
     <xi:include href="Flickr/flickr.xml"/>
   </interface>
-  <interface name="exif" location="http://localhost:9292">
+  <interface name="exif" location="http://localhost:9001">
     <xi:include href="Exif/exif.xml"/>
   </interface>
 

data/examples/library/server.rb

@@ -34,7 +34,7 @@ class BookDescription < Riddl::Implementation
   end
 end
 
-Riddl::Server.new(File.dirname(__FILE__) + '/description.xml', :port => 9292, :bind => '::') do
+Riddl::Server.new(File.dirname(__FILE__) + '/description.xml', :port => 9001, :bind => '::') do
   accessible_description true
 
   on resource do

data/examples/notifications/producer.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server'
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/fileserve')
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/notifications_producer')
 
-Riddl::Server.new(::File.dirname(__FILE__) + '/producer.declaration.xml', :port => 9291) do
+Riddl::Server.new(::File.dirname(__FILE__) + '/producer.declaration.xml', :port => 9001) do
   accessible_description true
   backend =  Riddl::Utils::Notifications::Producer::Backend.new(
     ::File.dirname(__FILE__) + '/topics.xml',
@@ -14,7 +14,7 @@ Riddl::Server.new(::File.dirname(__FILE__) + '/producer.declaration.xml', :port
     run Riddl::Utils::FileServe, "implementation/index.html" if get
     on resource 'oliver' do
       run Riddl::Utils::FileServe, "implementation/oliver.html" if get
-    end  
+    end
     on resource 'juergen' do
       run Riddl::Utils::FileServe, "implementation/juergen.html" if get
     end
@@ -22,5 +22,5 @@ Riddl::Server.new(::File.dirname(__FILE__) + '/producer.declaration.xml', :port
 
   interface 'main' do |r|
     use Riddl::Utils::Notifications::Producer::implementation(backend,nil,@riddl_opts[:mode])
-  end  
+  end
 end.loop!

data/examples/properties/server.properties.xml

@@ -11,6 +11,6 @@
   </endpoints>
   <handlerwrapper>Test</handlerwrapper>
   <description>lala</description>
-  <state>stopped</state>
+  <state changed="2020-10-01T22:38:07+02:00">running</state>
   <transformation>xxx</transformation>
 </properties>

data/lib/ruby/riddl/handlers/plain-type.rb

@@ -10,7 +10,7 @@ module Riddl
         begin
           hi = XML::Smart::string(hinfo)
           re = Regexp.new(hi.root.text)
-        rescue => e
+        rescue
           return false
         end
         w =~ re

data/lib/ruby/riddl/wrapper.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-require 'open-uri'
 gem 'xml-smart', '>= 0.3.0'
 require 'xml/smart'
 
@@ -79,10 +78,18 @@ module Riddl
           name = File.expand_path(File.dirname(__FILE__)) + $2
         end
         begin
-          fh = name.respond_to?(:read) ? name : URI.open(name,:ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE)
-          @doc = XML::Smart.string(fh.read)
-          fh.close
-          fpath = File.dirname(fh.path) if fh.is_a?(File) || fh.is_a?(Tempfile)
+          if name.respond_to?(:read)
+            fpath = File.dirname(name.path) if name.is_a?(File) || name.is_a?(Tempfile)
+            xml = name.read
+            name.close
+          elsif File.exist?(name)
+            fpath = File.dirname(name)
+            xml = File.read(name)
+          else
+            fpath = nil
+            xml = Typhoeus.get(name, ssl_verifypeer: false).response_body
+          end
+          @doc = XML::Smart.string(xml)
         rescue
           begin
             @doc = XML::Smart.string(name)

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.101.26"
+  s.version          = "0.102"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rack', '~>2.2'
   s.add_runtime_dependency 'thin', '~>1.6'
   s.add_runtime_dependency 'eventmachine', '>= 1.0.0', '~>1.0'
-  s.add_runtime_dependency 'em-websocket', '>= 0.4.0', '~>0'
+  s.add_runtime_dependency 'em-websocket', '>= 0.5.2', '~>0'
   s.add_runtime_dependency 'faye-websocket', '>= 0.1', '~>0'
   s.add_runtime_dependency 'mime-types', '>= 3.0', '~>3'
   s.add_runtime_dependency 'minitest', '>= 5.0.0', '~>5'

data/test/smartrunner.rb

@@ -13,27 +13,34 @@ class TestServerInfo
   end
 end
 
-module ServerCase 
+module ServerCase
   def setup
     self.class::SERVER.each do |s|
       if self.class::NORUN
         out = `#{s.server} info`
         s.port = out.match(/:(\d+)\)/)[1].to_i
         s.url = out.match(/\(([^\)]+)\)/)[1]
-      else  
-        out = `#{s.server} start`
+      else
+        Thread.new do
+          `#{s.server} -v start`
+        end
+        out = 'not running'
+        while out.match(/not running/)
+          out = `#{s.server} info`
+          sleep 0.2
+        end
         s.port = out.match(/:(\d+)\)/)[1].to_i
         s.url = out.match(/\(([^\)]+)\)/)[1]
 
-        up = false
-        until up
-          begin
-            TCPSocket.new('localhost', s.port)
-            up = true
-          rescue
-            sleep 0.2
-          end  
-        end
+        # up = false
+        # until up
+        #   begin
+        #     TCPSocket.new('localhost', s.port)
+        #     up = true
+        #   rescue
+        #     sleep 0.2
+        #   end
+        # end
       end
     end
   end
@@ -42,7 +49,7 @@ module ServerCase
     unless self.class::NORUN
        self.class::SERVER.each do |s|
         `#{s.server} stop`
-       end 
-    end 
+       end
+    end
   end
 end

data/test/tc_declaration-distributed.rb

@@ -31,6 +31,7 @@ class TestDecDi <  Minitest::Test
 
     test = ep.resource('/')
     status, res = test.get
+    p status
     assert status == 200
     doc = XML::Smart.string(res[0].value.read)
     assert doc.find('/processing-instruction("xml-stylesheet")').length == 1

data/test/tc_websocket.rb

@@ -27,36 +27,37 @@ class TestWebsocket <  Minitest::Test
     test.ws do |conn|
       cbs = []
 
-      conn.callback do
+      conn.on :open do
         ### called on connection
-        conn.send_msg "hello world"
-        conn.send_msg "done"
+        conn.send "hello world"
+        conn.send "done"
       end
 
-      conn.errback do |e|
+      conn.on :error do |e|
         ### called on error
         cbs << "Got error: #{e}"
       end
 
-      conn.stream do |msg|
+      conn.on :message do |msg|
         ### called when server responds
-        cbs << "<#{msg}>"
+        cbs << "<#{msg.data}>"
         if msg.data == "done"
-          conn.close_connection
+          conn.close
         end
       end
 
-      conn.disconnect do
+      conn.on :close do
         ### called on disconnect
         cbs << "gone"
         EM::stop_event_loop
-        
-        assert cbs.length == 3
-        assert cbs[0] == '<hello world>'
-        assert cbs[1] == '<done>'
-        assert cbs[2] == 'gone'
+
+        assert cbs.length == 4
+        assert cbs[0] == '<oasch 1>'
+        assert cbs[1] == '<hello world>'
+        assert cbs[2] == '<done>'
+        assert cbs[3] == 'gone'
       end
     end
 
-  end  
-end    
+  end
+end