evt-messaging 2.5.7.0 → 2.5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a5c611f9683e1398927dd4223a8cba0f1520ff54523aef003ccd5d86a00ab0a
-  data.tar.gz: 1263fa3a97c59fcaabe62b4f0699fb3128117be0fd847f7df3dbd4419f6a8a0a
+  metadata.gz: ed29a0c35879e58829f90553574808b36c4925450725c0e6b312e45cbb75abc7
+  data.tar.gz: 5c3649886b569d050834f02391672745595611a83a3a6fed8958070bab1ddaea
 SHA512:
-  metadata.gz: 78f3bdccb3a7fdb31a46426223810cc9b6ef5108c4ac803ba1ba54cb2452a6e5a0bbe7e8209eaed03f8c35192bba484cd5d7983e26ff0f4544934a14eec936a0
-  data.tar.gz: 29ecd80c4d0a941b29d8b1081f21032ca3d82c8327c0e7fe8777555d77401e03d1e6d7f7f9bf2e63dc2ccb43415391ad1160a8b6f80965d404213922e93075ce
+  metadata.gz: '04208a998e7aa313e679e41d064d8a8945b613dc6b2a3bea74cd2d53717cd69445d4824bd9c989ed42969798677f84bf756b1ed0989f385700d1e3dc3d467745'
+  data.tar.gz: a090214c089d0052e5a904b4e7c01b0537f4c7f5978e65766e89bf342c2c889294f438f3a07d59ef1c2f5f2381cfc0cfb715e0317a764c94763097fb7233a68f

data/lib/messaging/controls/metadata.rb

@@ -4,6 +4,8 @@ module Messaging
       def self.example
         data = self.data
 
+        ## Remove this once Metadata can be built
+        ## from Raw data (Scott, Fri Feb 5 20201)
         data[:properties] = Properties.example
 
         Messaging::Message::Metadata.build(data)

data/lib/messaging/controls/properties.rb

@@ -4,14 +4,14 @@ module Messaging
       def self.example
         [
           SomeProperty.example,
-          SomeTransientProperty.example
+          SomeLocalProperty.example
         ]
       end
 
       def self.data
         [
           SomeProperty.data,
-          SomeTransientProperty.data
+          SomeLocalProperty.data
         ]
       end
 
@@ -36,7 +36,7 @@ module Messaging
         end
       end
 
-      module SomeTransientProperty
+      module SomeLocalProperty
         def self.example
           Messaging::Message::Metadata::Property.new(name, value, true)
         end
@@ -44,16 +44,17 @@ module Messaging
         def self.data
           {
             name: name,
-            value: value
+            value: value,
+            local: true
           }
         end
 
         def self.name
-          :some_transient_property
+          :some_local_property
         end
 
         def self.value
-          'some transient property value'
+          'some local property value'
         end
       end
     end

data/lib/messaging/message/copy.rb

@@ -32,8 +32,13 @@ module Messaging
         end
 
         if metadata
-          metadata_include = source.metadata.class.attribute_names
+          metadata_include = source.metadata.class.attribute_names - [:properties]
+
           SetAttributes.(receiver.metadata, source.metadata, include: metadata_include)
+
+          source.metadata.properties.each do |property|
+            receiver.metadata.properties << property.dup
+          end
         end
 
         receiver

data/lib/messaging/message/metadata.rb

@@ -61,15 +61,11 @@ module Messaging
         self.reply_stream_name = preceding_metadata.reply_stream_name
 
         preceding_metadata.properties.each do |property|
-          if property.transient?
+          if property.local?
             next
           end
 
-          set_property(
-            property.name,
-            property.value,
-            transient: property.transient
-          )
+          properties << property.dup
         end
       end
 
@@ -140,20 +136,20 @@ module Messaging
       end
       alias :correlates? :correlated?
 
-      def set_property(name, value, transient: nil)
-        transient ||= false
+      def set_property(name, value, local: nil)
+        local ||= false
 
         delete_property(name)
 
-        property = Property.new(name, value, transient)
+        property = Property.new(name, value, local)
 
         properties << property
 
         property
       end
 
-      def set_transient_property(name, value, transient: nil)
-        set_property(name, value, transient: true)
+      def set_local_property(name, value, local: nil)
+        set_property(name, value, local: true)
       end
 
       def get_property(name)

data/lib/messaging/message/metadata/property.rb

@@ -4,17 +4,17 @@ module Messaging
       Property = Struct.new(
         :name,
         :value,
-        :transient
+        :local
       ) do
-        def transient?
-          transient == true
+        def local?
+          local == true
         end
 
         def ==(other)
           equal =
             name == other.name &&
             value == other.value &&
-            !!transient == !!other.transient
+            !!local == !!other.local
         end
       end
     end

data/lib/messaging/message/transform.rb

@@ -46,8 +46,8 @@ module Messaging
             properties.map do |property|
               property_hash = property.to_h
 
-              if not property_hash[:transient]
-                property_hash.delete(:transient)
+              if not property_hash[:local]
+                property_hash.delete(:local)
               end
 
               property_hash
@@ -58,6 +58,7 @@ module Messaging
         def self.read(message_data)
           data = message_data.to_h
 
+## TODO change to positive "if"
           unless data[:metadata].nil?
             data[:metadata] = data[:metadata].clone
           else
@@ -72,6 +73,16 @@ module Messaging
           metadata[:global_position] = data[:global_position]
           metadata[:time] = data[:time]
 
+          if metadata[:properties].nil?
+            metadata[:properties] = []
+          end
+
+          properties = metadata[:properties].map do |property_data|
+            Metadata::Property.new(*property_data.values_at(*Metadata::Property.members))
+          end
+
+          metadata[:properties] = properties
+
           data
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-messaging
 version: !ruby/object:Gem::Version
-  version: 2.5.7.0
+  version: 2.5.8.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-message_store
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Common primitives for platform-specific messaging implementations for Eventide