event_store_client 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb2aa608fd561e6504dcf828cf7f79bbbec475a68f73e97a28075548036f2fd
-  data.tar.gz: 96e18fab23a42511ac7d9460ee770dcf07cab910fbdd88dbf26b77d7870f8024
+  metadata.gz: 215ed29dc778024dfc7122cc295ec29e112284f67cb3ed4e74960d47a1e0a32e
+  data.tar.gz: 0be0bb78dfe0ce97fb3d171a9d145d82091e81978944c1dfb891d2609df12356
 SHA512:
-  metadata.gz: c21debe01e60efa49f91b850e13ed594d6eca83ca0e96be2844b389f1d02c612a068d7c356565e064eade560dc44aff436fcf66308ff6159d35692bddba89797
-  data.tar.gz: c44edabff17c8a6d8321d3c536ffabfd7a22b935847bc0847b64e7ec97b5500d41d89624c6330f780bbaba12b5bfa7339f00934c1be4b2aab6553082c6725a3a
+  metadata.gz: ba84c9bd5b6148f4c8eaa4332e4a264364edcdf2642ef680a403a29d0406306e19db1f70422e711601ffe349df50c8b54a458f201d45288f711864aa6823c683
+  data.tar.gz: d2932967bcd5018fe330b0923231ee83062c3a8a713bcd6e6e92d8ddfa5bd633609415dd6ecf6b76d479d115b34cdd02a4de3f3f8b5c57a4010e29b40e0d8b6e

data/README.md

@@ -44,6 +44,10 @@ See documentation chapters for the usage reference:
 - [Deleting streams](docs/deleting_streams.md)
 - [Encrypting events](docs/encrypting_events.md)
 
+### Subscriptions
+
+We have written a gem that helps you to manage and handle Catch-up Subscriptions - `event_store_subscription`. You could check it [here](https://github.com/yousty/event_store_subscriptions).
+
 ## Contributing
 
 Do you want to contribute? Welcome!

data/lib/event_store_client/adapters/grpc/cluster/gossip_discover.rb

@@ -2,10 +2,6 @@
 
 # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
-require 'event_store_client/adapters/grpc/generated/shared_pb'
-require 'event_store_client/adapters/grpc/generated/gossip_pb'
-require 'event_store_client/adapters/grpc/generated/gossip_services_pb'
-
 module EventStoreClient
   module GRPC
     module Cluster

data/lib/event_store_client/adapters/grpc/commands/gossip/cluster_info.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'event_store_client/adapters/grpc/generated/shared_pb'
-require 'event_store_client/adapters/grpc/generated/gossip_pb'
-require 'event_store_client/adapters/grpc/generated/gossip_services_pb'
-
 module EventStoreClient
   module GRPC
     module Commands

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'event_store_client/adapters/grpc/generated/streams_pb'
-require 'event_store_client/adapters/grpc/generated/streams_services_pb'
-
 module EventStoreClient
   module GRPC
     module Commands
@@ -11,8 +8,6 @@ module EventStoreClient
           use_request EventStore::Client::Streams::AppendReq
           use_service EventStore::Client::Streams::Streams::Stub
 
-          ALLOWED_EVENT_METADATA = %w[type content-type created_at].freeze
-
           # @api private
           # @see {EventStoreClient::GRPC::Client#append_to_stream}
           def call(stream_name, event, options:, &blk)
@@ -26,8 +21,6 @@ module EventStoreClient
               service.append(payload, metadata: metadata)
             end
             validate_response(response)
-          rescue ::GRPC::Unavailable => e
-            Failure(e)
           end
 
           private
@@ -36,31 +29,7 @@ module EventStoreClient
           # @return [EventStore::Client::Streams::AppendReq::ProposedMessage]
           def proposed_message(event)
             serialized_event = config.mapper.serialize(event)
-            event_metadata = JSON.parse(serialized_event.metadata)
-            custom_metadata = custom_metadata(serialized_event.type, event_metadata)
-            opts =
-              {
-                id: {
-                  string: serialized_event.id
-                },
-                data: serialized_event.data.b,
-                custom_metadata: custom_metadata.to_json,
-                metadata: event_metadata.slice(*ALLOWED_EVENT_METADATA)
-              }
-            EventStore::Client::Streams::AppendReq::ProposedMessage.new(opts)
-          end
-
-          # @param event_type [String]
-          # @param event_metadata [Hash]
-          # @return [Hash]
-          def custom_metadata(event_type, event_metadata)
-            {
-              type: event_type,
-              created_at: Time.now.utc,
-              encryption: event_metadata['encryption'],
-              'content-type': event_metadata['content-type'],
-              transaction: event_metadata['transaction']
-            }.compact
+            EventStore::Client::Streams::AppendReq::ProposedMessage.new(serialized_event.to_grpc)
           end
 
           # @param stream_name [String]

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'event_store_client/adapters/grpc/generated/streams_pb'
-require 'event_store_client/adapters/grpc/generated/streams_services_pb'
-
 module EventStoreClient
   module GRPC
     module Commands

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'event_store_client/adapters/grpc/generated/streams_pb'
-require 'event_store_client/adapters/grpc/generated/streams_services_pb'
-
 module EventStoreClient
   module GRPC
     module Commands

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

@@ -8,8 +8,8 @@ module EventStoreClient
           # @see {EventStoreClient::GRPC::Client#hard_delete_stream}
           def call(stream_name, event, options:, &blk)
             append_cmd = Append.new(**connection_options)
-            link_event = EventStoreClient::DeserializedEvent.new(
-              id: event.id, type: '$>', data: event.title
+            link_event = DeserializedEvent.new(
+              id: event.id, type: DeserializedEvent::LINK_TYPE, data: event.title
             )
             append_cmd.call(stream_name, link_event, options: options, &blk)
           end

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'event_store_client/adapters/grpc/generated/streams_pb'
-require 'event_store_client/adapters/grpc/generated/streams_services_pb'
-
 module EventStoreClient
   module GRPC
     module Commands

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'event_store_client/adapters/grpc/generated/streams_pb'
-require 'event_store_client/adapters/grpc/generated/streams_services_pb'
-
 module EventStoreClient
   module GRPC
     module Commands

data/lib/event_store_client/adapters/grpc/options/streams/read_options.rb

@@ -2,8 +2,6 @@
 
 # rubocop:disable Metrics/AbcSize
 
-require 'event_store_client/adapters/grpc/generated/shared_pb'
-
 module EventStoreClient
   module GRPC
     module Options

data/lib/event_store_client/adapters/grpc/options/streams/write_options.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'event_store_client/adapters/grpc/generated/shared_pb'
-
 module EventStoreClient
   module GRPC
     module Options

data/lib/event_store_client/adapters/grpc/shared/options/filter_options.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'event_store_client/adapters/grpc/generated/shared_pb'
-
 module EventStoreClient
   module GRPC
     module Shared

data/lib/event_store_client/adapters/grpc/shared/streams/process_response.rb

@@ -6,6 +6,7 @@ module EventStoreClient
       module Streams
         class ProcessResponse
           include Dry::Monads[:result]
+          include Configuration
 
           # @api private
           # @param response [EventStore::Client::Streams::ReadResp]
@@ -18,7 +19,7 @@ module EventStoreClient
             return unless response.event&.event
 
             Success(
-              EventDeserializer.new.call(response.event.event, skip_decryption: skip_decryption)
+              config.mapper.deserialize(response.event.event, skip_decryption: skip_decryption)
             )
           end
         end

data/lib/event_store_client/adapters/grpc/shared/streams/process_responses.rb

@@ -6,6 +6,7 @@ module EventStoreClient
       module Streams
         class ProcessResponses
           include Dry::Monads[:result]
+          include Configuration
 
           # @api private
           # @param responses [Array<EventStore::Client::Streams::ReadResp>]
@@ -17,12 +18,12 @@ module EventStoreClient
             return Success(responses) if skip_deserialization
 
             events =
-              responses.map do |read_resp|
+              responses.map do |response|
                 # It could be <EventStore::Client::Streams::ReadResp: last_stream_position: 39> for
                 # example. Such responses should be skipped. See generated files for more info.
-                next unless read_resp.event&.event
+                next unless response.event&.event
 
-                EventDeserializer.new.call(read_resp.event.event, skip_decryption: skip_decryption)
+                config.mapper.deserialize(response.event.event, skip_decryption: skip_decryption)
               end
             Success(events.compact)
           end

data/lib/event_store_client/adapters/grpc.rb

@@ -3,10 +3,12 @@
 require 'grpc'
 require 'dry-monads'
 
+# Load all generated by google-protobuf files
+Dir[File.expand_path('grpc/generated/*.rb', __dir__)].each { |f| require f }
+
 require 'event_store_client/adapters/grpc/options/streams/read_options'
 require 'event_store_client/adapters/grpc/options/streams/write_options'
 
-require 'event_store_client/adapters/grpc/shared/event_deserializer'
 require 'event_store_client/adapters/grpc/shared/options/stream_options'
 require 'event_store_client/adapters/grpc/shared/options/filter_options'
 require 'event_store_client/adapters/grpc/shared/streams/process_response'

data/lib/event_store_client/deserialized_event.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'dry/schema'
-
 module EventStoreClient
   class DeserializedEvent
+    LINK_TYPE = '$>'
+
     InvalidDataError = Class.new(StandardError)
     private_constant :InvalidDataError
 
@@ -12,6 +12,7 @@ module EventStoreClient
 
     # @args [Hash] opts
     # @option opts [Boolean] :skip_validation
+    # @option opts [UUID] :id
     # @option opts [Hash] :data
     # @option opts [Hash] :metadata
     # @option opts [String] :type
@@ -68,6 +69,12 @@ module EventStoreClient
       end
     end
 
+    # Detect whether an event is a link event
+    # @return [Boolean]
+    def link?
+      type == LINK_TYPE
+    end
+
     private
 
     def validate(data)

data/lib/event_store_client/mapper/default.rb

@@ -1,47 +1,32 @@
 # frozen_string_literal: true
 
+# rubocop:disable Layout/LineLength
+
 module EventStoreClient
   module Mapper
     class Default
       attr_reader :serializer
       private :serializer
 
+      # @param serializer [#serialize, #deserialize]
       def initialize(serializer: Serializer::Json)
         @serializer = serializer
       end
 
+      # @param event [EventStoreClient::DeserializedEvent]
+      # @return [EventStoreClient::SerializedEvent]
       def serialize(event)
-        Event.new(
-          id: event.respond_to?(:id) ? event.id : nil,
-          type: (event.respond_to?(:type) ? event.type : nil) || event.class.to_s,
-          data: serializer.serialize(event.data),
-          metadata: serializer.serialize(event.metadata)
-        )
+        Serializer::EventSerializer.call(event, serializer: serializer)
       end
 
-      def deserialize(event, **)
-        metadata = serializer.deserialize(event.metadata)
-        data = serializer.deserialize(event.data)
+      # @param event_or_raw_event [EventStoreClient::DeserializedEvent, EventStore::Client::Streams::ReadResp::ReadEvent::RecordedEvent, EventStore::Client::PersistentSubscriptions::ReadResp::ReadEvent::RecordedEvent]
+      # @return event [EventStoreClient::DeserializedEvent]
+      def deserialize(event_or_raw_event, **)
+        return event_or_raw_event if event_or_raw_event.is_a?(EventStoreClient::DeserializedEvent)
 
-        event_class =
-          begin
-            Object.const_get(event.type)
-          rescue NameError
-            EventStoreClient.config.default_event_class
-          end
-        event_class.new(
-          skip_validation: true,
-          id: event.id,
-          type: event.type,
-          title: event.title,
-          data: data,
-          metadata: metadata,
-          stream_revision: event.stream_revision,
-          commit_position: event.commit_position,
-          prepare_position: event.prepare_position,
-          stream_name: event.stream_name
-        )
+        Serializer::EventDeserializer.call(event_or_raw_event, serializer: serializer)
       end
     end
   end
 end
+# rubocop:enable Layout/LineLength

data/lib/event_store_client/mapper/encrypted.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/AbcSize, Layout/LineLength, Style/IfUnlessModifier
+
 require 'event_store_client/encryption_metadata'
 require 'event_store_client/data_encryptor'
 require 'event_store_client/data_decryptor'
@@ -15,88 +17,62 @@ module EventStoreClient
       attr_reader :key_repository, :serializer
       private :key_repository, :serializer
 
-      ##
-      # Initializes the mapper with required dependencies. Accepts:
-      # * +key_repoistory+ - repository stored encryption keys. Passed down to the +DataEncryptor+
-      # * +serializer+ - object used to serialize data. By default JSON serializer is used.
+      # @param key_repository [#find, #create, #encrypt, #decrypt]
+      #   See spec/support/dummy_repository.rb for the example of simple in-memory implementation
+      # @param serializer [#serialize, #deserialize]
       def initialize(key_repository, serializer: Serializer::Json)
         @key_repository = key_repository
         @serializer = serializer
       end
 
-      ##
-      # Encrypts the given event's subset of data.
-      # Accepts specific event class instance with:
-      # * +#data+ - hash with non-encrypted values.
-      # * encryption_schema - hash with information which data to encrypt and
-      #   which key should be used as an identifier.
-      # *Returns*: General +Event+ instance with encrypted data
+      # @param event [EventStoreClient::DeserializedEvent]
+      # @return [Hash]
       def serialize(event)
-        # Links does not need to be encrypted
-        return Default.new(serializer: serializer).serialize(event) if event.type == '$>'
+        # Links don't need to be encrypted
+        return Default.new(serializer: serializer).serialize(event) if event.link?
+
+        serialized = Serializer::EventSerializer.call(event, serializer: serializer)
+        encryption_schema =
+          if event.class.respond_to?(:encryption_schema)
+            event.class.encryption_schema
+          end
 
-        encryption_schema = (
-          event.class.respond_to?(:encryption_schema) &&
-          event.class.encryption_schema
-        )
         encryptor = EventStoreClient::DataEncryptor.new(
-          data: event.data,
+          data: serialized.data,
           schema: encryption_schema,
           repository: key_repository
         )
         encryptor.call
-        EventStoreClient::Event.new(
-          id: event.respond_to?(:id) ? event.id : nil,
-          data: serializer.serialize(encryptor.encrypted_data),
-          metadata: serializer.serialize(
-            event.metadata.merge(encryption: encryptor.encryption_metadata)
-          ),
-          type: event.class.to_s
-        )
+        serialized.data = encryptor.encrypted_data
+        serialized.custom_metadata['encryption'] = encryptor.encryption_metadata
+        serialized
       end
 
-      ##
       # Decrypts the given event's subset of data.
-      # General +Event+ instance with encrypted data
-      # * +#data+ - hash with encrypted values.
-      # * encryption_metadata - hash with information which data to encrypt and
-      #   which key should be used as an identifier.
-      # *Returns*: Specific event class with all data decrypted
-      def deserialize(event, skip_decryption: false)
-        metadata = serializer.deserialize(event.metadata)
-        encryption_schema = metadata['encryption']
+      # @param event_or_raw_event [EventStoreClient::DeserializedEvent, EventStore::Client::Streams::ReadResp::ReadEvent::RecordedEvent, EventStore::Client::PersistentSubscriptions::ReadResp::ReadEvent::RecordedEvent]
+      # @param skip_decryption [Boolean]
+      # @return event [EventStoreClient::DeserializedEvent]
+      def deserialize(event_or_raw_event, skip_decryption: false)
+        if skip_decryption
+          return Default.new(serializer: serializer).deserialize(event_or_raw_event)
+        end
 
-        decrypted_data =
-          if skip_decryption
-            serializer.deserialize(event.data)
+        event =
+          if event_or_raw_event.is_a?(EventStoreClient::DeserializedEvent)
+            event_or_raw_event
           else
-            EventStoreClient::DataDecryptor.new(
-              data: serializer.deserialize(event.data),
-              schema: encryption_schema,
-              repository: key_repository
-            ).call
-          end
-
-        event_class =
-          begin
-            Object.const_get(event.type)
-          rescue NameError
-            EventStoreClient.config.default_event_class
+            Serializer::EventDeserializer.call(event_or_raw_event, serializer: serializer)
           end
 
-        event_class.new(
-          skip_validation: true,
-          id: event.id,
-          type: event.type,
-          title: event.title,
-          data: decrypted_data,
-          metadata: metadata,
-          stream_revision: event.stream_revision,
-          commit_position: event.commit_position,
-          prepare_position: event.prepare_position,
-          stream_name: event.stream_name
-        )
+        decrypted_data =
+          EventStoreClient::DataDecryptor.new(
+            data: event.data,
+            schema: event.metadata['encryption'],
+            repository: key_repository
+          ).call
+        event.class.new(**event.to_h.merge(data: decrypted_data, skip_validation: true))
       end
     end
   end
 end
+# rubocop:enable Metrics/AbcSize, Layout/LineLength, Style/IfUnlessModifier

data/lib/event_store_client/serialized_event.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module EventStoreClient
+  class SerializedEvent
+    include Extensions::OptionsExtension
+
+    option(:id)
+    option(:data)
+    option(:custom_metadata)
+    option(:metadata)
+    option(:serializer)
+
+    # Constructs a hash that can be passed directly in the proposed_message attribute of the append
+    # request, or it can be used to instantiate the raw EventStore event.
+    # Example:
+    #   ```ruby
+    #   serialized_event = EventStoreClient::SerializedEvent.new(
+    #     id: 'some id',
+    #     data: { foo: :bar },
+    #     custom_metadata: { bar: :baz },
+    #     metadata: { baz: :foo },
+    #     serializer: EventStoreClient::Serializer::Json
+    #   )
+    #   # Compute proposed_message
+    #   EventStore::Client::Streams::AppendReq::ProposedMessage.new(
+    #     serialized_event.to_grpc
+    #   )
+    #   # Compute raw event
+    #   EventStore::Client::Streams::ReadResp::ReadEvent::RecordedEvent.new(
+    #     serialized_event.to_grpc
+    #   )
+    #   ```
+    # @return [Hash]
+    def to_grpc
+      {
+        id: { string: id },
+        data: serializer.serialize(data),
+        custom_metadata: serializer.serialize(custom_metadata),
+        metadata: metadata
+      }
+    end
+  end
+end

data/lib/event_store_client/serializer/event_deserializer.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+# rubocop:disable Metrics/AbcSize, Layout/LineLength
+
+module EventStoreClient
+  module Serializer
+    class EventDeserializer
+      class << self
+        # @param raw_event [EventStore::Client::Streams::ReadResp::ReadEvent::RecordedEvent, EventStore::Client::PersistentSubscriptions::ReadResp::ReadEvent::RecordedEvent]
+        # @param serializer [#serialize, #deserialize]
+        # @return [EventStoreClient::DeserializedEvent]
+        def call(raw_event, serializer: Serializer::Json)
+          new(serializer: serializer).call(raw_event)
+        end
+      end
+
+      attr_reader :serializer
+      private :serializer
+
+      # @param serializer [#serialize, #deserialize]
+      def initialize(serializer:)
+        @serializer = serializer
+      end
+
+      # @param raw_event [EventStore::Client::Streams::ReadResp::ReadEvent::RecordedEvent, EventStore::Client::PersistentSubscriptions::ReadResp::ReadEvent::RecordedEvent]
+      # @return [EventStoreClient::DeserializedEvent]
+      def call(raw_event)
+        data = serializer.deserialize(normalize_serialized(raw_event.data))
+        custom_metadata = serializer.deserialize(normalize_serialized(raw_event.custom_metadata))
+        metadata = custom_metadata.merge(raw_event.metadata.to_h)
+
+        event_class(metadata['type']).new(
+          skip_validation: true,
+          id: raw_event.id.string,
+          title: "#{raw_event.stream_revision}@#{raw_event.stream_identifier.stream_name}",
+          type: metadata['type'],
+          data: data,
+          metadata: metadata,
+          stream_revision: raw_event.stream_revision,
+          commit_position: raw_event.commit_position,
+          prepare_position: raw_event.prepare_position,
+          stream_name: raw_event.stream_identifier.stream_name
+        )
+      end
+
+      private
+
+      # @param event_type [String]
+      # @return [Class<EventStoreClient::DeserializedEvent>]
+      def event_class(event_type)
+        Object.const_get(event_type)
+      rescue NameError, TypeError
+        config.logger&.debug(<<~TEXT.strip)
+          Unable to resolve class by `#{event_type}' event type. \
+          Picking default `#{config.default_event_class}' event class to instantiate the event.
+        TEXT
+        config.default_event_class
+      end
+
+      # @param raw_data [String]
+      # @return [String]
+      def normalize_serialized(raw_data)
+        return serializer.serialize({}) if raw_data.empty?
+
+        raw_data
+      end
+
+      def config
+        EventStoreClient.config
+      end
+    end
+  end
+end
+# rubocop:enable Metrics/AbcSize, Layout/LineLength

data/lib/event_store_client/serializer/event_serializer.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module EventStoreClient
+  module Serializer
+    class EventSerializer
+      ALLOWED_EVENT_METADATA = %w[type content-type created_at].freeze
+
+      class << self
+        # @param event [EventStoreClient::DeserializedEvent]
+        # @param serializer [#serialize, #deserialize]
+        # @return [EventStoreClient::SerializedEvent]
+        def call(event, serializer: Serializer::Json)
+          new(serializer: serializer).call(event)
+        end
+      end
+
+      attr_reader :serializer
+      private :serializer
+
+      # @param serializer [#serialize, #deserialize]
+      def initialize(serializer:)
+        @serializer = serializer
+      end
+
+      # @param event [EventStoreClient::DeserializedEvent]
+      # @return [EventStoreClient::SerializedEvent]
+      def call(event)
+        event_metadata = metadata(event)
+        event_custom_metadata = custom_metadata(event, event_metadata)
+        SerializedEvent.new(
+          id: event.id || SecureRandom.uuid,
+          data: data(event),
+          custom_metadata: event_custom_metadata,
+          metadata: event_metadata.slice(*ALLOWED_EVENT_METADATA),
+          serializer: serializer
+        )
+      end
+
+      private
+
+      # @param event [EventStoreClient::DeserializedEvent]
+      # @return [Hash]
+      def metadata(event)
+        metadata = serializer.deserialize(serializer.serialize(event.metadata))
+        metadata['created_at'] ||= Time.now.utc.to_s
+        metadata
+      end
+
+      # @param event [EventStoreClient::DeserializedEvent]
+      # @param metadata [Hash]
+      # @return [Hash]
+      def custom_metadata(event, metadata)
+        metadata.
+          slice('created_at', 'encryption', 'content-type', 'transaction').
+          merge('type' => event.type.to_s)
+      end
+
+      # @param event [EventStoreClient::DeserializedEvent]
+      # @return [Hash, String]
+      def data(event)
+        # Link events are special events. They contain special string value which shouldn't be
+        # serialized.
+        return event.data if event.link?
+
+        serializer.deserialize(serializer.serialize(event.data))
+      end
+    end
+  end
+end

data/lib/event_store_client/serializer/json.rb

@@ -1,19 +1,28 @@
 # frozen_string_literal: true
 
-module Serializer
-  module Json
-    def self.deserialize(data)
-      return data if data.is_a?(Hash)
+module EventStoreClient
+  module Serializer
+    module Json
+      # @param data [String, Hash]
+      # @return [Hash]
+      def self.deserialize(data)
+        return data if data.is_a?(Hash)
 
-      JSON.parse(data)
-    rescue JSON::ParserError
-      { 'message' => data }
-    end
+        result = JSON.parse(data)
+        return result if result.is_a?(Hash)
+
+        { 'message' => result }
+      rescue JSON::ParserError
+        { 'message' => data }
+      end
 
-    def self.serialize(data)
-      return data if data.is_a?(String)
+      # @param data [String, Object]
+      # @return [String]
+      def self.serialize(data)
+        return data if data.is_a?(String)
 
-      JSON.generate(data)
+        JSON.generate(data)
+      end
     end
   end
 end

data/lib/event_store_client/version.rb

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

data/lib/event_store_client.rb

@@ -3,9 +3,12 @@
 module EventStoreClient
 end
 
+require 'json'
 require 'event_store_client/types'
 
 require 'event_store_client/serializer/json'
+require 'event_store_client/serializer/event_serializer'
+require 'event_store_client/serializer/event_deserializer'
 
 require 'event_store_client/mapper'
 
@@ -15,8 +18,8 @@ require 'event_store_client/utils'
 
 require 'event_store_client/connection/url'
 require 'event_store_client/connection/url_parser'
-require 'event_store_client/event'
 require 'event_store_client/deserialized_event'
+require 'event_store_client/serialized_event'
 require 'event_store_client/configuration'
 
 require 'event_store_client/adapters/grpc'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_store_client
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - Sebastian Wilgosz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -38,34 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: dry-schema
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: dry-struct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.5
+- !ruby/object:Gem::Dependency
+  name: dry-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Easy to use client for event-sources applications written in ruby
 email:
 - sebastian@driggl.com
@@ -240,7 +226,6 @@ files:
 - lib/event_store_client/adapters/grpc/generated/users_services_pb.rb
 - lib/event_store_client/adapters/grpc/options/streams/read_options.rb
 - lib/event_store_client/adapters/grpc/options/streams/write_options.rb
-- lib/event_store_client/adapters/grpc/shared/event_deserializer.rb
 - lib/event_store_client/adapters/grpc/shared/options/filter_options.rb
 - lib/event_store_client/adapters/grpc/shared/options/stream_options.rb
 - lib/event_store_client/adapters/grpc/shared/streams/process_response.rb
@@ -252,11 +237,13 @@ files:
 - lib/event_store_client/data_encryptor.rb
 - lib/event_store_client/deserialized_event.rb
 - lib/event_store_client/encryption_metadata.rb
-- lib/event_store_client/event.rb
 - lib/event_store_client/extensions/options_extension.rb
 - lib/event_store_client/mapper.rb
 - lib/event_store_client/mapper/default.rb
 - lib/event_store_client/mapper/encrypted.rb
+- lib/event_store_client/serialized_event.rb
+- lib/event_store_client/serializer/event_deserializer.rb
+- lib/event_store_client/serializer/event_serializer.rb
 - lib/event_store_client/serializer/json.rb
 - lib/event_store_client/types.rb
 - lib/event_store_client/utils.rb

data/lib/event_store_client/adapters/grpc/shared/event_deserializer.rb

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-# rubocop:disable Metrics/AbcSize
-
-module EventStoreClient
-  module GRPC
-    module Shared
-      class EventDeserializer
-        include Configuration
-
-        # @param raw_event [
-        #   Array<EventStore::Client::Streams::ReadResp::ReadEvent::RecordedEvent>,
-        #   Array<EventStore::Client::PersistentSubscriptions::ReadResp::ReadEvent::RecordedEvent>
-        # ]
-        # @param skip_decryption [Boolean]
-        # @return [EventStoreClient::DeserializedEvent]
-        def call(raw_event, skip_decryption: false)
-          data = normalize_serialized(raw_event.data)
-          custom_metadata = normalize_serialized(raw_event.custom_metadata)
-
-          metadata =
-            JSON.parse(custom_metadata).merge(raw_event.metadata.to_h).to_json
-
-          event = EventStoreClient::Event.new(
-            id: raw_event.id.string,
-            title: "#{raw_event.stream_revision}@#{raw_event.stream_identifier.stream_name}",
-            type: raw_event.metadata['type'],
-            data: data,
-            metadata: metadata,
-            stream_revision: raw_event.stream_revision,
-            commit_position: raw_event.commit_position,
-            prepare_position: raw_event.prepare_position,
-            stream_name: raw_event.stream_identifier.stream_name
-          )
-
-          config.mapper.deserialize(event, skip_decryption: skip_decryption)
-        end
-
-        private
-
-        # @param raw_data [String, nil]
-        # @return [String]
-        def normalize_serialized(raw_data)
-          return {}.to_json if raw_data.nil? || raw_data.empty?
-
-          raw_data
-        end
-      end
-    end
-  end
-end
-# rubocop:enable Metrics/AbcSize

data/lib/event_store_client/event.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'dry-struct'
-require 'securerandom'
-require 'json'
-
-module EventStoreClient
-  class Event < Dry::Struct
-    attribute :id, Types::Strict::String.optional.default(nil)
-    attribute :type, Types::Strict::String
-    attribute :title, Types::Strict::String.optional.default(nil)
-    attribute :data, Types::Strict::String.default('{}')
-    attribute :metadata, Types::Strict::String.default('{}')
-    attribute :stream_name, Types::Strict::String.optional.default(nil)
-    attribute :stream_revision, Types::Strict::Integer.optional.default(nil)
-    attribute :commit_position, Types::Strict::Integer.optional.default(nil)
-    attribute :prepare_position, Types::Strict::Integer.optional.default(nil)
-
-    def initialize(args = {})
-      args[:id] = SecureRandom.uuid if args[:id].nil?
-      hash_meta = JSON.parse(args[:metadata] || '{}')
-      hash_meta['created_at'] ||= Time.now
-      args[:metadata] = JSON.generate(hash_meta)
-      super(args)
-    end
-  end
-end