cpee 1.4.21 → 1.4.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 353a2b794638ff548e66e80c3e3f07156f2950418e1235a15227218ad8ef3865
-  data.tar.gz: 213780c132273b1db52b734ff9d0f591a5beaa82fa0e26b891086af335acd827
+  metadata.gz: c0684d7e7afade30d9f451dd8a32839d98d3be45ba7fcf3f901ee61646daf04b
+  data.tar.gz: edb98cf9fddb0d88ccc29879ad83668c4cdb95684f4d02901cfb5f23209145eb
 SHA512:
-  metadata.gz: c5479c3f260fc5371bda1f6c813144020d08d76698faf74a10319b836760405df9a38553c3d00a6243de8b0944a66c0f29cf39933d692b2a6ef5622c3160f5aa
-  data.tar.gz: dbf3338aec98924ae690c524b3b7ec59a5cca2125a640b8396eec0632a8c84123f4d310be9c97099fb498b21fb18e43b31538861438cb34fbd71f432c6a8076a
+  metadata.gz: 13cb10d326b707afbcb43721bcb044ad1a66dd7ba1e9fce8fc36e19a8d0f94092d6d6b8604fdc22d20bdbab94f42848db7c697f81a9e11b8d828e0018f1659f2
+  data.tar.gz: 8bd78ae132f025df061ecfa1417a1e918ccb411b60b3c54d8155fd3ca21b186bb09c2160112ac7f4cc356096c5153491412d580288e5c20426cdb1d64efcf816

data/cockpit/css/wfadaptor.css

@@ -41,6 +41,15 @@ svg g.vote .rfill {
   fill: #8ae234;
   fill-opacity:1;
 }
+svg g.passive .rline {
+  stroke: #729fcf;
+}
+svg g.active .rline {
+  stroke: #ef2929;
+}
+svg g.vote .rline {
+  stroke: #8ae234;
+}
 
 svg .rfill.menu {
   fill: #ff7f7f;
@@ -70,18 +79,18 @@ svg .stand {
   fill:#ffffff;
   fill-opacity:1;
   stroke:#000000;
-  stroke-width:2.06896567;
+  stroke-width:1.6;
   stroke-linecap:round;
   stroke-linejoin:round;
   stroke-miterlimit:4;
   stroke-opacity:1;
   stroke-dasharray:none;
 }
-svg .standthin {
+svg .standfat {
   fill:#ffffff;
   fill-opacity:1;
   stroke:#000000;
-  stroke-width:1.7;
+  stroke-width:3;
   stroke-linecap:round;
   stroke-linejoin:round;
   stroke-miterlimit:4;
@@ -103,7 +112,7 @@ svg .white {
   fill:#000000;
   fill-opacity:1;
   stroke:#ffffff;
-  stroke-width:2.06896567;
+  stroke-width:1.6;
   stroke-linecap:round;
   stroke-linejoin:round;
   stroke-miterlimit:4;
@@ -114,7 +123,7 @@ svg .black {
   fill:#000000;
   fill-opacity:1;
   stroke:#000000;
-  stroke-width:2.06896567;
+  stroke-width: 1.6;
   stroke-linecap:round;
   stroke-linejoin:round;
   stroke-miterlimit:4;
@@ -139,7 +148,6 @@ svg .marked .cfill {
 }
 svg .marked .cline {
   stroke:#d4d4d4;
-  stroke-width:2.06896567;
   stroke-linecap:round;
   stroke-linejoin:round;
   stroke-miterlimit:4;
@@ -164,7 +172,6 @@ svg .clicked .cfill {
 }
 svg .clicked .cline {
   stroke:#f57900;
-  stroke-width:2.06896567;
   stroke-linecap:round;
   stroke-linejoin:round;
   stroke-miterlimit:4;
@@ -176,7 +183,7 @@ svg .unknown {
   fill:#FF0000;
   fill-opacity:1;
   stroke:#000000;
-  stroke-width:2.06896567;
+  stroke-width:1.6;
   stroke-linecap:round;
   stroke-linejoin:round;
   stroke-miterlimit:4;
@@ -189,7 +196,7 @@ svg .gen {
   fill-opacity:1;
   stroke-opacity:0.7;
   stroke:#000000;
-  stroke-width:2.06896567;
+  stroke-width:1.6;
   stroke-linecap:round;
   stroke-linejoin:round;
   stroke-miterlimit:4;
@@ -333,7 +340,6 @@ svg g.element[element-id]:hover .hline {
   fill:#f57900;
   fill-opacity:1;
   stroke:#f57900;
-  stroke-width:2.06896567;
   stroke-linecap:round;
   stroke-linejoin:round;
   stroke-miterlimit:4;
@@ -370,7 +376,6 @@ svg g.element[element-id]:hover .cfill {
 }
 svg g.element[element-id]:hover .cline {
   stroke:#000000;
-  stroke-width:2.06896567;
   stroke-linecap:round;
   stroke-linejoin:round;
   stroke-miterlimit:4;

data/cockpit/themes/default/symbols/terminate.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="stand"/>
+  <circle cx="15" cy="15" r="14" class="standfat"/>
   <circle cx="15" cy="15" r="9" class="black"/>
 </svg>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.4.21"
+  s.version          = "1.4.23"
   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/sic.rb

@@ -13,8 +13,8 @@ def follow(fname,io,deep=0)
     if name = e.dig('log','trace','cpee:name')
       puts " " * deep + name + " (#{File.basename(fname,'.xes.yaml')}) - #{e.dig('log','trace','concept:name')}"
     end
-    if e.dig('event','concept:endpoint') == 'https://centurio.work/flow/start/url/' && e.dig('event','cpee:lifecycle:transition') == 'activity/receiving'
-      base = e.dig('event','list','data_receiver',0,'data')
+    if e.dig('event','concept:endpoint') == 'https://centurio.work/flow/start/url/' && e.dig('event','cpee:lifecycle:transition') == 'task/instantiation'
+      base = e.dig('event','data','data_receiver')
       val = base.dig('CPEE-INSTANCE') rescue nil
       if val.nil?
         val = File.basename(base)
@@ -26,15 +26,15 @@ def follow(fname,io,deep=0)
           uuid = XML::Smart.string(res.body).find('string(/*)')
         end
       end
-      next unless ((base.dig('CPEE-STATE') == 'running' || (base.dig('CPEE-FORKED') == 'true')) rescue true)
-
       react File.dirname(fname) + "/#{uuid}.xes.yaml",deep + 2
     end
   end
 end
 
 def react(name,deep=0)
-  if name =~ /^https?:\/\//
+  if name.nil?
+    help
+  elsif name =~ /^https?:\/\//
     res = Typhoeus.get(name)
     if res.success?
       file = Tempfile.new('sic')
@@ -46,6 +46,8 @@ def react(name,deep=0)
     end
   elsif File.exists? name
     follow name, File.open(name), deep
+  else
+    help
   end
 end
 

data/log/xes_yaml.rb

@@ -30,7 +30,7 @@ class Logging < Riddl::Implementation #{{{
     event["id:id"] = (activity.nil? || activity == "") ? 'external' : activity
     event["cpee:uuid"] = notification['instance_uuid'] if notification["instance_uuid"]
     case event_name
-      when 'receiving', 'change'
+      when 'receiving', 'change', 'instantiation'
         event["lifecycle:transition"] = "unknown"
       when 'done'
         event["lifecycle:transition"] = "complete"

data/server/handlerwrappers/default.rb

@@ -57,7 +57,11 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
         if s.respond_to?(:mimetype)
           params <<  Riddl::Parameter::Complex.new(s.name.to_s,v.mimetype,v.value)
         else
-          params <<  Riddl::Parameter::Simple.new(s.name.to_s,CPEE::ValueHelper::generate(s.value))
+          if s.name.to_s =~ /__$/
+            params <<  Riddl::Parameter::Simple.new(s.name.to_s.chop.chop,CPEE::ValueHelper::generate(s.value),:query)
+          else
+            params <<  Riddl::Parameter::Simple.new(s.name.to_s,CPEE::ValueHelper::generate(s.value))
+          end
         end
       end
 
@@ -73,24 +77,25 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
         params << Riddl::Header.new("CPEE-ATTR-#{key.to_s.gsub(/_/,'-')}",value)
       end
 
-      type = if @handler_endpoint.sub!(/^http(s)?-(get|put|post|delete):/,'http\\1:')
-        $2
-      else
-        parameters[:method] || 'post'
-      end
-      client = Riddl::Client.new(@handler_endpoint)
+      tendpoint = @handler_endpoint.sub(/^http(s)?-(get|put|post|delete):/,'http\\1:')
+      type = $2 || parameters[:method] || 'post'
+
+      client = Riddl::Client.new(tendpoint)
 
       @controller.callbacks[callback] = CPEE::Callback.new("callback activity: #{@handler_position}",self,:callback,nil,nil,:http)
       @handler_passthrough = callback
 
       status, result, headers = client.request type => params
 
-      raise "Could not #{parameters[:method] || 'post'} #{@handler_endpoint} - status: #{status}: #{result&.dig(0)&.value&.read}" if status < 200 || status >= 300
+      raise "Could not #{type || 'post'} #{tendpoint} - status: #{status}: #{result&.dig(0)&.value&.read}" if status < 200 || status >= 300
 
       if headers['CPEE_INSTANTIATION']
         @controller.notify("task/instantiation", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
       end
-      unless headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true'
+      if headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.any?
+        headers['CPEE_UPDATE'] = true
+        callback result, headers
+      else
         callback result
       end
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.4.21
+  version: 1.4.23
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-02-19 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -328,7 +328,6 @@ files:
 - log/trace.yaml
 - log/trace_sic.yaml
 - log/xes_xml.rb
-- log/xes_yaml.pid
 - log/xes_yaml.rb
 - server/dev.rb
 - server/handlerwrappers/default.rb

data/log/xes_yaml.pid

@@ -1 +0,0 @@
-7611