event_store_client 2.1.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a751756e4700e5e6329d009398cfa56fffed6c30d7672d57be5dac187a87a837
-  data.tar.gz: f54b8d2b63d28d040834a0e07c76f12b3dd92a586a93fbd2cad1dd0879c3c2c1
+  metadata.gz: cf7ad41170584cd3dbe64ba7afff6e8e3af7a51277cf60e5732b6187e18e8170
+  data.tar.gz: 2cb382ee414a9d00373954e05f6a931e9bec042a84491dd58d2d96f4fd47559c
 SHA512:
-  metadata.gz: 15412534b3a696afdd183edb291f929940babf747870938624b5262cbd15bf383ef6a4512bfb7690b71bc2774d535d09b4ad0dc81548ec91e7a28360a09528fa
-  data.tar.gz: 0774e310c1460b957997fe9b78f0f0500483c31ea379f9828c5a6c5861c6dd7807ec7580ee726af1fb3e78f47e58e1a7f390817e4803e95048758f37fc4e657f
+  metadata.gz: adec2fceef915b4383e694f299e91963bd27bebcf6b3bcf5a25d8549bc6b6038a2d58ab1937444a8ffa3fd8785ed6f8351ec9b9960537a4d4000d3f7ce80d6c0
+  data.tar.gz: ad2b082b49f5c6d40f6f74bf5e31543878b1d09787650381687eb1b9367aecbc80121d277f929a242e26e7f82d15dede426dc0da983ced71712b87497a3ede36

data/lib/event_store_client/configuration.rb

@@ -1,44 +1,43 @@
 # frozen_string_literal: true
 
-require 'dry-configurable'
-
 module EventStoreClient
+  class Config
+    include Extensions::OptionsExtension
+
+    option(:eventstore_url) { 'esdb://localhost:2113' }
+    option(:per_page) { 20 }
+    option(:mapper) { Mapper::Default.new }
+    option(:default_event_class) { DeserializedEvent }
+    option(:logger)
+    option(:skip_deserialization) { false }
+    option(:skip_decryption) { false }
+
+    def eventstore_url=(value)
+      @eventstore_url =
+        if value.is_a?(Connection::Url)
+          value
+        else
+          Connection::UrlParser.new.call(value)
+        end
+    end
+
+    # @param logger [Logger, nil]
+    # @return [Logger, nil]
+    def logger=(logger)
+      ::GRPC.define_singleton_method :logger do
+        @logger ||= logger.nil? ? ::GRPC::DefaultLogger::NoopLogger.new : logger
+      end
+      @logger = logger
+    end
+  end
+
   class << self
     def configure
       yield(config) if block_given?
     end
 
     def config
-      @config ||= Class.new do
-        extend Dry::Configurable
-
-        # @param logger [Logger, nil]
-        # @return [Logger, nil]
-        def self.assign_grpc_logger(logger)
-          ::GRPC.define_singleton_method :logger do
-            @logger ||= logger.nil? ? ::GRPC::DefaultLogger::NoopLogger.new : logger
-          end
-          logger
-        end
-
-        setting :eventstore_url,
-                default: 'esdb://localhost:2113',
-                constructor:
-                  proc { |value|
-                    value.is_a?(Connection::Url) ? value : Connection::UrlParser.new.call(value)
-                  }
-        setting :per_page, default: 20
-
-        setting :mapper, default: Mapper::Default.new
-
-        setting :default_event_class, default: DeserializedEvent
-
-        setting :logger, constructor: method(:assign_grpc_logger).to_proc
-
-        setting :skip_deserialization, default: false
-        setting :skip_decryption, default: false
-      end
-      @config.config
+      @config ||= Config.new
     end
 
     def client

data/lib/event_store_client/data_decryptor.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'event_store_client/configuration'
-
 module EventStoreClient
   class DataDecryptor
     include Configuration

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.1'
+  VERSION = '2.1.3'
 end

data/lib/event_store_client.rb

@@ -4,13 +4,12 @@ module EventStoreClient
 end
 
 require 'json'
+require 'set'
 
 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'
-
 require 'event_store_client/extensions/options_extension'
 
 require 'event_store_client/utils'
@@ -21,4 +20,6 @@ require 'event_store_client/deserialized_event'
 require 'event_store_client/serialized_event'
 require 'event_store_client/configuration'
 
+require 'event_store_client/mapper'
+
 require 'event_store_client/adapters/grpc'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: event_store_client
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Sebastian Wilgosz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2022-11-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: dry-configurable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement