evt-consumer 1.1.0.0 → 2.2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2077ef49032cd7e88e66307072188bd14f3f5eb60c3889d3eaa2d8e32d398a91
-  data.tar.gz: db192f1c6a7d6c7629200fdb71152d325ec05fcd27f1acf17d2f6f7a77088a77
+  metadata.gz: d005131cba1d68a95028facee2e86fb2936e29ae0fe296a746f4e0e25abfc910
+  data.tar.gz: caf16c231eb6195749b4b2190843ab87aed7735f4fd3b3da72555bab45f8ea76
 SHA512:
-  metadata.gz: e80126fd3557847a29603838d917b11fbdc93b617cca9ac17ea2c68471d6c1cef76c9e15656a306bf4959ff6ea80f9615db120fb8c72d37ca8096b3c2ed5c187
-  data.tar.gz: 4c64c89911619b136db60fc135619c17573410083ce86cf0fc4438254133b8bd1724f0123536393f58b783830a60c46248ba2cf62f58b96b8d4dd0852d52dcfd
+  metadata.gz: 332338327a4a4fc99a3010e1e62b0dd840d64914efba85d3f90a22a001df3215c43f49933b213ac6ae7bef78dfe2018b3cb6dcf051c40b42eb278e5d547dd0a8
+  data.tar.gz: 76e5105a629fbd97447d2423139b08ecf1d33a1cdb513bc662cacf3e4ec969888ee2b3da677fdc009583490f313d9067effac3e1c9087ee074ff9760d2bca24a

data/lib/consumer/consumer.rb

@@ -1,4 +1,6 @@
 module Consumer
+  Error = Class.new(RuntimeError)
+
   def self.included(cls)
     cls.class_exec do
       include Dependency
@@ -14,7 +16,7 @@ module Consumer
 
       prepend Configure
 
-      initializer :stream_name
+      initializer :category
 
       attr_writer :identifier
       def identifier
@@ -35,7 +37,7 @@ module Consumer
 
       attr_accessor :poll_interval_milliseconds
 
-      dependency :get
+      dependency :get, MessageStore::Get
       dependency :position_store, PositionStore
       dependency :subscription, Subscription
 
@@ -57,19 +59,22 @@ module Consumer
     update_position(message_data.global_position)
 
     logger.info { "Message 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)})" }
     error_raised(error, message_data)
   end
 
   def start(&probe)
-    logger.info(tag: :*) { "Starting consumer: #{self.class.name} (Stream: #{stream_name}, Identifier: #{identifier || '(none)'}, Position: #{subscription.position})" }
+    logger.info(tag: :*) { "Starting consumer: #{self.class.name} (Category: #{category}, Identifier: #{identifier || '(none)'}, Position: #{subscription.position})" }
+
+    if not MessageStore::StreamName.category?(category)
+      raise Error, "Consumer's stream name must be a category (Stream Name: #{category})"
+    end
 
     starting() if respond_to?(:starting)
 
     self.class.handler_registry.each do |handler|
-      logger.info(tag: :*) { "Handler: #{handler.name} (Stream Name: #{stream_name}, Consumer: #{self.class.name})" }
+      logger.info(tag: :*) { "Handler: #{handler.name} (Category: #{category}, Consumer: #{self.class.name})" }
     end
 
     _, subscription_thread = ::Actor::Start.(subscription)
@@ -82,7 +87,7 @@ module Consumer
       probe.(self, [actor_thread, subscription_thread], [actor_address, subscription_address])
     end
 
-    logger.info(tag: :*) { "Started consumer: #{self.class.name} (Stream: #{stream_name}, Identifier: #{identifier || '(none)'}, Position: #{subscription.position})" }
+    logger.info(tag: :*) { "Started consumer: #{self.class.name} (Category: #{category}, Identifier: #{identifier || '(none)'}, Position: #{subscription.position})" }
 
     AsyncInvocation::Incorrect
   end
@@ -105,13 +110,13 @@ module Consumer
 
   module LogText
     def self.message_data(message_data)
-      "Type: #{message_data.type}, Stream: #{message_data.stream_name}, Position: #{message_data.position}, GlobalPosition: #{message_data.global_position}"
+      "Type: #{message_data.type}, Stream Name: #{message_data.stream_name}, Position: #{message_data.position}, GlobalPosition: #{message_data.global_position}"
     end
   end
 
   module Configure
     def configure(**kwargs)
-      logger.trace { "Configuring (Stream Name: #{stream_name})" }
+      logger.trace { "Configuring (Category: #{category})" }
 
       super(**kwargs)
 
@@ -124,13 +129,13 @@ module Consumer
         poll_interval_milliseconds: poll_interval_milliseconds
       )
 
-      logger.debug { "Done configuring (Stream Name: #{stream_name}, Starting Position: #{starting_position})" }
+      logger.debug { "Done configuring (Category: #{category}, Starting Position: #{starting_position})" }
     end
   end
 
   module Build
-    def build(stream_name, position_update_interval: nil, poll_interval_milliseconds: nil, identifier: nil, **arguments)
-      instance = new(stream_name)
+    def build(category, position_update_interval: nil, poll_interval_milliseconds: nil, identifier: nil, **arguments)
+      instance = new(category)
 
       unless identifier.nil?
         instance.identifier = identifier
@@ -146,8 +151,8 @@ module Consumer
   end
 
   module Start
-    def start(stream_name, **arguments, &probe)
-      instance = build stream_name, **arguments
+    def start(category, **arguments, &probe)
+      instance = build category, **arguments
       instance.start(&probe)
     end
   end

data/lib/consumer/controls/consumer.rb

@@ -1,12 +1,12 @@
 module Consumer
   module Controls
     module Consumer
-      def self.example(stream_name=nil, identifier: nil, handlers: nil)
-        stream_name ||= StreamName.example
+      def self.example(category=nil, identifier: nil, handlers: nil)
+        category ||= Category.example
 
         cls = example_class(identifier: identifier, handlers: handlers)
 
-        cls.new(stream_name)
+        cls.new(category)
       end
 
       def self.example_class(identifier: nil, handlers: nil)

data/lib/consumer/controls/consumer/error_handler.rb

@@ -2,10 +2,10 @@ module Consumer
   module Controls
     module Consumer
       module ErrorHandler
-        def self.example(stream_name=nil)
-          stream_name ||= StreamName.example
+        def self.example(category=nil)
+          category ||= Category.example
 
-          Example.new(stream_name)
+          Example.new(category)
         end
 
         class Example

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

@@ -32,7 +32,7 @@ module Consumer
           sleep_duration = ENV['SLEEP_DURATION'] || 100
           sleep_duration = sleep_duration.to_i
 
-          Get::Incrementing.configure(self, stream_name, sleep_duration)
+          Get::Incrementing.configure(self, sleep_duration)
 
           PositionStore::File.configure(self, identifier: identifier)
         end

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

@@ -7,16 +7,19 @@ module Consumer
 
         configure :get
 
-        initializer :stream_name, :frequency_milliseconds
+        def frequency_milliseconds
+          @frequency_milliseconds ||= Defaults.frequency_milliseconds
+        end
+        attr_writer :frequency_milliseconds
 
         def frequency_seconds
           frequency_milliseconds.to_f / 1000
         end
 
-        def self.build(stream_name, frequency_milliseconds=nil)
-          frequency_milliseconds ||= Defaults.frequency_milliseconds
-
-          new(stream_name, frequency_milliseconds)
+        def self.build(frequency_milliseconds=nil)
+          instance = new
+          instance.frequency_milliseconds = frequency_milliseconds
+          instance
         end
 
         def batch_size
@@ -30,7 +33,6 @@ module Consumer
 
           batch_size.times.map do |offset|
             MessageData.example(
-              stream_name,
               position + offset,
               offset
             )
@@ -48,14 +50,13 @@ module Consumer
         end
 
         class MessageData
-          def self.example(stream_name, global_position, position)
+          def self.example(global_position, position)
             data = {
               :position => position,
               :global_position => global_position
             }
 
             Controls::MessageData.example(
-              stream_name: stream_name,
               data: data,
               global_position: global_position,
               position: position

data/lib/consumer/controls/message_data.rb

@@ -1,13 +1,11 @@
 module Consumer
   module Controls
     module MessageData
-      def self.example(stream_name: nil, data: nil, position: nil, global_position: nil)
+      def self.example(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?
 

data/lib/consumer/controls/stream_name.rb

@@ -1,3 +1,4 @@
+## Consider whether this is still needed after category rename
 module Consumer
   module Controls
     StreamName = Messaging::Controls::StreamName

data/lib/consumer/controls/subscription.rb

@@ -1,8 +1,8 @@
 module Consumer
   module Controls
     module Subscription
-      def self.example(stream_name: nil, next_batch: nil, position: nil, batch_size: nil, count: nil)
-        get = Get.example(stream_name: stream_name, batch_size: batch_size, count: count)
+      def self.example(category: nil, next_batch: nil, position: nil, batch_size: nil, count: nil)
+        get = Get.example(stream_name: category, batch_size: batch_size, count: count)
 
         subscription = ::Consumer::Subscription.new(get)
 

data/lib/consumer/subscription.rb

@@ -46,20 +46,20 @@ module Consumer
     end
 
     handle :resupply do
-      logger.trace { "Resupplying (Stream Name: #{get.stream_name}, Position: #{position})" }
+      logger.trace { "Resupplying (Category: #{get.category}, Position: #{position})" }
 
       batch = poll.() do
         get.(position)
       end
 
       if batch.nil? || batch.empty?
-        logger.debug { "Did not resupply; no events available (Stream Name: #{get.stream_name}, Position: #{position})" }
+        logger.debug { "Did not resupply; no events available (Category: #{get.category}, Position: #{position})" }
 
         :resupply
       else
         self.next_batch = batch
 
-        logger.debug { "Resupplied (Stream Name: #{get.stream_name}, Position: #{position}, Batch Size: #{batch.count})" }
+        logger.debug { "Resupplied (Category: #{get.category}, Position: #{position}, Batch Size: #{batch.count})" }
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-consumer
 version: !ruby/object:Gem::Version
-  version: 1.1.0.0
+  version: 2.2.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ntl-actor
@@ -158,5 +158,5 @@ requirements: []
 rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
-summary: Continuous subscription to a stream and message dispatching to handlers
+summary: Continuous subscription to a category and message dispatching to handlers
 test_files: []