cpee-logging-xes-yaml 1.3.13 → 1.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5006bd8583bbc97375b4cf1ea8c244cf9557737b4aa7ecf8498fef79d2e613a1
-  data.tar.gz: edf2cd9d644b5db644c7fbb3bffb9c6717e1d9daece275046a4724fdde83c4e1
+  metadata.gz: 57268eb5b34557dd4f6d496033c026965be162de70f9bd76197b5299bf681c3e
+  data.tar.gz: 795924403cc65799cc01cd2f5522757aecb9ab43d3447409545fd6c4776476e0
 SHA512:
-  metadata.gz: 35d541adde0c9a67e917304e3e8ee29db3cda9b6e15e6d3017ee73219503a98f7c49739ad6347330492a886fb40b10cc4ff082acac0802fb740ee849d90390ef
-  data.tar.gz: 6c9c08d88a95cc5490ae2d396d774dcde2994c9ed765267c60e361f9f249b4971608362a30d9223019521d836bb8583e9f6c0789be5c8f2fc7a371b39a68506b
+  metadata.gz: 642455b3f54dc1f8f7298f0fe4030287efca8cc97a2d56b6c3109919d0ba87580f05f98b19e0bc2d808ba981601ace0aec361b192c9da233b429c46ad096c750
+  data.tar.gz: b83200a4293de12b50763727df58d977662c08cb1ce6ccc898663b40c7eb553163131371523b876591c91384f0c741069549381c32c134e6bbf569a56c323f3c

data/cpee-logging-xes-yaml.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-logging-xes-yaml"
-  s.version          = "1.3.13"
+  s.version          = "1.3.15"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Logging for the cloud process execution engine (cpee.org)"

data/lib/cpee-logging-xes-yaml/tools.rb

@@ -348,7 +348,7 @@ module CPEE
       if receiving && !receiving.empty?
         event["data"] = receiving
       end
-      event["time:timestamp"]= notification['timestamp'] || Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z")
+      event["time:timestamp"]= notification['timestamp'] || Time.now.xmlschema(4)
       File.open(File.join(log_dir,instance+'.xes.yaml'),'a') do |f|
         f << {'event' => event}.to_yaml
       end

data/tools/cpee-logging-xes-yaml

@@ -113,7 +113,7 @@ def rec_insert(event,node,level=0)
         tnode = node.add('x:list', 'key' => k)
         rec_a_insert(v,tnode,level+1)
       when Hash
-        tnode = node.add('x:string', 'key' => k)
+        tnode = node.add('x:list', 'key' => k)
         rec_insert(v,tnode)
     end
   end
@@ -134,7 +134,7 @@ def follow(fname,io,copy,deep=0,index=nil)
       index.write " " * deep + name + " (#{tname}) - #{e.dig('log','trace','concept:name')}\n"
     end
     if e.dig('event','cpee:lifecycle:transition') == 'task/instantiation'
-      base = e.dig('event','raw')
+      base = e.dig('event','data')
       val = base.dig('CPEE-INSTANCE') rescue nil
       if val.nil?
         val = File.basename(base)
@@ -195,14 +195,14 @@ def extract(path)
   info = yaml.shift
   uuid = info.dig('log','trace','cpee:instance')
   yaml.each do |el|
-    if el['event']['id:id'] == 'external' && (el.dig('event','cpee:lifecycle:transition') == 'endpoints/change' || el.dig('event','cpee:lifecycle:transition') == 'dataelements/change'|| el.dig('event','cpee:lifecycle:transition') == 'description/change')
+    if el['event']['id:id'] == 'external' && (el.dig('event','cpee:lifecycle:transition') == 'endpoints/change' || el.dig('event','cpee:lifecycle:transition') == 'attributes/change' || el.dig('event','cpee:lifecycle:transition') == 'dataelements/change'|| el.dig('event','cpee:lifecycle:transition') == 'description/change')
       changes.push(el)
     end
   end
 
   changes.sort! { |a,b| DateTime.strptime(a.dig('event','time:timestamp'),'%Y-%m-%dT%H:%M:%S.%L%:z') <=> DateTime.strptime(b.dig('event','time:timestamp'),'%Y-%m-%dT%H:%M:%S.%L%:z') }
 
-  de = ep = desc = nil
+  de = ep = desc = at = nil
   counter = 0
   changes.each do |change|
     if change.dig('event','cpee:lifecycle:transition') == 'dataelements/change'
@@ -211,11 +211,14 @@ def extract(path)
     if change.dig('event','cpee:lifecycle:transition') == 'endpoints/change'
       ep = change.dig('event','data')
     end
+    if change.dig('event','cpee:lifecycle:transition') == 'attributes/change'
+      at = change.dig('event','data')
+    end
     if change.dig('event','cpee:lifecycle:transition') == 'description/change'
       desc = change.dig('event','cpee:description')
     end
     if change.dig('event','cpee:lifecycle:transition') == 'description/change' || change.dig('event','cpee:lifecycle:transition') == 'endpoints/change'
-      yield uuid, de, ep, desc, counter if block_given?
+      yield uuid, de, ep, desc, at, counter if block_given?
       counter += 1
     end
   end
@@ -223,10 +226,11 @@ def extract(path)
   text.close
   text.unlink if unlink
 
-  [de, ep, desc]
+  [de, ep, desc, at]
 end
 
 exname = File.basename($0)
+attr = {}
 
 ARGV.options { |opt|
   opt.summary_indent = ' ' * 2
@@ -234,6 +238,7 @@ ARGV.options { |opt|
   opt.banner = "Usage:\n#{opt.summary_indent}#{exname} new [DIR] | view [URI] | copy [URI]\n"
   opt.on("Options:")
   opt.on("--help", "-h", "This text") { puts opt; exit }
+  opt.on("--add [STRING]", "-a [STRING]", "Add attribute for extract-all and extract-last. Example: -a 'filter=me'") { |a| x,y = a.split('='); attr[x] = y }
 	opt.on("")
   opt.on(wrap("\"#{exname}\" will be call \"c\" in the examples for each command."))
   exname = 'c'
@@ -260,7 +265,7 @@ if (ARGV.length < 1 || ARGV.length > 2)
 elsif ARGV.length == 2
   command = ARGV[0]
   path = ARGV[1]
-elsif ARGV.length == 1 && %w{index extract-last to-xes-xml}.include?(ARGV[0])
+elsif (ARGV.length == 1 || ARGV.length == 2) && %w{index extract-last to-xes-xml}.include?(ARGV[0])
   command = ARGV[0]
 end
 
@@ -276,7 +281,7 @@ elsif command == 'view'
 elsif command == 'copy'
   react path, true
 elsif command == 'extract-all'
-  extract(path) do |uuid, de, ep, desc, version|
+  extract(path) do |uuid, de, ep, desc, at, version|
     xml = XML::Smart.string('<testset xmlns="http://cpee.org/ns/properties/2.0"><executionhandler>ruby</executionhandler></testset>')
     dataelements = xml.root().add('dataelements')
     endpoints = xml.root().add('endpoints')
@@ -291,6 +296,11 @@ elsif command == 'extract-all'
         endpoints.add(e['name'],e['value'])
       end
     end
+    unless at.nil?
+      at.each do |e|
+        attributes.add(e['name'],e['value'])
+      end
+    end
     unless desc.nil?
       description.replace_by(XML::Smart.string(desc).root())
     end
@@ -307,12 +317,13 @@ elsif command == 'extract-last'
   end
 
   path.each do |f|
-    de, ep, desc = extract(f)
+    de, ep, desc, at = extract(f)
 
     xml = XML::Smart.string('<testset xmlns="http://cpee.org/ns/properties/2.0"><executionhandler>ruby</executionhandler></testset>')
     dataelements = xml.root().add('dataelements')
     endpoints = xml.root().add('endpoints')
     description = xml.root().add('description').add(XML::Smart.string('<description xmlns="http://cpee.org/ns/description/1.0"/>').root())
+    attributes = xml.root().add('attributes')
     unless de.nil?
       de.each do |d|
         dataelements.add(d['name'],d['value'])
@@ -326,6 +337,16 @@ elsif command == 'extract-last'
     unless desc.nil?
       description.replace_by(XML::Smart.string(desc).root())
     end
+    unless at.nil?
+      attr.each do |k,v|
+        attributes.add(k,v)
+      end
+      at.each do |e|
+        unless attr.keys.include? e['name']
+          attributes.add(e['name'],e['value'])
+        end
+      end
+    end
 
     File.write(f + '.model', xml.to_s)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-logging-xes-yaml
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.3.15
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Logging for the cloud process execution engine (cpee.org)