evt-messaging 0.19.0.0 → 0.20.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3601c7051816b61b0bff53ad401f897c926460b6
-  data.tar.gz: 956dbb82cd85977cd90d68615c9e4b1e2b3465f9
+  metadata.gz: 5a902797846e034919214139eba742866903a8b6
+  data.tar.gz: bcf0164858250a906eecb1461d3d85a6241c4038
 SHA512:
-  metadata.gz: 62df5c595eb662e56837d92f28c2a3825854296775e3831929f0ce45d093d922651896e29d8f48e79ff5e51c8be78c705fe051d89f3ab672f0f1792d499b80f4
-  data.tar.gz: 3191cdafe905adceb2b036d3140446cc9875c9107f7973683a266f7b8448361dfdb1b692c15ce57401c2e3f87af557bf709d26c509b30d9fef1fa4c28f43155b
+  metadata.gz: 28609094e5a1d4bac2ab4202e4ee0e9b784ebcc56556bee192c1ab809fc7593330edfd25fdbcedf2d7fe1851e5bea833f61bb665416cc641815431ad84d3e5a3
+  data.tar.gz: 9c7e5acb32ecd73b576a8d69501d43d9550cb7b8cefe3940067c1feaf9391ddbfd3289ab667c7eabbb8a9f275896315b0093882364e52fde320db88029376ab1

data/lib/messaging/controls/metadata.rb

@@ -5,11 +5,11 @@ module Messaging
         Messaging::Message::Metadata.build(data)
       end
 
-      def self.source_message_stream_name
+      def self.stream_name
         'someSource'
       end
 
-      def self.source_message_position
+      def self.position
         1
       end
 
@@ -37,8 +37,8 @@ module Messaging
         '1.1'
       end
 
-      def self.source_message_identifier
-        "#{source_message_stream_name}/#{source_message_position}"
+      def self.identifier
+        "#{stream_name}/#{position}"
       end
 
       def self.causation_message_identifier
@@ -55,8 +55,8 @@ module Messaging
 
       def self.data
         {
-          source_message_stream_name: source_message_stream_name,
-          source_message_position: source_message_position,
+          stream_name: stream_name,
+          position: position,
 
           causation_message_stream_name: causation_message_stream_name,
           causation_message_position: causation_message_position,
@@ -101,11 +101,11 @@ module Messaging
           Messaging::Message::Metadata.build(data)
         end
 
-        def self.source_message_stream_name
+        def self.stream_name
           Controls::Random::Text.example
         end
 
-        def self.source_message_position
+        def self.position
           Controls::Random::Number.example
         end
 
@@ -133,8 +133,8 @@ module Messaging
           Controls::Random::Number.example.to_s
         end
 
-        def self.source_message_identifier
-          "#{source_message_stream_name}/#{source_message_position}"
+        def self.identifier
+          "#{stream_name}/#{position}"
         end
 
         def self.causation_message_identifier
@@ -151,8 +151,8 @@ module Messaging
 
         def self.data
           {
-            source_message_stream_name: source_message_stream_name,
-            source_message_position: source_message_position,
+            stream_name: stream_name,
+            position: position,
 
             causation_message_stream_name: causation_message_stream_name,
             causation_message_position: causation_message_position,

data/lib/messaging/message/metadata.rb

@@ -5,26 +5,17 @@ module Messaging
 
       include Schema::DataStructure
 
-      attribute :source_message_stream_name, String
-      alias :stream_name :source_message_stream_name
-      alias :stream_name= :source_message_stream_name=
+      attribute :stream_name, String
+      alias :source_message_stream_name :stream_name
+      alias :source_message_stream_name= :stream_name=
 
-      ## TODO Plan: Switch to this in subsequent commit
-      # attribute :stream_name, String
-      # alias :source_message_stream_name :stream_name
-      # alias :source_message_stream_name= :stream_name=
+      attribute :position, Integer
+      alias :source_message_position :position
+      alias :source_message_position= :position=
 
-      attribute :source_message_position, Integer
-      alias :position :source_message_position
-      alias :position= :source_message_position=
-
-      ## TODO Plan: Switch to this in subsequent commit
-      # attribute :position, Integer
-      # alias :source_message_position :position
-      # alias :source_message_position= :position=
-
-      ## TODO make this point to previous_message_global_position
-      # alias :sequence :source_message_position
+      attribute :global_position, Integer
+      alias :source_message_global_position :global_position
+      alias :source_message_global_position= :global_position=
 
       attribute :causation_message_stream_name, String
       attribute :causation_message_position, Integer
@@ -36,18 +27,15 @@ module Messaging
 
       attribute :reply_stream_name, String
 
-      attribute :global_position, Integer
-      alias :source_message_global_position :global_position
-      alias :source_message_global_position= :global_position=
-
       attribute :time, Time
 
       attribute :schema_version, String
 
-      def source_message_identifier
-        return nil if source_message_stream_name.nil? || source_message_position.nil?
-        "#{source_message_stream_name}/#{source_message_position}"
+      def identifier
+        return nil if stream_name.nil? || position.nil?
+        "#{stream_name}/#{position}"
       end
+      alias :source_message_identifier :identifier
 
       def causation_message_identifier
         return nil if causation_message_stream_name.nil? || causation_message_position.nil?
@@ -55,9 +43,9 @@ module Messaging
       end
 
       def follow(other_metadata)
-        self.causation_message_stream_name = other_metadata.source_message_stream_name
-        self.causation_message_position = other_metadata.source_message_position
-        self.causation_message_global_position = other_metadata.source_message_global_position
+        self.causation_message_stream_name = other_metadata.stream_name
+        self.causation_message_position = other_metadata.position
+        self.causation_message_global_position = other_metadata.global_position
 
         self.correlation_stream_name = other_metadata.correlation_stream_name
 
@@ -65,8 +53,8 @@ module Messaging
       end
 
       def follows?(other_metadata)
-        causation_message_identifier == other_metadata.source_message_identifier &&
-          causation_message_global_position == other_metadata.source_message_global_position &&
+        causation_message_identifier == other_metadata.identifier &&
+          causation_message_global_position == other_metadata.global_position &&
           correlation_stream_name == other_metadata.correlation_stream_name &&
           reply_stream_name == other_metadata.reply_stream_name
       end
@@ -93,10 +81,9 @@ module Messaging
       alias :correlates? :correlated?
 
       def self.transient_attributes
-        ## TODO change global_position to source_message_global_position
         [
-          :source_message_stream_name,
-          :source_message_position,
+          :stream_name,
+          :position,
           :global_position,
           :time
         ]

data/lib/messaging/message/transformer.rb

@@ -43,8 +43,8 @@ module Messaging
 
           metadata = data[:metadata]
 
-          metadata[:source_message_stream_name] = data[:stream_name]
-          metadata[:source_message_position] = data[:position]
+          metadata[:stream_name] = data[:stream_name]
+          metadata[:position] = data[:position]
 
           metadata[:global_position] = data[:global_position]
           metadata[:time] = data[:time]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-messaging
 version: !ruby/object:Gem::Version
-  version: 0.19.0.0
+  version: 0.20.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-message_store