cpee 2.1.20 → 2.1.24

data/server/executionhandlers/ruby/connection.rb

@@ -13,6 +13,7 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'charlock_holmes'
+require 'mimemagic'
 require 'base64'
 
 class ConnectionWrapper < WEEL::ConnectionWrapperBase
@@ -199,7 +200,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| enc = detect_encoding(v); (enc == 'BINARY' ? convert_to_base64(v) : (enc == 'UTF-8' ? v : v.encode('UTF-8',enc))) }
+      de = dataelements.slice(*changed_dataelements).transform_values { |v| enc = detect_encoding(v); (enc == 'OTHER' ? v.inspect : (v.encode('UTF-8',enc) rescue 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? || changed_endpoints.empty?
@@ -245,19 +246,25 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
 
   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]
+      if text.valid_encoding? && text.encoding.name == 'UTF-8'
+        'UTF-8'
       else
-        'BINARY'
+        res = CharlockHolmes::EncodingDetector.detect(text)
+        if res.is_a?(Hash) && res[:type] == :text && res[:ruby_encoding] != "binary"
+          res[:encoding]
+        elsif res.is_a?(Hash) && res[:type] == :binary
+          'BINARY'
+        else
+          'ISO-8859-1'
+        end
       end
     else
-      'UTF-8'
+      'OTHER'
     end
   end
 
   def convert_to_base64(text)
-    'data:application/octet-stream;base64,' + Base64::urlsafe_encode64(text)
+    ('data:' + MimeMagic.by_magic(text).type + ';base64,' + Base64::encode64(text)) rescue ('data:application/octet-stream;base64,' + Base64::encode64(text))
   end
 
   def structurize_result(result)
@@ -266,20 +273,28 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
         { 'name' => r.name, 'data' => r.value }
       elsif r.is_a? Riddl::Parameter::Complex
         res = if r.mimetype == 'application/json'
-          JSON::parse(r.value.read) rescue nil
+          ttt = JSON::parse(r.value.read) rescue nil
+          if ttt.nil?
+            ''
+          else
+            enc = detect_encoding(ttt)
+            enc == 'OTHER' ? ttt.inspect : (ttt.encode('UTF-8',enc) rescue convert_to_base64(ttt))
+          end
         elsif r.mimetype == 'text/plain' || r.mimetype == 'text/html'
           ttt = r.value.read
           ttt = ttt.to_f if ttt == ttt.to_f.to_s
           ttt = ttt.to_i if ttt == ttt.to_i.to_s
-          ttt
+          enc = detect_encoding(ttt)
+          enc == 'OTHER' ? ttt.inspect : (ttt.encode('UTF-8',enc) rescue convert_to_base64(ttt))
         else
-          r.value.read
+          convert_to_base64(r.value.read)
+          r.value.rewind
         end
-        enc = detect_encoding(res)
+
         tmp = {
           'name' => r.name == '' ? 'result' : r.name,
           'mimetype' => r.mimetype,
-          'data' => (enc == 'BINARY' ? convert_to_base64(res) : (enc == 'UTF-8' ? res : res.encode('UTF-8',enc)))
+          'data' => res.to_s
         }
         r.value.rewind
         tmp

data/tools/cpee

@@ -116,13 +116,20 @@ elsif command == 'convert'
             doc.root.prepend('x:executionhandler','ruby')
           end
         end rescue nil
+        doc.find('//d:parallel_branch/@pass').delete_all!
+        doc.find('//d:parallel_branch/@local').delete_all!
+        doc.find('//d:call').each do |c|
+          c.find('d:annotations').first.add c.find('d:parameters/d:_context_data_analysis')
+          c.find('d:annotations').first.add c.find('d:parameters/d:_report')
+          if c.find('d:documentation').empty?
+            node = c.add('d:documentation')
+            node.add c.find('d:input')
+            node.add c.find('d:output')
+            node.add c.find('d:implementation')
+            node.add c.find('d:code[d:description]')
+          end
+        end
         doc.find('//x:handlerwrapper').delete_all!
-        doc.find('//x:start_url').each do |e|
-          e.text = 'https://cpee.org/flow/start/url/'
-        end rescue nil
-        doc.find('//x:start_git').each do |e|
-          e.text = 'https://cpee.org/flow/start/git/'
-        end rescue nil
         doc.find('//d:finalize | //d:update | //d:prepare | //d:rescue').each do |e|
           if e.parent.qname.name != 'code'
             n = e.parent

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.20
+  version: 2.1.24
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-10-04 00:00:00.000000000 Z
+date: 2021-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -116,6 +116,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mimemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables: