event_store_client 1.1.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 301a92ed47fa04e52d45989042f82571e30eeba810c73b7c0f73af55a95304f0
-  data.tar.gz: 0a58c9b4dc19bb56a2f2082b06552de05f39e0983f5c7379a1e058cbe5c65332
+  metadata.gz: 2624a6c8e08a686f5e307eccfb00ac9321eb5e2e32aed9093c0c67e8cb01b9e5
+  data.tar.gz: 0b4ff333a547924f54aa182e0bb1f821a7382db93c5d9304038c43a514ee6d3b
 SHA512:
-  metadata.gz: f87b1b7516fdae3a51a23970485ad6d492a50b91550208eee10d3d01530cbda57641941c0dc7a9c2696f25c2f442b87bfc02dc70149fdea499dbb11e02bc8d73
-  data.tar.gz: 903f6f6b64725911be55f7d4730f988f1a4596b4f4c8de05c226a77fb6ac477f90063854c0ae2b0981abba5cc78928feebc3aff52c38f6b5863f12408f8bcc84
+  metadata.gz: dfda05e2c763e85977c63a3b0e27034050b37c7ded273750b1aadec42e55fc459475c4a8d50167fe66952bb39c7145242ed017b5548abbece412beaa4e98d37a
+  data.tar.gz: ca27251198df7d78a9b60482ee8dfef7f8b6cfdbda08d3a36f0af1723ee487b85239d0d046a6d777e5c6e5161725faaa4b4fac6aa3b650460eb622a428dc0960

data/lib/event_store_client/adapters/grpc/client.rb

@@ -110,7 +110,10 @@ module EventStoreClient
       # @return Dry::Monads::Result::Success or Dry::Monads::Result::Failure
       #
       def join_streams(name, streams)
-        Commands::Projections::Create.new.call(name, streams)
+        res = Commands::Projections::Create.new.call(name, streams)
+        return if res.success?
+
+        Commands::Projections::Update.new.call(name, streams)
       end
 
       # @api private

data/lib/event_store_client/adapters/grpc/commands/command.rb

@@ -12,7 +12,7 @@ module EventStoreClient
         def self.inherited(klass)
           super
           klass.class_eval do
-            include Dry::Monads[:result]
+            include Dry::Monads[:try, :result]
 
             def self.use_request(request_klass)
               CommandRegistrar.register_request(self, request: request_klass)

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

@@ -38,16 +38,17 @@ module EventStoreClient
 
             requests = [request.new(options: opts)] # please notice that it's an array. Should be?
 
+            skip_decryption = options[:skip_decryption] || false
             service.read(requests, metadata: metadata).each do |res|
               next if res.subscription_confirmation
-              yield deserialize_event(res.event.event) if block_given?
+              yield deserialize_event(res.event.event, skip_decryption: skip_decryption) if block_given?
             end
             Success()
           end
 
           private
 
-          def deserialize_event(entry)
+          def deserialize_event(entry, skip_decryption: false)
             id = entry.id.string
             id = SecureRandom.uuid if id.nil? || id.empty?
 
@@ -65,7 +66,8 @@ module EventStoreClient
                 type: entry.metadata['type'],
                 data: data,
                 metadata: metadata
-              )
+              ),
+              skip_decryption: skip_decryption
             )
           end
         end

data/lib/event_store_client/adapters/grpc/commands/projections/create.rb

@@ -33,8 +33,11 @@ module EventStoreClient
                 }
               }
 
-            service.create(request.new(options: options), metadata: metadata)
-            Success()
+            res = Try do
+              service.create(request.new(options: options), metadata: metadata)
+            end
+
+            res.error? ? res.to_result : Success()
           rescue ::GRPC::Unknown => e
             Failure(:conflict) if e.message.include?('Conflict')
           end

data/lib/event_store_client/adapters/grpc/commands/projections/update.rb

@@ -30,7 +30,9 @@ module EventStoreClient
                 name: name,
                 emit_enabled: true
               }
+
             service.update(request.new(options: options), metadata: metadata)
+
             Success()
           rescue ::GRPC::AlreadyExists
             Failure(:conflict)

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

@@ -43,10 +43,10 @@ module EventStoreClient
               opts[:stream][:revision] = options[:start]
             end
 
+            skip_decryption = options[:skip_decryption] || false
             events = service.read(request.new(options: opts), metadata: metadata).map do |res|
               raise StreamNotFound if res.stream_not_found
-
-              deserialize_event(res.event.event)
+              deserialize_event(res.event.event, skip_decryption: skip_decryption)
             end
             Success(events)
           rescue StreamNotFound
@@ -55,7 +55,7 @@ module EventStoreClient
 
           private
 
-          def deserialize_event(entry)
+          def deserialize_event(entry, skip_decryption: false)
             data = (entry.data.nil? || entry.data.empty?) ? '{}' : entry.data
 
             metadata =
@@ -71,7 +71,7 @@ module EventStoreClient
               metadata: metadata
             )
 
-            config.mapper.deserialize(event)
+            config.mapper.deserialize(event, skip_decryption: skip_decryption)
           end
         end
       end

data/lib/event_store_client/adapters/http.rb

@@ -6,6 +6,7 @@ require 'event_store_client/adapters/http/commands/persistent_subscriptions/crea
 require 'event_store_client/adapters/http/commands/persistent_subscriptions/read'
 
 require 'event_store_client/adapters/http/commands/projections/create'
+require 'event_store_client/adapters/http/commands/projections/update'
 
 require 'event_store_client/adapters/http/commands/streams/append'
 require 'event_store_client/adapters/http/commands/streams/delete'

data/lib/event_store_client/adapters/http/client.rb

@@ -137,7 +137,10 @@ module EventStoreClient
       # @return Dry::Monads::Result::Success or Dry::Monads::Result::Failure
       #
       def join_streams(name, streams, options: {})
-        Commands::Projections::Create.new(connection).call(name, streams, options: options)
+        res = Commands::Projections::Create.new(connection).call(name, streams, options: options)
+        return res if res.success?
+
+        Commands::Projections::Update.new(connection).call(name, streams, options: options)
       end
 
       # @api private

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

@@ -28,16 +28,19 @@ module EventStoreClient
 
             ack_info = body['links'].find { |link| link['relation'] == 'ackAll' }
             return { events: [] } unless ack_info
+
+            skip_decryption = options[:skip_decryption] || false
             body['entries'].map do |entry|
-              yield deserialize_event(entry)
+              yield deserialize_event(entry, skip_decryption: skip_decryption)
             end
+
             Ack.new(connection).call(ack_info['uri'])
             Success()
           end
 
           private
 
-          def deserialize_event(entry)
+          def deserialize_event(entry, skip_decryption: false)
             event = EventStoreClient::Event.new(
               id: entry['eventId'],
               title: entry['title'],
@@ -46,7 +49,7 @@ module EventStoreClient
               metadata: entry['isMetaData'] ? entry['metaData'] : '{}'
             )
 
-            config.mapper.deserialize(event)
+            config.mapper.deserialize(event, skip_decryption: skip_decryption)
           rescue EventStoreClient::DeserializedEvent::InvalidDataError
             event
           end

data/lib/event_store_client/adapters/http/commands/projections/create.rb

@@ -16,12 +16,15 @@ module EventStoreClient
                 })
               STRING
 
-            connection.call(
+
+            res = connection.call(
               :post,
               "/projections/continuous?name=#{name}&type=js&enabled=yes&emit=true&trackemittedstreams=true", # rubocop:disable Metrics/LineLength
               body: data,
               headers: {}
             )
+
+            (200...300).cover?(res.status) ? Success() : Failure(res)
           end
         end
       end

data/lib/event_store_client/adapters/http/commands/projections/update.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module EventStoreClient
+  module HTTP
+    module Commands
+      module Projections
+        class Update < Command
+          def call(name, streams, options: {})
+            data =
+              <<~STRING
+                fromStreams(#{streams})
+                .when({
+                  $any: function(s,e) {
+                    linkTo("#{name}", e)
+                  }
+                })
+              STRING
+            res = connection.call(
+              :put,
+              "/projection/#{name}/query?type=js&enabled=yes&emit=true&trackemittedstreams=true", # rubocop:disable Metrics/LineLength
+              body: data,
+              headers: {}
+            )
+
+            (200...300).cover?(res.status) ? Success() : Failure(res)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -23,8 +23,9 @@ module EventStoreClient
 
             return Failure(:stream_not_found) unless response.success? || response.status == 404
             return Failure(:connection_failed) if response.body.nil? || response.body.empty?
+            skip_decryption = options[:skip_decryption] || false
             entries = JSON.parse(response.body)['entries'].map do |entry|
-              deserialize_event(entry)
+              deserialize_event(entry, skip_decryption: skip_decryption)
             end.reverse
             Success(entries)
           rescue Faraday::ConnectionFailed
@@ -33,7 +34,7 @@ module EventStoreClient
 
           private
 
-          def deserialize_event(entry)
+          def deserialize_event(entry, skip_decryption: false)
             event = EventStoreClient::Event.new(
               id: entry['eventId'],
               title: entry['title'],
@@ -42,7 +43,7 @@ module EventStoreClient
               metadata: entry['isMetaData'] ? entry['metaData'] : '{}'
             )
 
-            config.mapper.deserialize(event)
+            config.mapper.deserialize(event, skip_decryption: skip_decryption)
           end
         end
       end

data/lib/event_store_client/adapters/in_memory.rb

@@ -46,8 +46,9 @@ module EventStoreClient
       res = Response.new(response.to_json, 200)
 
       return [] if res.body.nil? || res.body.empty?
+      skip_decryption = options[:skip_decryption] || false
       events = JSON.parse(res.body)['entries'].map do |entry|
-        deserialize_event(entry)
+        deserialize_event(entry, skip_decryption: skip_decryption)
       end.reverse
       Dry::Monads::Success(events)
     end
@@ -127,7 +128,7 @@ module EventStoreClient
       end
     end
 
-    def deserialize_event(entry)
+    def deserialize_event(entry, skip_decryption: false)
       event = EventStoreClient::Event.new(
         id: entry['eventId'],
         title: entry['title'],
@@ -136,7 +137,7 @@ module EventStoreClient
         metadata: entry['isMetaData'] ? entry['metaData'] : '{}'
       )
 
-      mapper.deserialize(event)
+      mapper.deserialize(event, skip_decryption: skip_decryption)
     end
   end
 end

data/lib/event_store_client/broker.rb

@@ -10,6 +10,14 @@ module EventStoreClient
     #   main app process (useful for debugging)
     #
     def call(subscriptions, wait: false)
+      Signal.trap('TERM') do
+        Thread.new { logger&.info('Broker: TERM Signal has been received') }
+        threads.each do |thread|
+          thread.thread_variable_set(:terminate, true)
+        end
+        Thread.new { logger&.info('Broker: Terminate variable for subscription threads set') }
+      end
+
       subscriptions.each do |subscription|
         threads << Thread.new do
           subscriptions.listen(subscription)
@@ -20,12 +28,13 @@ module EventStoreClient
 
     private
 
-    attr_reader :connection
+    attr_reader :connection, :logger
     attr_accessor :threads
 
     def initialize(connection:)
       @connection = connection
       @threads = []
+      @logger = EventStoreClient.config.logger
     end
   end
 end

data/lib/event_store_client/catch_up_subscriptions.rb

@@ -34,6 +34,13 @@ module EventStoreClient
         next unless event
 
         subscription.subscriber.call(event)
+
+        if Thread.current.thread_variable_get(:terminate)
+          msg =
+            "CatchUpSubscriptions: Terminating subscription listener for #{subscription.subscriber}"
+          logger&.info(msg)
+          break
+        end
       rescue StandardError
         subscription.position = old_position
         subscription_store.update_position(subscription)
@@ -45,14 +52,19 @@ module EventStoreClient
       subscription_store.clean_unused(subscriptions.map(&:name))
     end
 
+    def reset
+      subscription_store.reset(subscriptions)
+    end
+
     private
 
-    attr_reader :connection, :subscriptions, :subscription_store
+    attr_reader :connection, :subscriptions, :subscription_store, :logger
 
     def initialize(connection:, subscription_store:)
       @connection = connection
       @subscription_store = subscription_store
       @subscriptions = []
+      @logger = EventStoreClient.config.logger
     end
 
     def confirmation?(event_data)

data/lib/event_store_client/client.rb

@@ -33,6 +33,12 @@ module EventStoreClient
       @subscriptions.create_or_load(subscriber, filter: filter)
     end
 
+    def reset_subscriptions
+      return unless @subscriptions.respond_to?(:reset)
+
+      @subscriptions.reset
+    end
+
     def listen(wait: false)
       broker.call(@subscriptions, wait: wait)
     end

data/lib/event_store_client/configuration.rb

@@ -30,6 +30,8 @@ module EventStoreClient
 
   setting :subscriptions_repo
 
+  setting :logger
+
   def self.configure
     yield(config) if block_given?
   end

data/lib/event_store_client/data_decryptor.rb

@@ -9,28 +9,28 @@ module EventStoreClient
     KeyNotFoundError = Class.new(StandardError)
 
     def call
-      return decrypted_data if encryption_metadata.empty?
+      return encrypted_data if encryption_metadata.empty?
 
       decrypt_attributes(
         key: find_key(encryption_metadata['key']),
-        data: decrypted_data,
+        data: encrypted_data,
         attributes: encryption_metadata['attributes']
       )
     end
 
-    attr_reader :decrypted_data, :encryption_metadata
-
     private
 
-    attr_reader :key_repository
+    attr_reader :key_repository, :encryption_metadata, :encrypted_data
 
     def initialize(data:, schema:, repository:)
-      @decrypted_data = deep_dup(data).transform_keys!(&:to_s)
+      @encrypted_data = deep_dup(data).transform_keys!(&:to_s)
       @key_repository = repository
       @encryption_metadata = schema&.transform_keys(&:to_s) || {}
     end
 
     def decrypt_attributes(key:, data:, attributes: {}) # rubocop:disable Lint/UnusedMethodArgument
+      return data unless key
+
       res = key_repository.decrypt(key: key, message: data['es_encrypted'])
       return data if res.failure?
 
@@ -42,6 +42,7 @@ module EventStoreClient
     end
 
     def deep_dup(hash)
+      return hash unless hash.instance_of?(Hash)
       dupl = hash.dup
       dupl.each { |k, v| dupl[k] = v.instance_of?(Hash) ? deep_dup(v) : v }
       dupl
@@ -53,8 +54,8 @@ module EventStoreClient
           key_repository.find(identifier).value!
         rescue StandardError => e
           config.error_handler&.call(e)
+          nil
         end
-      raise KeyNotFoundError unless key
 
       key
     end

data/lib/event_store_client/mapper/default.rb

@@ -12,7 +12,7 @@ module EventStoreClient
         )
       end
 
-      def deserialize(event)
+      def deserialize(event, **)
         metadata = serializer.deserialize(event.metadata)
         data = serializer.deserialize(event.data)
 

data/lib/event_store_client/mapper/encrypted.rb

@@ -49,14 +49,20 @@ module EventStoreClient
       #   which key should be used as an identifier.
       # *Returns*: Specific event class with all data decrypted
 
-      def deserialize(event)
+      def deserialize(event, skip_decryption: false)
         metadata = serializer.deserialize(event.metadata)
         encryption_schema = serializer.deserialize(event.metadata)['encryption']
-        decrypted_data = EventStoreClient::DataDecryptor.new(
-          data: serializer.deserialize(event.data),
-          schema: encryption_schema,
-          repository: key_repository
-        ).call
+
+        decrypted_data =
+          if skip_decryption
+            serializer.deserialize(event.data)
+          else
+            EventStoreClient::DataDecryptor.new(
+              data: serializer.deserialize(event.data),
+              schema: encryption_schema,
+              repository: key_repository
+            ).call
+          end
 
         event_class =
           begin

data/lib/event_store_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_store_client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.5
 platform: ruby
 authors:
 - Sebastian Wilgosz
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.8
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +213,7 @@ files:
 - lib/event_store_client/adapters/http/commands/persistent_subscriptions/create.rb
 - lib/event_store_client/adapters/http/commands/persistent_subscriptions/read.rb
 - lib/event_store_client/adapters/http/commands/projections/create.rb
+- lib/event_store_client/adapters/http/commands/projections/update.rb
 - lib/event_store_client/adapters/http/commands/streams/append.rb
 - lib/event_store_client/adapters/http/commands/streams/delete.rb
 - lib/event_store_client/adapters/http/commands/streams/link_to.rb
@@ -232,7 +247,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -247,8 +262,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Ruby integration for https://eventstore.org
 test_files: []