cpee 2.1.16 → 2.1.21

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 49e634c161f11e6701a10d2823b9df0e45375ce9b0808cd90d5d0be60e8583a2
4
- data.tar.gz: 30888c84a0244ce4cdfa9cf77f5be0637d50717de4b14fe0a51f300a9b151689
3
+ metadata.gz: 8839bf4c3b0fcfe489e9fb864d202adabb6305f72ad925a00489749d9ec7ea09
4
+ data.tar.gz: 05060da7d58c1f726c3fd91abdac358a0c77c987ebce15acbe855fda9fe11d16
5
5
  SHA512:
6
- metadata.gz: ee8cd1e8a77277bd005e19caf3e6f52b21c9b79d7e29e4fa0072c7b56226fc063e2f1159eae7c1f5eab15f5d29095c39d748dd8d3b3c9872960dc93f09b9d53d
7
- data.tar.gz: 50622f0ae03580818fa5f33347e1f5227906fd542923e400d50817ad77241fe8257b30fdc1020d4ebc37be977fb3e077321a0532d0ee65fb6c265bdf80d34255
6
+ metadata.gz: f0e8f566d8602e4c04c55459ad06793858b87ebab75f22d7c52630d74c83f458fdc572625ccb2b45514b9c04eaedeae971e4c8ff28cb1c12ef3adb5cb8126e12
7
+ data.tar.gz: 4d34178f65a77dcb1c0a599ffae42c9493a4897d5fd852b1c594344cf4fada84a6cc14bb0448705991e54bf19ce915fc994044fcca2b9713f7cd1892281408e4
@@ -1371,7 +1371,11 @@ function append_to_log(what,type,message) {//{{{
1371
1371
  message = message.replace(/>/g, '>');
1372
1372
  message = message.replace(/"/g, '"');
1373
1373
  message = message.replace(/'/g, ''');
1374
- $("#dat_log").prepend("<tr><td class='fixed'><a title=\"" + d.strftime("[%d/%b/%Y %H:%M:%S]") + "\">D</a></td><td class='fixed'>&#160;-&#160;</td><td class='fixed'><a title=\"" + what + "\">T</a></td><td class='fixed'>&#160;-&#160;</td><td class='fixed'>" + type + "</td><td class='fixed'>&#160;-&#160;</td><td class='long'>" + message + "</td></tr>");
1374
+ if (type == 'description/change') {
1375
+ $("#dat_log").prepend("<tr><td class='fixed'><a title=\"" + d.strftime("[%d/%b/%Y %H:%M:%S]") + "\">D</a></td><td class='fixed'>&#160;-&#160;</td><td class='fixed'><a title=\"" + what + "\">T</a></td><td class='fixed'>&#160;-&#160;</td><td class='fixed'>" + type + "</td><td class='fixed'>&#160;-&#160;</td><td class='long'>... check in persistent log ...</td></tr>");
1376
+ } else {
1377
+ $("#dat_log").prepend("<tr><td class='fixed'><a title=\"" + d.strftime("[%d/%b/%Y %H:%M:%S]") + "\">D</a></td><td class='fixed'>&#160;-&#160;</td><td class='fixed'><a title=\"" + what + "\">T</a></td><td class='fixed'>&#160;-&#160;</td><td class='fixed'>" + type + "</td><td class='fixed'>&#160;-&#160;</td><td class='long'>" + message + "</td></tr>");
1378
+ }
1375
1379
  var dle = $("#dat_log").children();
1376
1380
  if (dle.length > 100) {
1377
1381
  dle.slice(100).each((k,ele) => {
data/cpee.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "cpee"
3
- s.version = "2.1.16"
3
+ s.version = "2.1.21"
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.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
@@ -18,6 +18,8 @@ require 'json'
18
18
  require 'erb'
19
19
  require 'yaml'
20
20
 
21
+ Encoding.default_external = 'UTF-8'
22
+
21
23
  module CPEE
22
24
  module Properties
23
25
 
@@ -1,3 +1,4 @@
1
+ <%# coding: UTF-8 %>
1
2
  class Instance < WEEL
2
3
  connectionwrapper ConnectionWrapper
3
4
 
@@ -199,7 +199,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
199
199
  @controller.notify("status/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :id => status.id, :message => status.message)
200
200
  end
201
201
  unless changed_dataelements.nil? || changed_dataelements.empty?
202
- de = dataelements.slice(*changed_dataelements).transform_values { |v| detect_encoding(v) == 'UTF-8' ? v : convert_to_base64(v) }
202
+ de = dataelements.slice(*changed_dataelements).transform_values { |v| enc = detect_encoding(v); (enc == 'BINARY' ? convert_to_base64(v) : (enc == 'UTF-8' ? v : v.encode('UTF-8',enc))) }
203
203
  @controller.notify("dataelements/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_dataelements, :values => de)
204
204
  end
205
205
  unless changed_endpoints.nil? || changed_endpoints.empty?
@@ -244,7 +244,16 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
244
244
  end
245
245
 
246
246
  def detect_encoding(text)
247
- CharlockHolmes::EncodingDetector.detect(text)[:encoding] || 'ISO-8859-1'
247
+ if text.is_a? String
248
+ res = CharlockHolmes::EncodingDetector.detect(text)
249
+ if res.is_a?(Hash) && res[:type] == :text && res[:encoding].match(/(ISO|UTF-8)/)
250
+ res[:encoding]
251
+ else
252
+ 'BINARY'
253
+ end
254
+ else
255
+ 'UTF-8'
256
+ end
248
257
  end
249
258
 
250
259
  def convert_to_base64(text)
@@ -266,10 +275,11 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
266
275
  else
267
276
  r.value.read
268
277
  end
278
+ enc = detect_encoding(res)
269
279
  tmp = {
270
280
  'name' => r.name == '' ? 'result' : r.name,
271
281
  'mimetype' => r.mimetype,
272
- 'data' => (detect_encoding(res) == 'UTF-8' ? res : convert_to_base64(res))
282
+ 'data' => (enc == 'BINARY' ? convert_to_base64(res) : (enc == 'UTF-8' ? res : res.encode('UTF-8',enc)))
273
283
  }
274
284
  r.value.rewind
275
285
  tmp
data/tools/cpee CHANGED
@@ -117,12 +117,6 @@ elsif command == 'convert'
117
117
  end
118
118
  end rescue nil
119
119
  doc.find('//x:handlerwrapper').delete_all!
120
- doc.find('//x:start_url').each do |e|
121
- e.text = 'https://cpee.org/flow/start/url/'
122
- end rescue nil
123
- doc.find('//x:start_git').each do |e|
124
- e.text = 'https://cpee.org/flow/start/git/'
125
- end rescue nil
126
120
  doc.find('//d:finalize | //d:update | //d:prepare | //d:rescue').each do |e|
127
121
  if e.parent.qname.name != 'code'
128
122
  n = e.parent
data/tools/server/cpee CHANGED
@@ -4,7 +4,7 @@ require 'cpee/implementation'
4
4
 
5
5
  Riddl::Server.new(CPEE::SERVER, :host => 'localhost', :port => 8298) do |opts|
6
6
  opts[:instances] = File.join(__dir__,'instances')
7
- opts[:executionhandlers = File.join(__dir__,'executionhandlers')
7
+ opts[:executionhandlers] = File.join(__dir__,'executionhandlers')
8
8
  opts[:notifications_init] = File.join(__dir__,'resources','notifications')
9
9
  opts[:properties_init] = File.join(__dir__,'resources','properties.init')
10
10
 
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: 2.1.16
4
+ version: 2.1.21
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: tools
12
12
  cert_chain: []
13
- date: 2021-08-02 00:00:00.000000000 Z
13
+ date: 2021-10-28 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: riddl
@@ -675,7 +675,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
675
675
  - !ruby/object:Gem::Version
676
676
  version: '0'
677
677
  requirements: []
678
- rubygems_version: 3.1.6
678
+ rubygems_version: 3.2.22
679
679
  signing_key:
680
680
  specification_version: 4
681
681
  summary: Preliminary release of cloud process execution engine (cpee.org). If you