cpee-logging-xes-yaml 1.3.7 → 1.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5aae51b9195c2048f4aa6bffe2e166ff929ff769060b17abd40fbe05e8c360f2
-  data.tar.gz: 9f1f40663b2f867e9d5663f1b1205c03af5357f072aaee202d46a3222e84591d
+  metadata.gz: eef13eff4942a9f42979d5cf9f6bcd6b18138e45f430b2d0eaf314261552875f
+  data.tar.gz: f38d433ce4c2d03ebd6e3c5ad70067a02855ac4ad05a82390ed559f23d66afc5
 SHA512:
-  metadata.gz: 204d3006b767ca4a40adf8076f63f6c176fbc054c22eb3599f1e929210f8e150f060aee7dda49853b5bd02fac5ae7f32f796037f0a2b2ba72ff5caed3f61ce0c
-  data.tar.gz: 5e6557309512c4e1ab3159ac79dc232308163f70a74b8693712da02edbfda67cc8294fc2a89f3b86c75fee4684c3f848bf165a12201bd67dad871c3cf44cad39
+  metadata.gz: f8855de7b6cd340b6d7579c6ef0ed83da5f717648b364a4fd9b939b4eebb9898c6159c9db3e139332df4debc5170dd8c72dfd2a059101c0b13efdca2119c873b
+  data.tar.gz: 3fb011c791d2a29140ba81328672b7be78c398b869eb3a7e6d8e5538ea0b35fd10e41607f41db960636262135cc023a627e2571ba41b886d73f8f412d2874c20

data/cpee-logging-xes-yaml.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-logging-xes-yaml"
-  s.version          = "1.3.7"
+  s.version          = "1.3.14"
   s.platform         = Gem::Platform::RUBY
-  s.license          = "LGPL-3.0"
+  s.license          = "LGPL-3.0-or-later"
   s.summary          = "Logging for the cloud process execution engine (cpee.org)"
 
   s.description      = "see http://cpee.org"
@@ -23,4 +23,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'riddl', '~> 1.0'
   s.add_runtime_dependency 'json', '~> 2.1'
   s.add_runtime_dependency 'cpee', '~> 2.1', '>= 2.1.4'
+  s.add_runtime_dependency 'msgpack', '~> 1.7', '>= 1.7.2'
 end

data/lib/cpee-logging-xes-yaml/template.xes_yaml

@@ -16,14 +16,14 @@ log:
     stream: https://cpee.org/datastream/datastream.xesext
   global:
     trace:
-      concept:name: __INVALID__
-      cpee:name: __INVALID__
+      concept:name: __NOTSPECIFIED__
+      cpee:name: __NOTSPECIFIED__
     event:
       concept:instance: -1
-      concept:name: __INVALID__
-      concept:endpoint: ''
-      id:id: ''
-      cpee:uuid: ''
+      concept:name: __NOTSPECIFIED__
+      concept:endpoint: __NOTSPECIFIED__
+      id:id: __NOTSPECIFIED__
+      cpee:uuid: __NOTSPECIFIED__
       lifecycle:transition: complete
       cpee:lifecycle:transition: activity/calling
       time:timestamp: ''

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

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

data/tools/cpee-logging-xes-yaml

@@ -58,24 +58,24 @@ TEMPLATE_XES_XML = <<-END
     <extension name="CPEE" prefix="cpee" uri="http://cpee.org/cpee.xesext"/>
     <extension name="stream" prefix="stream" uri="https://cpee.org/datastream/datastream.xesext"/>
     <global scope="trace">
-      <string key="concept:name" value="__INVALID__"/>
-      <string key="cpee:name" value="__INVALID__"/>
+      <string key="concept:name" value="__NOTSPECIFIED__"/>
+      <string key="cpee:name" value="__NOTSPECIFIED__"/>
     </global>
     <global scope="event">
-      <string key="concept:name" value="__INVALID__"/>
+      <string key="concept:name" value="__NOTSPECIFIED__"/>
       <string key="concept:instance" value="-1"/>
-      <string key="concept:endpoint" value=""/>
-      <string key="id:id" value=""/>
+      <string key="concept:endpoint" value="__NOTSPECIFIED__"/>
+      <string key="id:id" value="__NOTSPECIFIED__"/>
       <string key="lifecycle:transition" value="complete" />
       <string key="cpee:lifecycle:transition" value="activity/calling"/>
-      <date key="time:timestamp" value=""/>
+      <date key="time:timestamp" value="__NOTSPECIFIED__"/>
     </global>
     <trace/>
   </log>
 END
 
 def rec_type(it)
-  if (Time.parse(it) rescue nil)
+  if it.is_a?(String) && it =~ /^[\dT:+.-]+$/ && (Time.parse(it) rescue nil)
     'x:date'
   elsif it.is_a? Float
     'x:float'
@@ -89,14 +89,13 @@ end
 def rec_a_insert(event,node,level=0)
   event.each do |i|
     tnode = node
-    # tnode = node.add('x:string', 'key' => 'item')
     case i
       when Hash
         rec_insert(i,tnode,level+1)
       when Array
         rec_a_insert(i,tnode,level+1)
       when String
-        node.add(rec_type(i), 'key' => i, 'value' => i)
+        node.add(rec_type(i), 'key' => i, 'value' => (i.empty? ? "__UNSPECIFIED__" : i))
     end
   end
 end
@@ -105,12 +104,16 @@ def rec_insert(event,node,level=0)
   event.each do |k,v|
     case v
       when String
+        node.add(rec_type(v), 'key' => k, 'value' => (v.empty? ? "__UNSPECIFIED__" : v))
+      when Integer
+        node.add(rec_type(v), 'key' => k, 'value' => v)
+      when Float
         node.add(rec_type(v), 'key' => k, 'value' => v)
       when Array
         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
@@ -145,7 +148,7 @@ def follow(fname,io,copy,deep=0,index=nil)
 end
 
 def react(name,copy=false,deep=0,index=nil)
-  index ||= File.open('index.txt','w')
+  index ||= File.open('index.txt','a')
   if name.nil?
     help
   elsif name =~ /^https?:\/\//
@@ -170,7 +173,7 @@ def extract(path)
   if path =~ /^http.*/
     unlink = true
     text = Tempfile.new('extract-model-download')
-    request = Typhoeus::Request.new("www.example.com/huge.iso")
+    request = Typhoeus::Request.new(path)
     request.on_headers do |response|
       if response.code != 200
         raise "Request failed"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-logging-xes-yaml
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.14
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-03-19 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -59,6 +59,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.4
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.2
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables:
@@ -81,7 +101,7 @@ files:
 - tools/cpee-logging-xes-yaml
 homepage: http://cpee.org/
 licenses:
-- LGPL-3.0
+- LGPL-3.0-or-later
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -98,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Logging for the cloud process execution engine (cpee.org)