RubyGems - cpee-instantiation - Versions diffs - 1.0.2 → 1.0.8 - Mend

cpee-instantiation 1.0.2 → 1.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +4 -4
data/cpee-instantiation.gemspec +2 -2
data/lib/cpee-instantiation/instantiation.rb +63 -38
data/lib/cpee-instantiation/instantiation.xml +3 -3
data/tools/cpee-instantiation +5 -3
metadata +10 -10

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54e2fbfea39571218c38e9d1afb4a81689439d11cad30c988d7db9f5d523aaca
-  data.tar.gz: 9ca8330ce8f3ea4f7a5e3e1523afa44067eaa4d660f3db5135be0c60e79794ab
+  metadata.gz: 8bc55ea88a7ce4e1bc6ef44f168bf6da2b20b77e2959d6b52d6cbb1b218fc140
+  data.tar.gz: a696d35bf0d432a516fc41152c593fc4f673111d94f1312785024c2c233f50f4
 SHA512:
-  metadata.gz: e15d2bfdd3d31de04223c8799b61cdd5e38c7c99bf342bac736767a2f60d78dc320717bffa7650c5fc5bb2afd1ce8c16e6b4573d877ecf475d228081a42ea430
-  data.tar.gz: 5f5b2f07bc686d05e47571e638330f2da1dbc57a14472ee6d9c04bcaeae6f5003de6b253622aec7c3d98ab25d40cec7edb21e77bd66eb8215272e20922cd9caf
+  metadata.gz: 2e8d8ef73155472996b1069d274670b29934e9ac4c4873f7de23ed16201a58cc2e2d8b7d635a5c79de079054bf634ceeca4aa944ee1aba39160bbe2f15c193dd
+  data.tar.gz: 815e7fc7d79314b0da18c9f5e2dd7fa348453894784ef3b909698d1300d3da517d50398733d1a3ab9dbbe8aeb05719950ca16c15611e864d9289773b84cef0bb

data/cpee-instantiation.gemspec CHANGED Viewed

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-instantiation"
-  s.version          = "1.0.2"
+  s.version          = "1.0.8"
   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 CHANGED Viewed

@@ -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
@@ -96,7 +104,6 @@ module CPEE
       def handle_waiting(cpee,instance,uuid,behavior,selfurl,cblist) #{{{
         if behavior =~ /^wait/
           condition = behavior.match(/_([^_]+)_/)&.[](1) || 'finished'
-          @headers << Riddl::Header.new('CPEE-CALLBACK','true')
           cb = @h['CPEE_CALLBACK']
           if cb
@@ -168,16 +175,18 @@ 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
-          handle_data cpee, instance, @p[4]&.value if @p[4]&.name == 'init'
-          handle_endpoints cpee, instance, @p[4]&.value if @p[4]&.name == 'endpoints'
-          handle_endpoints cpee, instance, @p[5]&.value if @p[5]&.name == 'endpoints'
+          EM.defer do
+            handle_data cpee, instance, @p[4]&.value if @p[4]&.name == 'init'
+            handle_endpoints cpee, instance, @p[4]&.value if @p[4]&.name == 'endpoints'
+            handle_endpoints cpee, instance, @p[5]&.value if @p[5]&.name == 'endpoints'
-          handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
-          handle_starting cpee, instance, @p[0].value
+            handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
+            handle_starting cpee, instance, @p[0].value
+          end
           send = {
             'CPEE-INSTANCE' => instance,
@@ -185,6 +194,9 @@ module CPEE
             'CPEE-INSTANCE-UUID' => uuid,
             'CPEE-BEHAVIOR' => @p[0].value
           }
+          if @p[0].value =~ /^wait/
+            @headers << Riddl::Header.new('CPEE-CALLBACK','true')
+          end
           @headers << Riddl::Header.new('CPEE-INSTANTIATION',JSON::generate(send))
           Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
         end
@@ -206,16 +218,18 @@ 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
-          handle_data cpee, instance, @p[2]&.value if @p[2]&.name == 'init'
-          handle_endpoints cpee, instance, @p[2]&.value if @p[2]&.name == 'endpoints'
-          handle_endpoints cpee, instance, @p[3]&.value if @p[3]&.name == 'endpoints'
+          EM.defer do
+            handle_data cpee, instance, @p[2]&.value if @p[2]&.name == 'init'
+            handle_endpoints cpee, instance, @p[2]&.value if @p[2]&.name == 'endpoints'
+            handle_endpoints cpee, instance, @p[3]&.value if @p[3]&.name == 'endpoints'
-          handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
-          handle_starting cpee, instance, @p[0].value
+            handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
+            handle_starting cpee, instance, @p[0].value
+          end
           send = {
             'CPEE-INSTANCE' => instance,
@@ -223,6 +237,9 @@ module CPEE
             'CPEE-INSTANCE-UUID' => uuid,
             'CPEE-BEHAVIOR' => @p[0].value
           }
+          if @p[0].value =~ /^wait/
+            @headers << Riddl::Header.new('CPEE-CALLBACK','true')
+          end
           @headers << Riddl::Header.new('CPEE-INSTANTIATION',JSON::generate(send))
           Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
         end
@@ -247,9 +264,11 @@ module CPEE
         if (instance, uuid = load_testset(tdoc,cpee)).first == -1
           @status = 500
         else
-          handle_data cpee, instance, @p[data+1]&.value
-          handle_waiting cpee, instance, uuid, behavior, selfurl, cblist
-          handle_starting cpee, instance, behavior
+          EM.defer do
+            handle_data cpee, instance, @p[data+1]&.value
+            handle_waiting cpee, instance, uuid, behavior, selfurl, cblist
+            handle_starting cpee, instance, behavior
+          end
           send = {
             'CPEE-INSTANCE' => instance,
@@ -257,6 +276,9 @@ module CPEE
             'CPEE-INSTANCE-UUID' => uuid,
             'CPEE-BEHAVIOR' => behavior
           }
+          if @p[0].value =~ /^wait/
+            @headers << Riddl::Header.new('CPEE-CALLBACK','true')
+          end
           Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
         end
       end
@@ -280,6 +302,9 @@ module CPEE
           handle_data cpee, instance, @p[2]&.value
           handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
           handle_starting cpee, instance, @p[0].value
+          if @p[0].value =~ /^wait/
+            @headers << Riddl::Header.new('CPEE-CALLBACK','true')
+          end
           return Riddl::Parameter::Simple.new("url",cpee + instance)
         end
       end

data/lib/cpee-instantiation/instantiation.xml CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/ })
+  puts 'Directory already exists, updating ...'
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-instantiation
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.8
 platform: ruby
 authors:
 - Juergen eTM Mangler
-autorequire:
+autorequire:
 bindir: tools
 cert_chain: []
-date: 2020-10-13 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:
@@ -93,7 +93,7 @@ homepage: http://cpee.org/
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,8 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Subprocess instantiation service for the cloud process execution engine (cpee.org)
 test_files: []