cpee 2.1.14 → 2.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41c8af6dfe0026a757a1cb1d3627415773aabf2e99712ac77207de2f518fbf0e
-  data.tar.gz: 8b02404db658a5e2a6219e5b3843cee54beed9df08356d615c504bd56851b61d
+  metadata.gz: bfcea35b5af1c0944e0ef51f370febe9bb9596c7d43dff4d4aeaf679c70be29f
+  data.tar.gz: 53b9636942a7fa4a3408717151c53975d6ca34712337f00ecd65214a975f292d
 SHA512:
-  metadata.gz: 04104b072172fa082b879e414f6ffec58d21fe99be5ec18a7fd3a070947139cf30d7f02e377b34bcd8e61cc9f5afef1570971224c4786e5338ab9c02c11cd50f
-  data.tar.gz: 3cb492d19adf14b727c6ce14cd4edd2dcca0da1819502b63b20a68a249ce78a5c803b19c18a23d9051f00734cbb161cd0e9eac2ecb9efec2ce3d667cfa663440
+  metadata.gz: 372a9a4a84164a833e94e97c9371b081550511806bf977fb5b78acca93f62b4fbbad45e288d48a0a5dd5b6ec5228d01e2fe0bfb2f5f4f89ca0a4a034a4290580
+  data.tar.gz: 9dba028bc84297ae212cbc7bfd377d754eb38c78c2f53e8e542b0669567b23fb7456957d1adb40048fdfcb7f871b439421cd5bb3e1d04420514a77c501cadb33

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.14"
+  s.version          = "2.1.19"
   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/server/executionhandlers/ruby/connection.rb

@@ -13,6 +13,7 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'charlock_holmes'
+require 'base64'
 
 class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def self::loop_guard(arguments,id,count) # {{{
@@ -197,11 +198,12 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     unless status.nil?
       @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?
-      @controller.notify("dataelements/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_dataelements, :values => dataelements)
+    unless changed_dataelements.nil? || changed_dataelements.empty?
+      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?
-      @controller.notify("endpoints/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_endpoints, :values => endpoints)
+    unless changed_endpoints.nil? || changed_endpoints.empty?
+      @controller.notify("endpoints/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_endpoints, :values => endpoints.slice(*changed_endpoints))
     end
   end # }}}
 
@@ -241,12 +243,21 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     result
   end
 
-  def detected_encoding(text)
-    CharlockHolmes::EncodingDetector.detect(text)[:encoding] || 'ISO-8859-1'
+  def detect_encoding(text)
+    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_utf8(text)
-    CharlockHolmes::Converter.convert(text, detected_encoding(text), "UTF-8")
+  def convert_to_base64(text)
+    'data:application/octet-stream;base64,' + Base64::urlsafe_encode64(text)
   end
 
   def structurize_result(result)
@@ -264,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' => 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.14
+  version: 2.1.19
 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