evt-messaging 2.5.1.1 → 2.5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bc5ad08d7cd5f55d19c1b407f80cd3448a6d877a22afd0f81b0261c25f2396c
-  data.tar.gz: ba24610fc9a6e02666f4d5094ffb4bb13ab9c084f7fccc34f237fb9dc520cb4d
+  metadata.gz: 0b88d9fc2f126343b5373d93c22046df73c920bdfba1921e1c606ee2929d8240
+  data.tar.gz: 46ca26755b68db2c9c4eb9427e530bfc6579857ef93a298912e4774ada3521af
 SHA512:
-  metadata.gz: 6a60193d1bd2f2bc8acb856b80dc76bf3bfb46ddb1a4d6810565b8725a1af6791e5197aaf94b1c89bc747af60b835c441e9a232d89acd97fe387d6cdc1e09352
-  data.tar.gz: ada89ba5b187b8762be1c5b2da07040d40e8cb3f96d61d019020c0d8e2dc2755387de5040fb46f5ad45544a149fb3fdba99a7aabde039582b63f76ac11001c07
+  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/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

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.1.2
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2020-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-message_store