cpee 2.1.15 → 2.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdba71d5df8124590a3b932d83af91b87801663f3e21d8ebbafb9d4e2b339869
-  data.tar.gz: 73e7507c88a39096b2d418178a03150165a0966cd94ce4d452565a21c0e31683
+  metadata.gz: 199518d8d1220f03618033f059c9cc3571c0d90b696956f39327f306e8923ac9
+  data.tar.gz: c65ff88e791be50e1a2dfba3eb6793742bcd5b9af3acd3381dc17afb294171aa
 SHA512:
-  metadata.gz: '093136bfeee58f4ba9152b15c5a83220aa219734160a50b60739f30337e08e2b99d2b503addcec8cd72c832bf67430b4e177110007f5693a593c8a513d620fec'
-  data.tar.gz: d50286266ac5d15a94f4c0f86cdd2d87b8730948e0f1a6bdfe0d0ca73af8104fdcf720620abf06b8819aaea005d6cf264954c0b063841f4dba22c29c977e2bd2
+  metadata.gz: e4543cd2508a74e4e69f92e397069c71a150c6c3239c69779afd59b2a97b2c1c038c1cec54cf391d182b66873d134031a9478a0d5eea8720aed1cde74e0c0aee
+  data.tar.gz: 5bd8e6bce342ec26032c67d7abe137208659b7b5a78c6342dccdc6e7ad1da7d38a15376bc7d4e2eca916943875f2be65075fba5754e405c85a90f856249b4031

data/cockpit/js/instance.js

@@ -1366,7 +1366,16 @@ function append_to_log(what,type,message) {//{{{
   message = message.replace(/:\"/g,': "');
   message = message.replace(/:\{/g,': {');
   message = message.replace(/:\[/g,': [');
-  $("#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>");
+  message = message.replace(/&/g, '&amp;');
+  message = message.replace(/</g, '&lt;');
+  message = message.replace(/>/g, '&gt;');
+  message = message.replace(/"/g, '&quot;');
+  message = message.replace(/'/g, '&apos;');
+  if (type == 'description/change') {
+    $("#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>");
+  } else {
+    $("#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>");
+  }
   var dle = $("#dat_log").children();
   if (dle.length > 100) {
     dle.slice(100).each((k,ele) => {

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.15"
+  s.version          = "2.1.20"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   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."

data/lib/cpee/implementation_properties.rb

@@ -18,6 +18,8 @@ require 'json'
 require 'erb'
 require 'yaml'
 
+Encoding.default_external = 'UTF-8'
+
 module CPEE
   module Properties
 

data/server/executionhandlers/ruby/backend/instance.template

@@ -1,3 +1,4 @@
+<%# coding: UTF-8 %>
 class Instance < WEEL
   connectionwrapper ConnectionWrapper
 

data/server/executionhandlers/ruby/connection.rb

@@ -199,7 +199,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       @controller.notify("status/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :id => status.id, :message => status.message)
     end
     unless changed_dataelements.nil? || changed_dataelements.empty?
-      de = dataelements.slice(*changed_dataelements).transform_values { |v| detect_encoding(v) == 'UTF-8' ? v : convert_to_base64(v) }
+      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))) }
       @controller.notify("dataelements/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_dataelements, :values => de)
     end
     unless changed_endpoints.nil? || changed_endpoints.empty?
@@ -244,7 +244,16 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end
 
   def detect_encoding(text)
-    CharlockHolmes::EncodingDetector.detect(text)[:encoding] || 'ISO-8859-1'
+    if text.is_a? String
+      res = CharlockHolmes::EncodingDetector.detect(text)
+      if res.is_a?(Hash) && res[:type] == :text && res[:encoding].match(/(ISO|UTF-8)/)
+        res[:encoding]
+      else
+        'BINARY'
+      end
+    else
+      'UTF-8'
+    end
   end
 
   def convert_to_base64(text)
@@ -266,10 +275,11 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
         else
           r.value.read
         end
+        enc = detect_encoding(res)
         tmp = {
           'name' => r.name == '' ? 'result' : r.name,
           'mimetype' => r.mimetype,
-          'data' => (detect_encoding(res) == 'UTF-8' ? res : convert_to_base64(res))
+          'data' => (enc == 'BINARY' ? convert_to_base64(res) : (enc == 'UTF-8' ? res : res.encode('UTF-8',enc)))
         }
         r.value.rewind
         tmp

data/tools/server/cpee

@@ -4,7 +4,7 @@ require 'cpee/implementation'
 
 Riddl::Server.new(CPEE::SERVER, :host => 'localhost', :port => 8298) do |opts|
   opts[:instances]          = File.join(__dir__,'instances')
-  opts[:executionhandlers   = File.join(__dir__,'executionhandlers')
+  opts[:executionhandlers]  = File.join(__dir__,'executionhandlers')
   opts[:notifications_init] = File.join(__dir__,'resources','notifications')
   opts[:properties_init]    = File.join(__dir__,'resources','properties.init')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.15
+  version: 2.1.20
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2021-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -675,7 +675,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: Preliminary release of cloud process execution engine (cpee.org). If you