cpee-instantiation 1.0.1 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8179be00caf9485a82cc72f3180439fa8db27a45ee8ff58b7e642534e7397aa
-  data.tar.gz: 1d9b5a792f4a95a35c5368c78ba03134ed84a751e873c10751771297998aaf2a
+  metadata.gz: 9efdce12606b0b4a2dcc8edb56a511a8b4392afa1de52d55df1d89f7037ad96d
+  data.tar.gz: b7ddc4881dadce16e7dfd2da9db9c0bd68c8b70dfe9dc8c8180a3cef75f1dcee
 SHA512:
-  metadata.gz: 852d8a607287b4dfd197c45386ebc9d83bdead3428e454736341586a7166088ac12044000714e91f181c286d8d282c86908b089e9a8a047a2be580f071a29616
-  data.tar.gz: 60982f32ca0a4ebef7628de4b8f444022071ae437b8494e6bef310c6e2bf7a1c70fe65fb527fe1ce444a7e40e67228b6440c89f5c9da58d7a62fc083253fa87e
+  metadata.gz: 4b65153017b9a2f2c7853e0d7ec658cba83b6e3eabe79425b3166ca818ae8a0f61ee36242c9b5cf080db41938b55c7652e6e37765c47b2fb282656fe25ad5ae6
+  data.tar.gz: 7b1a05794b4f6df41298f01ade332459806e613989f70f35c58b9786b86b7e38d9added2762b1bafe432de625910d25625d3bf1c27860180afec09730cdaeea9

data/cpee-instantiation.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-instantiation"
-  s.version          = "1.0.1"
+  s.version          = "1.0.7"
   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'
 end

data/lib/cpee-instantiation/instantiation.rb

@@ -30,7 +30,7 @@ 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|
@@ -44,13 +44,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,7 +70,7 @@ 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
@@ -96,7 +96,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
@@ -128,7 +127,7 @@ module CPEE
       private :handle_starting
       def handle_data(cpee,instance,data) #{{{
         if data && !data.empty?
-          content = XML::Smart.string('<dataelements xmlns="http://cpee.org/ns/properties/2.0">')
+          content = XML::Smart.string('<dataelements xmlns="http://cpee.org/ns/properties/2.0"/>')
           JSON::parse(data).each do |k,v|
             content.root.add(k,v)
           end
@@ -141,7 +140,7 @@ module CPEE
       end #}}}
       def handle_endpoints(cpee,instance,data) #{{{
         if data && !data.empty?
-          content = XML::Smart.string('<endpoints xmlns="http://cpee.org/ns/properties/2.0">')
+          content = XML::Smart.string('<endpoints xmlns="http://cpee.org/ns/properties/2.0"/>')
           JSON::parse(data).each do |k,v|
             content.root.add(k,v)
           end
@@ -168,16 +167,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 +186,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 +210,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 +229,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 +256,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 +268,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 +294,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

@@ -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">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-instantiation
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.7
 platform: ruby
 authors:
 - Juergen eTM Mangler
-autorequire: 
+autorequire:
 bindir: tools
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -58,20 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.1'
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables:
@@ -93,7 +87,7 @@ homepage: http://cpee.org/
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,8 +102,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.4
+signing_key:
 specification_version: 4
 summary: Subprocess instantiation service for the cloud process execution engine (cpee.org)
 test_files: []