ruby_event_store 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e43f2327229617a89cfbd0ed495d5dcc3a96f056f4e7a7d3984826efaedd0ca
-  data.tar.gz: 5668a001f159239b593831820696d1a645d170b47db38bccd6bddc36c2ac9a7e
+  metadata.gz: 81a9b613c69a42dd544741b6c9beda7f8bffe1e680eba7e4bd93c1fad1ef2f40
+  data.tar.gz: ada38679291f059d618a9232770d401f795deb3e0ce6b8c04e43604269a36353
 SHA512:
-  metadata.gz: 3b125835ca8080259820933f625776dd85b0f0e385df47cd094b9fdef180b833b2bd11cd9177f9072c8ec696c65ce9837a844446d3a9b3898fda957d9b8a0ad6
-  data.tar.gz: 1b4392aedb361795854cd30483383f4ae0c3b6ec88d141f52de4048e8a2f6afe70eb08257ac7aa4ef9b7606be10793757d25587d98ea6ce6e413a03708f09bb2
+  metadata.gz: 106d20e97c28f0595d5750aa61934a905b74aa8d9ecd28ac14176225c5a257082017da184c47d7a314cda09e142b5c1e31a20a9544bee2eeaf4973f8f158a745
+  data.tar.gz: b78ee185caefd7070b3cb82f355f03e6efd9299c367187fbbdde5cb65e75973d796dba103c7ddc3123a6eb7919992dab1cb84cef9717409632244cdf93a6a7eb

data/lib/ruby_event_store/client.rb

@@ -254,9 +254,9 @@ module RubyEventStore
     # @param metadata [Hash] metadata to set for events
     # @param block [Proc] block of code during which the metadata will be added
     # @return [Object] last value returned by the provided block
-    def with_metadata(metadata, &block)
-      previous_metadata = metadata()
-      self.metadata = previous_metadata.merge(metadata)
+    def with_metadata(metadata_for_block, &block)
+      previous_metadata = metadata
+      self.metadata = previous_metadata.merge(metadata_for_block)
       block.call if block_given?
     ensure
       self.metadata = previous_metadata

data/lib/ruby_event_store/event.rb

@@ -62,9 +62,6 @@ module RubyEventStore
         other_event.event_id.eql?(event_id) && other_event.data.eql?(data)
     end
 
-    # @private
-    BIG_VALUE = 0b111111100100000010010010110011101011000101010101001100100110000
-
     # Generates a Fixnum hash value for this object. This function
     # have the property that a.eql?(b) implies a.hash == b.hash.
     #
@@ -77,7 +74,7 @@ module RubyEventStore
     # * data
     def hash
       # We don't use metadata because == does not use metadata
-      [self.class, event_type, event_id, data].hash ^ BIG_VALUE
+      [event_type, event_id, data].hash ^ self.class.hash
     end
 
     # Reads correlation_id from metadata.

data/lib/ruby_event_store/expected_version.rb

@@ -49,11 +49,8 @@ module RubyEventStore
       end
     end
 
-    BIG_VALUE = 0b110111100100000010010010110011101011000101010101001100100110011
-    private_constant :BIG_VALUE
-
     def hash
-      [self.class, version].hash ^ BIG_VALUE
+      version.hash ^ self.class.hash
     end
 
     def ==(other_expected_version)

data/lib/ruby_event_store/instrumented_subscriptions.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module RubyEventStore
+  class InstrumentedSubscriptions
+    def initialize(subscriptions, instrumentation)
+      @subscriptions = subscriptions
+      @instrumentation = instrumentation
+    end
+
+    def add_subscription(subscriber, event_types)
+      instrument(subscriber: subscriber, event_types: event_types) do
+        subscriptions.add_subscription(subscriber, event_types)
+      end
+    end
+
+    def add_global_subscription(subscriber)
+      instrument(subscriber: subscriber) do
+        subscriptions.add_global_subscription(subscriber)
+      end
+    end
+
+    def add_thread_subscription(subscriber, event_types)
+      instrument(subscriber: subscriber, event_types: event_types) do
+        subscriptions.add_thread_subscription(subscriber, event_types)
+      end
+    end
+
+    def add_thread_global_subscription(subscriber)
+      instrument(subscriber: subscriber) do
+        subscriptions.add_thread_global_subscription(subscriber)
+      end
+    end
+
+    def method_missing(method_name, *arguments, &block)
+      if respond_to?(method_name)
+        subscriptions.public_send(method_name, *arguments, &block)
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(method_name, _include_private)
+      subscriptions.respond_to?(method_name)
+    end
+
+    private
+
+    def instrument(args)
+      instrumentation.instrument("add.subscriptions.rails_event_store", args) do
+        unsubscribe = yield
+        ->() {
+          instrumentation.instrument("remove.subscriptions.rails_event_store", args) do
+            unsubscribe.call
+          end
+        }
+      end
+    end
+
+    attr_reader :instrumentation, :subscriptions
+  end
+end

data/lib/ruby_event_store/mappers/transformation/preserve_types.rb

@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+module RubyEventStore
+  module Mappers
+    module Transformation
+      class PreserveTypes
+        def initialize(type_resolver: ->(type) { type.to_s } )
+          @registered_type_serializers = {}
+          @type_resolver = type_resolver
+        end
+
+        def register(type, serializer:, deserializer:)
+          @registered_type_serializers[@type_resolver.(type)] = {
+            serializer: serializer,
+            deserializer: deserializer
+          }
+          self
+        end
+
+        def dump(record)
+          data = transform(record.data)
+          metadata = transform(record.metadata)
+          if (metadata.respond_to?(:[]=))
+            metadata[:types] = {
+              data: store_type(record.data),
+              metadata: store_type(record.metadata),
+            }
+          end
+
+          Record.new(
+            event_id:   record.event_id,
+            event_type: record.event_type,
+            data:       data,
+            metadata:   metadata,
+            timestamp:  record.timestamp,
+            valid_at:   record.valid_at,
+          )
+        end
+
+        def load(record)
+          types = record.metadata.delete(:types) rescue nil
+          data_types = types&.fetch(:data, nil)
+          metadata_types = types&.fetch(:metadata, nil)
+          data = data_types ? restore_type(record.data, data_types) : record.data
+          metadata = metadata_types ? restore_type(record.metadata, metadata_types) : record.metadata
+
+          Record.new(
+            event_id:   record.event_id,
+            event_type: record.event_type,
+            data:       data,
+            metadata:   metadata,
+            timestamp:  record.timestamp,
+            valid_at:   record.valid_at,
+          )
+        end
+
+        private
+        PASS_THROUGH = ->(v) { v }
+
+        def transform_hash(argument)
+          argument.each_with_object({}) do |(key, value), hash|
+            hash[transform(key)] = transform(value)
+          end
+        end
+
+        def transform(argument)
+          case argument
+          when Hash
+            transform_hash(argument)
+          when Array
+            argument.map{|i| transform(i)}
+          else
+            serializer_of(argument.class).call(argument)
+          end
+        end
+
+        def store_types(argument)
+          argument.each_with_object({}) do |(key, value), hash|
+            hash[transform(key)] = [store_type(key), store_type(value)]
+          end
+        end
+
+        def store_type(argument)
+          case argument
+          when Hash
+            store_types(argument)
+          when Array
+            argument.map{|i| store_type(i)}
+          else
+            argument.class.name
+          end
+        end
+
+        def restore_types(argument, types)
+          argument.each_with_object({}) do |(key, value), hash|
+            key_type, value_type = types.fetch(key.to_sym)
+            restored_key = restore_type(key, key_type)
+            hash[restored_key] = restore_type(value, value_type)
+          end
+        end
+
+        def restore_type(argument, type)
+          case argument
+          when Hash
+            restore_types(argument, type)
+          when Array
+            argument.each_with_index.map{|a,idx| restore_type(a, type.fetch(idx))}
+          else
+            deserializer_of(type).call(argument)
+          end
+        end
+
+        def serializer_of(type)
+          @registered_type_serializers.dig(@type_resolver.(type), :serializer) || PASS_THROUGH
+        end
+
+        def deserializer_of(type)
+          @registered_type_serializers.dig(type, :deserializer) || PASS_THROUGH
+        end
+      end
+    end
+  end
+end

data/lib/ruby_event_store/record.rb

@@ -17,9 +17,8 @@ module RubyEventStore
 
     attr_reader :event_id, :data, :metadata, :event_type, :timestamp, :valid_at
 
-    BIG_VALUE = 0b110011100100000010010010110011101011110101010101001100111110011
     def hash
-      [self.class, event_id, data, metadata, event_type, timestamp, valid_at].hash ^ BIG_VALUE
+      [event_id, data, metadata, event_type, timestamp, valid_at].hash ^ self.class.hash
     end
 
     def ==(other)

data/lib/ruby_event_store/serialized_record.rb

@@ -16,9 +16,8 @@ module RubyEventStore
 
     attr_reader :event_id, :data, :metadata, :event_type, :timestamp, :valid_at
 
-    BIG_VALUE = 0b110011100100000010010010110011101011110101010101001100111110111
     def hash
-      [self.class, event_id, data, metadata, event_type, timestamp, valid_at].hash ^ BIG_VALUE
+      [event_id, data, metadata, event_type, timestamp, valid_at].hash ^ self.class.hash
     end
 
     def ==(other)

data/lib/ruby_event_store/spec/event_repository_lint.rb

@@ -1407,6 +1407,15 @@ module RubyEventStore
       )
       expect(repository.read(specification.result).count).to eq(0)
     end
+
+    specify "linking empty list of commits to stream should be a no-op" do
+      repository.link_to_stream(
+        [],
+        RubyEventStore::Stream.new("whatever-non-globa"),
+        RubyEventStore::ExpectedVersion.any
+      )
+      expect(repository.read(specification.result).count).to eq(0)
+    end
   end
 
   ::RSpec::Matchers.define :eq_ids do |expected_ids|

data/lib/ruby_event_store/specification.rb

@@ -43,7 +43,7 @@ module RubyEventStore
       Specification.new(reader, result.dup { |r| r.stop = stop })
     end
 
-    # Limits the query to events that later than given time.
+    # Limits the query to events that occurred before given time.
     # {http://railseventstore.org/docs/read/ Find out more}.
     #
     # @param time [Time]
@@ -59,7 +59,7 @@ module RubyEventStore
       )
     end
 
-    # Limits the query to events that occurred on given time or later.
+    # Limits the query to events that occurred on or before given time.
     # {http://railseventstore.org/docs/read/ Find out more}.
     #
     # @param time [Time]
@@ -75,7 +75,7 @@ module RubyEventStore
       )
     end
 
-    # Limits the query to events that occurred earlier than given time.
+    # Limits the query to events that occurred after given time.
     # {http://railseventstore.org/docs/read/ Find out more}.
     #
     # @param time [Time]
@@ -91,7 +91,7 @@ module RubyEventStore
       )
     end
 
-    # Limits the query to events that occurred on given time or earlier.
+    # Limits the query to events that occurred on or after given time.
     # {http://railseventstore.org/docs/read/ Find out more}.
     #
     # @param time [Time]

data/lib/ruby_event_store/specification_result.rb

@@ -244,9 +244,6 @@ module RubyEventStore
       other_spec.hash.eql?(hash)
     end
 
-    # @private
-    BIG_VALUE = 0b100010010100011110111101100001011111100101001010111110101000000
-
     # Generates a Fixnum hash value for this object. This function
     # have the property that a.eql?(b) implies a.hash == b.hash.
     #
@@ -273,7 +270,6 @@ module RubyEventStore
     # @return [Integer]
     def hash
       [
-        self.class,
         get_direction,
         start,
         stop,
@@ -288,7 +284,7 @@ module RubyEventStore
         batch_size,
         with_ids,
         with_types
-      ].hash ^ BIG_VALUE
+      ].hash ^ self.class.hash
     end
 
     private

data/lib/ruby_event_store/stream.rb

@@ -13,9 +13,8 @@ module RubyEventStore
 
     attr_reader :name
 
-    BIG_VALUE = 0b111111100100000010010010110011101011000101010101001100100110011
     def hash
-      [self.class, name].hash ^ BIG_VALUE
+      name.hash ^ self.class.hash
     end
 
     def ==(other_stream)
@@ -23,7 +22,5 @@ module RubyEventStore
     end
 
     alias_method :eql?, :==
-
-    private_constant :BIG_VALUE
   end
 end

data/lib/ruby_event_store/transform_keys.rb

@@ -14,16 +14,15 @@ module RubyEventStore
       private
 
       def deep_transform(data, &block)
-        data.each_with_object({}) do |(k, v), h|
-          h[yield(k)] =
-            case v
-            when Hash
-              deep_transform(v, &block)
-            when Array
-              v.map { |i| Hash === i ? deep_transform(i, &block) : i }
-            else
-              v
-            end
+        case data
+        when Hash
+          data.each_with_object({}) do |(key, value), hash|
+            hash[yield(key)] = deep_transform(value, &block)
+          end
+        when Array
+          data.map { |i| deep_transform(i, &block) }
+        else
+          data
         end
       end
     end

data/lib/ruby_event_store/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyEventStore
-  VERSION = "2.5.1"
+  VERSION = "2.6.0"
 end

data/lib/ruby_event_store.rb

@@ -27,6 +27,7 @@ require_relative "ruby_event_store/mappers/transformation/event_class_remapper"
 require_relative "ruby_event_store/mappers/transformation/upcast"
 require_relative "ruby_event_store/mappers/transformation/stringify_metadata_keys"
 require_relative "ruby_event_store/mappers/transformation/symbolize_metadata_keys"
+require_relative "ruby_event_store/mappers/transformation/preserve_types"
 require_relative "ruby_event_store/mappers/pipeline"
 require_relative "ruby_event_store/mappers/pipeline_mapper"
 require_relative "ruby_event_store/mappers/default"
@@ -44,3 +45,4 @@ require_relative "ruby_event_store/composed_dispatcher"
 require_relative "ruby_event_store/version"
 require_relative "ruby_event_store/instrumented_repository"
 require_relative "ruby_event_store/instrumented_dispatcher"
+require_relative "ruby_event_store/instrumented_subscriptions"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Arkency
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2022-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -55,6 +55,7 @@ files:
 - lib/ruby_event_store/in_memory_repository.rb
 - lib/ruby_event_store/instrumented_dispatcher.rb
 - lib/ruby_event_store/instrumented_repository.rb
+- lib/ruby_event_store/instrumented_subscriptions.rb
 - lib/ruby_event_store/link_by_metadata.rb
 - lib/ruby_event_store/mappers/default.rb
 - lib/ruby_event_store/mappers/encryption_key.rb
@@ -69,6 +70,7 @@ files:
 - lib/ruby_event_store/mappers/transformation/domain_event.rb
 - lib/ruby_event_store/mappers/transformation/encryption.rb
 - lib/ruby_event_store/mappers/transformation/event_class_remapper.rb
+- lib/ruby_event_store/mappers/transformation/preserve_types.rb
 - lib/ruby_event_store/mappers/transformation/stringify_metadata_keys.rb
 - lib/ruby_event_store/mappers/transformation/symbolize_metadata_keys.rb
 - lib/ruby_event_store/mappers/transformation/upcast.rb
@@ -116,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Implementation of an event store in Ruby