event_store_client 1.0.1 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 134b0426087d6b24a29e55e762f5bcbdbaafbe91b3311e95e10cbaff66d83f20
-  data.tar.gz: 8e08fecbacc16ef6a4983f69e867a1a6295160fa35f864e8635e365366b2ad38
+  metadata.gz: 073a691ef952647fd7be92fad2526a279dccfe05867c524ccab6a86aee815dd2
+  data.tar.gz: 75c51d92577ceb57488e07761466dd58bf1b8cb52e23ee11a82d40bdfb387039
 SHA512:
-  metadata.gz: 74af83ac0ba1dab7b00e660ed16320c9fe84ea87f39b28e9b876cd1689a02c4a48df70567b4d1949b5188a7dd37d3b6f46a6f897a7073adc368eac13807197cc
-  data.tar.gz: d69d047e3054f10bfd7928347d6b5e17c59c2a73aa0ea4f131af7d0a238188686975f5ac866b362dc9096d5d22d4ed9a5f29a9ef751f93e4c89b05d0b2d94dd7
+  metadata.gz: c9ba15429219f65fc9a7473642ff2e7a0c048cf14a0246f00ecac62ad5daf38ab9c0a800993911d14cd142706ec1d3f5e233e092279391c7c7d9d43683468a05
+  data.tar.gz: 27f4088d4e92c6a0cef51a93970559a4253d44789e5d9c3a744afebc59de027f3f1853e0c527de5438ede1031bd5cf9ad36aff2e6f8f82856202c23a45b47025

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

@@ -48,13 +48,23 @@ module EventStoreClient
           private
 
           def deserialize_event(entry)
+            id = entry.id.string
+            id = SecureRandom.uuid if id.nil? || id.empty?
+
+            data = (entry.data.nil? || entry.data.empty?) ? '{}' : entry.data
+
+            metadata =
+              JSON.parse(entry.custom_metadata || '{}').merge(
+                entry.metadata.to_h || {}
+              ).to_json
+
             config.mapper.deserialize(
               EventStoreClient::Event.new(
-                id: entry.id.string,
+                id: id,
                 title: "#{entry.stream_revision}@#{entry.stream_identifier.streamName}",
                 type: entry.metadata['type'],
-                data: entry.data || '{}',
-                metadata: (entry.metadata.to_h || {}).to_json
+                data: data,
+                metadata: metadata
               )
             )
           end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'securerandom'
 require 'grpc'
 require 'event_store_client/adapters/grpc/generated/streams_pb.rb'
 require 'event_store_client/adapters/grpc/generated/streams_services_pb.rb'
@@ -26,10 +27,13 @@ module EventStoreClient
 
               event_metadata = event.metadata.tap do |h|
                 h['type'] = '$>'
-                h['content-type'] = 'application/octet-stream'
+                h['content-type'] = 'application/json'
                 h.delete('encryption')
               end
 
+              event_id = event.id
+              event_id = SecureRandom.uuid if event.id.nil? || event.id.empty?
+
               payload = [
                 request.new(
                   options: {
@@ -42,7 +46,7 @@ module EventStoreClient
                 request.new(
                   proposed_message: {
                     id: {
-                      string: event.id
+                      string: event_id
                     },
                     data: event.title,
                     custom_metadata: custom_metadata,

data/lib/event_store_client/client.rb

@@ -10,9 +10,8 @@ module EventStoreClient
     WrongExpectedEventVersion = Class.new(StandardError)
 
     def publish(stream:, events:, options: {})
-      connection.append_to_stream(stream, events, options: options)
-    rescue HTTP::Client::WrongExpectedEventVersion => e
-      raise WrongExpectedEventVersion.new(e.message)
+      res = connection.append_to_stream(stream, events, options: options)
+      raise WrongExpectedEventVersion.new(e.message) if res.failure?
     end
 
     def read(stream, options: {})
@@ -43,7 +42,7 @@ module EventStoreClient
     end
     # rubocop:enable Metrics/CyclomaticComplexity
 
-    attr_accessor :connection, :service_name
+    attr_accessor :connection
 
     private
 
@@ -53,7 +52,6 @@ module EventStoreClient
       @threads = []
       @connection ||= EventStoreClient.adapter
       @error_handler ||= config.error_handler
-      @service_name ||= 'default'
       @broker ||= Broker.new(connection: connection)
       @subscriptions ||= Subscriptions.new(connection: connection, service: config.service_name)
     end

data/lib/event_store_client/deserialized_event.rb

@@ -32,7 +32,7 @@ module EventStoreClient
     end
 
     def content_type
-      return 'application/octet-stream' if EventStoreClient.config.adapter == :grpc
+      return 'application/json' if EventStoreClient.config.adapter == :grpc
 
       'application/vnd.eventstore.events+json'
     end

data/lib/event_store_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_store_client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.6
 platform: ruby
 authors:
 - Sebastian Wilgosz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable