evt-consumer-postgres 1.1.0.0 → 2.3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 861ae33dd8cdc77daa5ff1a5772a92197668213c7a40b3b043541184925af076
-  data.tar.gz: b5c2826abe9d2b894206d089d566983386535229206c2ff1d0f629f36ec7a078
+  metadata.gz: 2cc5ecbb73d89d8374981ab62efe89cee7d5a6d9a8431dd2700ed880fce96806
+  data.tar.gz: bf8dbfc0bb5657e95f87ca26b823cc35c495ab85a506a2b53588715a0b607df3
 SHA512:
-  metadata.gz: 52a29b32a7dc60e891d3faf0b023f24baaf4ce1ddbe45419767b32b407a53d9e9bebcf74f492f3e0b7fe8e934cc2eedf18cd33c87e9cacf82313a3e9d2788d02
-  data.tar.gz: 714324b6df2649764467298e9826e6ae5e0c23eb490dcdadcb566124dbf93e8edb94f6e6e54e0116d14b98480349a7c236e5245dac7a1957db49ca1512fb6a4d
+  metadata.gz: 5f59a010a570efe5b51da63f28054a6a6447fc5b64203e053e5ce02d5e278c656d334be2425f64212556d41737ed7b2568c471f508cad731fe1496ad52386d32
+  data.tar.gz: a8e67c94d15340b3da9424e822cbd65e7b19ca6b6e6c2fac0ea8f90852c5769f2001bfaac49286fb0b4b9c0494c03604d1556b5980fe5a8c9fdb4e261e203f83

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.rb

@@ -5,13 +5,11 @@ require 'message_store/postgres/controls'
 require 'consumer/postgres/controls/category'
 require 'consumer/postgres/controls/id'
 require 'consumer/postgres/controls/identifier'
-require 'consumer/postgres/controls/message_data'
 require 'consumer/postgres/controls/message'
 require 'consumer/postgres/controls/position'
 require 'consumer/postgres/controls/position/store/recorded'
 require 'consumer/postgres/controls/position/stream/write'
 require 'consumer/postgres/controls/stream_name'
 
-require 'consumer/postgres/controls/condition'
 require 'consumer/postgres/controls/handler'
 require 'consumer/postgres/controls/consumer'

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

@@ -2,6 +2,18 @@ module Consumer
   module Postgres
     module Controls
       Category = MessageStore::Postgres::Controls::Category
+
+      module Category
+        module Position
+          def self.example
+            category = Controls::Category.example
+
+            type = 'position'
+
+            MessageStore::StreamName.stream_name(category, type: type)
+          end
+        end
+      end
     end
   end
 end

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/position/stream/write.rb

@@ -5,9 +5,9 @@ module Consumer
         module Stream
           module Write
             def self.call(stream_name=nil, position: nil)
-              stream_name ||= StreamName::Position.example
+              stream_name ||= Category::Position.example
 
-              message = Store::Recorded.example position: position
+              message = Store::Recorded.example(position: position)
 
               Messaging::Postgres::Write.(message, stream_name)
 

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

@@ -1,31 +1,22 @@
 module Consumer
   module Postgres
     module Controls
-      StreamName = ::Consumer::Controls::StreamName
+      StreamName = Messaging::Controls::StreamName
 
       module StreamName
         module Position
-          def self.example(id: nil, randomize_category: nil, types: nil)
+          def self.example(id: nil, category: nil, types: nil)
+            category ||= Controls::Category.example(category: category)
             types ||= []
 
             types << 'position'
 
-            StreamName.example(
+            Messaging::Controls::StreamName.example(
               id: id,
-              randomize_category: randomize_category,
+              category: category,
               types: types
             )
           end
-
-          module Category
-            def self.example(category: nil)
-              category = Controls::Category.example category: category
-
-              position_type = 'position'
-
-              MessageStore::StreamName.stream_name(category, type: position_type)
-            end
-          end
         end
       end
     end

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

@@ -2,16 +2,24 @@ module Consumer
   module Postgres
     class PositionStore
       module StreamName
+        Error = Class.new(RuntimeError)
+
         def self.position_stream_name(stream_name, consumer_identifier: nil)
+          if not MessageStore::StreamName.category?(stream_name)
+            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 = MessageStore::StreamName.get_entity_name(stream_name)
+          entity_name = MessageStore::StreamName.get_entity_name(stream_name)
           type_list = MessageStore::StreamName.get_types(stream_name)
 
           position_type = Type.get
 
-          type_list << position_type unless type_list.include?(position_type)
+          if not type_list.include?(position_type)
+            type_list << position_type
+          end
 
-          unless consumer_identifier.nil?
+          if not consumer_identifier.nil?
             if stream_id.nil?
               stream_id = consumer_identifier
             else
@@ -20,7 +28,7 @@ module Consumer
           end
 
           MessageStore::StreamName.stream_name(
-            entity,
+            entity_name,
             stream_id,
             types: type_list
           )

data/lib/consumer/postgres/postgres.rb

@@ -6,130 +6,77 @@ module Consumer
 
         attr_accessor :batch_size
         attr_accessor :correlation
-        attr_accessor :group_size
         attr_accessor :group_member
+        attr_accessor :group_size
         attr_accessor :condition
-        attr_accessor :composed_condition
       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_size.nil? && group_member.nil?
-        logger.info(tag: :*) { "Group Size: #{group_size.inspect}, Group Member: #{group_member.inspect}" }
+      unless group_member.nil? && group_size.nil?
+        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
 
-      unless composed_condition.nil?
-        logger.debug(tag: :*) { "Composed Condition: #{composed_condition}" }
-      end
+    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 configure(batch_size: nil, settings: nil, correlation: nil, group_size: nil, group_member: nil, condition: nil)
-      composed_condition = Condition.compose(correlation: correlation, group_size: group_size, group_member: group_member, condition: condition)
+    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_size = group_size
       self.group_member = group_member
+      self.group_size = group_size
       self.condition = condition
-      self.composed_condition = composed_condition
 
-      MessageStore::Postgres::Session.configure(self, settings: settings)
+      session_settings ||= settings
 
-      session = self.session
+      if not session_settings.nil?
+        if not session_settings.is_a?(::Settings)
+          session_settings = ::Settings.build(session_settings)
+        end
+      end
 
-      PositionStore.configure(
-        self,
-        stream_name,
-        consumer_identifier: identifier,
-        session: session
-      )
+      MessageStore::Postgres::Session.configure(self, settings: session_settings)
+      session = self.session
 
       get_session = MessageStore::Postgres::Session.build(settings: settings)
-      MessageStore::Postgres::Get.configure(
+
+      MessageStore::Postgres::Get::Category.configure(
         self,
-        stream_name,
+        category,
         batch_size: batch_size,
-        condition: composed_condition,
+        correlation: correlation,
+        consumer_group_member: group_member,
+        consumer_group_size: group_size,
+        condition: condition,
         session: get_session
       )
-    end
-
-    module Condition
-      extend self
-
-      def compose(condition: nil, correlation: nil, group_size: nil, group_member: nil)
-        composed_condition = []
-
-        unless condition.nil?
-          composed_condition << condition
-        end
-
-        unless correlation.nil?
-          Correlation.assure(correlation)
-          composed_condition << "metadata->>'correlationStreamName' like '#{correlation}-%'"
-        end
 
-        unless group_size.nil? && group_member.nil?
-          Group.assure(group_size, group_member)
-          composed_condition << "@hash_64(stream_name) % #{group_size} = #{group_member}"
-        end
-
-        return nil if composed_condition.empty?
-
-        sql_condition = composed_condition.join(' AND ')
-
-        sql_condition
-      end
-    end
-
-    module Correlation
-      Error = Class.new(RuntimeError)
-
-      def self.assure(correlation)
-        unless MessageStore::StreamName.category?(correlation)
-          raise Correlation::Error, "Correlation must be a category (Correlation: #{correlation})"
-        end
-      end
-    end
-
-    module Group
-      Error = Class.new(RuntimeError)
-
-      def self.assure(group_size, group_member)
-        error_message = 'Consumer group definition is incorrect.'
-
-        arguments_count = [group_size, group_member].compact.length
-
-        if arguments_count == 1
-          raise Error, "#{error_message} Group size and group member are both required. (Group Size: #{group_size.inspect}, Group Member: #{group_member.inspect})"
-        end
-
-        return if arguments_count == 0
-
-        if group_size < 1
-          raise Error, "#{error_message} Group size must not be less than 1. (Group Size: #{group_size.inspect}, Group Member: #{group_member.inspect})"
-        end
-
-        if group_member < 0
-          raise Error, "#{error_message} Group member must not be less than 0. (Group Size: #{group_size.inspect}, Group Member: #{group_member.inspect})"
-        end
-
-        if group_member >= group_size
-          raise Error, "#{error_message} Group member must be at least one less than group size. (Group Size: #{group_size.inspect}, Group Member: #{group_member.inspect})"
-        end
-      end
+      PositionStore.configure(
+        self,
+        category,
+        consumer_identifier: identifier,
+        session: session
+      )
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-consumer-postgres
 version: !ruby/object:Gem::Version
-  version: 1.1.0.0
+  version: 2.3.2.0
 platform: ruby
 authors:
 - The Eventide Project
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2020-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-consumer
@@ -61,17 +61,16 @@ files:
 - lib/consumer/postgres.rb
 - lib/consumer/postgres/controls.rb
 - lib/consumer/postgres/controls/category.rb
-- lib/consumer/postgres/controls/condition.rb
 - lib/consumer/postgres/controls/consumer.rb
 - lib/consumer/postgres/controls/handler.rb
 - lib/consumer/postgres/controls/id.rb
 - lib/consumer/postgres/controls/identifier.rb
 - lib/consumer/postgres/controls/message.rb
-- lib/consumer/postgres/controls/message_data.rb
 - lib/consumer/postgres/controls/position.rb
 - 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
@@ -80,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
@@ -95,9 +94,9 @@ 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 stream and message
+summary: Postgres implementation of continuous subscription to a category and message
   dispatching to handlers
 test_files: []

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

@@ -1,25 +0,0 @@
-module Consumer
-  module Postgres
-    module Controls
-      module Condition
-        module Correlation
-          def self.example(category:)
-            "metadata->>'correlationStreamName' like '#{category}-%'"
-          end
-        end
-
-        module ConsumerGroup
-          def self.example(group_size:, group_member:)
-            "@hash_64(stream_name) % #{group_size} = #{group_member}"
-          end
-        end
-
-        module Ordinary
-          def self.example
-            'some condition'
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,7 +0,0 @@
-module Consumer
-  module Postgres
-    module Controls
-      MessageData = ::Consumer::Controls::MessageData
-    end
-  end
-end