cpee 1.3.107 → 1.3.108

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6d2ef5c20ab5c4b9832ca3a64ac93cd5bedbd65
-  data.tar.gz: 256f9915882374a897e2a308ddcc94f409745f00
+  metadata.gz: c46a89bd19fce13c4e6c2820da06ae9405fb3e4f
+  data.tar.gz: 87d8d8a89a1222afddce25a28e71eda6d201a1c9
 SHA512:
-  metadata.gz: 920c40d108efd8f7c12f7aac2ac4f2412b93155d667b53f11d3c59b17ec15c317e703ee5e8b159007beba4d2dc11dc11652b5f8f1f319cc709f216cdf5c1cda7
-  data.tar.gz: 78944ec5a60ec0db95eb4ae0f46eb267af2962a37033c6335e80f8fa1913e3be93383a72e9873b4f025e23d1f36878634759335487fdfec634106518c0911189
+  metadata.gz: a7180af5aab98cedd7af9f27ce6e442675d00573298f0a15d6dfc048e9805bd49b2037bc7ced33d23e9c51bf80e97f5d414eb7c06c23ffdd5fc342786dd83fec
+  data.tar.gz: 17498fa4071644b486c16974346e4da87d307649f2dfbf5701e44ad3649a1b2f449b0c9de45bda839d268911c3e87adb91f92da342c3d2411bf0c4e8ce274bd6

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.107"
+  s.version          = "1.3.108"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   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"

data/server/handlerwrappers/default.rb

@@ -29,12 +29,8 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     if passthrough.nil?
       params = []
       callback = Digest::MD5.hexdigest(Kernel::rand().to_s)
-      (parameters[:parameters] || {}).each do |h|
-        if h.class == Hash
-          h.each do |k,v|
-            params <<  Riddl::Parameter::Simple.new("#{k}",CPEE::ValueHelper::generate(v))
-          end
-        end
+      (parameters[:parameters] || {}).each do |k,v|
+        params <<  Riddl::Parameter::Simple.new("#{k}",CPEE::ValueHelper::generate(v))
       end
       params << Riddl::Header.new("CPEE_BASE",@url)
       params << Riddl::Header.new("CPEE_INSTANCE","#{@url}/#{@controller.id}")
@@ -42,6 +38,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
       type = parameters[:method] || 'post'
       client = Riddl::Client.new(@handler_endpoint)
+
       status, result, headers = client.request type => params
       raise "Could not #{parameters[:method] || 'post'} #{@handler_endpoint}" if status != 200
 
@@ -127,7 +124,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   def vote_sync_after # {{{
     @controller.call_vote("running/syncing_after", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :activity => @handler_position)
   end # }}}
-  def vote_sync_before # {{{
+  def vote_sync_before(parameters=nil) # {{{
     @controller.call_vote("running/syncing_before", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :activity => @handler_position)
   end # }}}
 

data/server/resources/transformation_dslx.xsl

@@ -28,7 +28,9 @@
     <xsl:if test="name()='call'">
       <xsl:text>, :</xsl:text>
       <xsl:value-of select="@endpoint"/>
+      <xsl:text>, { </xsl:text>
       <xsl:apply-templates select="d:parameters"/>
+      <xsl:text> }</xsl:text>
       <xsl:apply-templates select="d:manipulate" mode="part-of-call">
         <xsl:with-param name="myspace"><xsl:value-of select="$myspace"/></xsl:with-param>
       </xsl:apply-templates>
@@ -192,14 +194,21 @@
   </xsl:template>
     
   <xsl:template match="d:*" mode="parameter">
-    <xsl:text>, :</xsl:text>
+    <xsl:choose>
+      <xsl:when test="position() = 1">
+        <xsl:text>:</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>, :</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>  
     <xsl:value-of select="name()"/>
     <xsl:text> => </xsl:text>
     <xsl:choose>  
       <xsl:when test="count(*) > 0">
-        <xsl:text>[</xsl:text>
+        <xsl:text>{</xsl:text>
         <xsl:apply-templates select="d:*" mode="sub-parameter"/>
-        <xsl:text>]</xsl:text>
+        <xsl:text>}</xsl:text>
       </xsl:when>
       <xsl:otherwise>
         <xsl:choose>
@@ -217,11 +226,10 @@
   </xsl:template>
   
   <xsl:template match="d:*" mode="sub-parameter">
-    <xsl:text> { :</xsl:text>
+    <xsl:text> :</xsl:text>
     <xsl:value-of select="name()"/>
     <xsl:text> => </xsl:text>
     <xsl:value-of select="text()"/>
-    <xsl:text> }</xsl:text>
     <xsl:choose>  
       <xsl:when test="generate-id(.) = generate-id(../*[last()])">
         <xsl:text> </xsl:text>
@@ -252,7 +260,7 @@
           </xsl:if>
         </xsl:when>  
         <xsl:otherwise>
-          <xsl:text> &lt;&lt;-end </xsl:text>
+          <xsl:text>, &lt;&lt;-end </xsl:text>
         </xsl:otherwise>
       </xsl:choose>
       <xsl:call-template name="print-newline"/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.107
+  version: 1.3.108
 platform: ruby
 authors:
 - Juergen eTM Mangler