evt-messaging 2.5.5.0 → 2.5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7461dc41752ca20949d07bd6cdd226d26b813e7fe094e7eec8c5191cb6ac308b
-  data.tar.gz: bdeffa8dd6a53ec121c06db08f0cb63569db4eac34910716bd433dfca1cf3068
+  metadata.gz: ed29a0c35879e58829f90553574808b36c4925450725c0e6b312e45cbb75abc7
+  data.tar.gz: 5c3649886b569d050834f02391672745595611a83a3a6fed8958070bab1ddaea
 SHA512:
-  metadata.gz: 688353dc94af44d17c52803e872dfe307f3aeafcef13ac78754dcd0b1bb9f1e411a75c9482c46c3f5ef72c56586d40c6499ace71ac6db801c2209faccac5ed08
-  data.tar.gz: e92b9f581f4acd8688d7e399d8b6e94c1d36710c40a8223bb891d339e2fdace923fc2c9e554d226e02edc9e9229fba705ca5e75992bd889a4b90cd71b05ab561
+  metadata.gz: '04208a998e7aa313e679e41d064d8a8945b613dc6b2a3bea74cd2d53717cd69445d4824bd9c989ed42969798677f84bf756b1ed0989f385700d1e3dc3d467745'
+  data.tar.gz: a090214c089d0052e5a904b4e7c01b0537f4c7f5978e65766e89bf342c2c889294f438f3a07d59ef1c2f5f2381cfc0cfb715e0317a764c94763097fb7233a68f

data/lib/messaging.rb

@@ -7,6 +7,7 @@ require 'messaging/stream_name'
 
 require 'messaging/message'
 require 'messaging/message/metadata'
+require 'messaging/message/metadata/property'
 require 'messaging/message/copy'
 require 'messaging/message/follow'
 require 'messaging/message/sequence_accessor'

data/lib/messaging/controls.rb

@@ -7,9 +7,10 @@ require 'messaging/controls/random'
 require 'messaging/controls/time'
 require 'messaging/controls/id'
 require 'messaging/controls/stream_name'
+require 'messaging/controls/properties'
+require 'messaging/controls/metadata'
 require 'messaging/controls/message_data'
 require 'messaging/controls/message'
-require 'messaging/controls/metadata'
 require 'messaging/controls/batch'
 require 'messaging/controls/write'
 require 'messaging/controls/settings'

data/lib/messaging/controls/metadata.rb

@@ -2,6 +2,12 @@ module Messaging
   module Controls
     module Metadata
       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)
       end
 
@@ -50,9 +56,7 @@ module Messaging
       end
 
       def self.properties
-        {
-          some_property: 'some property value'
-        }
+        Properties.example
       end
 
       def self.time
@@ -73,7 +77,7 @@ module Messaging
 
           reply_stream_name: reply_stream_name,
 
-          properties: properties,
+          properties: Properties.data,
 
           time: time,
 

data/lib/messaging/controls/properties.rb

@@ -0,0 +1,62 @@
+module Messaging
+  module Controls
+    module Properties
+      def self.example
+        [
+          SomeProperty.example,
+          SomeLocalProperty.example
+        ]
+      end
+
+      def self.data
+        [
+          SomeProperty.data,
+          SomeLocalProperty.data
+        ]
+      end
+
+      module SomeProperty
+        def self.example
+          Messaging::Message::Metadata::Property.new(name, value)
+        end
+
+        def self.data
+          {
+            name: name,
+            value: value
+          }
+        end
+
+        def self.name
+          :some_property
+        end
+
+        def self.value
+          'some property value'
+        end
+      end
+
+      module SomeLocalProperty
+        def self.example
+          Messaging::Message::Metadata::Property.new(name, value, true)
+        end
+
+        def self.data
+          {
+            name: name,
+            value: value,
+            local: true
+          }
+        end
+
+        def self.name
+          :some_local_property
+        end
+
+        def self.value
+          'some local property value'
+        end
+      end
+    end
+  end
+end

data/lib/messaging/handle.rb

@@ -93,6 +93,8 @@ module Messaging
 
         if message_or_message_data.is_a? MessageStore::MessageData::Read
           name = Messaging::Message::Info.canonize_name(message_or_message_data.type)
+        elsif message_or_message_data.is_a? String
+          name = Messaging::Message::Info.canonize_name(message_or_message_data)
         else
           name = message_or_message_data.message_name
         end
@@ -209,7 +211,12 @@ module Messaging
 
         message_type = message.message_type
 
+        handler_logger.trace(tag: [:handle, :message_data]) { "Handling Message Data (Type: #{message_type}, Method: #{handler})" }
+
         public_send(handler, message)
+
+        handler_logger.info(tags: [:handle, :message_data]) { "Handled message data (Type: #{message_data.type})" }
+        handler_logger.info(tags: [:data, :message_data]) { message_data.pretty_inspect }
       else
         if respond_to?(:handle)
           message_type = message_data.type

data/lib/messaging/message/copy.rb

@@ -21,7 +21,7 @@ module Messaging
           receiver = receiver.build
         end
 
-        if include.nil?
+        if copy.nil? && include.nil?
           include = source.class.attribute_names
         end
 
@@ -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

@@ -33,7 +33,7 @@ module Messaging
 
       attribute :reply_stream_name, String
 
-      attribute :properties, Hash, default: -> { Hash.new }
+      attribute :properties, Array, default: -> { Array.new }
 
       attribute :time, Time
 
@@ -59,6 +59,14 @@ module Messaging
         self.correlation_stream_name = preceding_metadata.correlation_stream_name
 
         self.reply_stream_name = preceding_metadata.reply_stream_name
+
+        preceding_metadata.properties.each do |property|
+          if property.local?
+            next
+          end
+
+          properties << property.dup
+        end
       end
 
       def follows?(preceding_metadata)
@@ -128,16 +136,37 @@ module Messaging
       end
       alias :correlates? :correlated?
 
-      def set_property(name, value)
-        properties[name] = value
+      def set_property(name, value, local: nil)
+        local ||= false
+
+        delete_property(name)
+
+        property = Property.new(name, value, local)
+
+        properties << property
+
+        property
+      end
+
+      def set_local_property(name, value, local: nil)
+        set_property(name, value, local: true)
       end
 
       def get_property(name)
-        properties[name]
+        property = properties.find { |property| property.name == name }
+        property&.value
       end
 
       def delete_property(name)
-        properties.delete(name)
+        i = properties.index { |property| property.name == name }
+
+        return nil if i.nil?
+
+        properties.delete_at(i).value
+      end
+
+      def clear_properties
+        properties.clear
       end
 
       def self.source_attribute_names

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

@@ -0,0 +1,22 @@
+module Messaging
+  module Message
+    class Metadata
+      Property = Struct.new(
+        :name,
+        :value,
+        :local
+      ) do
+        def local?
+          local == true
+        end
+
+        def ==(other)
+          equal =
+            name == other.name &&
+            value == other.value &&
+            !!local == !!other.local
+        end
+      end
+    end
+  end
+end

data/lib/messaging/message/transform.rb

@@ -26,8 +26,12 @@ module Messaging
 
           metadata = message.metadata.to_h
 
-          if metadata[:properties].empty?
-            metadata[:properties] = nil
+          properties = metadata[:properties]
+
+          if properties.empty?
+            metadata.delete(:properties)
+          else
+            metadata[:properties] = Properties.write(properties)
           end
 
           metadata.delete_if { |k, v| v.nil? }
@@ -37,9 +41,24 @@ module Messaging
           message_data
         end
 
+        module Properties
+          def self.write(properties)
+            properties.map do |property|
+              property_hash = property.to_h
+
+              if not property_hash[:local]
+                property_hash.delete(:local)
+              end
+
+              property_hash
+            end
+          end
+        end
+
         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
@@ -54,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.5.0
+  version: 2.5.8.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-message_store
@@ -67,6 +67,7 @@ files:
 - lib/messaging/controls/message.rb
 - lib/messaging/controls/message_data.rb
 - lib/messaging/controls/metadata.rb
+- lib/messaging/controls/properties.rb
 - lib/messaging/controls/random.rb
 - lib/messaging/controls/settings.rb
 - lib/messaging/controls/stream_name.rb
@@ -81,6 +82,7 @@ files:
 - lib/messaging/message/follow.rb
 - lib/messaging/message/import.rb
 - lib/messaging/message/metadata.rb
+- lib/messaging/message/metadata/property.rb
 - lib/messaging/message/sequence_accessor.rb
 - lib/messaging/message/transform.rb
 - lib/messaging/message_registry.rb