evt-messaging 1.4.0.0 → 2.5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4e0aa73d808a4999c6cdac274d1e598f428e839d6e43dfc162e6e29d0460dc3
-  data.tar.gz: 8ae2506bf2c46e4c9fa266fbee2207eea81b6812f5cd6b4ec99b9b4e0fe514e5
+  metadata.gz: 0b88d9fc2f126343b5373d93c22046df73c920bdfba1921e1c606ee2929d8240
+  data.tar.gz: 46ca26755b68db2c9c4eb9427e530bfc6579857ef93a298912e4774ada3521af
 SHA512:
-  metadata.gz: 62321d4c0015f5216d980bfc23e0508a899e136e0f98e6cd75a16051cf0f740d3ad0447b40b70d901e565dc91aa344c6d7f5a006d1b3ddbe68e42f63f0e5a73a
-  data.tar.gz: 621abd69a36e4e05fd9f68f97f3bb824ddf115beb05df917d477b337833768a88db7915628533fab5aa12451915e336c91cd0ce89d308ec32823865db30bd0bb
+  metadata.gz: c753037cf3097102bbc9a7fe3a52eaa95a7cc63213caeaa8e23d7580f3a8ea616e6161e073f726289c8ee0be84a4b592719584b62b840c3fb01e956f5be63d30
+  data.tar.gz: 15f5370691d0868a5730de4683fbc1a1993673d0ff2a6ea49bf79f98dc104a2cb67ce5cf3df2177566b8dfde8718931d86800c68815667e6cd7b368c3e65449f

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/handle.rb

@@ -7,7 +7,10 @@ module Messaging
         include Dependency
         include Virtual
 
-        dependency :handler_logger, ::Log
+        def handler_logger
+          @handler_logger ||= Log.get(self)
+        end
+        attr_writer :handler_logger
 
         extend Build
         extend Call
@@ -25,7 +28,6 @@ module Messaging
       def build(strict: nil, session: nil)
         instance = new
         instance.strict = strict
-        Log.configure(instance, attr_name: :handler_logger)
 
         if Build.configure_session?(instance)
           instance.configure(session: session)
@@ -48,12 +50,12 @@ 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
 

data/lib/messaging/message/metadata.rb

@@ -59,11 +59,36 @@ 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_position.nil? && preceding_metadata.position.nil?
+          return false
+        end
+
+        if causation_message_global_position.nil? && preceding_metadata.global_position.nil?
+          return false
+        end
+
+        if causation_message_stream_name != preceding_metadata.stream_name
+          return false
+        end
+
+        if causation_message_position != preceding_metadata.position
+          return false
+        end
+
+        if causation_message_global_position != preceding_metadata.global_position
+          return false
+        end
+
+        if reply_stream_name != preceding_metadata.reply_stream_name
+          return false
+        end
+
+        true
       end
 
       def clear_reply_stream_name

data/lib/messaging/message_registry.rb

@@ -4,12 +4,18 @@ module Messaging
 
     include Log::Dependency
 
-    def entries
-      @entries ||= []
+    def message_classes
+      @message_classes ||= []
+    end
+
+    def message_types
+      message_classes.map do |message_class|
+        message_class.message_type
+      end
     end
 
     def get(message_name)
-      entries.find do |message_class|
+      message_classes.find do |message_class|
         message_class.message_name == message_name
       end
     end
@@ -22,19 +28,19 @@ module Messaging
         raise Error, error_msg
       end
 
-      entries << message_class
+      message_classes << message_class
 
       logger.debug { "Registered #{message_class}"}
 
-      entries
+      message_classes
     end
 
     def registered?(message_class)
-      entries.include?(message_class)
+      message_classes.include?(message_class)
     end
 
     def length
-      entries.length
+      message_classes.length
     end
   end
 end

data/lib/messaging/stream_name.rb

@@ -13,13 +13,21 @@ module Messaging
       end
     end
 
-    def stream_name(id, category=nil, type: nil, types: nil)
-      if id == nil
+    def stream_name(stream_id=nil, stream_category=nil, category: nil, cardinal_id: nil, id: nil, ids: nil, type: nil, types: nil)
+      if stream_id.nil? && cardinal_id.nil? && id.nil? && ids.nil?
         raise Error, "ID must not be omitted from stream name"
       end
 
-      category ||= self.category
-      MessageStore::StreamName.stream_name(category, id, type: type, types: types)
+      stream_category ||= category
+      if stream_category.nil?
+        if not self.respond_to?(:category)
+          raise Error, "Category must not be omitted from stream name"
+        else
+          stream_category = self.category
+        end
+      end
+
+      MessageStore::StreamName.stream_name(stream_category, stream_id, cardinal_id: cardinal_id, id: id, ids: ids, type: type, types: types)
     end
 
     def category_stream_name(category=nil, type: nil, types: nil)
@@ -51,6 +59,14 @@ module Messaging
       MessageStore::StreamName.get_category(stream_name)
     end
 
+    def self.category?(stream_name)
+      MessageStore::StreamName.category?(stream_name)
+    end
+
+    def self.get_entity_name(stream_name)
+      MessageStore::StreamName.get_entity_name(stream_name)
+    end
+
     def self.get_id(stream_name)
       MessageStore::StreamName.get_id(stream_name)
     end
@@ -58,5 +74,17 @@ module Messaging
     def self.get_ids(stream_name)
       MessageStore::StreamName.get_ids(stream_name)
     end
+
+    def self.get_cardinal_id(stream_name)
+      MessageStore::StreamName.get_cardinal_id(stream_name)
+    end
+
+    def self.get_type(stream_name)
+      MessageStore::StreamName.get_type(stream_name)
+    end
+
+    def self.get_types(stream_name)
+      MessageStore::StreamName.get_types(stream_name)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-messaging
 version: !ruby/object:Gem::Version
-  version: 1.4.0.0
+  version: 2.5.1.2
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-03 00:00:00.000000000 Z
+date: 2020-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-message_store
@@ -44,7 +44,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/loader.rb
 - lib/messaging.rb
 - lib/messaging/category.rb
 - lib/messaging/controls.rb
@@ -92,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Common primitives for platform-specific messaging implementations for Eventide

data/lib/loader.rb

@@ -1 +0,0 @@
-lib/messaging.rb