cpee-instantiation 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b486ad9081818b993eef007d6b34f1140f7e0a35508d6cee8aed91d009f4f559
-  data.tar.gz: 360568a27c1640c62cf619aa0365af42432e08864589895deede571db9a88f1c
+  metadata.gz: e8e16d204b34a37277bd75a4971eb72716af21f4c6792f6f4281d15c61d53bd6
+  data.tar.gz: 1e34b02335ca3242cc7c915ccceb8422b0653e057877afd385ad20717ce08785
 SHA512:
-  metadata.gz: cec4e88f55717ab2700718a94673f2838a163d89e3dcdebc54359110d0ea2eef2b5273bd640b7e584ee5798273a8f0ab7144ed088fff06142f2b49a65c65d0b2
-  data.tar.gz: caffa739df23afd0d9e764fc3500d1b9748e2eca9b9395abc06d8d7ed0dd0a009de0ddaaddd0162413917a68ef19aa4ba997ef8409dd9373f9c4e7f7322d584e
+  metadata.gz: 26b3f9c3f8cabc8fca64353fc267a6b6a5cfd0249a7f10f63d863f621b098e8809c231819fa44aba5083cccaae2a7158c7e950314f93ee84b3d8c7e735e8d449
+  data.tar.gz: 659bd9d0d59e35f75fe7b2e7d762322870ac934f1a3769b9e89a1185936531adfdd6ddf82bfe12c7f4e51eaaa5d4cfc826c2d866d126e64b6a97273f81f4beff

data/cpee-instantiation.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-instantiation"
-  s.version          = "1.1.3"
+  s.version          = "1.1.5"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Subprocess instantiation service for the cloud process execution engine (cpee.org)"

data/lib/cpee-instantiation/instantiation.rb

@@ -36,7 +36,8 @@ module CPEE
 
       def add_to_testset(tdoc,what,data) #{{{
         if data && !data.empty?
-          JSON::parse(data).each do |k,v|
+          data = JSON::parse(data) if data.is_a? String
+          data.each do |k,v|
             ele = tdoc.find("/*/prop:#{what}/prop:#{k}")
             if ele.any?
               ele.first.text = CPEE::ValueHelper::generate(v)
@@ -53,7 +54,7 @@ module CPEE
         end
       end #}}}
 
-      def augment_testset(tdoc,p) #{{{
+      def augment_testset(tdoc,p,h) #{{{
         tdoc = XML::Smart.string(tdoc)
         tdoc.register_namespace 'desc', 'http://cpee.org/ns/description/1.0'
         tdoc.register_namespace 'prop', 'http://cpee.org/ns/properties/2.0'
@@ -68,6 +69,13 @@ module CPEE
         if data = p.find{ |e| e.name == 'attributes' }&.value
           add_to_testset(tdoc,'attributes',data)
         end
+        data = {}
+        data['parent_instance']            = h['CPEE_INSTANCE']      if h['CPEE_INSTANCE']
+        data['parent_instance_uuid']       = h['CPEE_INSTANCE_UUID'] if h['CPEE_INSTANCE_UUID']
+        data['parent_instance_model']      = h['CPEE_ATTR_INFO']     if h['CPEE_ATTR_INFO']
+        data['parent_instance_task_id']    = h['CPEE_ACTIVITY']      if h['CPEE_ACTIVITY']
+        data['parent_instance_task_label'] = h['CPEE_LABEL']         if h['CPEE_LABEL']
+        add_to_testset(tdoc,'attributes',data)
         tdoc
       end #}}}
 
@@ -97,11 +105,13 @@ module CPEE
           condition = behavior.match(/_([^_]+)_/)&.[](1) || 'finished'
 
           if cb
-            cbk = '_instantiation_' + Digest::MD5.hexdigest(Kernel::rand().to_s)
+            cbk = 'instantiation_' + Digest::MD5.hexdigest(Kernel::rand().to_s)
             n = doc.find('/*/sub:subscriptions') rescue []
             if (n.empty?)
               n = doc.root.add('subscriptions')
               n.namespaces.add(nil,'http://riddl.org/ns/common-patterns/notifications-producer/2.0')
+            else
+              n = n.first
             end
             n.append('subscription', :id => cbk, :url => File.join(selfurl,'callback',cbk))
              .append('topic', :id => 'state')
@@ -168,7 +178,7 @@ module CPEE
         end
         customization = @p.find{ |e| e.name == 'customization' }&.value
 
-        doc = augment_testset(tdoc,@p)
+        doc = augment_testset(tdoc,@p,@h)
         customize_testset(customization,doc)
         cbk, condition = add_waiting_to_testset(behavior,@h['CPEE_CALLBACK'],doc,selfurl)
         add_running_to_testset(behavior,doc)
@@ -195,7 +205,7 @@ module CPEE
         end
         customization = @p.find{ |e| e.name == 'customization' }&.value
 
-        doc = augment_testset(tdoc,@p)
+        doc = augment_testset(tdoc,@p,@h)
         customize_testset(customization,doc)
         cbk, condition = add_waiting_to_testset(behavior,@h['CPEE_CALLBACK'],doc,selfurl)
         add_running_to_testset(behavior,doc)
@@ -219,7 +229,7 @@ module CPEE
           @p[data].value.read
         end
 
-        doc = augment_testset(tdoc,@p)
+        doc = augment_testset(tdoc,@p,@h)
         cbk, condition = add_waiting_to_testset(behavior,@h['CPEE_CALLBACK'],doc,selfurl)
         add_running_to_testset(behavior,doc)
 
@@ -241,6 +251,8 @@ module CPEE
         key = @r.last
         cb, condition, instance, uuid, instance_url = cblist.lrange(key,0,-1)
 
+        return if cb.nil?
+
         cpee = File.dirname(instance_url)
 
         send = {

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-instantiation
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Juergen eTM Mangler
 - Heinrich Fenkart
-autorequire:
 bindir: tools
 cert_chain: []
-date: 2025-03-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -95,7 +94,6 @@ homepage: http://cpee.org/
 licenses:
 - LGPL-3.0-or-later
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,8 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Subprocess instantiation service for the cloud process execution engine (cpee.org)
 test_files: []