cpee 1.5.3 → 1.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7797410be55aa02b3dd1edc1515943221291e08e50e2d24f69a190d300e4218c
4
- data.tar.gz: 5790bc2f97543b937e568b0b09810a62b7f9d99feda17afcd0d1cb415ac00fdb
3
+ metadata.gz: 835b66c60a3c5f973c652392a30147cd7158739b08275ce23f0dd623c56a8b05
4
+ data.tar.gz: cea467eab2cc1a6489ac0485cad08afdd2b87a7024e0787e3fa115af614ba324
5
5
  SHA512:
6
- metadata.gz: ac85c913bdbe0b1deb3ef209d2b3be84a107b81c25f2ccbe5a449cfd99eba6b51382ca624c835357f234953c7fd74841000929b96d0c451a7b20e351838f61f2
7
- data.tar.gz: 27491054757ae01a041c340d0bed67fb2513461eb73ab4acafed400de13cb46b0c74c5f3345561e9cfdea808f80ed56df7aa53f1100527fc3d3aef96590f721b
6
+ metadata.gz: c1cc53575b713697d77aae2c90ccc1cc72b941a1cf1557f552bcff0fa59ed7582e6608b816456bdd1d19bfbcee645975df4b3fff99f066758003e56601bd0655
7
+ data.tar.gz: 9a1e8849b603b7e4f59c7b5e7ddf1b0bd546f4b9dfddef1e01ac1b4e32b8c334e52e332261346483d60782544d85c252d5cc857e0602ac2976a29ddc4ba6119d
@@ -19,7 +19,7 @@
19
19
  </element>
20
20
  <element name="arguments" rngui:header="Arguments">
21
21
  <zeroOrMore rngui:label="Create Argument Pair">
22
- <element rngui:label='Name'>
22
+ <element rngui:label='Name' rngui:labeltype='xml'>
23
23
  <anyName/>
24
24
  <data type="string" rngui:label="Value"/>
25
25
  </element>
@@ -40,9 +40,6 @@
40
40
  <element name="visualizer_url" rngui:label="Visualizer Url">
41
41
  <data type="string" rngui:label="Url"/>
42
42
  </element>
43
- <element name="visualizer_config" rngui:label="Visualizer Config">
44
- <data type="string" rngui:label="Url"/>
45
- </element>
46
43
  <element name="visualizer_params" rngui:header="Visualizer Arguments">
47
44
  <zeroOrMore rngui:label="Create Argument Pair">
48
45
  <element rngui:label='Name'>
@@ -54,21 +51,6 @@
54
51
  </element>
55
52
  </zeroOrMore>
56
53
  </element>
57
- <element name="aggregators" rngui:header="Aggregators">
58
- <zeroOrMore rngui:label="Add Aggregator">
59
- <element name="aggregator">
60
- <element name="name" rngui:label="Label">
61
- <data type="string" rngui:label="Label"/>
62
- </element>
63
- <element name="aggregator_url" rngui:label="Aggregator Url">
64
- <data type="string" rngui:label="Url"/>
65
- </element>
66
- <element name="aggregator_arg" rngui:label="Aggregator Argument">
67
- <data type="string" rngui:label="Path"/>
68
- </element>
69
- </element>
70
- </zeroOrMore>
71
- </element>
72
54
  </element>
73
55
  <element name="_timing" rngui:header="Timing">
74
56
  <element name="_timing_min" rngui:label='Min in min'>
@@ -81,24 +63,6 @@
81
63
  <data type='float' rngui:label='Minutes'/>
82
64
  </element>
83
65
  </element>
84
- <element name="_cost" rngui:header="Costs">
85
- <zeroOrMore rngui:label="Create Cost Factor">
86
- <element name='_cost_factor'>
87
- <element name="name" rngui:label="Label">
88
- <data type="string" rngui:label="Label"/>
89
- </element>
90
- <element name="target" rngui:label="Target Value">
91
- <data type="string" rngui:label="Value"/>
92
- </element>
93
- <element name="vfunc" rngui:label="Violation Function">
94
- <data type="string" rngui:label="Url"/>
95
- </element>
96
- <element name="vcost" rngui:label="Violation Cost">
97
- <data type="string" rngui:label="Value"/>
98
- </element>
99
- </element>
100
- </zeroOrMore>
101
- </element>
102
66
  <element name="_notes" rngui:header="Notes">
103
67
  <element name="_notes_general" rngui:label='General'>
104
68
  <text rngui:wrap='true' rngui:label='Notes'/>
@@ -19,7 +19,7 @@
19
19
  </element>
20
20
  <element name="arguments" rngui:header="Arguments">
21
21
  <zeroOrMore rngui:label="Create Argument Pair">
22
- <element rngui:label='Name'>
22
+ <element rngui:label='Name' rngui:labeltype='xml'>
23
23
  <anyName/>
24
24
  <data type="string" rngui:label="Value"/>
25
25
  </element>
@@ -40,9 +40,6 @@
40
40
  <element name="visualizer_url" rngui:label="Visualizer Url">
41
41
  <data type="string" rngui:label="Url"/>
42
42
  </element>
43
- <element name="visualizer_config" rngui:label="Visualizer Config">
44
- <data type="string" rngui:label="Url"/>
45
- </element>
46
43
  <element name="visualizer_params" rngui:header="Visualizer Arguments">
47
44
  <zeroOrMore rngui:label="Create Argument Pair">
48
45
  <element rngui:label='Name'>
@@ -54,21 +51,6 @@
54
51
  </element>
55
52
  </zeroOrMore>
56
53
  </element>
57
- <element name="aggregators" rngui:header="Aggregators">
58
- <zeroOrMore rngui:label="Add Aggregator">
59
- <element name="aggregator">
60
- <element name="name" rngui:label="Label">
61
- <data type="string" rngui:label="Label"/>
62
- </element>
63
- <element name="aggregator_url" rngui:label="Aggregator Url">
64
- <data type="string" rngui:label="Url"/>
65
- </element>
66
- <element name="aggregator_arg" rngui:label="Aggregator Argument">
67
- <data type="string" rngui:label="Path"/>
68
- </element>
69
- </element>
70
- </zeroOrMore>
71
- </element>
72
54
  </element>
73
55
  <element name="finalize" rngui:header="Finalize" rngui:label="Code">
74
56
  <attribute name="output" rngui:label="Access Variable" rngui:default="result">
@@ -93,24 +75,6 @@
93
75
  <data type='float' rngui:label='Minutes'/>
94
76
  </element>
95
77
  </element>
96
- <element name="_cost" rngui:header="Costs">
97
- <zeroOrMore rngui:label="Create Cost Factor">
98
- <element name='_cost_factor'>
99
- <element name="name" rngui:label="Label">
100
- <data type="string" rngui:label="Label"/>
101
- </element>
102
- <element name="target" rngui:label="Target Value">
103
- <data type="string" rngui:label="Value"/>
104
- </element>
105
- <element name="vfunc" rngui:label="Violation Function">
106
- <data type="string" rngui:label="Url"/>
107
- </element>
108
- <element name="vcost" rngui:label="Violation Cost">
109
- <data type="string" rngui:label="Value"/>
110
- </element>
111
- </element>
112
- </zeroOrMore>
113
- </element>
114
78
  <element name="_notes" rngui:header="Notes">
115
79
  <element name="_notes_general" rngui:label='General'>
116
80
  <text rngui:wrap='true' rngui:label='Notes'/>
@@ -19,7 +19,7 @@
19
19
  </element>
20
20
  <element name="arguments" rngui:header="Arguments">
21
21
  <zeroOrMore rngui:label="Create Argument Pair">
22
- <element rngui:label='Name'>
22
+ <element rngui:label='Name' rngui:labeltype='xml'>
23
23
  <anyName/>
24
24
  <data type="string" rngui:label="Value"/>
25
25
  </element>
@@ -19,7 +19,7 @@
19
19
  </element>
20
20
  <element name="arguments" rngui:header="Arguments">
21
21
  <zeroOrMore rngui:label="Create Argument Pair">
22
- <element rngui:label='Name'>
22
+ <element rngui:label='Name' rngui:labeltype='xml'>
23
23
  <anyName/>
24
24
  <data type="string" rngui:label="Value"/>
25
25
  </element>
@@ -0,0 +1,24 @@
1
+ <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">
2
+ <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold='closed_conditional'>
3
+ <text rngui:label='Script that is executed, before a service call'/>
4
+ </element>
5
+ <element name="finalize" rngui:header="Finalize" rngui:label="Code" rngui:fold='closed_conditional'>
6
+ <attribute name="output" rngui:label="Access Variable" rngui:default="result">
7
+ <data type="string" rngui:readonly="true"/>
8
+ </attribute>
9
+ <text rngui:label='Script that is executed, when a service returns data'/>
10
+ </element>
11
+ <element name="update" rngui:header="Update" rngui:label="Code" rngui:fold='closed_conditional'>
12
+ <attribute name="output" rngui:label="Access Variable" rngui:default="result">
13
+ <data type="string" rngui:readonly="true"/>
14
+ </attribute>
15
+ <text rngui:label='Script that is executed, when a service sends intermediate data'/>
16
+ </element>
17
+ <element name="rescue" rngui:header="Rescue" rngui:label="Code" rngui:fold='closed_conditional'>
18
+ <attribute name="output" rngui:label="Access Variable" rngui:default="result">
19
+ <data type="string" rngui:readonly="true"/>
20
+ </attribute>
21
+ <text rngui:label='Script that is executed, if a service call fails'/>
22
+ </element>
23
+ </element>
24
+
@@ -1184,6 +1184,6 @@ function WFAdaptorManifestation(adaptor) {
1184
1184
  }//}}}
1185
1185
  }; /*}}}*/
1186
1186
  this.elements.scripts = { /*{{{*/
1187
- 'description': [self.adaptor.theme_dir + 'rngs/update.rng',self.adaptor.theme_dir + 'rngs/finalize.rng']
1187
+ 'description': [self.adaptor.theme_dir + 'rngs/scripts.rng']
1188
1188
  }; /*}}}*/
1189
1189
  }
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "cpee"
3
- s.version = "1.5.3"
3
+ s.version = "1.5.4"
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.license = "LGPL-3.0"
6
6
  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"
@@ -69,8 +69,14 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
69
69
  if s.respond_to?(:mimetype)
70
70
  params << Riddl::Parameter::Complex.new(s.name.to_s,v.mimetype,v.value)
71
71
  else
72
- if s.name.to_s =~ /__$/
73
- params << Riddl::Parameter::Simple.new(s.name.to_s.chop.chop,CPEE::ValueHelper::generate(s.value),:query)
72
+ if s.name.to_s =~ /^__Q_/
73
+ params << Riddl::Parameter::Simple.new(s.name.to_s.sub(/^__Q_/,''),CPEE::ValueHelper::generate(s.value),:query)
74
+ elsif s.name.to_s =~ /^__B_/
75
+ params << Riddl::Parameter::Simple.new(s.name.to_s.sub(/^__B_/,''),CPEE::ValueHelper::generate(s.value),:body)
76
+ elsif s.name.to_s =~ /^__H_/
77
+ params << Riddl::Header.new(s.name.to_s.sub(/^__H_/,''),CPEE::ValueHelper::generate(s.value))
78
+ elsif s.name.to_s =~ /^__C_/
79
+ params << Riddl::Parameter::Complex.new(s.name.to_s.sub(/^__C_/,''),*CPEE::ValueHelper::generate(s.value).split(';',2))
74
80
  else
75
81
  params << Riddl::Parameter::Simple.new(s.name.to_s,CPEE::ValueHelper::generate(s.value))
76
82
  end
@@ -99,7 +105,9 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
99
105
 
100
106
  status, result, headers = client.request type => params
101
107
  if status < 200 || status >= 300
102
- callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => status, 'error' => result[0].value.read }))) ], 'CPEE_SALVAGE' => true)
108
+ c = result[0]&.value
109
+ c = c.read if c.respond_to? :read
110
+ callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => status, 'error' => c }))) ], 'CPEE_SALVAGE' => true)
103
111
  else
104
112
  if headers['CPEE_INSTANTIATION']
105
113
  @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 CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cpee
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.3
4
+ version: 1.5.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: tools
13
13
  cert_chain: []
14
- date: 2019-10-08 00:00:00.000000000 Z
14
+ date: 2019-10-10 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: riddl
@@ -227,16 +227,15 @@ files:
227
227
  - cockpit/themes/preset/rngs/choose.rng
228
228
  - cockpit/themes/preset/rngs/critical.rng
229
229
  - cockpit/themes/preset/rngs/escape.rng
230
- - cockpit/themes/preset/rngs/finalize.rng
231
230
  - cockpit/themes/preset/rngs/group.rng
232
231
  - cockpit/themes/preset/rngs/loop.rng
233
232
  - cockpit/themes/preset/rngs/manipulate.rng
234
233
  - cockpit/themes/preset/rngs/otherwise.rng
235
234
  - cockpit/themes/preset/rngs/parallel.rng
236
235
  - cockpit/themes/preset/rngs/parallel_branch.rng
236
+ - cockpit/themes/preset/rngs/scripts.rng
237
237
  - cockpit/themes/preset/rngs/stop.rng
238
238
  - cockpit/themes/preset/rngs/terminate.rng
239
- - cockpit/themes/preset/rngs/update.rng
240
239
  - cockpit/themes/preset/theme.js
241
240
  - cockpit/track.html
242
241
  - contrib/Screenshot at 2011-09-28 02:38:11.png
@@ -1 +0,0 @@
1
- ../../default/rngs/finalize.rng
@@ -1 +0,0 @@
1
- ../../default/rngs/update.rng