cpee 1.4.32 → 1.5.0

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.4.32"
+  s.version          = "1.5.0"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.executables      = ['cpee']
   s.test_files       = Dir['{test/*,test/*/tc_*.rb}']
 
-  s.required_ruby_version = '>=2.3.0'
+  s.required_ruby_version = '>=2.4.0'
 
   s.authors          = ['Juergen eTM Mangler','Ralph Vigne','Gerhard Stuermer','Florian Stertz']
 
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.homepage         = 'http://cpee.org/'
 
   s.add_runtime_dependency 'riddl', '~> 0.99'
-  s.add_runtime_dependency 'weel', '~> 1.99'
+  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.76'
   s.add_runtime_dependency 'savon', '~> 2'
   s.add_runtime_dependency 'highline', '~> 1.6'
   s.add_runtime_dependency 'json', '~>2.1'

data/server/handlerwrappers/default.rb

@@ -38,19 +38,31 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     controller.notify("position/change", ipc)
   end # }}}
 
-  def initialize(arguments,endpoint=nil,position=nil,continue=nil) # {{{
+  def initialize(arguments,position=nil,continue=nil) # {{{
     @controller = arguments[0]
     @handler_continue = continue
-    @handler_endpoint = endpoint
     @handler_position = position
     @handler_passthrough = nil
     @handler_returnValue = nil
     @label = ''
   end # }}}
 
+  def prepare(readonly, endpoints, parameters)
+    @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| readonly.endpoints[ep] }.compact : readonly.endpoints[endpoints]
+    parameters[:arguments].each do |ele|
+      if ele.value.is_a?(Proc)
+        ele.value = readonly.instance_exec &ele.value
+      end
+    end
+    parameters
+  end
+
   def activity_handle(passthrough, parameters) # {{{
+    raise "Wrong endpoint" if @handler_endpoint.nil? || @handler_endpoint.empty?
     @label = parameters[:label]
     @sensors = parameters[:sensors]
+    @aggregators = parameters[:aggregators]
+    @costs = parameters[:costs]
     @controller.notify("activity/calling", :instance => @controller.instance, :instance_uuid => @controller.uuid, :label => @label, :instance_name => @controller.info, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
     if passthrough.to_s.empty?
       if @handler_endpoint.start_with?('opc.tcp')
@@ -138,19 +150,20 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
         @handler_passthrough = callback
 
         status, result, headers = client.request type => params
-
-        raise "Could not #{type || 'post'} #{tendpoint} - status: #{status}: #{result&.dig(0)&.value&.read}" if status < 200 || status >= 300
-
-        if headers['CPEE_INSTANTIATION']
-          @controller.notify("task/instantiation", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
-        end
-        if headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.any?
-          headers['CPEE_UPDATE'] = true
-          callback result, headers
-        elsif headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.empty?
-          # do nothing, later on things will happend
+        if status < 200 || status >= 300
+          callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => status, 'error' => result[0].value.read }))) ], 'CPEE_SALVAGE' => true)
         else
-          callback result
+          if headers['CPEE_INSTANTIATION']
+            @controller.notify("task/instantiation", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+          end
+          if headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.any?
+            headers['CPEE_UPDATE'] = true
+            callback result, headers
+          elsif headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.empty?
+            # do nothing, later on things will happend
+          else
+            callback result
+          end
         end
       end
     else
@@ -241,7 +254,6 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     result
   end
 
-
   def structurize_result(result)
     result.map do |r|
       if r.is_a? Riddl::Parameter::Simple
@@ -269,7 +281,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end
 
   def callback(result=nil,options={})
-    @controller.notify("activity/receiving", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated, :sensors => @sensors)
+    @controller.notify("activity/receiving", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated, :sensors => @sensors, :aggregators => @aggregators, :costs => @costs)
     result = simplify_result(result)
     if options['CPEE_UPDATE']
       @handler_returnValue = result
@@ -281,7 +293,11 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
       @controller.callbacks.delete(@handler_passthrough)
       @handler_returnValue = result
       @handler_passthrough = nil
-      @handler_continue.continue
+      if options['CPEE_SALVAGE']
+        @handler_continue.continue WEEL::Signal::Salvage
+      else
+        @handler_continue.continue
+      end
     end
   end
 

data/server/resources/test1.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<testset>
+  <positions><!--{{{-->
+    <a1>after</a1>
+  </positions><!--}}}-->
+  <attributes>
+    <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Linear</info>
+    <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
+    <theme>default</theme>
+  </attributes>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <dataelements><!--{{{-->
+    <x/>
+  </dataelements><!--}}}-->
+  <handlers/>
+  <endpoints><!--{{{-->
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+  </endpoints><!--}}}-->
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0"><!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters><!--{{{-->
+          <label>Step 1</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters><!--}}}-->
+        <finalize output="result">data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters><!--{{{-->
+          <label>Step 2</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters><!--}}}-->
+        <finalize output="result">data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters><!--{{{-->
+          <label>Step 3</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters><!--}}}-->
+        <finalize output="result">data.x += "a3,"</finalize>
+      </call>
+    </description><!--}}}-->
+  </description>
+  <transformation>
+    <description type='copy'/>
+    <dataelements type='rest'/>
+    <endpoints type='rest'/>
+  </transformation>
+</testset>

data/server/resources/test2.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<testset>
+  <positions><!--{{{-->
+    <a1>after</a1>
+  </positions><!--}}}-->
+  <attributes>
+    <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Linear</info>
+    <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
+    <theme>default</theme>
+  </attributes>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <dataelements><!--{{{-->
+    <x/>
+  </dataelements><!--}}}-->
+  <handlers/>
+  <endpoints><!--{{{-->
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+  </endpoints><!--}}}-->
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0"><!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters><!--{{{-->
+          <label>Step 1</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters><!--}}}-->
+        <code>
+          <finalize output="result">data.x += "a1,"</finalize>
+        </code>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters><!--{{{-->
+          <label>Step 2</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters><!--}}}-->
+        <finalize output="result">data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters><!--{{{-->
+          <label>Step 3</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters><!--}}}-->
+        <finalize output="result">data.x += "a3,"</finalize>
+      </call>
+    </description><!--}}}-->
+  </description>
+  <transformation>
+    <description type='copy'/>
+    <dataelements type='rest'/>
+    <endpoints type='rest'/>
+  </transformation>
+</testset>

data/server/resources/transformation_dslx.xsl

@@ -49,18 +49,34 @@
       <xsl:text>, parameters: { </xsl:text>
       <xsl:apply-templates select="d:parameters"/>
       <xsl:text> }</xsl:text>
-      <xsl:if test="d:finalize and d:finalize/text()">
+      <xsl:if test="(d:finalize or d:code/d:finalize) and (d:finalize/text() or d:code/d:finalize/text())">
         <xsl:text>, finalize: &lt;&lt;-END</xsl:text>
       </xsl:if>
-      <xsl:if test="d:update and d:update/text()">
+      <xsl:if test="(d:update or d:code/d:update) and (d:update/text() or d:code/d:update/text())">
         <xsl:text>, update: &lt;&lt;-END</xsl:text>
       </xsl:if>
-      <xsl:apply-templates select="d:finalize" mode="part-of-call">
+      <xsl:if test="(d:prepare or d:code/d:prepare) and (d:prepare/text() or d:code/d:prepare/text())">
+        <xsl:text>, prepare: &lt;&lt;-END</xsl:text>
+      </xsl:if>
+      <xsl:if test="(d:rescue or d:code/d:rescue) and (d:rescue/text() or d:code/d:rescue/text())">
+        <xsl:text>, salvage: &lt;&lt;-END</xsl:text>
+      </xsl:if>
+      <xsl:apply-templates select="d:finalize | d:code/d:finalize" mode="part-of-call">
         <xsl:with-param name="myspace">
           <xsl:value-of select="$myspace"/>
         </xsl:with-param>
       </xsl:apply-templates>
-      <xsl:apply-templates select="d:update" mode="part-of-call">
+      <xsl:apply-templates select="d:update | d:code/d:update" mode="part-of-call">
+        <xsl:with-param name="myspace">
+          <xsl:value-of select="$myspace"/>
+        </xsl:with-param>
+      </xsl:apply-templates>
+      <xsl:apply-templates select="d:prepare | d:code/d:prepare" mode="part-of-call">
+        <xsl:with-param name="myspace">
+          <xsl:value-of select="$myspace"/>
+        </xsl:with-param>
+      </xsl:apply-templates>
+      <xsl:apply-templates select="d:rescue | d:code/d:rescue" mode="part-of-call">
         <xsl:with-param name="myspace">
           <xsl:value-of select="$myspace"/>
         </xsl:with-param>
@@ -390,7 +406,7 @@
         <xsl:value-of select="name()"/>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:text>, :value =&gt; </xsl:text>
+    <xsl:text>, :value =&gt; -&gt;{ </xsl:text>
     <xsl:choose>
       <xsl:when test="not(node())">
         <xsl:text>nil</xsl:text>
@@ -423,6 +439,7 @@
         </xsl:choose>
       </xsl:otherwise>
     </xsl:choose>
+    <xsl:text> }</xsl:text>
     <xsl:for-each select="@*">
       <xsl:text>, :</xsl:text>
       <xsl:value-of select="name()"/>
@@ -433,7 +450,7 @@
     <xsl:text>)</xsl:text>
   </xsl:template>
 
-  <xsl:template match="d:finalize | d:update" mode="part-of-call">
+  <xsl:template match="d:finalize | d:update | d:prepare | d:rescue" mode="part-of-call">
     <xsl:param name="myspace"/>
     <xsl:call-template name="print-content">
       <xsl:with-param name="myspace">
@@ -557,18 +574,18 @@
                 <xsl:value-of select="."/>
               </xsl:when>
               <xsl:otherwise>
-                <xsl:text>\"</xsl:text>
                 <xsl:choose>
                   <xsl:when test="substring(.,1,1) = '!'">
                     <xsl:text>#{</xsl:text>
                     <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\\\&quot;')"/>
-                    <xsl:text>}</xsl:text>
+                    <xsl:text>.to_json}</xsl:text>
                   </xsl:when>
                   <xsl:otherwise>
+                    <xsl:text>\"</xsl:text>
                     <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+                    <xsl:text>\"</xsl:text>
                   </xsl:otherwise>
                 </xsl:choose>
-                <xsl:text>\"</xsl:text>
               </xsl:otherwise>
             </xsl:choose>
           </xsl:when>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.4.32
+  version: 1.5.0
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2019-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -34,6 +34,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.99'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.99.76
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,6 +44,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.99'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.99.76
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +241,23 @@ files:
 - cockpit/themes/default/theme.js
 - cockpit/themes/extended/theme.js
 - cockpit/themes/packed/theme.js
+- cockpit/themes/preset/rngs/alternative.rng
+- cockpit/themes/preset/rngs/call.rng
+- cockpit/themes/preset/rngs/callmanipulate.rng
+- cockpit/themes/preset/rngs/choose.rng
+- cockpit/themes/preset/rngs/critical.rng
+- cockpit/themes/preset/rngs/escape.rng
+- cockpit/themes/preset/rngs/finalize.rng
+- cockpit/themes/preset/rngs/group.rng
+- cockpit/themes/preset/rngs/loop.rng
+- cockpit/themes/preset/rngs/manipulate.rng
+- cockpit/themes/preset/rngs/otherwise.rng
+- cockpit/themes/preset/rngs/parallel.rng
+- cockpit/themes/preset/rngs/parallel_branch.rng
+- cockpit/themes/preset/rngs/stop.rng
+- cockpit/themes/preset/rngs/terminate.rng
+- cockpit/themes/preset/rngs/update.rng
+- cockpit/themes/preset/theme.js
 - cockpit/track.html
 - contrib/Screenshot at 2011-09-28 02:38:11.png
 - contrib/logo2-small.png
@@ -296,6 +319,8 @@ files:
 - server/resources/properties.schema.active
 - server/resources/properties.schema.finished
 - server/resources/properties.schema.inactive
+- server/resources/test1.xml
+- server/resources/test2.xml
 - server/resources/topics.xml
 - server/resources/transformation.xml
 - server/resources/transformation_dslx.xsl
@@ -321,7 +346,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="