cpee 1.3.144 → 1.3.145

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cffac3d4e0607675b23907910c211c76a29b1ae
-  data.tar.gz: 9e949dc935780024c373dfc883e6e80c8d6ce5a9
+  metadata.gz: c0dc2529d07f9ef3df654dfae91aef2117c31ae8
+  data.tar.gz: bc9b63fe537ecdffc405bef7110a03abbe594f79
 SHA512:
-  metadata.gz: 8b818353394a20d689bdf8e90d797998ed4b18182c27e848d99b07cf3f925420660046a8a951355e5fd6cb8a9ce21d6c6603580d1ebaeaf9b9b4e520794a5e48
-  data.tar.gz: adf6f532ee81e10f3258b153a0a4c8d56b6f70fe5410582ae62ea9a05cc3c844213c5c57587a82d6b4d1777e1d00af5684b3186674d8e447b9478ae07c8c76fc
+  metadata.gz: 687d6010942222aa7379df176ba8cbc7c38b3e3cd96f9b5b278508d72a04d0ed2dcab526dd096b1e89788f07b2577fec15d392cb89141f1dbaf0c2baf0e2144d
+  data.tar.gz: cd4a7c0a21011d36afe6d4b1b45904453cc24e04a4d69272ba5acb9e339366f5bd30f763ed44bc808c9d8af3c5f51ed045f72ff388b03c4d08f9d7367fc4b213

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.144"
+  s.version          = "1.3.145"
   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/lib/cpee/processtransformation/bpmn2.rb

@@ -184,10 +184,16 @@ module CPEE
             debug_print debug, traces
             if node = traces.same_first
               if branch.condition? && branch.empty?
-                li = @graph.link(branch.id,traces.first_node.id)
+                li = if (branch.id == traces.first_node.id)
+                  ### for tail controlled loops
+                  @graph.link(branch.id,traces.second_nodes.first.id)
+                else
+                  @graph.link(branch.id,traces.first_node.id)
+                end
                 unless li.nil?
                   branch.condition << li.condition unless li.condition.nil?
                   branch.condition_type = "text/javascript"
+                  branch.attributes.merge!(li.attributes)
                 end  
               end
               if node == enode
@@ -205,18 +211,18 @@ module CPEE
                   if node.incoming == 2
                     node.incoming = 1
                     branch << Loop.new(node.id)
-                    ### remove the gateway itself, as for a single loop it is no longer used.
-                    ### the condition will the loop condition
                     if traces.all_loops?
+                      ### if all loops, tail loop thus remove the loopback
                       loops.pop_all
                     else
+                      ### remove the gateway itself, as for a single loop it is no longer used.
                       traces.shift_all
                     end
                     puts '--> down to ' + (down + 1).to_s if debug
                     loops.remove_empty
                     puts '--> up from ' + down.to_s if debug
                     build_ttree branch.last, loops.dup, nil, debug, down + 1
-                  else  
+                  else
                     ### dont remove it, treat it as a normal conditional
                     ### an infinite loop that can only be left by break is created
                     node.incoming = 1
@@ -243,17 +249,18 @@ module CPEE
               end
             else
               endnode = traces.find_endnode || enode
+              puts "--> endnode #{endnode.nil? ? 'nil' : endnode.niceid}" if debug
               tracesgroup, endnode = traces.segment_by endnode
               tracesgroup.each do |trcs|
                 nb = branch.last.new_branch
                 if trcs.finished?
-                  puts '--> down to ' + (down + 1).to_s if debug
+                  puts '--> branch down to ' + (down + 1).to_s if debug
                   build_ttree nb, Traces.new([[Break.new(1)]]), endnode, debug, down + 1
-                  puts '--> up from ' + down.to_s if debug
+                  puts '--> branch up from ' + down.to_s if debug
                 else  
-                  puts '--> down to ' + (down + 1).to_s if debug
+                  puts '--> branch down to ' + (down + 1).to_s if debug
                   build_ttree nb, trcs, endnode, debug, down + 1
-                  puts '--> up from ' + down.to_s if debug
+                  puts '--> branch up from ' + down.to_s if debug
                 end  
                 endnode.incoming -= 1 unless endnode.nil?
               end

data/lib/cpee/processtransformation/cpee.rb

@@ -54,6 +54,9 @@ module CPEE
         def print_Loop_default(node,res)
           s1 = res.add('loop', 'pre_test' => node.condition.empty? ? 'true' : node.condition.join(' && '))
           s1.attributes['language'] = node.condition_type unless node.condition_type.nil?
+          node.attributes.each do |k,v|
+            s1.attributes[k] = v
+          end  
           generate_for_list(node,s1)
           s1
         end
@@ -109,6 +112,9 @@ module CPEE
             else
               s1.add('d:otherwise')
             end  
+            branch.attributes.each do |k,v|
+              s2.attributes[k] = v
+            end  
             generate_for_list(branch,s2)
           end
           if (x = s1.find('d:otherwise')).any?

data/lib/cpee/processtransformation/structures.rb

@@ -81,13 +81,14 @@ module CPEE
     class Alternative < Array #{{{
       include Container
       attr_accessor :condition, :condition_type
-      attr_reader :id
+      attr_reader :id, :attributes
       def condition?; true; end
       def initialize(id)
         @container = true
         @id = id
         @condition = []
         @condition_type = nil
+        @attributes = {}
       end
     end #}}}
     class Branch < Array #{{{
@@ -414,7 +415,7 @@ module CPEE
         def find_endnode
           # supress loops
           trcs = self.dup
-          trcs.delete_if { |t| t.uniq.length < t.length }
+          # trcs.delete_if { |t| t.uniq.length < t.length }
 
           # find common node (except loops)
           enode = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.144
+  version: 1.3.145
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl