cpee-instantiation 1.0.3 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f53d408e5dbfd7e322a845330ae10df4b8352798576d8bc244b6db6de0a3933
-  data.tar.gz: 8cbae1d0f118f5f7a53a5b6df2dc95946daaf30fa30c964d74ea5fcda0f6dbc8
+  metadata.gz: 0d8b35ec9b565e1bab33b2b5a241aca5bef057a5346e318a200f97ee5a747858
+  data.tar.gz: ce3baeadef619b73cafdcb68911fd80a3fa1431e3c9e4e4943073774dcd7fecd
 SHA512:
-  metadata.gz: 0ce67354922c16a1da5fa2077129081d043f8bb44fc308b2c991f5d6258a5e5eb8a834d68cbc7225db43445114e5447d2234ff90c027029244fa2070a691612d
-  data.tar.gz: 0516e8ba967d5896c925c8d82e2e651b0fa523bbddee621aba94ed995cbc6f7d002ec3d7e42852d4a81d0f5e69fbf43c8c2cbdb1b55d5feac89ad280f06d1a1b
+  metadata.gz: 148655d1172ff9741a123fb868d6f96aecde9b520482d6611073b0fe25ac1ad8b0edc0cc041e683ed578565fe8559d5b539fe719d25e9c7dc4af3ff319ce4f2b
+  data.tar.gz: 5ab0d7a92da34ebb58e533a99226a1d89764272aaf1b324a913214e9ceaef3b52789646dd1c645316490c066cface0093d8c871d46a54959b95412ded8e7510c

data/cpee-instantiation.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-instantiation"
-  s.version          = "1.0.3"
+  s.version          = "1.0.9"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Subprocess instantiation service for the cloud process execution engine (cpee.org)"
@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'riddl', '~> 0.99'
   s.add_runtime_dependency 'json', '~> 2.1'
   s.add_runtime_dependency 'redis', '~> 4.1'
-  s.add_runtime_dependency 'cpee', '~> 1', '>= 1.5'
+  s.add_runtime_dependency 'cpee', '~> 2.1', '>= 2.1.4'
 end

data/lib/cpee-instantiation/instantiation.rb

@@ -30,12 +30,13 @@ module CPEE
     SERVER = File.expand_path(File.join(__dir__,'instantiation.xml'))
 
     module Helpers #{{{
-      def load_testset(tdoc,cpee,name=nil,stream=nil) #{{{
+      def load_testset(tdoc,cpee,name=nil,customization=nil) #{{{
         ins = -1
         uuid = nil
         XML::Smart.string(tdoc) do |doc|
           doc.register_namespace 'desc', 'http://cpee.org/ns/description/1.0'
           doc.register_namespace 'prop', 'http://cpee.org/ns/properties/2.0'
+          doc.register_namespace 'sub', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
 
           srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
           res = srv.resource('/')
@@ -44,13 +45,13 @@ module CPEE
               e.text = name
             end
           end
-          if stream && !stream.empty?
-            JSON.parse(stream).each do |e|
+          if customization && !customization.empty?
+            JSON.parse(customization).each do |e|
               begin
-                stream = Typhoeus.get e['url']
-                if stream.success?
-                  XML::Smart::string(stream.response_body) do |str|
-                    doc.find("//desc:call[@id=\"#{e['id']}\"]/desc:parameters/desc:stream").each do |ele|
+                customization = Typhoeus.get e['url']
+                if customization.success?
+                  XML::Smart::string(customization.response_body) do |str|
+                    doc.find("//desc:call[@id=\"#{e['id']}\"]/desc:parameters/desc:customization").each do |ele|
                       ele.replace_by str.root
                     end
                   end
@@ -70,23 +71,30 @@ module CPEE
 
             inp = XML::Smart::string('<properties xmlns="http://cpee.org/ns/properties/2.0"/>')
             inp.register_namespace 'prop', 'http://cpee.org/ns/properties/2.0'
-            %w{handlerwrapper positions dataelements endpoints attributes description transformation}.each do |item|
+            %w{executionhandler positions dataelements endpoints attributes description transformation}.each do |item|
               ele = doc.find("/*/prop:#{item}")
               inp.root.add(ele.first) if ele.any?
             end
             res = srv.resource("/#{ins}/properties").put Riddl::Parameter::Complex.new('properties','application/xml',inp.to_s)
-            doc.find('/*/prop:handlers/prop:handler').each do |han|
-              url =  han.attributes['url']
-              inp = 'url=' + URI.encode_www_form_component(url)
-              inp = inp + '&topic=' + han.children.first.attributes['topic']
-              inp = inp + '&' + han.children.first.qname.to_s + '=' + han.children.first.to_s
-              status,body = Riddl::Client::new(cpee+ins+'/notifications/subscriptions/').post(
-                [
-                  Riddl::Parameter::Simple.new('url',han.attributes['url']),
-                  Riddl::Parameter::Simple.new('topic',han.children.first.attributes['topic']),
-                  Riddl::Parameter::Simple.new(han.children.first.qname.to_s,han.children.first.to_s)
-                ]
-              )
+            # TODO new versions
+            doc.find('/*/sub:subscriptions/sub:subscription').each do |s|
+              parts = []
+              if id = s.attributes['id']
+                parts << Riddl::Parameter::Simple.new('id', id)
+              end
+              parts << Riddl::Parameter::Simple.new('url', s.attributes['url'])
+              s.find('sub:topic').each do |t|
+                p s.find('sub:event').map{ |e| e.text }
+                if (evs = t.find('sub:event').map{ |e| e.text }.join(',')).length > 0
+                  parts <<  Riddl::Parameter::Simple.new('topic', t.attributes['id'])
+                  parts <<  Riddl::Parameter::Simple.new('events', evs)
+                end
+                if (vos = t.find('sub:vote').map{ |e| e.text }.join(',')).length > 0
+                  parts <<  Riddl::Parameter::Simple.new('topic', t.attributes['id'])
+                  parts <<  Riddl::Parameter::Simple.new('votes', vos)
+                end
+              end
+              status,body = Riddl::Client::new(cpee+ins+'/notifications/subscriptions/').post parts
             end
           end
         end
@@ -167,8 +175,8 @@ module CPEE
         else
           (@status = 500) && return
         end
-        stream = @p.find{ |e| e.name == 'stream' }&.value
-        if (instance, uuid = load_testset(tdoc,cpee,nil,stream)).first == -1
+        customization = @p.find{ |e| e.name == 'customization' }&.value
+        if (instance, uuid = load_testset(tdoc,cpee,nil,customization)).first == -1
           @status = 500
         else
           EM.defer do
@@ -210,8 +218,8 @@ module CPEE
         else
           (@status = 500) && return
         end
-        stream = @p.find{ |e| e.name == 'stream' }&.value
-        if (instance, uuid = load_testset(tdoc,cpee,name,stream)).first == -1
+        customization = @p.find{ |e| e.name == 'customization' }&.value
+        if (instance, uuid = load_testset(tdoc,cpee,name,customization)).first == -1
           @status = 500
         else
           EM.defer do

data/lib/cpee-instantiation/instantiation.xml

@@ -34,7 +34,7 @@
       <parameter name="endpoints" type="string"/>
     </optional>
     <optional>
-      <parameter name="stream" type="string"/>
+      <parameter name="customization" type="string"/>
     </optional>
   </message>
   <message name="url">
@@ -54,7 +54,7 @@
       <parameter name="endpoints" type="string"/>
     </optional>
     <optional>
-      <parameter name="stream" type="string"/>
+      <parameter name="customization" type="string"/>
     </optional>
   </message>
   <message name="git">
@@ -76,7 +76,7 @@
       <parameter name="endpoints" type="string"/>
     </optional>
     <optional>
-      <parameter name="stream" type="string"/>
+      <parameter name="customization" type="string"/>
     </optional>
   </message>
   <message name="instance">

data/tools/cpee-instantiation

@@ -30,7 +30,7 @@ ARGV.options { |opt|
   opt.on("Options:")
   opt.on("--help", "-h", "This text") { puts opt; exit }
 	opt.on("")
-  opt.on(wrap("[DIR]        scaffolds a sample instantiation service. Post a testset to a model to keep going in one operation."))
+  opt.on(wrap("[DIR]             scaffolds a sample instantiation service. Post a testset to a model to keep going in one operation."))
   opt.parse!
 }
 if (ARGV.length != 1)
@@ -40,8 +40,10 @@ else
   p1 = ARGV[0]
 end
 
+insta = "#{curpath}/../server/"
 if !File.exists?(p1)
-  FileUtils.cp_r("#{curpath}/../server/",p1)
+  FileUtils.cp_r(insta,p1)
 else
-  puts 'Directory already exists.'
+  FileUtils.cp_r(Dir.glob(File.join(insta,'*')).delete_if{|e| e =~ /\.conf/ },p1,remove_destination: true)
+  puts 'Directory already exists, updating ...'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-instantiation
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.9
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -58,20 +58,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 2.1.4
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables:
@@ -108,7 +108,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: Subprocess instantiation service for the cloud process execution engine (cpee.org)