cpee 2.1.13 → 2.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a36325365a950ed863e1d8f225d3d9c0fe955c03d9e8d54ef5a3b92366bffeea
-  data.tar.gz: 2579cb64ec6d53369b89f9ae2bd296422d5a9aafb527cfe4d7b4397702e15571
+  metadata.gz: 7ea62a69f615adda56866c02d31f1ea478bd49f7eb8e96f8855ed4b81397257b
+  data.tar.gz: 2f357f76cf73517f41d17c18dbbc594c05e16f99548599f1dd596119c01f2a91
 SHA512:
-  metadata.gz: 198bfa6332b16087dd108170166e4d91b92e82bb51e9853d72ad1fd2e152a3a5bee856c138a91598f63881a49897dbfed16fa4193732e1d55f7a5484476aa6fd
-  data.tar.gz: a068a5abf6abb788b8759ced41339db138b4775d0ca2c1be4f89e1d191205379632c8c36069b799f6475f04f57b53aac2f646aad8265e2ab6182733200780535
+  metadata.gz: fe3a326563ddab5daaf80aa114751fa17251579e3f6e33d3aa52031696f48b0fd5271e46f2a44f905366f7a82de57b2946d1815799ef175860b58c8d68f4dc27
+  data.tar.gz: 72ae028ddd526053ef10e40552ac84813502c3728e3c68bae9fc9d152f372796d4f57f313c9d025aec335d2784b1f124dc5f64cefab4fe54c079380dff150c71

data/cockpit/js/instance.js

@@ -56,7 +56,7 @@ var sub_more = 'topic'  + '=' + 'activity' + '&' +// {{{
                'events' + '=' + 'instantiation' + '&' +
                'topic'  + '=' + 'transformation' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'connectionwrapper' + '&' +
+               'topic'  + '=' + 'executionhandler' + '&' +
                'events' + '=' + 'error,change' + '&' +
                'topic'  + '=' + 'handlers' + '&' +
                'events' + '=' + 'change';// }}}
@@ -78,7 +78,7 @@ var sub_less = 'topic'  + '=' + 'activity' + '&' +// {{{
                'events' + '=' + 'instantiation' + '&' +
                'topic'  + '=' + 'transformation' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'connectionwrapper' + '&' +
+               'topic'  + '=' + 'executionhandler' + '&' +
                'events' + '=' + 'error,change' + '&' +
                'topic'  + '=' + 'handlers' + '&' +
                'events' + '=' + 'change';// }}}
@@ -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.13"
+  s.version          = "2.1.17"
   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| detect_encoding(v) == 'UTF-8' ? v : convert_to_base64(v) }
+      @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,12 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     result
   end
 
-  def detected_encoding(text)
+  def detect_encoding(text)
     CharlockHolmes::EncodingDetector.detect(text)[:encoding] || 'ISO-8859-1'
   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)
@@ -267,7 +269,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
         tmp = {
           'name' => r.name == '' ? 'result' : r.name,
           'mimetype' => r.mimetype,
-          'data' => res
+          'data' => (detect_encoding(res) == 'UTF-8' ? res : convert_to_base64(res))
         }
         r.value.rewind
         tmp

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.13
+  version: 2.1.17
 platform: ruby
 authors:
 - Juergen eTM Mangler