event_store_client 2.1.2 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b9b08383eb1a6c117cbb4a3c691395351a13fa471e6b86b7513297431cb2d03
-  data.tar.gz: f56227663d39cb4a753bd7f01e6b56b41febda176ba82d4d9d7afdc848ee9429
+  metadata.gz: d4ff17cd8c1913a09f27fd8ae0c846309b54d984ca81faa8291b769357ead3ec
+  data.tar.gz: b658667a55cc43ba62995e1369e4b8b0f2ee2c950b08dc5dfd19da75e1af430f
 SHA512:
-  metadata.gz: 402580786e13490581dc24e91a41bf2ac9c7d2846cd79cacd46b75c41fbce020808a6ed6cba615d191bc036f2afafeb49908ca2ee8d5b65cb7f6e63d9b8b69d3
-  data.tar.gz: 98caa3a759cb2594087805e3eafa83141d4f9db797c0eff8266aeb188c24b04e1a74d8cb0df3c3cc967a144e61501f9307a93a06fa1ae14227c457987399d770
+  metadata.gz: 6ece79e50bb8a38629587ad87fc6b69e4dea30fd2edb83f34a5fbc5daa760eb11970a02475c6258769d3ba0c9b108bd0bec0464398885e8ae909884650f37047
+  data.tar.gz: 3cc3551a091362045c125b0ea1ef014a0f798a0683401c5c13a43688d570809a185f74d4f7f5e405f442101e906edd4e0f42282114d8e0910cae1cbbb9884635

data/lib/event_store_client/adapters/grpc/commands/streams/read_paginated.rb

@@ -117,7 +117,7 @@ module EventStoreClient
           # @param stream_name [String]
           # @return [Integer]
           def calc_next_position(raw_events, direction, stream_name)
-            events = meaningful_events(raw_events).map { |e| e.event.event }
+            events = meaningful_events(raw_events).map(&:event)
 
             return next_position_for_all(events, direction) if stream_name == '$all'
 
@@ -128,18 +128,18 @@ module EventStoreClient
           # @param direction [Symbol] :Backwards or :Forwards
           # @return [Integer]
           def next_position_for_all(events, direction)
-            return events.last.commit_position if direction == DEFAULT_READ_DIRECTION
+            return event_or_link(events.last).commit_position if direction == DEFAULT_READ_DIRECTION
 
-            events.first.commit_position
+            event_or_link(events.first).commit_position
           end
 
           # @param events [Array<EventStore::Client::Streams::ReadResp::ReadEvent::RecordedEvent>]
           # @param direction [Symbol] :Backwards or :Forwards
           # @return [Integer]
           def next_position_for_regular(events, direction)
-            return events.last.stream_revision + 1 if direction == DEFAULT_READ_DIRECTION
+            return event_or_link(events.last).stream_revision + 1 if direction == DEFAULT_READ_DIRECTION
 
-            events.last.stream_revision - 1
+            event_or_link(events.last).stream_revision - 1
           end
 
           # @param raw_events [Array<EventStore::Client::Streams::ReadResp>]
@@ -166,6 +166,17 @@ module EventStoreClient
               "Current value is `#{max_count}'."
             )
           end
+
+          # Picks the correct object for later resolving of stream_revision from it. In case if we
+          # deal with links - we should prefer a link over a linked event, because exactly it
+          # contains correct stream revision of the stream we are reading from. Because if we pick
+          # a linked event's stream_revision, then it will be a revision from the stream that event
+          # belongs to - this can potentially create an infinite loop.
+          # @param event [EventStore::Client::Streams::ReadResp::ReadEvent]
+          # @return [EventStore::Client::Streams::ReadResp::ReadEvent::RecordedEvent]
+          def event_or_link(event)
+            event.link ? event.link : event.event
+          end
         end
       end
     end

data/lib/event_store_client/serialized_event.rb

@@ -34,8 +34,8 @@ module EventStoreClient
     def to_grpc
       {
         id: { string: id },
-        data: serializer.serialize(data),
-        custom_metadata: serializer.serialize(custom_metadata),
+        data: serializer.serialize(data).force_encoding('ASCII-8BIT'),
+        custom_metadata: serializer.serialize(custom_metadata).force_encoding('ASCII-8BIT'),
         metadata: metadata
       }
     end

data/lib/event_store_client/serializer/json.rb

@@ -19,7 +19,7 @@ module EventStoreClient
       # @param data [String, Object]
       # @return [String]
       def self.serialize(data)
-        return data if data.is_a?(String)
+        return data.dup if data.is_a?(String)
 
         JSON.generate(data)
       end

data/lib/event_store_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EventStoreClient
-  VERSION = '2.1.2'
+  VERSION = '2.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_store_client
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.4
 platform: ruby
 authors:
 - Sebastian Wilgosz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2022-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-monads