pg_eventstore 1.13.1 → 1.13.3

data/lib/pg_eventstore/web/paginator/helpers.rb

@@ -10,10 +10,10 @@ module PgEventstore
           id = collection.prev_page_starting_id
           disabled = id ? '' : 'disabled'
           <<~HTML
-          <li class="page-item #{disabled}">
-            <a class="page-link" href="#{build_starting_id_link(id)}" tabindex="-1">Previous</a>
-          </li>
-        HTML
+            <li class="page-item #{disabled}">
+              <a class="page-link" href="#{build_starting_id_link(id)}" tabindex="-1">Previous</a>
+            </li>
+          HTML
         end
 
         # @param collection [PgEventstore::Web::Paginator::BaseCollection]
@@ -22,20 +22,20 @@ module PgEventstore
           id = collection.next_page_starting_id
           disabled = id ? '' : 'disabled'
           <<~HTML
-          <li class="page-item #{disabled}">
-            <a class="page-link" href="#{build_starting_id_link(id)}" tabindex="-1">Next</a>
-          </li>
-        HTML
+            <li class="page-item #{disabled}">
+              <a class="page-link" href="#{build_starting_id_link(id)}" tabindex="-1">Next</a>
+            </li>
+          HTML
         end
 
         # @return [String]
         def first_page_link
           path = build_path(params.slice(*(params.keys - ['starting_id'])))
           <<~HTML
-          <li class="page-item">
-            <a class="page-link" href="#{path}" tabindex="-1">First</a>
-          </li>
-        HTML
+            <li class="page-item">
+              <a class="page-link" href="#{path}" tabindex="-1">First</a>
+            </li>
+          HTML
         end
 
         # @param per_page [String] string representation of items per page. E.g. "10", "20", etc.
@@ -59,9 +59,9 @@ module PgEventstore
         def total_count(number)
           prefix =
             if number > Paginator::EventsCollection::MAX_NUMBER_TO_COUNT
-              "Estimate count: "
+              'Estimate count: '
             else
-              "Total count: "
+              'Total count: '
             end
           number = number_with_delimiter(number)
           prefix + number
@@ -75,7 +75,7 @@ module PgEventstore
           number = number.to_s
           symbols_to_skip = number.size % 3
           parts = []
-          parts.push(number[0...symbols_to_skip]) unless symbols_to_skip.zero?
+          parts.push(number[0...symbols_to_skip]) unless symbols_to_skip == 0
           parts.push(*number[symbols_to_skip..].scan(/\d{3}/))
           parts.join(delimiter)
         end
@@ -90,10 +90,10 @@ module PgEventstore
                   {
                     context: escape_empty_string(event.stream.context),
                     stream_name: escape_empty_string(event.stream.stream_name),
-                    stream_id: escape_empty_string(event.stream.stream_id)
-                  }
-                ]
-              }
+                    stream_id: escape_empty_string(event.stream.stream_id),
+                  },
+                ],
+              },
             }
           )
         end

data/lib/pg_eventstore/web/paginator/stream_contexts_collection.rb

@@ -9,14 +9,13 @@ module PgEventstore
 
         # @return [Array<Hash<String => String>>]
         def collection
-          @_collection ||=
+          @collection ||=
             begin
-              sql_builder =
-                SQLBuilder.new.select('context').from('partitions').
-                  where('stream_name is null and event_type is null').
-                  limit(per_page).order("context #{order}")
+              sql_builder = SQLBuilder.new.select('context').from('partitions')
+              sql_builder.where('stream_name is null and event_type is null')
               sql_builder.where("context #{direction_operator} ?", starting_id) if starting_id
               sql_builder.where('context ilike ?', "%#{options[:query]}%")
+              sql_builder.limit(per_page).order("context #{order}")
               connection.with do |conn|
                 conn.exec_params(*sql_builder.to_exec_params)
               end.to_a
@@ -28,10 +27,11 @@ module PgEventstore
           return unless collection.size == per_page
 
           starting_id = collection.first['context']
-          sql_builder =
-            SQLBuilder.new.select('context').from('partitions').where('stream_name is null and event_type is null').
-              where("context #{direction_operator} ?", starting_id).where('context ilike ?', "%#{options[:query]}%").
-              limit(1).offset(per_page).order("context #{order}")
+          sql_builder = SQLBuilder.new.select('context').from('partitions')
+          sql_builder.where('stream_name is null and event_type is null')
+          sql_builder.where("context #{direction_operator} ?", starting_id)
+          sql_builder.where('context ilike ?', "%#{options[:query]}%")
+          sql_builder.limit(1).offset(per_page).order("context #{order}")
 
           connection.with do |conn|
             conn.exec_params(*sql_builder.to_exec_params)

data/lib/pg_eventstore/web/paginator/stream_ids_collection.rb

@@ -9,12 +9,11 @@ module PgEventstore
 
         # @return [Array<Hash<String => String>>]
         def collection
-          @_collection ||=
+          @collection ||=
             begin
-              sql_builder =
-                SQLBuilder.new.select('stream_id').from('events').
-                  where('context = ? and stream_name = ?', options[:context], options[:stream_name]).
-                  where('stream_id like ?', "#{options[:query]}%")
+              sql_builder = SQLBuilder.new.select('stream_id').from('events')
+              sql_builder.where('context = ? and stream_name = ?', options[:context], options[:stream_name])
+              sql_builder.where('stream_id like ?', "#{options[:query]}%")
               sql_builder.where("stream_id #{direction_operator} ?", starting_id) if starting_id
               sql_builder.group('stream_id').limit(per_page).order("stream_id #{order}")
               connection.with do |conn|
@@ -28,11 +27,11 @@ module PgEventstore
           return unless collection.size == per_page
 
           starting_id = collection.first['stream_id']
-          sql_builder =
-            SQLBuilder.new.select('stream_id').from('events').
-              where("stream_id #{direction_operator} ?", starting_id).where('stream_id like ?', "#{options[:query]}%").
-              where('context = ? and stream_name = ?', options[:context], options[:stream_name]).
-              group('stream_id').limit(1).offset(per_page).order("stream_id #{order}")
+          sql_builder = SQLBuilder.new.select('stream_id').from('events')
+          sql_builder.where("stream_id #{direction_operator} ?", starting_id)
+          sql_builder.where('stream_id like ?', "#{options[:query]}%")
+          sql_builder.where('context = ? and stream_name = ?', options[:context], options[:stream_name])
+          sql_builder.group('stream_id').limit(1).offset(per_page).order("stream_id #{order}")
 
           connection.with do |conn|
             conn.exec_params(*sql_builder.to_exec_params)

data/lib/pg_eventstore/web/paginator/stream_names_collection.rb

@@ -9,12 +9,11 @@ module PgEventstore
 
         # @return [Array<Hash<String => String>>]
         def collection
-          @_collection ||=
+          @collection ||=
             begin
-              sql_builder =
-                SQLBuilder.new.select('stream_name').from('partitions').
-                  where('event_type is null and context = ?', options[:context]).
-                  where('stream_name ilike ?', "%#{options[:query]}%")
+              sql_builder = SQLBuilder.new.select('stream_name').from('partitions')
+              sql_builder.where('event_type is null and context = ?', options[:context])
+              sql_builder.where('stream_name ilike ?', "%#{options[:query]}%")
               sql_builder.where("stream_name #{direction_operator} ?", starting_id) if starting_id
               sql_builder.limit(per_page).order("stream_name #{order}")
               connection.with do |conn|
@@ -28,12 +27,11 @@ module PgEventstore
           return unless collection.size == per_page
 
           starting_id = collection.first['stream_name']
-          sql_builder =
-            SQLBuilder.new.select('stream_name').from('partitions').
-              where("stream_name #{direction_operator} ?", starting_id).
-              where('stream_name ilike ?', "%#{options[:query]}%").
-              where('event_type is null and context = ?', options[:context]).
-              limit(1).offset(per_page).order("stream_name #{order}")
+          sql_builder = SQLBuilder.new.select('stream_name').from('partitions')
+          sql_builder.where("stream_name #{direction_operator} ?", starting_id)
+          sql_builder.where('stream_name ilike ?', "%#{options[:query]}%")
+          sql_builder.where('event_type is null and context = ?', options[:context])
+          sql_builder.limit(1).offset(per_page).order("stream_name #{order}")
 
           connection.with do |conn|
             conn.exec_params(*sql_builder.to_exec_params)

data/lib/pg_eventstore/web/subscriptions/set_collection.rb

@@ -16,7 +16,7 @@ module PgEventstore
 
         # @return [Array<String>]
         def names
-          @set_collection ||= (subscription_queries.set_collection | subscriptions_set_queries.set_names).sort
+          @names ||= (subscription_queries.set_collection | subscriptions_set_queries.set_names).sort
         end
 
         private

data/lib/pg_eventstore/web/subscriptions/subscriptions_to_set_association.rb

@@ -19,6 +19,7 @@ module PgEventstore
         end
 
         # @return [Hash{PgEventstore::SubscriptionsSet => Array<PgEventstore::Subscription>}]
+        # rubocop:disable Lint/RedundantWithObject,Lint/UnexpectedBlockArity
         def association
           @association ||=
             begin
@@ -31,6 +32,7 @@ module PgEventstore
               end
             end
         end
+        # rubocop:enable Lint/RedundantWithObject,Lint/UnexpectedBlockArity
       end
     end
   end

data/lib/pg_eventstore/web/subscriptions/with_state/set_collection.rb

@@ -19,7 +19,7 @@ module PgEventstore
 
           # @return [Array<String>]
           def names
-            @set_collection ||= subscription_queries.set_collection(@state)
+            @names ||= subscription_queries.set_collection(@state)
           end
 
           private

data/lib/pg_eventstore.rb

@@ -31,6 +31,9 @@ module PgEventstore
     attr_reader :mutex
     private :mutex
 
+    # @return [Logger, nil]
+    attr_accessor :logger
+
     # Creates a Config if not exists and yields it to the given block.
     # @param name [Symbol] a name to assign to a config
     # @return [Object] a result of the given block
@@ -107,17 +110,6 @@ module PgEventstore
       Maintenance.new(config(name))
     end
 
-    # @return [Logger, nil]
-    def logger
-      @logger
-    end
-
-    # @param logger [Logger, nil]
-    # @return [Logger, nil]
-    def logger=(logger)
-      @logger = logger
-    end
-
     private
 
     # @return [void]

data/pg_eventstore.gemspec

@@ -1,24 +1,24 @@
 # frozen_string_literal: true
 
-require_relative "lib/pg_eventstore/version"
+require_relative 'lib/pg_eventstore/version'
 
 Gem::Specification.new do |spec|
-  spec.name = "pg_eventstore"
+  spec.name = 'pg_eventstore'
   spec.version = PgEventstore::VERSION
-  spec.authors = ["Ivan Dzyzenko"]
-  spec.email = ["ivan.dzyzenko@gmail.com"]
+  spec.authors = ['Ivan Dzyzenko']
+  spec.email = ['ivan.dzyzenko@gmail.com']
 
-  spec.summary = "EventStore implementation using PostgreSQL"
-  spec.description = "EventStore implementation using PostgreSQL"
-  spec.homepage = "https://github.com/yousty/pg_eventstore"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.0"
+  spec.summary = 'EventStore implementation using PostgreSQL'
+  spec.description = 'EventStore implementation using PostgreSQL'
+  spec.homepage = 'https://github.com/yousty/pg_eventstore'
+  spec.license = 'MIT'
+  spec.required_ruby_version = '>= 3.0'
 
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/yousty/pg_eventstore"
-  spec.metadata["changelog_uri"] = "https://github.com/yousty/pg_eventstore/blob/main/CHANGELOG.md"
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://github.com/yousty/pg_eventstore'
+  spec.metadata['changelog_uri'] = 'https://github.com/yousty/pg_eventstore/blob/main/CHANGELOG.md'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -28,14 +28,14 @@ Gem::Specification.new do |spec|
       Rakefile benchmark/ .yardopts db/structure.sql config.ru docs/images/
     ]
     `git ls-files -z`.split("\x0").reject do |f|
-      (File.expand_path(f) == __FILE__) || f.start_with?(*paths_to_exclude) || File.extname(f) == ".map"
+      (File.expand_path(f) == __FILE__) || f.start_with?(*paths_to_exclude) || File.extname(f) == '.map'
     end
   end
-  spec.bindir = "exe"
+  spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "pg", "~> 1.5"
-  spec.add_dependency "connection_pool", "~> 2.4"
-  spec.add_dependency "sinatra", ">= 3", '< 5'
+  spec.add_dependency 'connection_pool', '~> 2.4'
+  spec.add_dependency 'pg', '~> 1.5'
+  spec.add_dependency 'sinatra', '>= 3', '< 5'
 end

data/rbs_collection.lock.yaml

@@ -6,9 +6,17 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ac8b33799c494ea5b22e7dc850d53f99dc4849e9
+    revision: 0cb6351d218704700cf4df797ff8966b3a418fcd
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
+- name: forwardable
+  version: '0'
+  source:
+    type: stdlib
+- name: monitor
+  version: '0'
+  source:
+    type: stdlib
 - name: timeout
   version: '0'
   source:

data/rbs_collection.yaml

@@ -16,6 +16,8 @@ path: .gem_rbs_collection
 gems:
   - name: sinatra
     ignore: true
+  - name: monitor
+  - name: forwardable
 
 # gems:
 #   # If you want to avoid installing rbs files for gems, you can specify them here.

data/sig/manifest.yaml

@@ -0,0 +1,3 @@
+dependencies:
+  - name: monitor
+  - name: forwardable

data/sig/pg_eventstore/client.rbs

@@ -28,14 +28,10 @@ module PgEventstore
 
     def read_grouped: (Stream stream, ?options: Hash[untyped, untyped], ?middlewares: ::Array[::Symbol]?) -> ::Array[PgEventstore::Event]
 
-    # _@param_ `stream`
-    #
-    # _@param_ `options` — request options
-    #
-    # _@param_ `middlewares`
-    #
-    # _@return_ — enumerator will yield PgEventstore::Event
-    def read_paginated: (PgEventstore::Stream stream, ?options: ::Hash[untyped, untyped], ?middlewares: ::Array[::Symbol]?) -> ::Enumerator[Array[PgEventstore::Event], void]
+    # Temporary skip RBS checks of this method. It doesn't play well with Enumerator under certain circumstances
+    %a{rbs:test:skip} def read_paginated: (
+        PgEventstore::Stream stream, ?options: ::Hash[untyped, untyped], ?middlewares: ::Array[::Symbol]?
+      ) -> ::Enumerator[Array[PgEventstore::Event], void]
 
     # _@param_ `stream`
     #

data/sig/pg_eventstore/subscriptions/callback_handlers/events_processor_handlers.rbs

@@ -1,6 +1,7 @@
 module PgEventstore
   class EventsProcessorHandlers
-    def self.process_event: (PgEventstore::Callbacks callbacks, _RawEventHandler handler, Array[Hash[untyped, untyped]] raw_events) -> void
+    def self.process_event: (PgEventstore::Callbacks callbacks, _RawEventHandler handler, SynchronizedArray raw_events,
+        MonitorMixin::ConditionVariable raw_events_cond) -> void
 
     def self.after_runner_died: (PgEventstore::Callbacks callbacks, StandardError error) -> void
 

data/sig/pg_eventstore/subscriptions/subscriptions_manager.rbs

@@ -82,5 +82,7 @@ module PgEventstore
         _RestartTerminator? restart_terminator,
         _FailedSubscriptionNotifier? failed_subscription_notifier
       ) -> Array[RunnerRecoveryStrategy]
+
+    def run_cli_callbacks: () { () -> untyped } -> untyped
   end
 end

data/sig/pg_eventstore/subscriptions/synchronized_array.rbs

@@ -0,0 +1,4 @@
+module PgEventstore
+  class SynchronizedArray < Array[Hash[untyped, untyped]]
+  end
+end

data/sig/pg_eventstore/web/application.rbs

@@ -7,6 +7,8 @@ module PgEventstore
 
       EMPTY_STRING_SIGN: String
 
+      LOGGING_ENVS: Array[Symbol]
+
       def asset_url: (String path) -> String
 
       def connection: -> PgEventstore::Connection

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_eventstore
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.3
 platform: ruby
 authors:
 - Ivan Dzyzenko
@@ -10,33 +10,33 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: connection_pool
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +65,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - LICENSE.txt
@@ -198,6 +199,7 @@ files:
 - lib/pg_eventstore/subscriptions/subscriptions_manager.rb
 - lib/pg_eventstore/subscriptions/subscriptions_set.rb
 - lib/pg_eventstore/subscriptions/subscriptions_set_lifecycle.rb
+- lib/pg_eventstore/subscriptions/synchronized_array.rb
 - lib/pg_eventstore/tasks/setup.rake
 - lib/pg_eventstore/utils.rb
 - lib/pg_eventstore/version.rb
@@ -256,6 +258,7 @@ files:
 - sig/interfaces/failed_subscription_notifier.rbs
 - sig/interfaces/restart_terminator.rbs
 - sig/interfaces/subscription_handler.rbs
+- sig/manifest.yaml
 - sig/pg/basic_type_registry.rbs
 - sig/pg/connection.rbs
 - sig/pg/constants.rbs
@@ -360,6 +363,7 @@ files:
 - sig/pg_eventstore/subscriptions/subscriptions_manager.rbs
 - sig/pg_eventstore/subscriptions/subscriptions_set.rbs
 - sig/pg_eventstore/subscriptions/subscriptions_set_lifecycle.rbs
+- sig/pg_eventstore/subscriptions/synchronized_array.rbs
 - sig/pg_eventstore/utils.rbs
 - sig/pg_eventstore/version.rbs
 - sig/pg_eventstore/web/application.rbs