cpee-eval-ruby 1.0.5 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 577aa3b37ebdabc0e3795ce991e717caae16b93e5133c869116599fc1dcc68b6
-  data.tar.gz: cff8a4e9685315c2a81fdf82540fa6feb8e92418f0dc444df71b9700a7d10df9
+  metadata.gz: 84fc79790dae3221f52506e89cac2873c3b87df3b453f28fcf66e6274fbbe9ed
+  data.tar.gz: 024a8c81054a23b338d794898fa8f459f6b603eca6aa53fab2c507d414243c35
 SHA512:
-  metadata.gz: 64ae1dbf57a22276c15d1526fe7fe8b58be5f65427eb32ce2d2462c0b45c28cad5ff8b6acf765498987e9b49b068816727968277ebb46aa113558a6ff5d0e3df
-  data.tar.gz: 83d6516896b832b841b325499a7e9d946e7dc15d0b9dc69037cb1cb1dffa5386c5d371ed19008191aa29324a5ace2843577d91e9701095c9d669f58f76572228
+  metadata.gz: e24df120022480933494c3040f9e47589a6bb410433e152a89a91d14c9ff5e5b564f63bf341b53db84e72ab6515df36d437493103dbb1c0be94cb19bb06a0e40
+  data.tar.gz: 7d9d35d776ea27611803bbd3a20ea5635b0c2027df74e885ae52e21e48df0ce1d8386fd8becc6567007efa1e573d7c070db059e0370a30c586b05e9b436a9b6b

data/cpee-eval-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-eval-ruby"
- s.version          = "1.0.5"
+  s.version          = "1.0.8"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Ruby eval for the cloud process execution engine (cpee.org)"
@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   s.homepage         = 'http://cpee.org/'
 
   s.add_runtime_dependency 'riddl', '~> 1.0'
-  s.add_runtime_dependency 'cpee', '~> 2.1', '>= 2.1.69'
+  s.add_runtime_dependency 'weel', '~> 1.99'
 end

data/lib/cpee-eval-ruby/implementation.rb

@@ -24,6 +24,7 @@ require 'uri'
 require 'redis'
 require 'json'
 require 'weel'
+require 'charlock_holmes'
 require_relative 'translation'
 
 module CPEE
@@ -35,7 +36,7 @@ module CPEE
       def exec(__struct,__code,result=nil,headers=nil)
         __ret = {}
         __cat = catch WEEL::Signal::Again do
-          __ret[:res] = __struct.instance_eval(__code)
+          __ret[:res] = JSON::generate(__struct.instance_eval(__code))
           WEEL::Signal::Proceed
         end
         if __cat.nil? || __cat == WEEL::Signal::Again
@@ -87,7 +88,7 @@ module CPEE
           execresult = exec struct, code, CPEE::EvalRuby::Translation::simplify_structurized_result(call_result), call_headers
 
           send = []
-          send << Riddl::Parameter::Simple.new('result',execresult[:res])
+          send << Riddl::Parameter::Complex.new('result','application/json',execresult[:res] || '')
           if execresult[:signal]
             send << Riddl::Parameter::Simple.new('signal',execresult[:signal])
             send << Riddl::Parameter::Simple.new('signal_text',execresult[:signal_text] || '')
@@ -99,7 +100,7 @@ module CPEE
             res[e] = struct.data[e]
           end
           if res.any?
-            send << Riddl::Parameter::Complex.new('dataelements','application/json',JSON::generate(data)) if mode == :full
+            send << Riddl::Parameter::Complex.new('dataelements','application/json',JSON::generate(dataelements)) if mode == :full
             send << Riddl::Parameter::Complex.new('changed_dataelements','application/json',JSON::generate(res))
           end
           res = {}
@@ -116,7 +117,7 @@ module CPEE
           struct = WEEL::ReadStructure.new(dataelements,endpoints,local,additional)
           execresult = exec struct, code
           send = []
-          send << Riddl::Parameter::Simple.new('result',execresult[:res])
+          send << Riddl::Parameter::Complex.new('result','application/json',execresult[:res])
           if execresult[:signal]
             send << Riddl::Parameter::Simple.new('signal',execresult[:signal])
             send << Riddl::Parameter::Simple.new('signal_text',execresult[:signal_text] || '')

data/lib/cpee-eval-ruby/implementation.xml

@@ -35,10 +35,7 @@
   </message>
 
   <message name="res">
-    <choice>
-      <parameter name="result" type="boolean"/>
-      <parameter name="result" type="string"/>
-    </choice>
+    <parameter name="result" mimetype="application/json"/>
     <optional>
       <parameter name="signal" type="string"/>
       <parameter name="signal_text" type="string"/>
@@ -54,10 +51,7 @@
     </optional>
   </message>
   <message name="res-full">
-    <choice>
-      <parameter name="result" type="boolean"/>
-      <parameter name="result" type="string"/>
-    </choice>
+    <parameter name="result" mimetype="application/json"/>
     <optional>
       <parameter name="signal" type="string"/>
       <parameter name="signal_text" type="string"/>

data/lib/cpee-eval-ruby/translation.rb

@@ -38,15 +38,15 @@ module CPEE
         if result && result.length == 1
           if result[0].has_key? 'mimetype'
             if result[0]['mimetype'] == 'application/json'
-              result = JSON::parse(result[0]['data']) rescue nil
+              result = JSON::parse(CPEE::EvalRuby::Translation::extract_base64(result[0]['data'])) rescue nil
             elsif result[0]['mimetype'] == 'text/csv'
-              result = result[0]['data']
+              result = CPEE::EvalRuby::Translation::extract_base64(result[0]['data'])
             elsif result[0]['mimetype'] == 'text/yaml'
-              result = YAML::load(result[0]['data']) rescue nil
+              result = YAML::load(CPEE::EvalRuby::Translation::extract_base64(result[0]['data'])) rescue nil
             elsif result[0]['mimetype'] == 'application/xml' || result[0]['mimetype'] == 'text/xml'
-              result = XML::Smart::string(result[0]['data']) rescue nil
+              result = XML::Smart::string(CPEE::EvalRuby::Translation::extract_base64(result[0]['data'])) rescue nil
             elsif result[0]['mimetype'] == 'text/plain'
-              result = result[0]['data']
+              result = CPEE::EvalRuby::Translation::extract_base64(result[0]['data'])
               if result.start_with?("<?xml version=")
                 result = XML::Smart::string(result)
               else
@@ -54,7 +54,7 @@ module CPEE
                 result = result.to_i if result == result.to_i.to_s
               end
             elsif result[0]['mimetype'] == 'text/html'
-              result = result[0]['data']
+              result = CPEE::EvalRuby::Translation::extract_base64(result[0]['data'])
               result = result.to_f if result == result.to_f.to_s
               result = result.to_i if result == result.to_i.to_s
             else
@@ -136,6 +136,13 @@ module CPEE
       def self::convert_to_base64(text)
         ('data:' + MimeMagic.by_magic(text).type + ';base64,' + Base64::encode64(text)) rescue ('data:application/octet-stream;base64,' + Base64::encode64(text))
       end
+      def self::extract_base64(text)
+        if text.is_a?(String) && text.start_with?(/(data:[\w_\/-]+;base64,)/)
+          Base64::decode64(text.delete_prefix $1)
+        else  
+          text
+        end
+      end
 
       def self::structurize_result(result)
         result.map do |r|

data/server/eval-ruby.pid

@@ -0,0 +1 @@
+934659

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-eval-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.8
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-09-19 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -25,25 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: cpee
+  name: weel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.69
+        version: '1.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.69
+        version: '1.99'
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables:
@@ -61,6 +55,7 @@ files:
 - lib/cpee-eval-ruby/implementation.xml
 - lib/cpee-eval-ruby/translation.rb
 - server/eval-ruby
+- server/eval-ruby.pid
 - tools/cpee-eval-ruby
 homepage: http://cpee.org/
 licenses:
@@ -81,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Ruby eval for the cloud process execution engine (cpee.org)