cpee 2.1.79 → 2.1.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c964061a70cac85b0e31055837221a3a29682b805b09896eaf5625834950f8f9
-  data.tar.gz: 67cb5bf54c347a06c90862645e0b59cb47319be0088ec9a1f2b0b92f6d0fdd5c
+  metadata.gz: 145cf697591637c0820595bad9ad1d3aaaaf5e6d9d6ce3fd99384d444d5fb616
+  data.tar.gz: 109326c90d18274d0413b361020a75c3a728589dab112d50a76575c84c7876fb
 SHA512:
-  metadata.gz: 1c28c2b6a6c3e4440ffc5dbb5bb610cd501b76e98e5021c9b2fe391b93b2128d52b5e319db8f4d2b45fe7c136abc23b56e5a1b25061b4d18f725ec8f8d3af482
-  data.tar.gz: 899cefe9a892dc6e9159c3c0bf35109b26c141b775e74cd65dbc1d6b0aedaa2fdc73ad372641ee756b8906ce94de4243f2c7ba753430f8b3778f4d39df21a750
+  metadata.gz: fffd736313773921542ef7b95f4584a6ddaa6342f67228488935aefdbefacddc159d030415117f9ed738793982519f0ae2bbf071ab74dce1fd6293583ed9f8bb
+  data.tar.gz: 7c02e850e4d1fbaf2679305c8b60b3b88018b94975f95a87e9e9dcfda62959d521d56357fabd7c6927b08d67067a8ab19f26db76a9a91f936397ca134105bd31

data/cockpit/js/wfadaptor.js

@@ -105,7 +105,7 @@ function WfAdaptor(theme_base,doit) { // Controller {{{
     }
     for(element in manifestation.elements) {
       if (manifestation.elements[element].illustrator) {
-        if (manifestation.elements[element].illustrator.svg) {
+        if (manifestation.elements[element].illustrator.svg && (typeof manifestation.elements[element].illustrator.svg === 'string' || manifestation.elements[element].illustrator.svg instanceof String)) {
           deferreds.push(
             $.ajax({
               type: "GET",
@@ -117,6 +117,40 @@ function WfAdaptor(theme_base,doit) { // Controller {{{
               }
             })
           );
+        } else {
+          deferreds.push(
+            $.ajax({
+              type: "GET",
+              dataType: "xml",
+              url: manifestation.elements[element].illustrator.svg.first,
+              context: element,
+              success: function(res){
+                manifestation.elements[this].illustrator.svg.first = $(res.documentElement);
+              }
+            })
+          );
+          deferreds.push(
+            $.ajax({
+              type: "GET",
+              dataType: "xml",
+              url: manifestation.elements[element].illustrator.svg.middle,
+              context: element,
+              success: function(res){
+                manifestation.elements[this].illustrator.svg.middle = $(res.documentElement);
+              }
+            })
+          );
+          deferreds.push(
+            $.ajax({
+              type: "GET",
+              dataType: "xml",
+              url: manifestation.elements[element].illustrator.svg.last,
+              context: element,
+              success: function(res){
+                manifestation.elements[this].illustrator.svg.last = $(res.documentElement);
+              }
+            })
+          );
         }
         illustrator.elements[element] = manifestation.elements[element].illustrator;
         illustrator.elements[element].type = manifestation.elements[element].type || 'abstract';

data/cockpit/themes/base.js

@@ -426,7 +426,11 @@ function WFAdaptorManifestationBase(adaptor) {
           return [];
         }
       },
-      'svg': self.adaptor.theme_dir + 'symbols/manipulate.svg'
+      'svg': {
+        first: self.adaptor.theme_dir + 'symbols/manipulate.svg',
+        middle: self.adaptor.theme_dir + 'symbols/manipulate.svg',
+        last: self.adaptor.theme_dir + 'symbols/manipulate.svg'
+      }
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/manipulate.rng',
     'permissible_children': function(node,mode) { //{{{

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.79"
+  s.version          = "2.1.81"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "The 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.rb

@@ -93,7 +93,7 @@ module CPEE
     CPEE::redis_connect opts, 'Server Main'
 
     ### start by server
-    if opts[:libs_preload]&.is_a?(Array) && opts[:libs_preload].length > 0
+    if opts[:libs_preload]&.is_a?(Array) && opts[:libs_preload].length > 0 && opts[:libs_preloader]&.is_a?(String) && opts[:libs_preloader]&.strip != ''
       puts '(re)starting by-server ...'
       `pkill -f #{File.basename(opts[:libs_preloader])}`
       `#{opts[:libs_preloader]} '#{opts[:libs_preload].join("' '")}'`

data/lib/cpee/implementation_callbacks.rb

@@ -108,6 +108,13 @@ module CPEE
     end #}}}
 
     class ExCallback < Riddl::Implementation #{{{
+      def cleanup_encoding(val)
+        enc = CharlockHolmes::EncodingDetector.detect(val)
+        if enc[:type] == :text && enc[:confidence] > 40
+          val.force_encoding(enc[:ruby_encoding])
+        end
+        val
+      end
       def response
         id = @a[0]
         opts = @a[1]
@@ -125,10 +132,10 @@ module CPEE
               if e.class == Riddl::Parameter::Simple
                 [:simple,e.value]
               elsif e.class == Riddl::Parameter::Complex && e.value.size <= 512000
-                [:complex,e.mimetype,e.value.read]
+                [:complex,e.mimetype,cleanup_encoding(e.value.read)]
               else
-                # [:complex,'cpee-external-' + e.mimetype,e.value.read]
-                [:complex, e.mimetype,e.value.read]
+                # [:complex,'cpee-external-' + e.mimetype,cleanup_encoding(e.value.read)]
+                [:complex, e.mimetype,cleanup_encoding(e.value.read)]
               end
             ]
           }

data/server/executionhandlers/ruby/backend/run.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env by
-# require 'rbtrace'
 require 'yaml'
 opts = YAML::load_file(File.join(__dir__,'opts.yaml'))
 opts[:pidf] = __FILE__ + '.pid'

data/server/executionhandlers/ruby/execution.rb

@@ -55,7 +55,6 @@ module CPEE
         end
         template = ERB.new(File.read(ExecutionHandler::Ruby::BACKEND_TEMPLATE), trim_mode: '-')
         res = template.result_with_hash(dsl: dsl, dataelements: dataelements, endpoints: endpoints, positions: positions)
-        pp dataelements
         File.write(File.join(opts[:instances],id.to_s,ExecutionHandler::Ruby::BACKEND_INSTANCE),res)
       end
 

data/server/routing/end.pid

@@ -1 +1 @@
-55683
+1180624

data/server/routing/forward-events-00.pid

@@ -1 +1 @@
-55702
+1180642

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-55696
+1180636

data/server/routing/persist.pid

@@ -1 +1 @@
-55689
+1180630

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.79
+  version: 2.1.81
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2025-02-21 00:00:00.000000000 Z
+date: 2025-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl