evt-consumer-postgres 2.2.0.0 → 2.3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d70c7356d131dd6d6cbe9242ddfa54ac600e40cea725de3232042cb3b0cac802
-  data.tar.gz: 2aecd3ff64cd6258b48b1ebcb95f432606d998b386592f4cdc94775d86ea2faa
+  metadata.gz: 4f2cedd4bf0b74f3dbaf6a106848d4565a5293e9e64c0d7aaaa65f858ed161fb
+  data.tar.gz: 3bbd51b10ef1e29d9389509635e848a93cf61125a19d5e3017ba4873ea065321
 SHA512:
-  metadata.gz: 02e7fa5d900dd3e9afa138aedb2f257fd7b2d16dae4fbf8373981ddab290c63d2854e555921c0b06894c679f5cf2bf15b68df2c3a69daba037624ee9868a9b00
-  data.tar.gz: bc1c3e7c2cfc5db09cdb805463602c450785a0b9d283044ad77a3921ba40004c2c7a7c7b4f851e739a47f09faa3a4359c30143cf41dd02d5634d334c0db509d1
+  metadata.gz: a35c5c9b664660be24a76276b90c8589ceaa9f2677c91ecdfca7ec2ec9442a12cdea5aa1f70bf863592d5403f1344d8c3e3c3eccac949c5c53cea05f7df15e39
+  data.tar.gz: f0576665c9132715ad5d6291a1d0b07c0b3a037a2e383e34a9b342394dc5a94e839063c663f47b0721da309e834abeea8f930172187df3567d962661d473ac3b

data/lib/consumer/postgres.rb

@@ -1,6 +1,7 @@
 require 'consumer'
 
 require 'messaging/postgres'
+require 'consumer/postgres/identifier'
 
 require 'consumer/postgres/position_store'
 require 'consumer/postgres/position_store/recorded'

data/lib/consumer/postgres/controls/id.rb

@@ -1,7 +1,7 @@
 module Consumer
   module Postgres
     module Controls
-      ID = Identifier::UUID::Controls::Incrementing
+      ID = ::Identifier::UUID::Controls::Incrementing
     end
   end
 end

data/lib/consumer/postgres/controls/message.rb

@@ -8,6 +8,8 @@ module Consumer
 
           message
         end
+
+        Metadata = Messaging::Controls::Metadata
       end
     end
   end

data/lib/consumer/postgres/controls/stream_name.rb

@@ -1,7 +1,7 @@
 module Consumer
   module Postgres
     module Controls
-      StreamName = ::Consumer::Controls::StreamName
+      StreamName = Messaging::Controls::StreamName
 
       module StreamName
         module Position
@@ -11,7 +11,7 @@ module Consumer
 
             types << 'position'
 
-            StreamName.example(
+            Messaging::Controls::StreamName.example(
               id: id,
               category: category,
               types: types

data/lib/consumer/postgres/identifier.rb

@@ -0,0 +1,7 @@
+module Consumer
+  module Postgres
+    module Identifier
+      Error = Class.new(RuntimeError)
+    end
+  end
+end

data/lib/consumer/postgres/position_store.rb

@@ -29,6 +29,10 @@ module Consumer
         Messaging::Postgres::Write.configure(self, session: session)
       end
 
+      def location
+        stream_name
+      end
+
       def get
         message_data = read.(stream_name)
 

data/lib/consumer/postgres/position_store/stream_name.rb

@@ -9,7 +9,6 @@ module Consumer
             raise Error, "Position store's stream name must be a category (Stream Name: #{stream_name})"
           end
 
-          stream_id = MessageStore::StreamName.get_id(stream_name)
           entity_name = MessageStore::StreamName.get_entity_name(stream_name)
           type_list = MessageStore::StreamName.get_types(stream_name)
 
@@ -19,12 +18,9 @@ module Consumer
             type_list << position_type
           end
 
+          stream_id = nil
           if not consumer_identifier.nil?
-            if stream_id.nil?
-              stream_id = consumer_identifier
-            else
-              stream_id = "#{stream_id}-#{consumer_identifier}"
-            end
+            stream_id = consumer_identifier
           end
 
           MessageStore::StreamName.stream_name(

data/lib/consumer/postgres/postgres.rb

@@ -12,32 +12,50 @@ module Consumer
       end
     end
 
-    def starting
-      unless batch_size.nil?
-        logger.info(tag: :*) { "Batch Size: #{batch_size}" }
-      end
-
-      unless correlation.nil?
-        logger.info(tag: :*) { "Correlation: #{correlation}" }
-      end
+    def print_startup_info
+      STDOUT.puts "      Correlation: #{correlation || '(none)'}"
 
       unless group_member.nil? && group_size.nil?
-        logger.info(tag: :*) { "Group Member: #{group_member.inspect}, Group Size: #{group_size.inspect}" }
+        STDOUT.puts "      Group Member: #{group_member.inspect}"
+        STDOUT.puts "      Group Size: #{group_size.inspect}"
       end
 
       unless condition.nil?
-        logger.info(tag: :*) { "Condition: #{condition}" }
+        STDOUT.puts "      Condition: #{condition.inspect || '(none)'}"
       end
     end
 
-    def configure(batch_size: nil, settings: nil, correlation: nil, group_member: nil, group_size: nil, condition: nil)
+    def log_startup_info
+      logger.info(tags: [:consumer, :start]) { "Correlation: #{correlation.inspect} (Consumer: #{self.class.name})" }
+      logger.info(tags: [:consumer, :start]) { "Batch Size: #{get.batch_size.inspect} (Consumer: #{self.class.name})" }
+      logger.info(tags: [:consumer, :start]) { "Group Member: #{group_member.inspect} (Consumer: #{self.class.name})" }
+      logger.info(tags: [:consumer, :start]) { "Group Size: #{group_size.inspect} (Consumer: #{self.class.name})" }
+      logger.info(tags: [:consumer, :start]) { "Condition: #{condition.inspect} (Consumer: #{self.class.name})" }
+    end
+
+    def starting
+      if identifier.nil? && !group_member.nil? && !group_size.nil?
+        raise Identifier::Error, 'Identifier must not be omitted when the consumer is a member of a group'
+      end
+    end
+
+    # TODO: Remove deprecated settings argument that has been replaced with session_settings when no longer in use (Nathan Ladd, Mon Nov 30 2020)
+    def configure(session_settings: nil, batch_size: nil, correlation: nil, group_member: nil, group_size: nil, condition: nil, settings: nil)
       self.batch_size = batch_size
       self.correlation = correlation
       self.group_member = group_member
       self.group_size = group_size
       self.condition = condition
 
-      MessageStore::Postgres::Session.configure(self, settings: settings)
+      session_settings ||= settings
+
+      if not session_settings.nil?
+        if not session_settings.is_a?(::Settings)
+          session_settings = ::Settings.build(session_settings)
+        end
+      end
+
+      MessageStore::Postgres::Session.configure(self, settings: session_settings)
       session = self.session
 
       get_session = MessageStore::Postgres::Session.build(settings: settings)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-consumer-postgres
 version: !ruby/object:Gem::Version
-  version: 2.2.0.0
+  version: 2.3.2.1
 platform: ruby
 authors:
 - The Eventide Project
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2021-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-consumer
@@ -70,6 +70,7 @@ files:
 - lib/consumer/postgres/controls/position/store/recorded.rb
 - lib/consumer/postgres/controls/position/stream/write.rb
 - lib/consumer/postgres/controls/stream_name.rb
+- lib/consumer/postgres/identifier.rb
 - lib/consumer/postgres/position_store.rb
 - lib/consumer/postgres/position_store/recorded.rb
 - lib/consumer/postgres/position_store/stream_name.rb
@@ -78,7 +79,7 @@ homepage: https://github.com/eventide-project/consumer-postgres
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -93,8 +94,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Postgres implementation of continuous subscription to a category and message
   dispatching to handlers