evt-consumer 0.5.0.0 → 0.5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27284a1d79008240bec7a95e6c22807e994dac8b
-  data.tar.gz: dbd8db5df89c7e511653f625f25c20de4d56cda5
+  metadata.gz: 2b7ba7639868951557d06b7a6c7fa66bf4141e3c
+  data.tar.gz: b7d2764110d1f64263e83871eab9e515b36c7002
 SHA512:
-  metadata.gz: 4d8c11d563ad2d38c54fd962a42911ff8acb00cf178eb9eaad7cd6b69f02c731b848c72a29572141201842f3deb018c54f3239934cc104d3a94d5bc4e95f07fc
-  data.tar.gz: 2e497f1d35244402f4b0ba5c105722a95187125c032cd5ae91d6210c2609517d710038fd0726f72a9fd3fbfcb215ff11df8c85c10461006cce5f91a04b99c57f
+  metadata.gz: cf143797978d8cfa068b6aea5232031c95c30339e189b0743675b50d74662217d3216916a87d54b1e1a5785067a642e08fe9321bab95cfd1ef1ca999956ed9a6
+  data.tar.gz: 6be8716feac2cf472d9c5226a7a312f5418b5a8431b9831d51ce536dc4c66f116884a3a2455dd75d2514aa008f90d2a63d4efa10b76a8585733e3b23ec18220a

data/lib/consumer/actor.rb

@@ -25,8 +25,8 @@ module Consumer
 
       request_batch
 
-      events.each do |event_data|
-        consumer.(event_data)
+      events.each do |message_data|
+        consumer.(message_data)
       end
 
       logger.debug { "Batch received (Events: #{events.count})" }

data/lib/consumer/consumer.rb

@@ -28,18 +28,18 @@ module Consumer
     end
   end
 
-  def call(event_data)
-    logger.trace { "Dispatching event (#{LogText.event_data event_data})" }
+  def call(message_data)
+    logger.trace { "Dispatching event (#{LogText.message_data message_data})" }
 
-    dispatch.(event_data)
+    dispatch.(message_data)
 
-    update_position event_data.global_position
+    update_position message_data.global_position
 
-    logger.info { "Event dispatched (#{LogText.event_data event_data})" }
+    logger.info { "Event dispatched (#{LogText.message_data message_data})" }
 
   rescue => error
-    logger.error { "Error raised (Error Class: #{error.class}, Error Message: #{error.message}, #{LogText.event_data event_data})" }
-    error_raised error, event_data
+    logger.error { "Error raised (Error Class: #{error.class}, Error Message: #{error.message}, #{LogText.message_data message_data})" }
+    error_raised error, message_data
   end
 
   def run(&probe)
@@ -103,8 +103,8 @@ module Consumer
   end
 
   module LogText
-    def self.event_data(event_data)
-      "Stream: #{event_data.stream_name}, Position: #{event_data.position}, GlobalPosition: #{event_data.global_position}, Type: #{event_data.type}"
+    def self.message_data(message_data)
+      "Stream: #{message_data.stream_name}, Position: #{message_data.position}, GlobalPosition: #{message_data.global_position}, Type: #{message_data.type}"
     end
   end
 
@@ -129,7 +129,7 @@ module Consumer
 
       dispatch = Dispatch.configure self, handlers
 
-      logger.debug { "Configuring (Batch Size: #{batch_size}, Session: #{session.inspect})" }
+      logger.debug { "Done configuring (Batch Size: #{batch_size}, Session: #{session.inspect}, Starting Position: #{starting_position})" }
     end
   end
 

data/lib/consumer/controls.rb

@@ -2,8 +2,8 @@ require 'messaging/controls'
 
 require 'consumer/controls/category'
 require 'consumer/controls/cycle'
-require 'consumer/controls/event_data'
-require 'consumer/controls/event_data/batch'
+require 'consumer/controls/message_data'
+require 'consumer/controls/message_data/batch'
 require 'consumer/controls/error'
 require 'consumer/controls/get'
 require 'consumer/controls/get/incrementing'

data/lib/consumer/controls/category.rb

@@ -1,5 +1,5 @@
 module Consumer
   module Controls
-    Category = EventSource::Controls::Category
+    Category = MessageStore::Controls::Category
   end
 end

data/lib/consumer/controls/consumer/incrementing.rb

@@ -8,12 +8,12 @@ module Consumer
           @logger ||= ::Log.get self
         end
 
-        handler do |event_data|
-          logger.info { "Handled event (StreamName: #{event_data.stream_name}, GlobalPosition: #{event_data.global_position})" }
+        handler do |message_data|
+          logger.info { "Handled event (StreamName: #{message_data.stream_name}, GlobalPosition: #{message_data.global_position})" }
         end
 
-        handler do |event_data|
-          logger.debug { event_data.data.pretty_inspect }
+        handler do |message_data|
+          logger.debug { message_data.data.pretty_inspect }
         end
 
         def configure(session: nil, batch_size: nil, position_store: nil)

data/lib/consumer/controls/get/incrementing.rb

@@ -16,7 +16,7 @@ module Consumer
           sleep Rational(sleep_duration, 1000)
 
           3.times.map do |offset|
-            EventData.get(
+            MessageData.get(
               stream_name,
               position + offset,
               offset
@@ -25,11 +25,11 @@ module Consumer
         end
       end
 
-      class EventData
+      class MessageData
         def self.get(stream_name, global_position, position)
           data = { :position => position, :global_position => global_position }
 
-          Controls::EventData.example(
+          Controls::MessageData.example(
             stream_name: stream_name,
             data: data,
             global_position: global_position,

data/lib/consumer/controls/handle.rb

@@ -8,16 +8,16 @@ module Consumer
       class Example
         include Messaging::Handle
 
-        def handle(event_data)
-          handled_events << event_data
+        def handle(message_data)
+          handled_events << message_data
         end
 
         def handled_events
           @handled_events ||= []
         end
 
-        def handled?(event_data)
-          handled_events.include? event_data
+        def handled?(message_data)
+          handled_events.include? message_data
         end
       end
     end

data/lib/consumer/controls/message_data.rb

@@ -0,0 +1,15 @@
+module Consumer
+  module Controls
+    module MessageData
+      def self.example(stream_name: nil, data: nil, position: nil, global_position: nil)
+        global_position ||= position
+
+        message_data = MessageStore::Controls::MessageData::Read.example(data: data)
+        message_data.stream_name = stream_name unless stream_name.nil?
+        message_data.position = position unless position.nil?
+        message_data.global_position = global_position unless global_position.nil?
+        message_data
+      end
+    end
+  end
+end

data/lib/consumer/controls/{event_data → message_data}/batch.rb

@@ -1,6 +1,6 @@
 module Consumer
   module Controls
-    module EventData
+    module MessageData
       module Batch
         def self.example(instances: nil, position: nil)
           instances ||= size
@@ -9,7 +9,7 @@ module Consumer
           instances.times.map do |offset|
             position = start_position + offset
 
-            EventData.example global_position: position
+            MessageData.example(global_position: position)
           end
         end
 

data/lib/consumer/controls/position.rb

@@ -3,7 +3,7 @@ module Consumer
     module Position
       module Stream
         def self.example
-          EventSource::Controls::EventData.position
+          MessageStore::Controls::MessageData.position
         end
       end
 
@@ -11,7 +11,7 @@ module Consumer
         def self.example(offset: nil)
           offset ||= 0
 
-          position = EventSource::Controls::EventData::Read.global_position
+          position = MessageStore::Controls::MessageData::Read.global_position
 
           position + offset
         end

data/lib/consumer/dispatch.rb

@@ -16,14 +16,14 @@ module Consumer
       instance
     end
 
-    def call(event_data)
-      logger.trace { "Dispatching event (#{LogText.event_data event_data})" }
+    def call(message_data)
+      logger.trace { "Dispatching event (#{LogText.message_data message_data})" }
 
       handlers.each do |handle|
-        handle.(event_data)
+        handle.(message_data)
       end
 
-      logger.debug { "Event dispatched (#{LogText.event_data event_data}, Handlers Count: #{handlers.count})" }
+      logger.debug { "Event dispatched (#{LogText.message_data message_data}, Handlers Count: #{handlers.count})" }
 
       nil
     end

data/lib/consumer/dispatch/substitute.rb

@@ -6,8 +6,8 @@ module Consumer
       end
 
       class Dispatch
-        def call(event_data)
-          dispatched_events << event_data
+        def call(message_data)
+          dispatched_events << message_data
         end
 
         def add_handler(handle)
@@ -18,11 +18,11 @@ module Consumer
           @dispatched_events ||= []
         end
 
-        def dispatched?(event_data=nil, &block)
-          if event_data.nil?
+        def dispatched?(message_data=nil, &block)
+          if message_data.nil?
             block ||= proc { true }
           else
-            block ||= proc { |e| event_data == e }
+            block ||= proc { |e| message_data == e }
           end
 
           dispatched_events.any? &block

data/lib/consumer/handler_registry.rb

@@ -23,8 +23,8 @@ module Consumer
     def get(consumer)
       entries.map do |handler|
         if handler.is_a? Proc
-          proc { |event_data|
-            consumer.instance_exec event_data, &handler
+          proc { |message_data|
+            consumer.instance_exec message_data, &handler
           }
         else
           handler.build

data/lib/consumer/log_text.rb

@@ -1,7 +1,7 @@
 module Consumer
   module LogText
-    def self.event_data(event_data)
-      "Stream: #{event_data.stream_name}, Position: #{event_data.position}, GlobalPosition: #{event_data.global_position}, Type: #{event_data.type}"
+    def self.message_data(message_data)
+      "Stream: #{message_data.stream_name}, Position: #{message_data.position}, GlobalPosition: #{message_data.global_position}, Type: #{message_data.type}"
     end
   end
 end

data/lib/consumer/position_store.rb

@@ -61,7 +61,7 @@ module Consumer
 
         position = super
 
-        logger.debug { "Get position done (Position: #{position || '(none)'})" }
+        logger.info { "Get position done (Position: #{position || '(none)'})" }
 
         telemetry.record :get, Telemetry::Get.new(position)
 
@@ -79,7 +79,7 @@ module Consumer
 
         super
 
-        logger.debug { "Put position done (Position: #{position})" }
+        logger.info { "Put position done (Position: #{position})" }
 
         telemetry.record :put, Telemetry::Put.new(position)
 

data/lib/consumer/substitute.rb

@@ -5,19 +5,19 @@ module Consumer
     end
 
     class Consumer
-      def call(event_data)
-        consumed_events << event_data
+      def call(message_data)
+        consumed_events << message_data
       end
 
       def consumed_events
         @consumed_events ||= []
       end
 
-      def consumed?(event_data=nil, &block)
-        if event_data.nil?
+      def consumed?(message_data=nil, &block)
+        if message_data.nil?
           block ||= proc { true }
         else
-          block ||= proc { |e| event_data == e }
+          block ||= proc { |e| message_data == e }
         end
 
         consumed_events.any? &block

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-consumer
 version: !ruby/object:Gem::Version
-  version: 0.5.0.0
+  version: 0.5.0.1
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ntl-actor
@@ -95,12 +95,12 @@ files:
 - lib/consumer/controls/consumer/incrementing.rb
 - lib/consumer/controls/cycle.rb
 - lib/consumer/controls/error.rb
-- lib/consumer/controls/event_data.rb
-- lib/consumer/controls/event_data/batch.rb
 - lib/consumer/controls/get.rb
 - lib/consumer/controls/get/incrementing.rb
 - lib/consumer/controls/handle.rb
 - lib/consumer/controls/id.rb
+- lib/consumer/controls/message_data.rb
+- lib/consumer/controls/message_data/batch.rb
 - lib/consumer/controls/position.rb
 - lib/consumer/controls/position_store.rb
 - lib/consumer/controls/position_store/local_file.rb
@@ -131,7 +131,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:
   - - ">="

data/lib/consumer/controls/event_data.rb

@@ -1,15 +0,0 @@
-module Consumer
-  module Controls
-    module EventData
-      def self.example(stream_name: nil, data: nil, position: nil, global_position: nil)
-        global_position ||= position
-
-        event_data = EventSource::Controls::EventData::Read.example data: data
-        event_data.stream_name = stream_name unless stream_name.nil?
-        event_data.position = position unless position.nil?
-        event_data.global_position = global_position unless global_position.nil?
-        event_data
-      end
-    end
-  end
-end