evt-messaging 2.5.5.2 → 2.6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be94b5e7a4670a45d0bc085b46690c1e2db3d43850dc4da4f21109d3c6514b0f
-  data.tar.gz: 2a8f66b930241c0f82acb7d70fefd0c1582e9608c7e753a5298abf7be1b59e32
+  metadata.gz: bdc052cd505024a0dc1c9ee66b8c7bf9233f1deb8efb4cc07f8bc67ac37dc1ca
+  data.tar.gz: 25087356a05e7d159345ef0f268d2fcb671dcac86f931236c7be25a49dd003d7
 SHA512:
-  metadata.gz: 1e6e49a66b6715c5775de11289496868de8bdb74fa691c44637948ee1d1c3e1562e08939bfd84920d293a12210fb12616f8f276925bcd05886ad82343d8739a3
-  data.tar.gz: 1eeac837bb22e5b1826daa69ce4a0237075df131210d466aeff0ab69fc04e7c49b9304ed632bfeefacd6d6370ac9a8882c6c70fe6ad62dceffbcd67a19fa244e
+  metadata.gz: cdf114d68c3a8102adf5a675eb2b784e36e51882b08b66e9ffeffeaf5cc0597741ae70a2326b6d14db69c3ab2ed5c9a41566f98eadaae3fec653617fa88ce067
+  data.tar.gz: 9438c70a8643db857dd6102f2ae22c5f4ca71e4dde416096a303e267a89c8ed0b6c71730fde5f9c1a5c1ab66db65c9eaad19f2128a6cab2c2e6a8584cf8a3a7c

data/lib/messaging/controls.rb

@@ -7,9 +7,11 @@ require 'messaging/controls/random'
 require 'messaging/controls/time'
 require 'messaging/controls/id'
 require 'messaging/controls/stream_name'
+require 'messaging/controls/properties'
+require 'messaging/controls/local_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/local_properties.rb

@@ -0,0 +1,39 @@
+module Messaging
+  module Controls
+    module LocalProperties
+      def self.example
+        {
+          SomeLocalProperty.name => SomeLocalProperty.value
+        }
+      end
+
+      module SomeLocalProperty
+        def self.name
+          :some_local_property
+        end
+
+        def self.value
+          'some local property value'
+        end
+      end
+
+      module Random
+        def self.example
+          {
+            SomeLocalProperty.name => SomeLocalProperty.value
+          }
+        end
+
+        module SomeLocalProperty
+          def self.name
+            :some_local_property
+          end
+
+          def self.value
+            SecureRandom.hex
+          end
+        end
+      end
+    end
+  end
+end

data/lib/messaging/controls/metadata.rb

@@ -2,6 +2,11 @@ module Messaging
   module Controls
     module Metadata
       def self.example
+        data = self.data
+
+        data[:properties] = properties
+        data[:local_properties] = local_properties
+
         Messaging::Message::Metadata.build(data)
       end
 
@@ -50,15 +55,21 @@ module Messaging
       end
 
       def self.properties
-        {
-          some_property: 'some property value'
-        }
+        Properties.example
       end
 
       def self.time
         Time::Raw.example
       end
 
+      def self.properties
+        Properties.example
+      end
+
+      def self.local_properties
+        LocalProperties.example
+      end
+
       def self.data
         {
           stream_name: stream_name,
@@ -73,7 +84,8 @@ module Messaging
 
           reply_stream_name: reply_stream_name,
 
-          properties: properties,
+          properties: Properties.example,
+          local_properties: LocalProperties.example,
 
           time: time,
 
@@ -106,6 +118,11 @@ module Messaging
 
       module Random
         def self.example
+          data = self.data
+
+          data[:properties] = properties
+          data[:local_properties] = local_properties
+
           Messaging::Message::Metadata.build(data)
         end
 
@@ -157,10 +174,19 @@ module Messaging
           (::Time.now + Controls::Random::Number.example).utc
         end
 
+        def self.properties
+          Properties::Random.example
+        end
+
+        def self.local_properties
+          LocalProperties::Random.example
+        end
+
         def self.data
           {
             stream_name: stream_name,
             position: position,
+            global_position: global_position,
 
             causation_message_stream_name: causation_message_stream_name,
             causation_message_position: causation_message_position,
@@ -170,7 +196,9 @@ module Messaging
 
             reply_stream_name: reply_stream_name,
 
-            global_position: global_position,
+            properties: Properties::Random.example,
+            local_properties: LocalProperties::Random.example,
+
             time: time,
 
             schema_version: schema_version

data/lib/messaging/controls/properties.rb

@@ -0,0 +1,39 @@
+module Messaging
+  module Controls
+    module Properties
+      def self.example
+        {
+          SomeProperty.name => SomeProperty.value
+        }
+      end
+
+      module SomeProperty
+        def self.name
+          :some_property
+        end
+
+        def self.value
+          'some property value'
+        end
+      end
+
+      module Random
+        def self.example
+          {
+            SomeProperty.name => SomeProperty.value
+          }
+        end
+
+        module SomeProperty
+          def self.name
+            :some_property
+          end
+
+          def self.value
+            SecureRandom.hex
+          end
+        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

data/lib/messaging/message/copy.rb

@@ -32,8 +32,12 @@ module Messaging
         end
 
         if metadata
-          metadata_include = source.metadata.class.attribute_names
+          metadata_include = source.metadata.class.attribute_names - [:properties, :local_properties]
+
           SetAttributes.(receiver.metadata, source.metadata, include: metadata_include)
+
+          receiver.metadata.properties = source.metadata.properties.dup
+          receiver.metadata.local_properties = source.metadata.local_properties.dup
         end
 
         receiver

data/lib/messaging/message/metadata.rb

@@ -34,6 +34,7 @@ module Messaging
       attribute :reply_stream_name, String
 
       attribute :properties, Hash, default: -> { Hash.new }
+      attribute :local_properties, Hash, default: -> { Hash.new }
 
       attribute :time, Time
 
@@ -59,6 +60,10 @@ 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 |name, value|
+          properties[name] = value
+        end
       end
 
       def follows?(preceding_metadata)
@@ -129,17 +134,65 @@ module Messaging
       alias :correlates? :correlated?
 
       def set_property(name, value)
+        if not name.is_a?(Symbol)
+          raise Error, "Property name must be a symbol: #{name.inspect}"
+        end
+
         properties[name] = value
+
+        value
       end
 
       def get_property(name)
+        if not name.is_a?(Symbol)
+          raise Error, "Property name must be a symbol: #{name.inspect}"
+        end
+
         properties[name]
       end
 
       def delete_property(name)
+        if not name.is_a?(Symbol)
+          raise Error, "Property name must be a symbol: #{name.inspect}"
+        end
+
         properties.delete(name)
       end
 
+      def clear_properties
+        properties.clear
+      end
+
+      def set_local_property(name, value)
+        if not name.is_a?(Symbol)
+          raise Error, "Local property name must be a symbol: #{name.inspect}"
+        end
+
+        local_properties[name] = value
+
+        value
+      end
+
+      def get_local_property(name)
+        if not name.is_a?(Symbol)
+          raise Error, "Local property name must be a symbol: #{name.inspect}"
+        end
+
+        local_properties[name]
+      end
+
+      def delete_local_property(name)
+        if not name.is_a?(Symbol)
+          raise Error, "Local property name must be a symbol: #{name.inspect}"
+        end
+
+        local_properties.delete(name)
+      end
+
+      def clear_local_properties
+        local_properties.clear
+      end
+
       def self.source_attribute_names
         [
           :stream_name,

data/lib/messaging/message/transform.rb

@@ -27,7 +27,11 @@ module Messaging
           metadata = message.metadata.to_h
 
           if metadata[:properties].empty?
-            metadata[:properties] = nil
+            metadata.delete(:properties)
+          end
+
+          if metadata[:local_properties].empty?
+            metadata.delete(:local_properties)
           end
 
           metadata.delete_if { |k, v| v.nil? }
@@ -40,10 +44,10 @@ module Messaging
         def self.read(message_data)
           data = message_data.to_h
 
-          unless data[:metadata].nil?
-            data[:metadata] = data[:metadata].clone
-          else
+          if data[:metadata].nil?
             data[:metadata] = {}
+          else
+            data[:metadata] = data[:metadata].clone
           end
 
           metadata = data[:metadata]
@@ -54,6 +58,9 @@ module Messaging
           metadata[:global_position] = data[:global_position]
           metadata[:time] = data[:time]
 
+          metadata[:properties] ||= {}
+          metadata[:local_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.2
+  version: 2.6.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-message_store
@@ -64,9 +64,11 @@ files:
 - lib/messaging/controls/batch.rb
 - lib/messaging/controls/handler.rb
 - lib/messaging/controls/id.rb
+- lib/messaging/controls/local_properties.rb
 - 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