evt-messaging 0.15.1.0 → 0.16.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a082e8b174c468e522ed5cc3e7196640eb05f6bd
-  data.tar.gz: 14fec7ed58a011bf50ef2fc821185b3e5d7e48d9
+  metadata.gz: accf64039c2587ab9ce5b4d334f72b1c18350399
+  data.tar.gz: 7d97eacb6307e1be46f17a7976be0b027ab63ee4
 SHA512:
-  metadata.gz: 94d583e6a85c858204d0a35c4d126a61416bd144c6410dafe3fd2ec5d0dc4ecec006341ab23baf2bd017d32308d14d186d753c67962b6f3c36f919c1eff3e4d5
-  data.tar.gz: 054f0f251e3f69ede8129119dbd761c855b32f8dbdcbaa5d3e062bddc18329ec00ed79b7c244d47002ff9825ffcd4bc152ba13e9e2b007732df5dc93c67ad188
+  metadata.gz: dff032d85a063bbe4ca4a871f1f9412ebffdf202dbbb240f6380434dc1dad0ad8022c97e68ca48cc838b57770a77569295ac7c06b4acfecd209d19de4fe8263e
+  data.tar.gz: 4f4caad9f0295fec47d663986798a025383bc001cf8b4b47e37e84e136291d6cddf66c5d0399e9114a5f6aecfd32dd2fcb7c155052c46ea2a39a1fbfc458b0b4

data/lib/messaging.rb

@@ -1,7 +1,9 @@
-require 'event_source'
+require 'message_store'
 
 require 'messaging/log'
 
+require 'messaging/stream_name'
+
 require 'messaging/message'
 require 'messaging/message/metadata'
 require 'messaging/message/copy'

data/lib/messaging/controls.rb

@@ -1,10 +1,10 @@
 require 'clock/controls'
-require 'event_source/controls'
+require 'message_store/controls'
 
 require 'messaging/controls/time'
 require 'messaging/controls/id'
 require 'messaging/controls/stream_name'
-require 'messaging/controls/event_data'
+require 'messaging/controls/message_data'
 require 'messaging/controls/message'
 require 'messaging/controls/metadata'
 require 'messaging/controls/batch'

data/lib/messaging/controls/batch.rb

@@ -9,8 +9,8 @@ module Messaging
         end
 
         values = [
-          EventSource::Controls::RandomValue.example,
-          EventSource::Controls::RandomValue.example
+          MessageStore::Controls::RandomValue.example,
+          MessageStore::Controls::RandomValue.example
         ]
 
         batch = Messages.example(id: id)

data/lib/messaging/controls/handler.rb

@@ -14,8 +14,8 @@ module Messaging
         class Example
           include Messaging::Handle
 
-          def handle(event_data)
-            event_data.data = 'some value set by handle method'
+          def handle(message_data)
+            message_data.data = 'some value set by handle method'
           end
         end
       end
@@ -29,8 +29,8 @@ module Messaging
             some_message.some_attribute = 'some attribute value set by handler'
           end
 
-          def handle(event_data)
-            event_data.data = 'some data value set by handler'
+          def handle(message_data)
+            message_data.data = 'some data value set by handler'
           end
         end
       end

data/lib/messaging/controls/id.rb

@@ -1,5 +1,5 @@
 module Messaging
   module Controls
-    ID = EventSource::Controls::ID
+    ID = MessageStore::Controls::ID
   end
 end

data/lib/messaging/controls/message_data.rb

@@ -0,0 +1,5 @@
+module Messaging
+  module Controls
+    MessageData = MessageStore::Controls::MessageData
+  end
+end

data/lib/messaging/controls/metadata.rb

@@ -5,19 +5,19 @@ module Messaging
         Messaging::Message::Metadata.build(data)
       end
 
-      def self.source_event_stream_name
+      def self.source_message_stream_name
         'someSource'
       end
 
-      def self.source_event_position
+      def self.source_message_position
         1
       end
 
-      def self.causation_event_stream_name
+      def self.causation_message_stream_name
         "someCausation"
       end
 
-      def self.causation_event_position
+      def self.causation_message_position
         11
       end
 
@@ -33,12 +33,12 @@ module Messaging
         '1.1'
       end
 
-      def self.source_event_identifier
-        "#{source_event_stream_name}/#{source_event_position}"
+      def self.source_message_identifier
+        "#{source_message_stream_name}/#{source_message_position}"
       end
 
-      def self.causation_event_identifier
-        "#{causation_event_stream_name}/#{causation_event_position}"
+      def self.causation_message_identifier
+        "#{causation_message_stream_name}/#{causation_message_position}"
       end
 
       def self.global_position
@@ -51,11 +51,11 @@ module Messaging
 
       def self.data
         {
-          source_event_stream_name: source_event_stream_name,
-          source_event_position: source_event_position,
+          source_message_stream_name: source_message_stream_name,
+          source_message_position: source_message_position,
 
-          causation_event_stream_name: causation_event_stream_name,
-          causation_event_position: causation_event_position,
+          causation_message_stream_name: causation_message_stream_name,
+          causation_message_position: causation_message_position,
 
           correlation_stream_name: correlation_stream_name,
 

data/lib/messaging/controls/stream_name.rb

@@ -1,6 +1,6 @@
 module Messaging
   module Controls
-    StreamName = EventSource::Controls::StreamName
+    StreamName = MessageStore::Controls::StreamName
 
     module StreamName
       module Named
@@ -9,7 +9,7 @@ module Messaging
         end
 
         class Example
-          include Messaging::Category
+          include Messaging::StreamName
 
           category :some_category
         end

data/lib/messaging/handle.rb

@@ -33,17 +33,17 @@ module Messaging
     end
 
     module Call
-      def call(message_or_event_data, strict: nil)
+      def call(message_or_message_data, strict: nil)
         instance = build(strict: strict)
-        instance.(message_or_event_data)
+        instance.(message_or_message_data)
       end
     end
 
     module Info
       extend self
 
-      def handler(message_or_event_data)
-        name = handler_name(message_or_event_data)
+      def handler(message_or_message_data)
+        name = handler_name(message_or_message_data)
 
         if method_defined?(name)
           return name
@@ -52,17 +52,17 @@ module Messaging
         end
       end
 
-      def handles?(message_or_event_data)
-        method_defined? handler_name(message_or_event_data)
+      def handles?(message_or_message_data)
+        method_defined? handler_name(message_or_message_data)
       end
 
-      def handler_name(message_or_event_data)
+      def handler_name(message_or_message_data)
         name = nil
 
-        if message_or_event_data.is_a? EventSource::EventData::Read
-          name = Messaging::Message::Info.canonize_name(message_or_event_data.type)
+        if message_or_message_data.is_a? MessageStore::MessageData::Read
+          name = Messaging::Message::Info.canonize_name(message_or_message_data.type)
         else
-          name = message_or_event_data.message_name
+          name = message_or_message_data.message_name
         end
 
         "handle_#{name}"
@@ -111,11 +111,11 @@ module Messaging
       end
     end
 
-    def call(message_or_event_data)
-      if message_or_event_data.is_a? Message
-        handle_message(message_or_event_data)
+    def call(message_or_message_data)
+      if message_or_message_data.is_a? Message
+        handle_message(message_or_message_data)
       else
-        handle_event_data(message_or_event_data)
+        handle_message_data(message_or_message_data)
       end
     end
 
@@ -141,33 +141,33 @@ module Messaging
       message
     end
 
-    def handle_event_data(event_data)
-      handler_logger.trace(tags: [:handle, :event_data]) { "Handling event data (Type: #{event_data.type})" }
-      handler_logger.trace(tags: [:data, :event_data, :handle]) { event_data.pretty_inspect }
+    def handle_message_data(message_data)
+      handler_logger.trace(tags: [:handle, :message_data]) { "Handling message data (Type: #{message_data.type})" }
+      handler_logger.trace(tags: [:data, :message_data, :handle]) { message_data.pretty_inspect }
 
       res = nil
 
-      handler = self.class.handler(event_data)
+      handler = self.class.handler(message_data)
 
       unless handler.nil?
-        message_name = Messaging::Message::Info.canonize_name(event_data.type)
+        message_name = Messaging::Message::Info.canonize_name(message_data.type)
         message_class = self.class.message_registry.get(message_name)
-        res = Message::Import.(event_data, message_class)
+        res = Message::Import.(message_data, message_class)
         public_send(handler, res)
       else
         if respond_to?(:handle)
-          res = handle(event_data)
+          res = handle(message_data)
         else
           if strict
-            error_msg = "#{self.class.name} does not implement `handle'. Cannot handle event data."
+            error_msg = "#{self.class.name} does not implement `handle'. Cannot handle message data."
             handler_logger.error { error_msg }
             raise Error, error_msg
           end
         end
       end
 
-      handler_logger.info(tags: [:handle, :event_data]) { "Handled event data (Type: #{event_data.type})" }
-      handler_logger.info(tags: [:data, :event_data, :handle]) { event_data.pretty_inspect }
+      handler_logger.info(tags: [:handle, :message_data]) { "Handled message data (Type: #{message_data.type})" }
+      handler_logger.info(tags: [:data, :message_data, :handle]) { message_data.pretty_inspect }
 
       res
     end

data/lib/messaging/message/export.rb

@@ -2,7 +2,7 @@ module Messaging
   module Message
     module Export
       def self.call(message)
-        Transform::Write.(message, :event_data)
+        Transform::Write.(message, :message_data)
       end
     end
   end

data/lib/messaging/message/import.rb

@@ -1,8 +1,8 @@
 module Messaging
   module Message
     module Import
-      def self.call(event_data, message_class)
-        Transform::Read.(event_data, :event_data, message_class)
+      def self.call(message_data, message_class)
+        Transform::Read.(message_data, :message_data, message_class)
       end
     end
   end

data/lib/messaging/message/metadata.rb

@@ -5,15 +5,15 @@ module Messaging
 
       include Schema::DataStructure
 
-      attribute :source_event_stream_name, String
-      alias :stream_name :source_event_stream_name
-      attribute :source_event_position, Integer
-      alias :sequence :source_event_position
-      alias :position :source_event_position
-      alias :position= :source_event_position=
+      attribute :source_message_stream_name, String
+      alias :stream_name :source_message_stream_name
+      attribute :source_message_position, Integer
+      alias :sequence :source_message_position
+      alias :position :source_message_position
+      alias :position= :source_message_position=
 
-      attribute :causation_event_stream_name, String
-      attribute :causation_event_position, Integer
+      attribute :causation_message_stream_name, String
+      attribute :causation_message_position, Integer
 
       attribute :correlation_stream_name, String
 
@@ -24,19 +24,19 @@ module Messaging
 
       attribute :schema_version, String
 
-      def source_event_identifier
-        return nil if source_event_stream_name.nil? || source_event_position.nil?
-        "#{source_event_stream_name}/#{source_event_position}"
+      def source_message_identifier
+        return nil if source_message_stream_name.nil? || source_message_position.nil?
+        "#{source_message_stream_name}/#{source_message_position}"
       end
 
-      def causation_event_identifier
-        return nil if causation_event_stream_name.nil? || causation_event_position.nil?
-        "#{causation_event_stream_name}/#{causation_event_position}"
+      def causation_message_identifier
+        return nil if causation_message_stream_name.nil? || causation_message_position.nil?
+        "#{causation_message_stream_name}/#{causation_message_position}"
       end
 
       def follow(other_metadata)
-        self.causation_event_stream_name = other_metadata.source_event_stream_name
-        self.causation_event_position = other_metadata.source_event_position
+        self.causation_message_stream_name = other_metadata.source_message_stream_name
+        self.causation_message_position = other_metadata.source_message_position
 
         self.correlation_stream_name = other_metadata.correlation_stream_name
 
@@ -44,7 +44,7 @@ module Messaging
       end
 
       def follows?(other_metadata)
-        causation_event_identifier == other_metadata.source_event_identifier &&
+        causation_message_identifier == other_metadata.source_message_identifier &&
           correlation_stream_name == other_metadata.correlation_stream_name &&
           reply_stream_name == other_metadata.reply_stream_name
       end
@@ -59,8 +59,8 @@ module Messaging
 
       def self.transient_attributes
         [
-          :source_event_stream_name,
-          :source_event_position,
+          :source_message_stream_name,
+          :source_message_position,
           :global_position,
           :time
         ]

data/lib/messaging/message/transformer.rb

@@ -1,39 +1,39 @@
 module Messaging
   module Message
     module Transformer
-      def self.event_data
-        EventData
+      def self.message_data
+        MessageData
       end
 
       def self.raw_data(message)
         message
       end
 
-      def self.instance(event_data_data, cls)
-        instance = cls.build(event_data_data[:data], event_data_data[:metadata])
-        instance.id = event_data_data[:id]
+      def self.instance(message_data_data, cls)
+        instance = cls.build(message_data_data[:data], message_data_data[:metadata])
+        instance.id = message_data_data[:id]
         instance
       end
 
-      module EventData
+      module MessageData
         def self.write(message)
-          event_data = EventSource::EventData::Write.build
+          message_data = MessageStore::MessageData::Write.build
 
-          event_data.id = message.id
-          event_data.type = message.message_type
+          message_data.id = message.id
+          message_data.type = message.message_type
 
-          event_data.data = message.to_h
+          message_data.data = message.to_h
 
           metadata = message.metadata.to_h
           metadata.delete_if { |k, v| v.nil? }
 
-          event_data.metadata = metadata
+          message_data.metadata = metadata
 
-          event_data
+          message_data
         end
 
-        def self.read(event_data)
-          data = event_data.to_h
+        def self.read(message_data)
+          data = message_data.to_h
 
           unless data[:metadata].nil?
             data[:metadata] = data[:metadata].clone
@@ -43,8 +43,8 @@ module Messaging
 
           metadata = data[:metadata]
 
-          metadata[:source_event_stream_name] = data[:stream_name]
-          metadata[:source_event_position] = data[:position]
+          metadata[:source_message_stream_name] = data[:stream_name]
+          metadata[:source_message_position] = data[:position]
 
           metadata[:global_position] = data[:global_position]
           metadata[:time] = data[:time]

data/lib/messaging/stream_name.rb

@@ -0,0 +1,39 @@
+module Messaging
+  module StreamName
+    extend self
+
+    def self.included(cls)
+      cls.class_exec do
+        include Messaging::Category
+      end
+    end
+
+    def stream_name(id, category=nil, type: nil)
+      category ||= self.category
+      MessageStore::StreamName.stream_name(category, id, type: type)
+    end
+
+    def category_stream_name(category=nil)
+      category ||= self.category
+      category
+    end
+
+    def command_stream_name(id, category=nil)
+      category ||= self.category
+      MessageStore::StreamName.stream_name(category, id, type: 'command')
+    end
+
+    def command_category_stream_name(category=nil)
+      category ||= self.category
+      MessageStore::StreamName.stream_name(category, type: 'command')
+    end
+
+    def self.get_category(stream_name)
+      MessageStore::StreamName.get_category(stream_name)
+    end
+
+    def self.get_id(stream_name)
+      MessageStore::StreamName.get_id stream_name
+    end
+  end
+end

data/lib/messaging/write.rb

@@ -6,7 +6,7 @@ module Messaging
       cls.class_exec do
         include Log::Dependency
 
-        dependency :event_writer
+        dependency :message_writer
         dependency :telemetry, ::Telemetry
 
         cls.extend Build
@@ -51,15 +51,15 @@ module Messaging
 
       message_batch = Array(message_or_batch)
 
-      event_data_batch = event_data_batch(message_batch, reply_stream_name)
-      last_position = event_writer.(event_data_batch, stream_name, expected_version: expected_version)
+      message_data_batch = message_data_batch(message_batch, reply_stream_name)
+      last_position = message_writer.(message_data_batch, stream_name, expected_version: expected_version)
 
       unless message_or_batch.is_a? Array
         logger.info(tag: :write) { "Wrote message (Position: #{last_position}, Stream Name: #{stream_name}, Type: #{message_or_batch.class.message_type}, Expected Version: #{expected_version.inspect}, Reply Stream Name: #{reply_stream_name.inspect})" }
       else
         logger.info(tag: :write) { "Wrote batch (Position: #{last_position}, Stream Name: #{stream_name}, Expected Version: #{expected_version.inspect}, Reply Stream Name: #{reply_stream_name.inspect})" }
       end
-      logger.info(tags: [:write, :data, :message]) { event_data_batch.pretty_inspect }
+      logger.info(tags: [:write, :data, :message]) { message_data_batch.pretty_inspect }
 
       message_batch.each do |message|
         telemetry.record :written, Telemetry::Data.new(message, stream_name, expected_version, reply_stream_name)
@@ -69,17 +69,17 @@ module Messaging
     end
     alias :write :call
 
-    def event_data_batch(message_batch, reply_stream_name=nil)
-      event_data_batch = []
+    def message_data_batch(message_batch, reply_stream_name=nil)
+      message_data_batch = []
       message_batch.each do |message|
         unless reply_stream_name.nil?
            message.metadata.reply_stream_name = reply_stream_name
         end
 
-        event_data_batch << Message::Export.(message)
+        message_data_batch << Message::Export.(message)
       end
 
-      event_data_batch
+      message_data_batch
     end
 
     def reply(message)

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: evt-messaging
 version: !ruby/object:Gem::Version
-  version: 0.15.1.0
+  version: 0.16.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-30 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: evt-event_source
+  name: evt-message_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -49,10 +49,10 @@ files:
 - lib/messaging/category.rb
 - lib/messaging/controls.rb
 - lib/messaging/controls/batch.rb
-- lib/messaging/controls/event_data.rb
 - lib/messaging/controls/handler.rb
 - lib/messaging/controls/id.rb
 - lib/messaging/controls/message.rb
+- lib/messaging/controls/message_data.rb
 - lib/messaging/controls/metadata.rb
 - lib/messaging/controls/stream_name.rb
 - lib/messaging/controls/time.rb
@@ -67,6 +67,7 @@ files:
 - lib/messaging/message/metadata.rb
 - lib/messaging/message/transformer.rb
 - lib/messaging/message_registry.rb
+- lib/messaging/stream_name.rb
 - lib/messaging/write.rb
 - lib/messaging/write/substitute.rb
 homepage: https://github.com/eventide-project/messaging
@@ -81,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.3
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -92,5 +93,5 @@ rubyforge_project:
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: Messaging primitives for Eventide
+summary: Common primitives for platform-specific messaging implementations for Eventide
 test_files: []

data/lib/messaging/controls/event_data.rb

@@ -1,5 +0,0 @@
-module Messaging
-  module Controls
-    EventData = EventSource::Controls::EventData
-  end
-end