evt-messaging 2.5.4.0 → 2.5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba3a02132d665b05fe90598a8ff7a1678b2ca868fb4f47ade0fe80da9dadb793
-  data.tar.gz: fc424d43824775b2d672dcf1592bf3efe997f86453af341d05ceee3e56b3256e
+  metadata.gz: 4a5c611f9683e1398927dd4223a8cba0f1520ff54523aef003ccd5d86a00ab0a
+  data.tar.gz: 1263fa3a97c59fcaabe62b4f0699fb3128117be0fd847f7df3dbd4419f6a8a0a
 SHA512:
-  metadata.gz: 12f6e4b7ecd4b166ea798052c648297e3b46b2a73b8c2dd5da940f37bbb4fca1f30eae8af0731bb1539841cd390a03ea04dc360aec46cfc6465a4f55ac0877b5
-  data.tar.gz: 638d0cce0872792272e9c444dc2c92534c57ab9db50523c3a4cdd104b00ef36dba8e39786f7448d09569c8a0bdb4b4a906abeab025e9a4691d2cc6429eecac65
+  metadata.gz: 78f3bdccb3a7fdb31a46426223810cc9b6ef5108c4ac803ba1ba54cb2452a6e5a0bbe7e8209eaed03f8c35192bba484cd5d7983e26ff0f4544934a14eec936a0
+  data.tar.gz: 29ecd80c4d0a941b29d8b1081f21032ca3d82c8327c0e7fe8777555d77401e03d1e6d7f7f9bf2e63dc2ccb43415391ad1160a8b6f80965d404213922e93075ce

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,10 @@ module Messaging
   module Controls
     module Metadata
       def self.example
+        data = self.data
+
+        data[:properties] = Properties.example
+
         Messaging::Message::Metadata.build(data)
       end
 
@@ -50,9 +54,7 @@ module Messaging
       end
 
       def self.properties
-        {
-          some_property: 'some property value'
-        }
+        Properties.example
       end
 
       def self.time
@@ -73,7 +75,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,61 @@
+module Messaging
+  module Controls
+    module Properties
+      def self.example
+        [
+          SomeProperty.example,
+          SomeTransientProperty.example
+        ]
+      end
+
+      def self.data
+        [
+          SomeProperty.data,
+          SomeTransientProperty.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 SomeTransientProperty
+        def self.example
+          Messaging::Message::Metadata::Property.new(name, value, true)
+        end
+
+        def self.data
+          {
+            name: name,
+            value: value
+          }
+        end
+
+        def self.name
+          :some_transient_property
+        end
+
+        def self.value
+          'some transient 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
 

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,18 @@ 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.transient?
+            next
+          end
+
+          set_property(
+            property.name,
+            property.value,
+            transient: property.transient
+          )
+        end
       end
 
       def follows?(preceding_metadata)
@@ -128,12 +140,37 @@ module Messaging
       end
       alias :correlates? :correlated?
 
-      def set_property(name, value)
-        properties[name] = value
+      def set_property(name, value, transient: nil)
+        transient ||= false
+
+        delete_property(name)
+
+        property = Property.new(name, value, transient)
+
+        properties << property
+
+        property
+      end
+
+      def set_transient_property(name, value, transient: nil)
+        set_property(name, value, transient: true)
       end
 
       def get_property(name)
-        properties[name]
+        property = properties.find { |property| property.name == name }
+        property&.value
+      end
+
+      def delete_property(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,
+        :transient
+      ) do
+        def transient?
+          transient == true
+        end
+
+        def ==(other)
+          equal =
+            name == other.name &&
+            value == other.value &&
+            !!transient == !!other.transient
+        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,6 +41,20 @@ module Messaging
           message_data
         end
 
+        module Properties
+          def self.write(properties)
+            properties.map do |property|
+              property_hash = property.to_h
+
+              if not property_hash[:transient]
+                property_hash.delete(:transient)
+              end
+
+              property_hash
+            end
+          end
+        end
+
         def self.read(message_data)
           data = message_data.to_h
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-messaging
 version: !ruby/object:Gem::Version
-  version: 2.5.4.0
+  version: 2.5.7.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2021-01-22 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
@@ -106,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Common primitives for platform-specific messaging implementations for Eventide