cpee-instantiation 1.0.11 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa7ec4be09e6574d2b06d3f63119403dd07d1bfd1f5c91b74e070a0168a73c92
-  data.tar.gz: 5557f2f30a55365b9ffe235cf025ed4c90bddfaa72d5a125da419b89eed83772
+  metadata.gz: 3fe76889766f1a2333a1cf46f15b9edc35742ff55f2abbc5afadf59e4222ee00
+  data.tar.gz: 4e92630e731a9b196415c69dbd647145fda7a76873e6c8f8a7afb738cb563692
 SHA512:
-  metadata.gz: 934220dc9cd7953028f9ec8c32fc77046380eb54a8ca6d5566e40a0450c4045a3a101a8cf14f988ddeb5e1d068a0a6945333d63c02d053c02c3fcb7383267401
-  data.tar.gz: 55a39d02d5614c6a2cf1af1b59cc71b8e8544c002d28eb3de6da89bf3938d0f9c6a05e3db9b8f4c0b481067a0ca58e25929246674066cb2f4e084d8f254558dd
+  metadata.gz: 551718de37d55ab2795370c873d310067e010877cfd915554cd34470fdcbd710c01b0afca5d50827e0098e33037bc3dc7f30147b6413c266932b189eaf31ccae
+  data.tar.gz: 01c916c086d25d62e1ce5c0e63d2455d082dc8da74c3ec000a66c1c915f9dd47b0db0499effc1bc306ac411f9e8dfc969e7bb2307d47ebc63101e06a48d6f0f1

data/cpee-instantiation.gemspec

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

data/lib/cpee-instantiation/instantiation.rb

@@ -84,7 +84,6 @@ module CPEE
               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)
@@ -137,7 +136,7 @@ module CPEE
         if data && !data.empty?
           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)
+            content.root.add(k,CPEE::ValueHelper::generate(v))
           end
           srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
           res = srv.resource("/#{instance}/properties/dataelements/")
@@ -159,6 +158,19 @@ module CPEE
           ]
         end rescue nil
       end #}}}
+      def handle_attributes(cpee,instance,data) #{{{
+        if data && !data.empty?
+          content = XML::Smart.string('<attributes xmlns="http://cpee.org/ns/properties/2.0"/>')
+          JSON::parse(data).each do |k,v|
+            content.root.add(k,v)
+          end
+          srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
+          res = srv.resource("/#{instance}/properties/attributes/")
+          status, response = res.patch [
+            Riddl::Parameter::Complex.new('attributes','text/xml',content.to_s)
+          ]
+        end rescue nil
+      end #}}}
     end #}}}
 
     class InstantiateGit < Riddl::Implementation #{{{
@@ -180,9 +192,15 @@ module CPEE
           @status = 500
         else
           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'
+            if x = @p.find{ |e| e.name == 'init' }&.value
+              handle_data cpee, instance, x
+            end
+            if x = @p.find{ |e| e.name == 'endpoints' }&.value
+              handle_endpoints cpee, instance, x
+            end
+            if x = @p.find{ |e| e.name == 'attributes' }&.value
+              handle_attributes cpee, instance, x
+            end
 
             handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
             handle_starting cpee, instance, @p[0].value
@@ -223,9 +241,15 @@ module CPEE
           @status = 500
         else
           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'
+            if x = @p.find{ |e| e.name == 'init' }&.value
+              handle_data cpee, instance, x
+            end
+            if x = @p.find{ |e| e.name == 'endpoints' }&.value
+              handle_endpoints cpee, instance, x
+            end
+            if x = @p.find{ |e| e.name == 'attributes' }&.value
+              handle_attributes cpee, instance, x
+            end
 
             handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
             handle_starting cpee, instance, @p[0].value
@@ -385,7 +409,7 @@ module CPEE
             run InstantiateGit, opts[:cpee], opts[:self], opts[:cblist] if post 'git'
           end
           on resource 'instance' do
-            run HandleInstance, opts[:cpee] if post 'instance'
+            run HandleInstance, opts[:cpee], opts[:self], opts[:cblist] if post 'instance'
           end
           on resource 'callback' do
             on resource do

data/lib/cpee-instantiation/instantiation.xml

@@ -33,6 +33,9 @@
     <optional>
       <parameter name="endpoints" type="string"/>
     </optional>
+    <optional>
+      <parameter name="attributes" type="string"/>
+    </optional>
     <optional>
       <parameter name="customization" type="string"/>
     </optional>
@@ -53,6 +56,9 @@
     <optional>
       <parameter name="endpoints" type="string"/>
     </optional>
+    <optional>
+      <parameter name="attributes" type="string"/>
+    </optional>
     <optional>
       <parameter name="customization" type="string"/>
     </optional>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-instantiation
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.14
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-11-23 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Subprocess instantiation service for the cloud process execution engine (cpee.org)