cpee-eval-ruby 1.0.0 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df0ac0169869de150fcc4006236aa7827c8815199b5a05b2433b02f31c00aea7
-  data.tar.gz: 1fe55c3eef49f0bb3ca16807c58e986cc8b57bc94064af24cbee4029cb488344
+  metadata.gz: da15f25700974469442cef4cdd7b52e6a42c846430bdd5e0d1d1d13eb49a681c
+  data.tar.gz: 976a7f9f849f4d8bce0eed92fdd717bbf7f6447ac2a4f7ef2a7dd4ffbc071841
 SHA512:
-  metadata.gz: 9607dea7a01072d1533d91365ccf3436454aa49f8da0521d3b8906639f83cc11ecc0c442b216ece4a955e6e5c0a96ee0920eb1c74ab95a917152fed16056eb8f
-  data.tar.gz: b2d29f6757561af76ef56bc414e6f834c9d7c5a0d2d2c239ddf958508517eb79753994cad8e2396217ac52104a34d13b26f9ca7031a73ed4ee90d948f6a2fdbb
+  metadata.gz: b3d5e23c492473deb8b3ab3c49dd69f7d6749e95a600a31ed3c7d9df0e53e7dd06e23d71b5053de602423232c86f1cfb1b55b8ae371896f46f59690a5fbfa064
+  data.tar.gz: 40a311a0c2f834d182bdb5f50e6d35c761ffb0903fee569a68a922ca807fae4e177a5d56fe109df9a2a584a5db6464e01865d77fceb3d0ff5581a09a5c03d391

data/cpee-eval-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-eval-ruby"
-  s.version          = "1.0.0"
+ s.version          = "1.0.3"
   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,4 +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.67'
 end

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

@@ -32,14 +32,13 @@ module CPEE
     SERVER = File.expand_path(File.join(__dir__,'implementation.xml'))
 
     class DoIt < Riddl::Implementation #{{{
-      def exec(mr,code,result=nil,headers=nil)
-        mr.instance_eval(code)
+      def exec(__struct,__code,result=nil,headers=nil)
+        __struct.instance_eval(__code)
       end
 
       def response
+        mode = @a[0]
         code = @p.shift.value
-        # code = code.read if code.respond_to? :read
-        # code = Riddl::Protocols::Utils::unescape(code)
         dataelements = JSON::parse(@p.shift.value.read)
         local = nil
         local = JSON::parse(@p.shift.value.read) if @p[0].name == 'local'
@@ -69,12 +68,18 @@ module CPEE
           struct.changed_data.each do |e|
             res[e] = struct.data[e]
           end
-          ret.push Riddl::Parameter::Complex.new('changed_dataelements','application/json',JSON::generate(res)) if res.any?
+          if res.any?
+            ret.push Riddl::Parameter::Complex.new('dataelements','application/json',JSON::generate(data)) if mode == :full
+            ret.push Riddl::Parameter::Complex.new('changed_dataelements','application/json',JSON::generate(res))
+          end
           res = {}
           struct.changed_endpoints.each do |e|
             res[e] = struct.endpoints[e]
           end
-          ret.push Riddl::Parameter::Complex.new('changed_endpoints','application/json',JSON::generate(res)) if res.any?
+          if res.any?
+            ret.push Riddl::Parameter::Complex.new('endpoints','application/json',JSON::generate(endpoints)) if mode == :full
+            ret.push Riddl::Parameter::Complex.new('changed_endpoints','application/json',JSON::generate(res))
+          end
           ret.push Riddl::Parameter::Complex.new('changed_status','application/json',JSON::generate(status)) if struct.changed_status
           ret
         else
@@ -94,7 +99,10 @@ module CPEE
       Proc.new do
         on resource do
           on resource 'exec' do
-            run DoIt if put 'exec'
+            run DoIt, :small if put 'exec'
+          end
+          on resource 'exec-full' do
+            run DoIt, :full if put 'exec'
           end
           on resource 'structurize' do
             run Structurize if put

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

@@ -41,6 +41,7 @@
     </choice>
     <optional>
       <parameter name="signal" type="string"/>
+      <parameter name="signal_text" type="string"/>
     </optional>
     <optional>
       <parameter name="changed_dataelements" mimetype="application/json"/>
@@ -52,6 +53,28 @@
       <parameter name="changed_status" mimetype="application/json"/>
     </optional>
   </message>
+  <message name="res-full">
+    <choice>
+      <parameter name="result" type="boolean"/>
+      <parameter name="result" type="string"/>
+    </choice>
+    <optional>
+      <parameter name="signal" type="string"/>
+      <parameter name="signal_text" type="string"/>
+    </optional>
+    <optional>
+      <parameter name="dataelements" mimetype="application/json"/>
+      <parameter name="changed_dataelements" mimetype="application/json"/>
+    </optional>
+    <optional>
+      <parameter name="endpoints" mimetype="application/json"/>
+      <parameter name="changed_endpoints" mimetype="application/json"/>
+    </optional>
+    <optional>
+      <parameter name="changed_status" mimetype="application/json"/>
+    </optional>
+  </message>
+
 
   <message name="struc">
     <parameter name="structurized" mimetype="application/json"/>
@@ -61,6 +84,9 @@
     <resource relative="exec">
       <put in="exec" out="res"/>
     </resource>
+    <resource relative="exec-full">
+      <put in="exec" out="res-full"/>
+    </resource>
     <resource relative="structurize">
       <put out="struc"/>
     </resource>

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

@@ -43,7 +43,7 @@ module CPEE
               result = result[0]['data']
             elsif result[0]['mimetype'] == 'text/yaml'
               result = YAML::load(result[0]['data']) rescue nil
-            elsif result[0]['mimetype'] == 'application/xml' || result[0].mimetype == 'text/xml'
+            elsif result[0]['mimetype'] == 'application/xml' || result[0]['mimetype'] == 'text/xml'
               result = XML::Smart::string(result[0]['data']) rescue nil
             elsif result[0]['mimetype'] == 'text/plain'
               result = result[0]['data']
@@ -53,7 +53,7 @@ module CPEE
                 result = result.to_f if result == result.to_f.to_s
                 result = result.to_i if result == result.to_i.to_s
               end
-            elsif result[0].mimetype == 'text/html'
+            elsif result[0]['mimetype'] == 'text/html'
               result = 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-eval-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.3
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-09-13 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -24,6 +24,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: cpee
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.67
+  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.67
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables:
@@ -41,8 +61,6 @@ files:
 - lib/cpee-eval-ruby/implementation.xml
 - lib/cpee-eval-ruby/translation.rb
 - server/eval-ruby
-- server/output.err
-- server/output.txt
 - tools/cpee-eval-ruby
 homepage: http://cpee.org/
 licenses: