cpee 1.3.205 → 1.3.206

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f2a2070f0a700f8b43054cbd9fcaeed7d761591
-  data.tar.gz: 915c01fb5cfad310d2f51f208049513f40a0358b
+  metadata.gz: 7d487ede487ce7bf7fe2aa4d2f59549540eb9b0a
+  data.tar.gz: 3ca95fe9bd0b351529bdc9538b983b2d6f00dd73
 SHA512:
-  metadata.gz: c30cd2c5277e0c79fe03303ce3c1f90339aa0a38c9deef1637a4dd1e4ccc37d2f521af04d5056da3a7b1fd71f3e55dee1c0e38ff27a0e8199618044ef7579d35
-  data.tar.gz: 40d532eaa4bedf2bf39abf0acdb578f78e3815669e05d3161e664a6a560d15a7ec6eb5a60ea0970092934463721953e92f1fb9fe96f92cd62215448fb81fc014
+  metadata.gz: 362c25b3bc380f795d1d8c7817d2cb371947556e0cf953c12ff0ffd3ba8fb278f25e7697e7cb3f9c82d307215d4d2b933756160634f960390d341bb68c19baa8
+  data.tar.gz: 539140c12dc844c4186ec4a5cad599360b622d64ee2e4923d612b3ff40c40f5003b3b39bbb6160e4fa514410663fd46dec760ccc0b6f46d5a85bcbd770695afb

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.205"
+  s.version          = "1.3.206"
   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"

data/log/server.rb

@@ -39,7 +39,6 @@ class Logging < Riddl::Implementation #{{{
     activity = notification["activity"]
     parameters = notification['parameters']
     receiving = notification['received']
-    pp notification
     Dir.mkdir(log_dir+'/'+uuid) unless Dir.exist?(log_dir+'/'+uuid)
     time_added=false
     XML::Smart.modify(log_dir+'/'+uuid+'/log.xes',LOGTEMPLATE) do |xml|
@@ -59,23 +58,26 @@ class Logging < Riddl::Implementation #{{{
         else
           event.add 'string', :key => "lifecycle:transition", :value => "unknown"
         end
-        data_send = ((parameters[:arguments].nil? ? [] : parameters[:arguments]) rescue [])
+        data_send = ((parameters["arguments"].nil? ? [] : parameters["arguments"]) rescue [])
         if data_send && data_send.any?
           list = event.add 'list', :key => "data_send"
-          data_send.each do |k,v|
-            list.add 'string', :key => k , :value => v
+          data_send.each do |e|
+            list.add 'string', :key => e['name'] , :value => e['value']
           end
         end
         if receiving && receiving.any?
-          list = event.add 'list', :key => "data_received"
           if receiving.is_a? Array
             receiving.each do |e|
               e.each do |k,v|
                 case v['mimetype']
                   when /\/xml$/ 
+          					list = event.add 'list', :key => "data_received"
                     node = list.add 'string', :key => k
                     node.add XML::Smart.string(v['content']).root
+                  when /\/json$/
+                    rec_unjson(JSON.parse(v['content']),event,"data_received")
                   else
+          					list = event.add 'list', :key => "data_received"
                     list.add 'string', :key => k, :value => v['content']
                 end    
               end
@@ -91,6 +93,24 @@ class Logging < Riddl::Implementation #{{{
       end
     end
   end
+  
+	def rec_unjson(value,list,key)
+		case value
+			when Array then
+				li = list.add 'list', :key => key
+				value.each_with_index do |v,k|
+					rec_unjson(v,li,k)
+				end
+			when Hash then
+				li = list.add 'list', :key => key
+				value.each do |k,v|
+					rec_unjson(v,li,k)
+				end
+			else
+				list.add 'string', :key => key, :value => value
+		end
+	end
+
   def response
     topic = @p[1].value
     event_name = @p[2].value

data/server/resources/transformation_dslx.xsl

@@ -339,11 +339,16 @@
     <xsl:text> =&gt; </xsl:text>
 
     <xsl:choose>
-      <xsl:when test="count(*) &gt; 0">
+      <xsl:when test="count(*) &gt; 0 and name()='arguments'">
         <xsl:text>[</xsl:text>
         <xsl:apply-templates select="d:*" mode="sub"/>
         <xsl:text>]</xsl:text>
       </xsl:when>
+      <xsl:when test="count(*) &gt; 0 and not(name()='arguments')">
+        <xsl:text>{</xsl:text>
+        <xsl:apply-templates select="d:*" mode="parameter"/>
+        <xsl:text>}</xsl:text>
+      </xsl:when>
       <xsl:when test="not(node())">
         <xsl:text>nil</xsl:text>
       </xsl:when>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.205
+  version: 1.3.206
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl