cpee 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7797410be55aa02b3dd1edc1515943221291e08e50e2d24f69a190d300e4218c
-  data.tar.gz: 5790bc2f97543b937e568b0b09810a62b7f9d99feda17afcd0d1cb415ac00fdb
+  metadata.gz: 835b66c60a3c5f973c652392a30147cd7158739b08275ce23f0dd623c56a8b05
+  data.tar.gz: cea467eab2cc1a6489ac0485cad08afdd2b87a7024e0787e3fa115af614ba324
 SHA512:
-  metadata.gz: ac85c913bdbe0b1deb3ef209d2b3be84a107b81c25f2ccbe5a449cfd99eba6b51382ca624c835357f234953c7fd74841000929b96d0c451a7b20e351838f61f2
-  data.tar.gz: 27491054757ae01a041c340d0bed67fb2513461eb73ab4acafed400de13cb46b0c74c5f3345561e9cfdea808f80ed56df7aa53f1100527fc3d3aef96590f721b
+  metadata.gz: c1cc53575b713697d77aae2c90ccc1cc72b941a1cf1557f552bcff0fa59ed7582e6608b816456bdd1d19bfbcee645975df4b3fff99f066758003e56601bd0655
+  data.tar.gz: 9a1e8849b603b7e4f59c7b5e7ddf1b0bd546f4b9dfddef1e01ac1b4e32b8c334e52e332261346483d60782544d85c252d5cc857e0602ac2976a29ddc4ba6119d

data/cockpit/themes/default/rngs/call.rng

@@ -19,7 +19,7 @@
     </element>
     <element name="arguments" rngui:header="Arguments">
       <zeroOrMore rngui:label="Create Argument Pair">
-        <element rngui:label='Name'>
+        <element rngui:label='Name' rngui:labeltype='xml'>
           <anyName/>
           <data type="string" rngui:label="Value"/>
         </element>
@@ -40,9 +40,6 @@
           <element name="visualizer_url" rngui:label="Visualizer Url">
             <data type="string" rngui:label="Url"/>
           </element>
-          <element name="visualizer_config" rngui:label="Visualizer Config">
-            <data type="string" rngui:label="Url"/>
-          </element>
           <element name="visualizer_params" rngui:header="Visualizer Arguments">
             <zeroOrMore rngui:label="Create Argument Pair">
               <element rngui:label='Name'>
@@ -54,21 +51,6 @@
         </element>
       </zeroOrMore>
     </element>
-    <element name="aggregators" rngui:header="Aggregators">
-      <zeroOrMore rngui:label="Add Aggregator">
-        <element name="aggregator">
-          <element name="name" rngui:label="Label">
-            <data type="string" rngui:label="Label"/>
-          </element>
-          <element name="aggregator_url" rngui:label="Aggregator Url">
-            <data type="string" rngui:label="Url"/>
-          </element>
-          <element name="aggregator_arg" rngui:label="Aggregator Argument">
-            <data type="string" rngui:label="Path"/>
-          </element>
-        </element>
-      </zeroOrMore>
-    </element>
   </element>
   <element name="_timing" rngui:header="Timing">
     <element name="_timing_min" rngui:label='Min in min'>
@@ -81,24 +63,6 @@
       <data type='float' rngui:label='Minutes'/>
     </element>
   </element>
-  <element name="_cost" rngui:header="Costs">
-    <zeroOrMore rngui:label="Create Cost Factor">
-      <element name='_cost_factor'>
-        <element name="name" rngui:label="Label">
-          <data type="string" rngui:label="Label"/>
-        </element>
-        <element name="target" rngui:label="Target Value">
-          <data type="string" rngui:label="Value"/>
-        </element>
-        <element name="vfunc" rngui:label="Violation Function">
-          <data type="string" rngui:label="Url"/>
-        </element>
-        <element name="vcost" rngui:label="Violation Cost">
-          <data type="string" rngui:label="Value"/>
-        </element>
-      </element>
-    </zeroOrMore>
-  </element>
   <element name="_notes" rngui:header="Notes">
     <element name="_notes_general" rngui:label='General'>
       <text rngui:wrap='true' rngui:label='Notes'/>

data/cockpit/themes/default/rngs/callmanipulate.rng

@@ -19,7 +19,7 @@
     </element>
     <element name="arguments" rngui:header="Arguments">
       <zeroOrMore rngui:label="Create Argument Pair">
-        <element rngui:label='Name'>
+        <element rngui:label='Name' rngui:labeltype='xml'>
           <anyName/>
           <data type="string" rngui:label="Value"/>
         </element>
@@ -40,9 +40,6 @@
           <element name="visualizer_url" rngui:label="Visualizer Url">
             <data type="string" rngui:label="Url"/>
           </element>
-          <element name="visualizer_config" rngui:label="Visualizer Config">
-            <data type="string" rngui:label="Url"/>
-          </element>
           <element name="visualizer_params" rngui:header="Visualizer Arguments">
             <zeroOrMore rngui:label="Create Argument Pair">
               <element rngui:label='Name'>
@@ -54,21 +51,6 @@
         </element>
       </zeroOrMore>
     </element>
-    <element name="aggregators" rngui:header="Aggregators">
-      <zeroOrMore rngui:label="Add Aggregator">
-        <element name="aggregator">
-          <element name="name" rngui:label="Label">
-            <data type="string" rngui:label="Label"/>
-          </element>
-          <element name="aggregator_url" rngui:label="Aggregator Url">
-            <data type="string" rngui:label="Url"/>
-          </element>
-          <element name="aggregator_arg" rngui:label="Aggregator Argument">
-            <data type="string" rngui:label="Path"/>
-          </element>
-        </element>
-      </zeroOrMore>
-    </element>
   </element>
   <element name="finalize" rngui:header="Finalize" rngui:label="Code">
     <attribute name="output" rngui:label="Access Variable" rngui:default="result">
@@ -93,24 +75,6 @@
       <data type='float' rngui:label='Minutes'/>
     </element>
   </element>
-  <element name="_cost" rngui:header="Costs">
-    <zeroOrMore rngui:label="Create Cost Factor">
-      <element name='_cost_factor'>
-        <element name="name" rngui:label="Label">
-          <data type="string" rngui:label="Label"/>
-        </element>
-        <element name="target" rngui:label="Target Value">
-          <data type="string" rngui:label="Value"/>
-        </element>
-        <element name="vfunc" rngui:label="Violation Function">
-          <data type="string" rngui:label="Url"/>
-        </element>
-        <element name="vcost" rngui:label="Violation Cost">
-          <data type="string" rngui:label="Value"/>
-        </element>
-      </element>
-    </zeroOrMore>
-  </element>
   <element name="_notes" rngui:header="Notes">
     <element name="_notes_general" rngui:label='General'>
       <text rngui:wrap='true' rngui:label='Notes'/>

data/cockpit/themes/preset/rngs/call.rng

@@ -19,7 +19,7 @@
     </element>
     <element name="arguments" rngui:header="Arguments">
       <zeroOrMore rngui:label="Create Argument Pair">
-        <element rngui:label='Name'>
+        <element rngui:label='Name' rngui:labeltype='xml'>
           <anyName/>
           <data type="string" rngui:label="Value"/>
         </element>

data/cockpit/themes/preset/rngs/callmanipulate.rng

@@ -19,7 +19,7 @@
     </element>
     <element name="arguments" rngui:header="Arguments">
       <zeroOrMore rngui:label="Create Argument Pair">
-        <element rngui:label='Name'>
+        <element rngui:label='Name' rngui:labeltype='xml'>
           <anyName/>
           <data type="string" rngui:label="Value"/>
         </element>

data/cockpit/themes/preset/rngs/scripts.rng

@@ -0,0 +1,24 @@
+<element rngui:version="1.2" name="code" rngui:header="Implementation" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+  <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold='closed_conditional'>
+    <text rngui:label='Script that is executed, before a service call'/>
+  </element>
+  <element name="finalize" rngui:header="Finalize" rngui:label="Code" rngui:fold='closed_conditional'>
+    <attribute name="output" rngui:label="Access Variable" rngui:default="result">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
+    <text rngui:label='Script that is executed, when a service returns data'/>
+  </element>
+  <element name="update" rngui:header="Update" rngui:label="Code" rngui:fold='closed_conditional'>
+    <attribute name="output" rngui:label="Access Variable" rngui:default="result">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
+    <text rngui:label='Script that is executed, when a service sends intermediate data'/>
+  </element>
+  <element name="rescue" rngui:header="Rescue" rngui:label="Code" rngui:fold='closed_conditional'>
+    <attribute name="output" rngui:label="Access Variable" rngui:default="result">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
+    <text rngui:label='Script that is executed, if a service call fails'/>
+  </element>
+</element>
+

data/cockpit/themes/preset/theme.js

@@ -1184,6 +1184,6 @@ function WFAdaptorManifestation(adaptor) {
     }//}}}
   };  /*}}}*/
   this.elements.scripts = { /*{{{*/
-    'description': [self.adaptor.theme_dir + 'rngs/update.rng',self.adaptor.theme_dir + 'rngs/finalize.rng']
+    'description': [self.adaptor.theme_dir + 'rngs/scripts.rng']
   }; /*}}}*/
 }

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.5.3"
+  s.version          = "1.5.4"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/server/handlerwrappers/default.rb

@@ -69,8 +69,14 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
         if s.respond_to?(:mimetype)
           params <<  Riddl::Parameter::Complex.new(s.name.to_s,v.mimetype,v.value)
         else
-          if s.name.to_s =~ /__$/
-            params <<  Riddl::Parameter::Simple.new(s.name.to_s.chop.chop,CPEE::ValueHelper::generate(s.value),:query)
+          if s.name.to_s =~ /^__Q_/
+            params <<  Riddl::Parameter::Simple.new(s.name.to_s.sub(/^__Q_/,''),CPEE::ValueHelper::generate(s.value),:query)
+          elsif s.name.to_s =~ /^__B_/
+            params <<  Riddl::Parameter::Simple.new(s.name.to_s.sub(/^__B_/,''),CPEE::ValueHelper::generate(s.value),:body)
+          elsif s.name.to_s =~ /^__H_/
+            params <<  Riddl::Header.new(s.name.to_s.sub(/^__H_/,''),CPEE::ValueHelper::generate(s.value))
+          elsif s.name.to_s =~ /^__C_/
+            params <<  Riddl::Parameter::Complex.new(s.name.to_s.sub(/^__C_/,''),*CPEE::ValueHelper::generate(s.value).split(';',2))
           else
             params <<  Riddl::Parameter::Simple.new(s.name.to_s,CPEE::ValueHelper::generate(s.value))
           end
@@ -99,7 +105,9 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
       status, result, headers = client.request type => params
       if status < 200 || status >= 300
-        callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => status, 'error' => result[0].value.read }))) ], 'CPEE_SALVAGE' => true)
+        c = result[0]&.value
+        c = c.read if c.respond_to? :read
+        callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => status, 'error' => c }))) ], 'CPEE_SALVAGE' => true)
       else
         if headers['CPEE_INSTANTIATION']
           @controller.notify("task/instantiation", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -227,16 +227,15 @@ files:
 - cockpit/themes/preset/rngs/choose.rng
 - cockpit/themes/preset/rngs/critical.rng
 - cockpit/themes/preset/rngs/escape.rng
-- cockpit/themes/preset/rngs/finalize.rng
 - cockpit/themes/preset/rngs/group.rng
 - cockpit/themes/preset/rngs/loop.rng
 - cockpit/themes/preset/rngs/manipulate.rng
 - cockpit/themes/preset/rngs/otherwise.rng
 - cockpit/themes/preset/rngs/parallel.rng
 - cockpit/themes/preset/rngs/parallel_branch.rng
+- cockpit/themes/preset/rngs/scripts.rng
 - cockpit/themes/preset/rngs/stop.rng
 - cockpit/themes/preset/rngs/terminate.rng
-- cockpit/themes/preset/rngs/update.rng
 - cockpit/themes/preset/theme.js
 - cockpit/track.html
 - contrib/Screenshot at 2011-09-28 02:38:11.png

data/cockpit/themes/preset/rngs/finalize.rng

@@ -1 +0,0 @@
-../../default/rngs/finalize.rng

data/cockpit/themes/preset/rngs/update.rng

@@ -1 +0,0 @@
-../../default/rngs/update.rng