cpee-instantiation 1.0.10 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d4f2d6bb294992580a51fe2e5f4c5c122506fe31a327fcbae1e88845964e02f
-  data.tar.gz: f2046e8bc78d8ff5d69feed0ba54ffc23d35da3afba9f58bf6417fe8963e01a2
+  metadata.gz: 0ff6b47e9462a3f92a2e6536974359fe3cc0b18b7583518d88f83998e2f79885
+  data.tar.gz: b881374ebad85ebe328cfe97534829979d3aec54ff8a0d976d89f79245a78d87
 SHA512:
-  metadata.gz: 316d7c396535c85ba2030750591c3152e15a99142120925ed3b6758d0f755a1276e1b3da6c074caab507ae38f8159fdcd5843d556a7417a408e12396b72564e8
-  data.tar.gz: 96dfd842fd444518894bc782c48eb6ca69bca06bb02077c64a1af503843f1bec454bfc4bbdb666b2477ae4bbbc040862586e02e6a3f5cb4a12205c1a8ace949d
+  metadata.gz: 9fd8d7ec4b66b06b94b53976886854548d27a1fc41faaf76b6fb994dbb1e58432c53be3a799eccbd23c9890723b8fab453e0375360a0f9dd981057097a672947
+  data.tar.gz: 3d3172e5b4a6a290a34ce06867539307bb0ba283c3a25a7770f17c0bba40a37f7bd05a02c29028f4c2b2cef50d52816391c42a08e750981e4c631e9c51c36b34

data/cpee-instantiation.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-instantiation"
-  s.version          = "1.0.10"
+  s.version          = "1.0.13"
   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/")
@@ -293,19 +292,29 @@ module CPEE
         cblist   = @a[2]
         instance = @p[1].value
 
-        srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
-        res = srv.resource("/#{instance}/properties/attributes/uuid")
+        srv = Riddl::Client.new(cpee)
+        res = srv.resource("/#{instance}/properties/attributes/uuid/")
         status, response = res.get
 
         if status >= 200 && status < 300
-          uuid = XML::Smart::string(response.first.value).root.text
+          uuid = response.first.value
           handle_data cpee, instance, @p[2]&.value
           handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
           handle_starting cpee, instance, @p[0].value
+
+          send = {
+            'CPEE-INSTANCE' => instance,
+            'CPEE-INSTANCE-URL' => File.join(cpee,instance),
+            'CPEE-INSTANCE-UUID' => uuid,
+            'CPEE-BEHAVIOR' => @p[0].value
+          }
+
           if @p[0].value =~ /^wait/
             @headers << Riddl::Header.new('CPEE-CALLBACK','true')
           end
-          return Riddl::Parameter::Simple.new("url",cpee + instance)
+          Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
+        else
+          @status = 500
         end
       end
     end #}}}
@@ -375,7 +384,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-instantiation
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.13
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2022-04-19 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.1.6
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Subprocess instantiation service for the cloud process execution engine (cpee.org)