cpee 1.3.221 → 1.3.222

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c23db9cd13cd8f8fdfcdd918d389f58ca66024fd
-  data.tar.gz: 5676d9a8d659f96c1f63cddd723fe94c06c96d04
+  metadata.gz: f3cb661f17cc471a5d31bc342379814800f3b14c
+  data.tar.gz: 0350166c37455dcc58d739137bfdaf35dcd9858c
 SHA512:
-  metadata.gz: f2bc178e35aa0482f6485e2f13596390c00506e40c131f346998c17e5179ff4ac93fd7fc68eaad82eb0560fc02857c5ee41d3fad96000d636d1d58c680a3dc89
-  data.tar.gz: a9c21bed26e25f5f820dc8415b33aef41606f006d0f7e932d0a141a083743e5f423d81bf04e5782f3e5403abc9d32d7b5b564e025003e67a423ff566ea4a0cfc
+  metadata.gz: 4ebeee1e5d632161e6f0213d85a229c7f0e0f9802dcd4552ff47951e0680767c1710fc75703c24827f629959a7b7444e992556be0b5caab7865d9328a1fab363
+  data.tar.gz: 6deba5a57f9e189dcf7624acb0189407210de3ad80dfcd629a03265e8e88ac9e811782b85d89f9d12b6cf232b1d0df7d5996989bb896c00553a145e8ae173cd9

data/cockpit/js/details.js

@@ -1,7 +1,7 @@
 $(document).ready(function() {
   var timer;
 
-  $(document).on('input','#dat_details input, #dat_details textarea',function(e){
+  $(document).on('input','#dat_details input, #dat_details textarea, #dat_details [contenteditable]',function(e){
     clearTimeout(timer);
     timer = setTimeout(do_main_save, 5000);
   });
@@ -9,7 +9,7 @@ $(document).ready(function() {
     clearTimeout(timer);
     do_main_save();
   });
-  $(document).on('blur','#dat_details input, #dat_details textarea',function(e){
+  $(document).on('blur','#dat_details input, #dat_details textarea, #dat_details [contenteditable]',function(e){
     clearTimeout(timer);
     do_main_save();
   });

data/cpee.gemspec

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

@@ -3,15 +3,15 @@
 # This file is part of CPEE.
 #
 # Apache License, Version 2.0
-# 
+#
 # Copyright (c) 2013 Juergen Mangler
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@ module CPEE
           @start = nil
 
           doc = XML::Smart.string(xml)
-          doc.register_namespace 'bm',  "http://www.omg.org/spec/BPMN/20100524/MODEL" 
+          doc.register_namespace 'bm',  "http://www.omg.org/spec/BPMN/20100524/MODEL"
 
           @dataelements = {}
           @endpoints = {}
@@ -51,27 +51,27 @@ module CPEE
           @traces = Traces.new [[@start]]
         end #}}}
 
-        def extract_dataelements(doc)
+        def extract_dataelements(doc) #{{{
           doc.find("/bm:definitions/bm:process/bm:property[bm:dataState/@name='cpee:dataelement']").each do |ref|
             if ref.attributes['itemSubjectRef']
               doc.find("/bm:definitions/bm:itemDefinition[@id=\"" + ref.attributes['itemSubjectRef'] + "\"]").each do |sref|
                 @dataelements[ref.attributes['name']] = sref.attributes['structureRef'].to_s
-              end 
+              end
             else
               @dataelements[ref.attributes['name']] = ''
-            end  
+            end
           end
-        end
+        end #}}}
 
-        def extract_endpoints(doc)
+        def extract_endpoints(doc) #{{{
           doc.find("/bm:definitions/bm:process/bm:property[bm:dataState/@name='cpee:endpoint']/@itemSubjectRef").each do |ref|
             doc.find("/bm:definitions/bm:itemDefinition[@id=\"" + ref.value + "\"]/@structureRef").each do |sref|
               @endpoints[ref.value] = sref.value
-            end  
+            end
           end
-        end
+        end #}}}
 
-        def extract_nodelink(doc)
+        def extract_nodelink(doc) #{{{
           doc.find("/bm:definitions/bm:process/bm:*[@id and @name and not(@itemSubjectRef) and not(name()='sequenceFlow')]").each do |e|
             n = Node.new(self.object_id,e.attributes['id'],e.qname.name.to_sym,e.attributes['name'].strip,e.find('count(bm:incoming)'),e.find('count(bm:outgoing)'))
 
@@ -94,7 +94,7 @@ module CPEE
               value = a.attributes['itemSubjectRef']
               if @dataelements.keys.include?(value)
                 n.parameters[name] = 'data.' + value
-              else  
+              else
                 n.parameters[name] = value
               end
             end
@@ -127,9 +127,9 @@ module CPEE
               true
             else
               false
-            end  
+            end
           end
-        end
+        end #}}}
 
         def build_traces #{{{
           build_extraces @traces, @start
@@ -140,14 +140,14 @@ module CPEE
           debug_print debug, 'Tree finished'
           @tree
         end #}}}
-    
+
         def  build_extraces(traces, node) #{{{
           dupt = traces.last.dup
           @graph.next_nodes(node).each_with_index do |n,i|
             traces << dupt.dup if i > 0
             if traces.last.include?(n)
               traces.last << n
-            else  
+            else
               traces.last << n
               build_extraces(traces,n)
             end
@@ -199,12 +199,12 @@ module CPEE
                   if branch.condition?
                     branch.condition << li.condition unless li.condition.nil?
                     branch.condition_type = "text/javascript"
-                  end  
+                  end
                   if branch.respond_to?(:attributes)
-                    branch.attributes.merge!(li.attributes) 
+                    branch.attributes.merge!(li.attributes)
                     li.attributes.delete_if{true}
-                  end  
-                end  
+                  end
+                end
               end
               if node == enode
                 traces.shift_all
@@ -228,13 +228,17 @@ module CPEE
                   ### if there is non (tail controlled, remove the loop target (last)
                   if node.type == :exclusiveGateway
                     loops.shift_all
-                    traces.shift_all 
+                    traces.shift_all
                   else
                     loops.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, loops, nil, debug, down + 1
+                  if loops.same_first
+                    build_ttree branch.last.new_branch, loops, nil, debug, down + 1
+                  else
+                    build_ttree branch, loops, nil, debug, down + 1
+                  end
                   puts '--> up head_loop from ' + (down + 1).to_s if debug
                 else
                   ### throw away the loop traces, remove loop traces from front of all other traces
@@ -252,19 +256,20 @@ module CPEE
               puts "--> endnode #{endnode.nil? ? 'nil' : endnode.niceid}" if debug
               tracesgroup, endnode = traces.segment_by endnode
               tracesgroup.each do |trcs|
+                next unless branch.last.respond_to?(:new_branch)
                 nb = branch.last.new_branch
                 unless trcs.finished?
                   puts '--> branch down to ' + (down + 1).to_s if debug
                   build_ttree nb, trcs, endnode, debug, down + 1
                   puts '--> branch up from ' + (down + 1).to_s if debug
-                end  
+                end
               end
               # remove all traces that don't start with endnode to account for loops
               if endnode.nil?
                 traces.empty!
-              else  
+              else
                 traces.remove_by_endnode(endnode)
-              end  
+              end
             end
           end
         end
@@ -275,7 +280,7 @@ module CPEE
             puts '-' * @hl.output_cols, @tree.to_s
             puts traces.to_s
             @hl.ask('Continue ... '){ |q| q.echo = false }
-          end  
+          end
         end #}}}
         private :debug_print
 
@@ -283,7 +288,7 @@ module CPEE
           formater.new(@tree).generate
         end #}}}
 
-      end  
+      end
 
     end
 

data/lib/cpee/processtransformation/cpee.rb

@@ -47,7 +47,11 @@ module CPEE
             generate_for_list(node.sub[0],s1)
           else
             s1 = res.add('loop', 'mode' => 'pre_test', 'condition' => 'true')
-            print_Conditional(node,s1)
+            if node.sub.length == 1
+              generate_for_list(node.sub[0],s1)
+            else
+              print_Conditional(node,s1)
+            end
           end
           s1
         end

data/lib/cpee/processtransformation/structures.rb

@@ -3,15 +3,15 @@
 # This file is part of CPEE.
 #
 # Apache License, Version 2.0
-# 
+#
 # Copyright (c) 2013 Juergen Mangler
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,10 +33,10 @@ module CPEE
       end
       def length
         @sub.length
-      end  
+      end
     end #}}}
 
-    class Node #{{{ 
+    class Node #{{{
       include Container
       @@niceid = {}
       attr_reader :id, :label, :niceid
@@ -59,7 +59,7 @@ module CPEE
         @outgoing = outgoing
         @attributes = {}
       end
-    end # }}} 
+    end # }}}
     class Link #{{{
       attr_accessor :from, :to
       attr_reader :condition, :attributes
@@ -116,7 +116,7 @@ module CPEE
         @sub = []
         @condition_type = nil
         @attributes = {}
-      end  
+      end
       def new_branch
         (@sub << Alternative.new(@id)).last
       end
@@ -138,7 +138,7 @@ module CPEE
       def new_branch
         (@sub << Branch.new(@id)).last
       end
-    end #}}} 
+    end #}}}
 
     class Conditional #{{{
       include Container
@@ -155,7 +155,7 @@ module CPEE
         @mode = mode
         @type = type
         @attributes = {}
-      end  
+      end
       def new_branch
         (@sub << Alternative.new(@id)).last
       end
@@ -182,7 +182,7 @@ module CPEE
         selnodes.each do |n|
           if n.incoming > 1 || n.outgoing > 1
             raise "#{n.inspect} - not a simple node to remove"
-          end  
+          end
           to,from = nil
           @links.each do |f|
             to = f if f.to == n.id
@@ -194,7 +194,7 @@ module CPEE
             @nodes.delete(n.id)
           else
             raise "#{n.inspect} - could not remove flow"
-          end  
+          end
         end
       end
 
@@ -204,7 +204,7 @@ module CPEE
 
       def add_node(n)
         @nodes[n.id] = n
-      end  
+      end
 
       def link(f,t)
         @links.find{ |x| x.from == f && x.to == t }
@@ -224,7 +224,7 @@ module CPEE
           nodes.first
         else
           raise "#{from.inspect} - multiple outgoing connections"
-        end  
+        end
       end
     end #}}}
 
@@ -263,11 +263,11 @@ module CPEE
         def remove(trcs)
           trcs.each do |t|
             self.delete(t)
-          end  
+          end
         end
         def remove_by_endnode(enode)
           self.delete_if do |t|
-            t[0] != enode 
+            t[0] != enode
           end
         end
 
@@ -290,16 +290,27 @@ module CPEE
           self.min_by{|e|e.length}
         end
 
+        def legend
+          ret = "Legend:\n"
+          a = self.flatten.uniq
+          a.each {|n| ret << "  " +  n.niceid.to_s + ' ' + n.type.to_s + ' ' + n.label.to_s + "\n" }
+          ret
+        end
+
         def to_s
           "TRACES: " + self.collect { |t| t.empty? ? '∅' : t.collect{|n| "%2d" % n.niceid }.join('→ ') }.join("\n        ")
         end
 
         def shift_all
           self.each{ |tr| tr.shift }
-        end  
-        def pop_all
-          self.each{ |tr| tr.pop }
-        end  
+        end
+        def pop_all(what=nil)
+          if node.nil?
+            self.each{ |tr| tr.pop }
+          else
+            self.each{ |tr| tr.pop if tr.last == what }
+          end
+        end
 
         def finished?
           self.reduce(0){|sum,t| sum += t.length} == 0
@@ -314,13 +325,13 @@ module CPEE
           self.each do |t|
             break if t.length == 1
             tcount += 1 if t.last == node
-          end  
+          end
           tcount
         end
 
         def include_in_all?(e)
           num = 0
-          self.each{|n| num += 1 if n.include?(e)} 
+          self.each{|n| num += 1 if n.include?(e)}
           num == self.length
         end
 
@@ -339,7 +350,7 @@ module CPEE
             self.each do |t|
               t << tb unless t.last == t.first ### an explicit break
             end
-          end  
+          end
         end
 
         def loops
@@ -365,7 +376,7 @@ module CPEE
               if self[i][j] == self[i].last
                 loops << self[i].shift(self[i].length)
               end
-            end  
+            end
           end
           loops.uniq!
           loops.remove_empty
@@ -403,9 +414,9 @@ module CPEE
               if t.index(last) && t.index(max)
                 (t.index(last) + 1).upto(t.index(max)) do |i|
                   t << t[i]
-                end 
+                end
               end
-            end  
+            end
           end
 
           max
@@ -424,11 +435,11 @@ module CPEE
               if trcs.include_in_all?(n)
                 enode = n
                 break
-              end  
+              end
             end
-          end  
+          end
           enode
-        end  
+        end
 
         def segment_by(endnode)
           # cut shit until common node, return the shit you cut away

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.221
+  version: 1.3.222
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl