evt-consumer 0.5.0.4 → 0.6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a06d0578ecaed78cc219810f3f5b53796592b7ff
-  data.tar.gz: 327aa00f833ded2114f8abf3d263ebdf42bfe713
+  metadata.gz: 2475ecea2ff83320921192335e0a577a7be6c570
+  data.tar.gz: 431e4d264dbf0e5905e38ea0fe5122ca97507ed7
 SHA512:
-  metadata.gz: 3f23e9ea6e60dea66642f82113562fc25d8bf6a2de1610e6dcff860b127fe0d9e8205120aee61cdf3267e6a4564c4a28681a380357a4c9e8928d3d3d6c609a55
-  data.tar.gz: 849f63c2c49a652ed96c3d541f33744afe99919c042bd25f21f0de501bd9f6da9037419e76b35849002635a69b4eefa15bed691cc46493283bffcffa3ea9efb4
+  metadata.gz: fe951b092065c75f0a06965e6cfb5afda86fee1c9133a1d1791c6755560cd32a483eee26db43ea9bcb7b9b6547ffdca26259dff779e4855fcaf33384440db8ec
+  data.tar.gz: 36f378434b972906ee3abc8aaeba0aa2d0b32dab08409c5d78a314abc58ffd27a44793b20de11927a0a2a906174ae15abb9b7c6dc5d1c88204b08c8f35a2a859

data/lib/consumer/actor.rb

@@ -19,23 +19,23 @@ module Consumer
     end
 
     handle Subscription::GetBatch::Reply do |get_batch_reply|
-      events = get_batch_reply.batch
+      messages = get_batch_reply.batch
 
-      logger.trace { "Received batch (Events: #{events.count})" }
+      logger.trace { "Received batch (Messages: #{messages.count})" }
 
       request_batch
 
-      events.each do |message_data|
+      messages.each do |message_data|
         consumer.(message_data)
       end
 
-      logger.debug { "Batch received (Events: #{events.count})" }
+      logger.debug { "Batch received (Events: #{messages.count})" }
     end
 
     def request_batch
       logger.trace { "Requesting batch" }
 
-      get_batch = Subscription::GetBatch.new address
+      get_batch = Subscription::GetBatch.new(address)
 
       send.(get_batch, subscription_address)
 

data/lib/consumer/consumer.rb

@@ -8,6 +8,7 @@ module Consumer
       extend Start
 
       extend HandlerMacro
+      extend IdentifierMacro
 
       prepend Configure
 
@@ -29,16 +30,16 @@ module Consumer
   end
 
   def call(message_data)
-    logger.trace { "Dispatching event (#{LogText.message_data message_data})" }
+    logger.trace { "Dispatching event (#{LogText.message_data(message_data)})" }
 
     dispatch.(message_data)
 
-    update_position message_data.global_position
+    update_position(message_data.global_position)
 
-    logger.info { "Event dispatched (#{LogText.message_data message_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.message_data message_data})" }
+    logger.error { "Error raised (Error Class: #{error.class}, Error Message: #{error.message}, #{LogText.message_data(message_data)})" }
     error_raised error, message_data
   end
 
@@ -59,15 +60,19 @@ module Consumer
       Actor::Messaging::Send.(:stop, address)
     end
 
-    threads.each &:join
+    threads.each(&:join)
 
     AsyncInvocation::Incorrect
   end
 
+  def identifier
+    self.class.identifier
+  end
+
   def start(&probe)
     _, subscription_thread = ::Actor::Start.(subscription)
 
-    actor_address, actor_thread = Actor.start self, subscription, include: :thread
+    actor_address, actor_thread = Actor.start(self, subscription, include: :thread)
 
     if probe
       subscription_address = subscription.address
@@ -89,8 +94,10 @@ module Consumer
   def update_position(position)
     logger.trace { "Updating position (Position: #{position}, Interval: #{position_update_interval})" }
 
-    if position % position_update_interval == 0
-      position_store.put position
+    position_offset = position % position_update_interval
+
+    if position_offset == 0
+      position_store.put(position)
 
       logger.debug { "Updated position (Position: #{position}, Interval: #{position_update_interval})" }
     else
@@ -112,7 +119,7 @@ module Consumer
     def configure(batch_size: nil, session: nil, position_store: nil)
       logger.trace { "Configuring (Batch Size: #{batch_size}, Session: #{session.inspect})" }
 
-      super if defined? super
+      super if defined?(super)
 
       starting_position = self.position_store.get
 
@@ -125,9 +132,9 @@ module Consumer
         cycle_timeout_milliseconds: cycle_timeout_milliseconds
       )
 
-      handlers = self.class.handler_registry.get self
+      handlers = self.class.handler_registry.get(self)
 
-      dispatch = Dispatch.configure self, handlers
+      dispatch = Dispatch.configure(self, handlers)
 
       logger.debug { "Done configuring (Batch Size: #{batch_size}, Session: #{session.inspect}, Starting Position: #{starting_position})" }
     end
@@ -139,7 +146,7 @@ module Consumer
       instance.position_update_interval = position_update_interval
       instance.cycle_maximum_milliseconds = cycle_maximum_milliseconds
       instance.cycle_timeout_milliseconds = cycle_timeout_milliseconds
-      instance.configure batch_size: batch_size, position_store: position_store, session: session
+      instance.configure(batch_size: batch_size, position_store: position_store, session: session)
       instance
     end
   end
@@ -147,14 +154,14 @@ module Consumer
   module Run
     def run(stream_name, **arguments, &probe)
       instance = build stream_name, **arguments
-      instance.run &probe
+      instance.run(&probe)
     end
   end
 
   module Start
     def start(stream_name, **arguments, &probe)
       instance = build stream_name, **arguments
-      instance.start &probe
+      instance.start(&probe)
     end
   end
 
@@ -162,7 +169,7 @@ module Consumer
     def handler_macro(handler=nil, &block)
       handler ||= block
 
-      handler_registry.register handler
+      handler_registry.register(handler)
     end
     alias_method :handler, :handler_macro
 
@@ -170,4 +177,20 @@ module Consumer
       @handler_registry ||= HandlerRegistry.new
     end
   end
+
+  module IdentifierMacro
+    attr_writer :identifier
+
+    def identifier_macro(identifier)
+      self.identifier = identifier
+    end
+
+    def identifier(identifier=nil)
+      if identifier.nil?
+        @identifier
+      else
+        identifier_macro(identifier)
+      end
+    end
+  end
 end

data/lib/consumer/controls.rb

@@ -9,6 +9,7 @@ require 'consumer/controls/get'
 require 'consumer/controls/get/incrementing'
 require 'consumer/controls/handle'
 require 'consumer/controls/id'
+require 'consumer/controls/identifier'
 require 'consumer/controls/position'
 require 'consumer/controls/stream_name'
 

data/lib/consumer/controls/consumer.rb

@@ -2,7 +2,7 @@ module Consumer
   module Controls
     module Consumer
       def self.example
-        Example.new StreamName.example
+        Example.new(StreamName.example)
       end
 
       class Example
@@ -11,8 +11,8 @@ module Consumer
         handler Handle::Example
 
         def configure(session: nil, batch_size: nil, position_store: nil)
-          Get::Example.configure self
-          PositionStore::Example.configure self, position_store: position_store
+          Get::Example.configure(self)
+          PositionStore::Example.configure(self, position_store: position_store)
         end
       end
     end

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

@@ -3,10 +3,7 @@ module Consumer
     module Consumer
       class Incrementing
         include ::Consumer
-
-        def self.logger
-          @logger ||= ::Log.get self
-        end
+        include ::Log::Dependency
 
         handler do |message_data|
           logger.info { "Handled event (StreamName: #{message_data.stream_name}, GlobalPosition: #{message_data.global_position})" }
@@ -20,9 +17,9 @@ module Consumer
           sleep_duration = ENV['SLEEP_DURATION'] || 100
           sleep_duration = sleep_duration.to_i
 
-          Get::Incrementing.configure self, sleep_duration
+          Get::Incrementing.configure(self, sleep_duration)
 
-          PositionStore::LocalFile.configure self, position_store: position_store
+          PositionStore::LocalFile.configure(self, position_store: position_store)
         end
       end
     end

data/lib/consumer/controls/error.rb

@@ -5,7 +5,7 @@ module Consumer
         Example.new
       end
 
-      Example = Class.new StandardError
+      Example = Class.new(RuntimeError)
     end
   end
 end

data/lib/consumer/controls/get.rb

@@ -15,7 +15,7 @@ module Consumer
         def call(stream_name, position: nil)
           position ||= 0
 
-          stream = streams.fetch stream_name do
+          stream = streams.fetch(stream_name) do
             return nil
           end
 

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

@@ -7,7 +7,7 @@ module Consumer
         initializer :sleep_duration
 
         def self.build(sleep_duration)
-          new sleep_duration
+          new(sleep_duration)
         end
 
         def call(stream_name, position: nil)
@@ -27,7 +27,10 @@ module Consumer
 
       class MessageData
         def self.get(stream_name, global_position, position)
-          data = { :position => position, :global_position => global_position }
+          data = {
+            :position => position,
+            :global_position => global_position
+          }
 
           Controls::MessageData.example(
             stream_name: stream_name,

data/lib/consumer/controls/handle.rb

@@ -9,15 +9,15 @@ module Consumer
         include Messaging::Handle
 
         def handle(message_data)
-          handled_events << message_data
+          handled_messages << message_data
         end
 
-        def handled_events
-          @handled_events ||= []
+        def handled_messages
+          @handled_messages ||= []
         end
 
         def handled?(message_data)
-          handled_events.include? message_data
+          handled_messages.include?(message_data)
         end
       end
     end

data/lib/consumer/controls/identifier.rb

@@ -0,0 +1,9 @@
+module Consumer
+  module Controls
+    module Identifier
+      def self.example
+        'some-consumer'
+      end
+    end
+  end
+end

data/lib/consumer/controls/position_store.rb

@@ -10,10 +10,16 @@ module Consumer
 
         attr_accessor :telemetry_sink
 
+        def self.build
+          instance = new
+          instance.configure
+          instance
+        end
+
         def configure
           self.telemetry_sink = ::Consumer::PositionStore::Telemetry::Sink.new
 
-          telemetry.register telemetry_sink
+          telemetry.register(telemetry_sink)
         end
 
         def get

data/lib/consumer/controls/position_store/local_file.rb

@@ -4,14 +4,20 @@ module Consumer
       class LocalFile
         include Consumer::PositionStore
 
+        def self.build
+          instance = new
+          instance.configure
+          instance
+        end
+
         def get
-          return 0 unless File.exist? path
-          text = File.read path
+          return 0 unless File.exist?(path)
+          text = File.read(path)
           text.to_i
         end
 
         def put(position)
-          File.write path, position
+          File.write(path, position)
         end
 
         def path

data/lib/consumer/controls/subscription.rb

@@ -7,10 +7,10 @@ module Consumer
         get = Get.example
 
         unless batch.nil?
-          get.set_batch stream_name, batch, position
+          get.set_batch(stream_name, batch, position)
         end
 
-        subscription = ::Consumer::Subscription.new stream_name, get
+        subscription = ::Consumer::Subscription.new(stream_name, get)
 
         subscription.position = position if position
 

data/lib/consumer/dispatch.rb

@@ -10,20 +10,20 @@ module Consumer
       instance = new
 
       handlers.each do |handler|
-        instance.add_handler handler
+        instance.add_handler(handler)
       end
 
       instance
     end
 
     def call(message_data)
-      logger.trace { "Dispatching event (#{LogText.message_data message_data})" }
+      logger.trace { "Dispatching event (#{LogText.message_data(message_data)})" }
 
       handlers.each do |handle|
         handle.(message_data)
       end
 
-      logger.debug { "Event dispatched (#{LogText.message_data message_data}, Handlers Count: #{handlers.count})" }
+      logger.debug { "Event dispatched (#{LogText.message_data(message_data)}, Handlers Count: #{handlers.count})" }
 
       nil
     end
@@ -37,12 +37,12 @@ module Consumer
     end
 
     def to_proc
-      method :call
+      method(:call)
     end
 
     module Assertions
       def handler?(handle)
-        handler_registry.registered? handle
+        handler_registry.registered?(handle)
       end
     end
   end

data/lib/consumer/dispatch/substitute.rb

@@ -7,25 +7,25 @@ module Consumer
 
       class Dispatch
         def call(message_data)
-          dispatched_events << message_data
+          dispatched_messages << message_data
         end
 
         def add_handler(handle)
           handlers << handle
         end
 
-        def dispatched_events
-          @dispatched_events ||= []
+        def dispatched_messages
+          @dispatched_messages ||= []
         end
 
         def dispatched?(message_data=nil, &block)
           if message_data.nil?
             block ||= proc { true }
           else
-            block ||= proc { |e| message_data == e }
+            block ||= proc { |msg| message_data == msg }
           end
 
-          dispatched_events.any? &block
+          dispatched_messages.any? &block
         end
 
         def handlers
@@ -33,7 +33,7 @@ module Consumer
         end
 
         def handler?(handler)
-          handlers.include? handler
+          handlers.include?(handler)
         end
       end
     end

data/lib/consumer/handler_registry.rb

@@ -5,17 +5,17 @@ module Consumer
     configure :handler_registry
 
     def register(handler)
-      logger.trace { "Registering handler (Handler: #{LogText.handler handler})" }
+      logger.trace { "Registering handler (Handler: #{LogText.handler(handler)})" }
 
       if registered? handler
-        error_message = "Handler is already registered (Handler: #{LogText.handler handler})"
-        logger.error error_message
+        error_message = "Handler is already registered (Handler: #{LogText.handler(handler)})"
+        logger.error { error_message }
         raise Error, error_message
       end
 
       entries << handler
 
-      logger.debug { "Handler registered (Handler: #{LogText.handler handler})" }
+      logger.debug { "Handler registered (Handler: #{LogText.handler(handler)})" }
 
       handler
     end
@@ -24,7 +24,7 @@ module Consumer
       entries.map do |handler|
         if handler.is_a? Proc
           proc { |message_data|
-            consumer.instance_exec message_data, &handler
+            consumer.instance_exec(message_data, &handler)
           }
         else
           handler.build
@@ -36,7 +36,7 @@ module Consumer
       entries.any? do |entry|
         return true if handler == entry 
 
-        next if entry.is_a? Proc
+        next if entry.is_a?(Proc)
 
         handler === entry
       end
@@ -60,6 +60,6 @@ module Consumer
       end
     end
 
-    Error = Class.new StandardError
+    Error = Class.new(RuntimeError)
   end
 end

data/lib/consumer/position_store.rb

@@ -15,13 +15,11 @@ module Consumer
       end
     end
 
-    Virtual::Method.define self, :configure
+    Virtual::Method.define(self, :configure)
 
     module Build
-      def build
-        instance = new
-        instance.configure
-        instance
+      def self.extended(cls)
+        Virtual::PureMethod.define(cls.singleton_class, :build)
       end
     end
 
@@ -31,13 +29,13 @@ module Consumer
 
         if position_store.nil?
           if arguments.any?
-            position_store = build *arguments, **keyword_arguments
+            position_store = build(*arguments, **keyword_arguments)
           else
-            position_store = build *arguments
+            position_store = build(*arguments)
           end
         end
 
-        receiver.public_send "#{attr_name}=", position_store
+        receiver.public_send("#{attr_name}=", position_store)
 
         position_store
       end
@@ -45,7 +43,7 @@ module Consumer
 
     module Configure
       def configure
-        ::Telemetry.configure self
+        ::Telemetry.configure(self)
 
         super
       end
@@ -53,7 +51,7 @@ module Consumer
 
     module Get
       def self.prepended(cls)
-        Virtual::PureMethod.define cls, :get
+        Virtual::PureMethod.define(cls, :get)
       end
 
       def get
@@ -63,7 +61,7 @@ module Consumer
 
         logger.info { "Get position done (Position: #{position || '(none)'})" }
 
-        telemetry.record :get, Telemetry::Get.new(position)
+        telemetry.record(:get, Telemetry::Get.new(position))
 
         position
       end
@@ -71,7 +69,7 @@ module Consumer
 
     module Put
       def self.prepended(cls)
-        Virtual::Method.define cls, :put
+        Virtual::Method.define(cls, :put)
       end
 
       def put(position)
@@ -81,7 +79,7 @@ module Consumer
 
         logger.info { "Put position done (Position: #{position})" }
 
-        telemetry.record :put, Telemetry::Put.new(position)
+        telemetry.record(:put, Telemetry::Put.new(position))
 
         nil
       end

data/lib/consumer/position_store/telemetry.rb

@@ -8,8 +8,8 @@ module Consumer
         record :put
       end
 
-      Get = Struct.new :position
-      Put = Struct.new :position
+      Get = Struct.new(:position)
+      Put = Struct.new(:position)
     end
   end
 end

data/lib/consumer/subscription.rb

@@ -20,7 +20,7 @@ module Consumer
       cycle_maximum_milliseconds ||= Defaults.cycle_maximum_milliseconds
       cycle_timeout_milliseconds ||= Defaults.cycle_timeout_milliseconds
 
-      instance = new stream_name, get
+      instance = new(stream_name, get)
 
       instance.position = position
 
@@ -67,7 +67,7 @@ module Consumer
 
       batch = reset_next_batch
 
-      reply_message = get_batch.reply_message batch
+      reply_message = get_batch.reply_message(batch)
 
       send.(reply_message, get_batch.reply_address)
 

data/lib/consumer/subscription/get_batch.rb

@@ -1,6 +1,6 @@
 module Consumer
   class Subscription
-    GetBatch = Struct.new :reply_address
+    GetBatch = Struct.new(:reply_address)
 
     class GetBatch
       include ::Actor::Messaging::Message

data/lib/consumer/substitute.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-consumer
 version: !ruby/object:Gem::Version
-  version: 0.5.0.4
+  version: 0.6.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ntl-actor
@@ -99,6 +99,7 @@ files:
 - lib/consumer/controls/get/incrementing.rb
 - lib/consumer/controls/handle.rb
 - lib/consumer/controls/id.rb
+- lib/consumer/controls/identifier.rb
 - lib/consumer/controls/message_data.rb
 - lib/consumer/controls/message_data/batch.rb
 - lib/consumer/controls/position.rb