cpee 1.3.160 → 1.3.161

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1db33f357360202a3eebfe4f375eb149fc5e6d1f
-  data.tar.gz: 83c7b07ca81a93a19d2d4062582728ef1dbc4a29
+  metadata.gz: 6ef65374496115f24fd4a4fdb02bc42c3055b814
+  data.tar.gz: a2f11dc883cd25ee613ccb62a86250abe3b7e685
 SHA512:
-  metadata.gz: 0e16f74611ae052df0e6e2b79cdbc8c4e82cb588839ac132b062610c71476bb816fedc0c789fbb23362803c81b1e489301d434294c8b577def9d7cda66037faf
-  data.tar.gz: 8d734498c1a896361ee8150d7cfb728001df38e032368ae7b03197cb1cd688e5d0c99a8fe840b4ec7f31a57cd46b37e08271c1eb82cf047784fce8cedead5f10
+  metadata.gz: 6e23286343b0e21ad4d236b3eb07a3a411bad2b868f4a413881959aefc90b292b291b2be0dcbedcc828b67485afe662d766c9001de8dff248bebf89191682a5c
+  data.tar.gz: d75b21cf9dfd7628ecab3786ec6c4c10c543da136f0347d8193726da9e7e7ed49b969973e9b96051d0fb7f2ddae1683f60c923591074c0d93a59d4003cb9af6c

data/cpee.gemspec

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

@@ -223,14 +223,20 @@ module CPEE
                   ### duplicate because we need it later to remove all the shit from traces
                   lops = loops.dup
                   ### remove the exclusive gateway because we no longer need it
-                  lops.add_breaks(self.object_id)
-                  lops.shift_all
+                  unless traces.all_loops?
+                    lops.add_breaks(self.object_id,node.type == :exclusiveGateway)
+                  end  
+                  traces.remove(loops)
+                  if node.type == :exclusiveGateway
+                    lops.shift_all
+                    traces.shift_all 
+                  else
+                    lops.pop_all
+                  end
                   ### add the blank conditional to get a break
                   puts '--> down head_loop to ' + (down + 1).to_s if debug
                   build_ttree branch, lops, nil, debug, down + 1
                   puts '--> up head_loop from ' + (down + 1).to_s if debug
-                  traces.remove(loops)
-                  traces.shift_all
                 else
                   ### throw away the loop traces, remove loop traces from front of all other traces
                   traces.segment_by_loops loops

data/lib/cpee/processtransformation/structures.rb

@@ -337,11 +337,11 @@ module CPEE
           num == self.length
         end
 
-        def add_breaks(context)
+        def add_breaks(context,front=true)
           trueloops = self.find_all{ |t| t.last == t.first }.length
           tb = Break.new(context)
           if trueloops == self.length
-            self << [nil,tb]
+            self << (front ? [nil,tb] : [tb,nil])
           else
             self.each do |t|
               t << tb unless t.last == t.first ### an explicit break

metadata

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