evt-consumer 2.2.0.2 → 2.3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1655677eabb7b620e0ea1a528d4b3406829041e560d32e803056c7c80926536
-  data.tar.gz: 7b7c5126c3641c3c042ab3bb6f2ed870c5c5ce078e731cc60b681901097ebe41
+  metadata.gz: 017c30298e5d8a0a9fe23fa86e09c44323e1a22d52e3663969747a02e2436146
+  data.tar.gz: 29bd3ab2d3024ab66821a5234e7195e669fc1ae2425ca5eed29261ff7dedc366
 SHA512:
-  metadata.gz: 7e9d3b6f759a77e5cb305d61a3f662aed1130e479ba9a14d504f8ed494f2e78e425984996b25518772097c3e830cdffdf355f8b06a89d4444f2e9bb72dae68d0
-  data.tar.gz: 5121f4eb1a4cc6888e14afbb308b0b907d79013e07fdb5bb3bc314fc49451758c6b38280423efd0bb1be7ce1082b86b49baef7900a06f0187f3b0525e77a7e08
+  metadata.gz: 456d640e41bf8ed1a4d5fe81f81158eb49bb74d49447765d29c9e4d30f085506d36357724b6dd05d2b9a9241e5644d005e46993df344439f1b37a19efd81afb2
+  data.tar.gz: 35a6285dfe925119da75328deef4f4d58d8ce94e8a0bdfb0d250f1a3a21e4815dc0511e7b603f29cd6956a302785a9af6531b91d334a41b772471ad737a4c5fc

data/lib/consumer/consumer.rb

@@ -37,6 +37,8 @@ module Consumer
 
       attr_accessor :session
 
+      attr_accessor :supplemental_settings
+
       dependency :get, MessageStore::Get
       dependency :position_store, PositionStore
       dependency :subscription, Subscription
@@ -87,7 +89,7 @@ module Consumer
 
     print_startup_info if respond_to?(:print_startup_info)
 
-    STDOUT.puts "      Position Stream: #{position_store.stream_name}"
+    STDOUT.puts "      Position Location: #{position_store.location || '(none)'}"
 
     STDOUT.puts
 
@@ -119,7 +121,7 @@ module Consumer
     logger.trace(tags: [:consumer, :dispatch, :message]) { "Dispatching message (#{LogText.message_data(message_data)})" }
 
     self.class.handler_registry.each do |handler|
-      handler.(message_data, session: session)
+      handler.(message_data, session: session, settings: supplemental_settings)
     end
 
     update_position(message_data.global_position)
@@ -172,13 +174,21 @@ module Consumer
   end
 
   module Build
-    def build(category, position_update_interval: nil, poll_interval_milliseconds: nil, identifier: nil, **arguments)
+    def build(category, position_update_interval: nil, poll_interval_milliseconds: nil, identifier: nil, supplemental_settings: nil, **arguments)
       instance = new(category)
 
-      unless identifier.nil?
+      if not identifier.nil?
         instance.identifier = identifier
       end
 
+      if not supplemental_settings.nil?
+        if not supplemental_settings.is_a?(::Settings)
+          supplemental_settings = ::Settings.build(supplemental_settings)
+        end
+
+        instance.supplemental_settings = supplemental_settings
+      end
+
       instance.position_update_interval = position_update_interval
       instance.poll_interval_milliseconds = poll_interval_milliseconds
 

data/lib/consumer/controls.rb

@@ -1,3 +1,4 @@
+require 'settings/controls'
 require 'messaging/controls'
 
 require 'consumer/controls/category'
@@ -11,7 +12,7 @@ require 'consumer/controls/id'
 require 'consumer/controls/identifier'
 require 'consumer/controls/position'
 require 'consumer/controls/session'
-require 'consumer/controls/stream_name'
+require 'consumer/controls/settings'
 
 require 'consumer/controls/position_store'
 require 'consumer/controls/position_store/file'
@@ -19,6 +20,7 @@ require 'consumer/controls/subscription'
 
 require 'consumer/controls/handle'
 require 'consumer/controls/handle/raise_error'
+require 'consumer/controls/handle/settings'
 
 require 'consumer/controls/actor'
 

data/lib/consumer/controls/consumer.rb

@@ -59,6 +59,14 @@ module Consumer
       end
 
       Example = self.example_class
+
+      module Settings
+        def self.example_class
+          Consumer.example_class(handlers: [Handle::Settings::Example])
+        end
+
+        Example = self.example_class
+      end
     end
   end
 end

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

@@ -15,7 +15,7 @@ module Consumer
           attr_accessor :failed_message
 
           handler Handle::Example
-          handler Handle::RaiseError
+          handler Handle::RaiseError::Example
 
           def error_raised(error, message)
             self.handled_error = error

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

@@ -22,6 +22,10 @@ module Consumer
           instance
         end
 
+        def category
+          Category.example
+        end
+
         def batch_size
           Defaults.batch_size
         end

data/lib/consumer/controls/handle/settings.rb

@@ -0,0 +1,26 @@
+module Consumer
+  module Controls
+    module Handle
+      module Settings
+        Error = Class.new(RuntimeError)
+
+        class Example
+          include Messaging::Handle
+
+          include ::Settings::Setting
+          setting :some_setting
+
+          attr_accessor :some_other_setting
+
+          def configure(settings:)
+            settings.set(self)
+          end
+
+          def handle(message_data)
+            raise Settings::Error if some_setting.nil?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/consumer/controls/position_store.rb

@@ -1,24 +1,35 @@
 module Consumer
   module Controls
     module PositionStore
-      def self.example
-        Example.build
+      def self.example(&block)
+        if block.nil?
+          cls = Example
+        else
+          cls = example_class(&block)
+        end
+
+        cls.build
       end
 
-      class Example
-        include ::Consumer::PositionStore
+      def self.example_class(&block)
+        Class.new do
+          include ::Consumer::PositionStore
 
-        attr_accessor :telemetry_sink
+          def self.build
+            instance = new
+            instance.configure
+            instance
+          end
 
-        def stream_name
-          'somePositionStream'
-        end
+          def configure
+          end
 
-        def self.build
-          instance = new
-          instance.configure
-          instance
+          class_exec(&block) unless block.nil?
         end
+      end
+
+      Example = example_class do
+        attr_accessor :telemetry_sink
 
         def configure
           self.telemetry_sink = ::Consumer::PositionStore::Telemetry::Sink.new
@@ -33,6 +44,12 @@ module Consumer
         def put(_)
         end
       end
+
+      module Location
+        def self.example
+          'somePositionStream'
+        end
+      end
     end
   end
 end

data/lib/consumer/controls/settings.rb

@@ -0,0 +1,13 @@
+module Consumer
+  module Controls
+    module Settings
+      def self.example
+        ::Settings.build(data)
+      end
+
+      def self.data
+        ::Settings::Controls::Data::Flat::Single.example
+      end
+    end
+  end
+end

data/lib/consumer/position_store.rb

@@ -3,6 +3,7 @@ module Consumer
     def self.included(cls)
       cls.class_exec do
         include Dependency
+        include Virtual
         include Log::Dependency
 
         extend Build
@@ -13,6 +14,8 @@ module Consumer
         prepend Put
 
         dependency :telemetry, ::Telemetry
+
+        virtual :location
       end
     end
 

data/lib/consumer/position_store/substitute.rb

@@ -6,6 +6,8 @@ module Consumer
       end
 
       class PositionStore
+        include Consumer::PositionStore
+
         attr_accessor :get_position
         attr_accessor :put_position
 

data/lib/consumer/subscription.rb

@@ -53,7 +53,7 @@ module Consumer
       end
 
       if batch.nil? || batch.empty?
-        logger.debug { "Did not resupply; no events available (Category: #{get.category}, Position: #{position})" }
+        logger.debug { "Did not resupply; no events available (Stream: #{get.stream_name}, Position: #{position})" }
 
         :resupply
       else

data/lib/consumer/subscription/defaults.rb

@@ -2,6 +2,9 @@ module Consumer
   class Subscription
     module Defaults
       def self.poll_interval_milliseconds
+        env_interval = ENV['POLL_INTERVAL_MILLISECONDS']
+        return env_interval.to_i if !env_interval.nil?
+
         100
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-consumer
 version: !ruby/object:Gem::Version
-  version: 2.2.0.2
+  version: 2.3.1.1
 platform: ruby
 authors:
 - The Eventide Project
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ntl-actor
@@ -114,6 +114,7 @@ files:
 - lib/consumer/controls/get/incrementing.rb
 - lib/consumer/controls/handle.rb
 - lib/consumer/controls/handle/raise_error.rb
+- lib/consumer/controls/handle/settings.rb
 - lib/consumer/controls/id.rb
 - lib/consumer/controls/identifier.rb
 - lib/consumer/controls/message_data.rb
@@ -123,7 +124,7 @@ files:
 - lib/consumer/controls/position_store.rb
 - lib/consumer/controls/position_store/file.rb
 - lib/consumer/controls/session.rb
-- lib/consumer/controls/stream_name.rb
+- lib/consumer/controls/settings.rb
 - lib/consumer/controls/subscription.rb
 - lib/consumer/defaults.rb
 - lib/consumer/handler_registry.rb
@@ -132,8 +133,6 @@ files:
 - lib/consumer/position_store.rb
 - lib/consumer/position_store/substitute.rb
 - lib/consumer/position_store/telemetry.rb
-- lib/consumer/postgres
-- lib/consumer/postgres.rb
 - lib/consumer/subscription.rb
 - lib/consumer/subscription/defaults.rb
 - lib/consumer/subscription/get_batch.rb
@@ -142,7 +141,7 @@ homepage: https://github.com/eventide-project/consumer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,8 +156,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Continuous subscription to a category and message dispatching to handlers
 test_files: []

data/lib/consumer/controls/stream_name.rb

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

data/lib/consumer/postgres

@@ -1 +0,0 @@
-lib/consumer/Users/sbellware/projects/eventide/consumer-postgres/lib/consumer/postgres

data/lib/consumer/postgres.rb

@@ -1 +0,0 @@
-lib/consumer/Users/sbellware/projects/eventide/consumer-postgres/lib/consumer/postgres.rb