evt-messaging 2.5.5.1 → 2.5.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35fd90e00b64cf6fd0d212593556b1d1b5a5bb394cf7897ec621e9d81996c632
-  data.tar.gz: e0fa90699ff19e912c1b90dca016391853c9b986f55b5d2e7c2d09400741370d
+  metadata.gz: ccafb945cdd024a0fa0d3b90b2bb197973f0a6111f778657e2c8dcc7514e944f
+  data.tar.gz: 64be2ec439b541414bd50e9d0ad2490cb6069d9e617bd12d8f44b5dad8231f64
 SHA512:
-  metadata.gz: a83436c76e20a0bfb81b69e01e5953dd424003035b1483397e67135aafcc7d740c8b7560b372308f61145acee8af85ac6f147d5854d520de3e48d035a442a625
-  data.tar.gz: d81f0b7bfe21c9186a7f1fcc57c7f0610a97bff7fb467ca37de65dbdefb93e8160cff7262ed047f18b4cd90c5cc311ebaece3d9cebf2cf2293bcabc220a7aaab
+  metadata.gz: 13a6e341c068157a89e0e3336afd19c3518149bc766bcfca8b73fc72d74a97948854838b5e35d9ba9adb127e660ef679ada4f1b4d928d7bb08307f816f3cfbac
+  data.tar.gz: c017e5d29247eb7601db7828574f03348429e38f51cd69c7c65dbf394723b9f5ca592d68589bcb1782055c6fa9562d6be5602fa91bf6834e0de8296b705c16d3

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

@@ -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,49 @@ module Messaging
       end
       alias :correlates? :correlated?
 
-      def set_property(name, value)
-        properties[name] = value
+      def set_property(name, value, local: nil)
+        if not name.is_a?(String)
+          raise Error, "Property name must be a string: #{name.inspect}"
+        end
+
+        local ||= false
+
+        delete_property(name)
+
+        property = Property.new(name, value, local)
+
+        properties << property
+
+        property
+      end
+
+      def set_local_property(name, value)
+        set_property(name, value, local: true)
       end
 
       def get_property(name)
-        properties[name]
+        if not name.is_a?(String)
+          raise Error, "Property name must be a string: #{name.inspect}"
+        end
+
+        property = properties.find { |property| property.name == name }
+        property&.value
       end
 
       def delete_property(name)
-        properties.delete(name)
+        if not name.is_a?(String)
+          raise Error, "Property name must be a string: #{name.inspect}"
+        end
+
+        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.1
+  version: 2.5.8.1
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2021-02-09 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