evt-messaging 2.5.1.0 → 2.5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd6068180b3ca2dfb0f5a22b74d134160f0feede1b6630134432845f1028692d
-  data.tar.gz: 5671e70a3eccc37368eaff3888d549dc5b174feef7d9ffc3742827104d6e137d
+  metadata.gz: 29e2d25659fffe70ab1e14512f6c4a4adf7c9daa929f7303e3b96ae169fa4822
+  data.tar.gz: 181e600b4ecebc75a08607b364c50e88600788e6fc2e7e62672df10b5c337998
 SHA512:
-  metadata.gz: 945148e6819e742c5344e19fbda31c5149a64011514ef2c768791b9170229dbb113fd0b3442b374b2f4461b9ae47dcf59e5196fe38c09326d893b2af760372c6
-  data.tar.gz: 22f508c29b63c7345bb7a1a3b1d1f6b085c32bd47398e12601891222f974360ae2e5ec769bfe0246473fe5d090dc7d963a99af822ef3987c9b56fa592d29b589
+  metadata.gz: 41165cbff3b2bb5a74a39809812851737b228ad1a59d85ecf2a8f46268042e06aed3c0fc3223f30e084febec586b1df09234e625286e7a8dfff617a15878b630
+  data.tar.gz: 88c7b54092d4b088de4c95f21f576c7c3e04a3e4cc805b0c32cdf4ae0479865c82e9d2195968ae7046d86508ba2aba1229ff9d7854179786447b2b798ecd7235

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,10 +49,6 @@ module Messaging
         "#{causation_message_stream_name}/#{causation_message_position}"
       end
 
-      def self.global_position
-        111
-      end
-
       def self.time
         Time::Raw.example
       end

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,8 +6,12 @@ module Messaging
       cls.class_exec do
         include Dependency
         include Virtual
+        include Settings::Setting
 
-        dependency :handler_logger, ::Log
+        def handler_logger
+          @handler_logger ||= Log.get(self)
+        end
+        attr_writer :handler_logger
 
         extend Build
         extend Call
@@ -22,10 +26,13 @@ module Messaging
     end
 
     module Build
-      def build(strict: nil, session: nil)
+      def build(strict: nil, session: nil, settings: nil)
         instance = new
         instance.strict = strict
-        Log.configure(instance, attr_name: :handler_logger)
+
+        if not settings.nil?
+          settings.set(instance)
+        end
 
         if Build.configure_session?(instance)
           instance.configure(session: session)
@@ -48,18 +55,18 @@ module Messaging
         return true if parameter_type == :key
 
         error_message = "Optional session parameter of configure is not a keyword argument (Type: #{parameter_type.inspect})"
-        logger.error(tag: :handle) { error_message }
+        handler_logger.error(tag: :handle) { error_message }
         raise ArgumentError, error_message
       end
 
-      def self.logger
-        @logger ||= Log.build(self)
+      def self.handler_logger
+        @handler_logger ||= Log.get(self)
       end
     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
@@ -152,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)
@@ -160,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."
@@ -170,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
@@ -201,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
@@ -220,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

@@ -59,11 +59,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 +126,33 @@ module Messaging
       end
       alias :correlates? :correlated?
 
+      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,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-messaging
 version: !ruby/object:Gem::Version
-  version: 2.5.1.0
+  version: 2.5.3.0
 platform: ruby
 authors:
 - The Eventide Project
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-12-01 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: []