pg_eventstore 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cac54fc5042fe312145da5a4e73cb211f375544fe9e19e7923408848efd0ecb
-  data.tar.gz: 4427be145c2b9bbee701e6c1dc12ac6fcb0ee7db2dfabbb0002524fe7f16a8f9
+  metadata.gz: 66aeaf1c1365b962133efe784a507722fe0be9c80cb1911edd76512cb7a1af17
+  data.tar.gz: 34ebc698b212e0631f005f754bbcf808f95796c149f969a1466ede8c7842e362
 SHA512:
-  metadata.gz: 2bf613831f93b498971b24a7192c10c9c22042bc6ca6f00f2c8ca8369f681d8f23e9069eff8b410c25062ff45447e32e18e4f83a8f100db7df314bbad2b707c4
-  data.tar.gz: f6d3296d2f2ea746d6bb204041aebe1bb7cc0b1b06b5ff865d27fad6610ae2694d4f438960042408ac8f49efbc42c6e158640d513fb8e3a3f95ba397d2bf2772
+  metadata.gz: ad3c0661aa7c995c357588cbbaa4c9958868068ec452284250f41e0c2e3ae98eabdae837e7c00e63e59f22df7c5920aef2ad1497340d99dcc5bdc8e3e98ffb1f
+  data.tar.gz: 395e5697dad7945e3c5bc2b51956195097aca503e9e20445b0d3b857fcdb17e4074ec392dc8fdf8a840e132e7f353093985e715a521ef7c73db5b902e0bcbffb

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## [Unreleased]
 
+## [1.3.4]
+- Fix `NoMethodError` error in `Client#read_paginated` when stream does not exist or when there are no events matching the given filter
+
 ## [1.3.3]
 - Adjust default value of `subscription_max_retries` setting
 

data/lib/pg_eventstore/commands/regular_stream_read_paginated.rb

@@ -6,31 +6,24 @@ module PgEventstore
     class RegularStreamReadPaginated < AbstractCommand
       # @see PgEventstore::Commands::Read for docs
       def call(stream, options: {})
-        revision = calc_initial_revision(stream, options)
         Enumerator.new do |yielder|
+          next_revision = nil
           loop do
-            events = read_cmd.call(stream, options: options.merge(from_revision: revision))
+            options = options.merge(from_revision: next_revision) if next_revision
+            events = read_cmd.call(stream, options: options)
             yielder << events if events.any?
-            raise StopIteration if end_reached?(events, options[:max_count])
+            if end_reached?(events, options[:max_count] || QueryBuilders::EventsFiltering::DEFAULT_LIMIT)
+              raise StopIteration
+            end
 
-            revision = calc_next_revision(events, revision, options[:direction])
-            raise StopIteration if revision.negative?
+            next_revision = calc_next_revision(events, options[:direction])
+            raise StopIteration if next_revision.negative?
           end
         end
       end
 
       private
 
-      # @param stream [PgEventstore::Stream]
-      # @param options [Hash]
-      # @return [Integer]
-      def calc_initial_revision(stream, options)
-        return options[:from_revision] if options[:from_revision]
-        return 0 if forwards?(options[:direction])
-
-        read_cmd.call(stream, options: options.merge(max_count: 1)).first.stream_revision
-      end
-
       # @param events [Array<PgEventstore::Event>]
       # @param max_count [Integer]
       # @return [Boolean]
@@ -39,13 +32,12 @@ module PgEventstore
       end
 
       # @param events [Array<PgEventstore::Event>]
-      # @param revision [Integer]
       # @param direction [String, Symbol, nil]
       # @return [Integer]
-      def calc_next_revision(events, revision, direction)
-        return revision + events.size if forwards?(direction)
+      def calc_next_revision(events, direction)
+        return events.last.stream_revision + 1 if forwards?(direction)
 
-        revision - events.size
+        events.last.stream_revision - 1
       end
 
       # @param direction [String, Symbol, nil]

data/lib/pg_eventstore/commands/system_stream_read_paginated.rb

@@ -6,31 +6,24 @@ module PgEventstore
     class SystemStreamReadPaginated < AbstractCommand
       # @see PgEventstore::Commands::Read for docs
       def call(stream, options: {})
-        position = calc_initial_position(stream, options)
         Enumerator.new do |yielder|
+          next_position = nil
           loop do
-            events = read_cmd.call(stream, options: options.merge(from_position: position))
+            options = options.merge(from_position: next_position) if next_position
+            events = read_cmd.call(stream, options: options)
             yielder << events if events.any?
-            raise StopIteration if end_reached?(events, options[:max_count])
+            if end_reached?(events, options[:max_count] || QueryBuilders::EventsFiltering::DEFAULT_LIMIT)
+              raise StopIteration
+            end
 
-            position = calc_next_position(events, options[:direction])
-            raise StopIteration if position <= 0
+            next_position = calc_next_position(events, options[:direction])
+            raise StopIteration if next_position <= 0
           end
         end
       end
 
       private
 
-      # @param stream [PgEventstore::Stream]
-      # @param options [Hash]
-      # @return [Integer]
-      def calc_initial_position(stream, options)
-        return options[:from_position] if options[:from_position]
-        return 1 if forwards?(options[:direction])
-
-        read_cmd.call(stream, options: options.merge(max_count: 1)).first.global_position
-      end
-
       # @param events [Array<PgEventstore::Event>]
       # @param max_count [Integer]
       # @return [Boolean]

data/lib/pg_eventstore/version.rb

@@ -2,5 +2,5 @@
 
 module PgEventstore
   # @return [String]
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
 end

data/sig/pg_eventstore/commands/regular_stream_read_paginated.rbs

@@ -6,11 +6,6 @@ module PgEventstore
       # _@param_ `options`
       %a{rbs:test:skip} def call: (PgEventstore::Stream stream, ?options: ::Hash[untyped, untyped]) -> ::Enumerator[Array[PgEventstore::Event], void]
 
-      # _@param_ `stream`
-      #
-      # _@param_ `options`
-      def calc_initial_revision: (PgEventstore::Stream stream, ::Hash[untyped, untyped] options) -> Integer
-
       # _@param_ `events`
       #
       # _@param_ `max_count`
@@ -21,7 +16,7 @@ module PgEventstore
       # _@param_ `revision`
       #
       # _@param_ `direction`
-      def calc_next_revision: (::Array[PgEventstore::Event] events, Integer revision, (String | Symbol)? direction) -> Integer
+      def calc_next_revision: (::Array[PgEventstore::Event] events, (String | Symbol)? direction) -> Integer
 
       # _@param_ `direction`
       def forwards?: ((String | Symbol)? direction) -> bool

data/sig/pg_eventstore/commands/system_stream_read_paginated.rbs

@@ -6,11 +6,6 @@ module PgEventstore
       # _@param_ `options`
       %a{rbs:test:skip} def call: (PgEventstore::Stream stream, ?options: ::Hash[untyped, untyped]) -> ::Enumerator[Array[PgEventstore::Event], void]
 
-      # _@param_ `stream`
-      #
-      # _@param_ `options`
-      def calc_initial_position: (PgEventstore::Stream stream, ::Hash[untyped, untyped] options) -> Integer
-
       # _@param_ `events`
       #
       # _@param_ `max_count`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_eventstore
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Ivan Dzyzenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-24 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg