evt-messaging 2.5.1.1 → 2.5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bc5ad08d7cd5f55d19c1b407f80cd3448a6d877a22afd0f81b0261c25f2396c
-  data.tar.gz: ba24610fc9a6e02666f4d5094ffb4bb13ab9c084f7fccc34f237fb9dc520cb4d
+  metadata.gz: ba3a02132d665b05fe90598a8ff7a1678b2ca868fb4f47ade0fe80da9dadb793
+  data.tar.gz: fc424d43824775b2d672dcf1592bf3efe997f86453af341d05ceee3e56b3256e
 SHA512:
-  metadata.gz: 6a60193d1bd2f2bc8acb856b80dc76bf3bfb46ddb1a4d6810565b8725a1af6791e5197aaf94b1c89bc747af60b835c441e9a232d89acd97fe387d6cdc1e09352
-  data.tar.gz: ada89ba5b187b8762be1c5b2da07040d40e8cb3f96d61d019020c0d8e2dc2755387de5040fb46f5ad45544a149fb3fdba99a7aabde039582b63f76ac11001c07
+  metadata.gz: 12f6e4b7ecd4b166ea798052c648297e3b46b2a73b8c2dd5da940f37bbb4fca1f30eae8af0731bb1539841cd390a03ea04dc360aec46cfc6465a4f55ac0877b5
+  data.tar.gz: 638d0cce0872792272e9c444dc2c92534c57ab9db50523c3a4cdd104b00ef36dba8e39786f7448d09569c8a0bdb4b4a906abeab025e9a4691d2cc6429eecac65

data/lib/messaging.rb

@@ -1,4 +1,5 @@
 require 'message_store'
+require 'settings'
 
 require 'messaging/log'
 

data/lib/messaging/controls.rb

@@ -12,4 +12,5 @@ require 'messaging/controls/message'
 require 'messaging/controls/metadata'
 require 'messaging/controls/batch'
 require 'messaging/controls/write'
+require 'messaging/controls/settings'
 require 'messaging/controls/handler'

data/lib/messaging/controls/handler.rb

@@ -1,6 +1,10 @@
 module Messaging
   module Controls
     module Handler
+      def self.example
+        Example.new
+      end
+
       class Example
         include Messaging::Handle
         include Controls::Message
@@ -97,6 +101,22 @@ module Messaging
           end
         end
       end
+
+      module Settings
+        Error = Class.new(RuntimeError)
+
+        class Example
+          include Messaging::Handle
+
+          setting :some_setting
+
+          attr_accessor :some_other_setting
+
+          def handle(message_data)
+            raise Settings::Error if some_setting.nil?
+          end
+        end
+      end
     end
   end
 end

data/lib/messaging/controls/metadata.rb

@@ -13,6 +13,10 @@ module Messaging
         1
       end
 
+      def self.global_position
+        222
+      end
+
       def self.causation_message_stream_name
         "someCausation"
       end
@@ -22,7 +26,7 @@ module Messaging
       end
 
       def self.causation_message_global_position
-        222
+        111
       end
 
       def self.correlation_stream_name
@@ -45,8 +49,10 @@ module Messaging
         "#{causation_message_stream_name}/#{causation_message_position}"
       end
 
-      def self.global_position
-        111
+      def self.properties
+        {
+          some_property: 'some property value'
+        }
       end
 
       def self.time
@@ -57,6 +63,7 @@ module Messaging
         {
           stream_name: stream_name,
           position: position,
+          global_position: global_position,
 
           causation_message_stream_name: causation_message_stream_name,
           causation_message_position: causation_message_position,
@@ -66,7 +73,8 @@ module Messaging
 
           reply_stream_name: reply_stream_name,
 
-          global_position: global_position,
+          properties: properties,
+
           time: time,
 
           schema_version: schema_version

data/lib/messaging/controls/settings.rb

@@ -0,0 +1,16 @@
+module Messaging
+  module Controls
+    module Settings
+      def self.example
+        ::Settings.build(data)
+      end
+
+      def self.data
+        {
+          some_setting: 'some setting value',
+          some_other_setting: 'some other setting value'
+        }
+      end
+    end
+  end
+end

data/lib/messaging/handle.rb

@@ -6,6 +6,7 @@ module Messaging
       cls.class_exec do
         include Dependency
         include Virtual
+        include Settings::Setting
 
         def handler_logger
           @handler_logger ||= Log.get(self)
@@ -25,10 +26,14 @@ module Messaging
     end
 
     module Build
-      def build(strict: nil, session: nil)
+      def build(strict: nil, session: nil, settings: nil)
         instance = new
         instance.strict = strict
 
+        if not settings.nil?
+          settings.set(instance)
+        end
+
         if Build.configure_session?(instance)
           instance.configure(session: session)
         else
@@ -60,8 +65,8 @@ module Messaging
     end
 
     module Call
-      def call(message_or_message_data, strict: nil, session: nil)
-        instance = build(strict: strict, session: session)
+      def call(message_or_message_data, strict: nil, session: nil, settings: nil)
+        instance = build(strict: strict, session: session, settings: settings)
         instance.(message_or_message_data)
       end
     end
@@ -154,7 +159,7 @@ module Messaging
     def handle_message(message, strict: nil)
       strict ||= self.strict?
 
-      handler_logger.trace(tags: [:handle, :message]) { "Handling message (Message class: #{message.class.name})" }
+      handler_logger.trace(tags: [:dispatch, :message]) { "Dispatching message (Message class: #{message.class.name})" }
       handler_logger.trace(tags: [:data, :message]) { message.pretty_inspect }
 
       handler = self.class.handler(message)
@@ -162,8 +167,12 @@ module Messaging
       unless handler.nil?
         message_type = message.message_type
 
-        handler_logger.debug(tag: :handle) { "Handling Message (Type: #{message_type}, Method: #{handler})" }
+        handler_logger.trace(tag: [:handle, :message]) { "Handling Message (Type: #{message_type}, Method: #{handler})" }
+
         public_send(handler, message)
+
+        handler_logger.info(tags: [:handle, :message]) { "Handled message (Message class: #{message.class.name})" }
+        handler_logger.info(tags: [:data, :message]) { message.pretty_inspect }
       else
         if strict
           error_msg = "#{self.class.name} does not implement a handler for #{message.message_type}. Cannot handle the message."
@@ -172,16 +181,13 @@ module Messaging
         end
       end
 
-      handler_logger.info(tags: [:handle, :message]) { "Handled message (Message class: #{message.class.name})" }
-      handler_logger.info(tags: [:data, :message]) { message.pretty_inspect }
-
       message
     end
 
     def handle_message_data(message_data, strict: nil)
       strict ||= self.strict?
 
-      handler_logger.trace(tags: [:handle, :message_data]) { "Handling message data (Type: #{message_data.type})" }
+      handler_logger.trace(tags: [:dispatch, :message_data]) { "Dispatching message data (Type: #{message_data.type})" }
       handler_logger.trace(tags: [:data, :message_data]) { message_data.pretty_inspect }
 
       message = nil
@@ -203,15 +209,17 @@ module Messaging
 
         message_type = message.message_type
 
-        handler_logger.debug(tag: :handle) { "Handling Message (Type: #{message_type}, Method: #{handler})" }
         public_send(handler, message)
       else
         if respond_to?(:handle)
           message_type = message_data.type
-          handler_logger.debug(tag: :handle) { "Handling Message Data (Type: #{message_type}, Method: handle" }
+          handler_logger.trace(tag: [:handle, :message_data]) { "Handling Message Data (Type: #{message_type}, Method: handle" }
 
           handle(message_data)
 
+          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 }
+
           message = message_data
         else
           if strict
@@ -222,9 +230,6 @@ module Messaging
         end
       end
 
-      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 }
-
       message
     end
   end

data/lib/messaging/message/metadata.rb

@@ -33,6 +33,8 @@ module Messaging
 
       attribute :reply_stream_name, String
 
+      attribute :properties, Hash, default: -> { Hash.new }
+
       attribute :time, Time
 
       attribute :schema_version, String
@@ -59,11 +61,48 @@ module Messaging
         self.reply_stream_name = preceding_metadata.reply_stream_name
       end
 
-      def follows?(metadata)
-        causation_message_stream_name == metadata.stream_name &&
-          causation_message_position == metadata.position &&
-          causation_message_global_position == metadata.global_position &&
-          reply_stream_name == metadata.reply_stream_name
+      def follows?(preceding_metadata)
+        if causation_message_stream_name.nil? && preceding_metadata.stream_name.nil?
+          return false
+        end
+
+        if causation_message_stream_name != preceding_metadata.stream_name
+          return false
+        end
+
+
+        if causation_message_position.nil? && preceding_metadata.position.nil?
+          return false
+        end
+
+        if causation_message_position != preceding_metadata.position
+          return false
+        end
+
+
+        if causation_message_global_position.nil? && preceding_metadata.global_position.nil?
+          return false
+        end
+
+        if causation_message_global_position != preceding_metadata.global_position
+          return false
+        end
+
+
+        if not preceding_metadata.correlation_stream_name.nil?
+          if correlation_stream_name != preceding_metadata.correlation_stream_name
+            return false
+          end
+        end
+
+
+        if not preceding_metadata.reply_stream_name.nil?
+          if reply_stream_name != preceding_metadata.reply_stream_name
+            return false
+          end
+        end
+
+        true
       end
 
       def clear_reply_stream_name
@@ -89,6 +128,41 @@ module Messaging
       end
       alias :correlates? :correlated?
 
+      def set_property(name, value)
+        properties[name] = value
+      end
+
+      def get_property(name)
+        properties[name]
+      end
+
+      def self.source_attribute_names
+        [
+          :stream_name,
+          :position,
+          :global_position
+        ]
+      end
+
+      def self.causation_attribute_names
+        [
+          :causation_message_stream_name,
+          :causation_message_position,
+          :causation_message_global_position
+        ]
+      end
+
+      def self.origin_attribute_names
+        [
+          :correlation_stream_name,
+          :reply_stream_name
+        ]
+      end
+
+      def self.workflow_attribute_names
+        causation_attribute_names + origin_attribute_names
+      end
+
       def self.transient_attributes
         [
           :stream_name,

data/lib/messaging/message/transform.rb

@@ -25,6 +25,11 @@ module Messaging
           message_data.data = message.to_h
 
           metadata = message.metadata.to_h
+
+          if metadata[:properties].empty?
+            metadata[:properties] = nil
+          end
+
           metadata.delete_if { |k, v| v.nil? }
 
           message_data.metadata = metadata

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-messaging
 version: !ruby/object:Gem::Version
-  version: 2.5.1.1
+  version: 2.5.4.0
 platform: ruby
 authors:
 - The Eventide Project
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-message_store
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: evt-settings
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test_bench
   requirement: !ruby/object:Gem::Requirement
@@ -54,6 +68,7 @@ files:
 - lib/messaging/controls/message_data.rb
 - lib/messaging/controls/metadata.rb
 - lib/messaging/controls/random.rb
+- lib/messaging/controls/settings.rb
 - lib/messaging/controls/stream_name.rb
 - lib/messaging/controls/time.rb
 - lib/messaging/controls/write.rb
@@ -76,7 +91,7 @@ homepage: https://github.com/eventide-project/messaging
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -92,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Common primitives for platform-specific messaging implementations for Eventide
 test_files: []