ruby_event_store 2.2.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28fef13a18c820b5e2e67ffef0aa6ee04b171a427fe9f7a9a4323dbab9db61bb
-  data.tar.gz: 8aa4bcf65629ae5e1912651d08be52de870f0dc0c274bd046796400d6a50bf34
+  metadata.gz: 3960a57258392156fd3d8ee9811d2c23a2b0a348d7938a830ae51f5edec01bc7
+  data.tar.gz: e4c4ef6136891a68ed94609f1fbd58ac0ce6ec854a1a843f7b167573b2cc6070
 SHA512:
-  metadata.gz: 2717723ff31551edb75469a884d88a5e64f97432f218a54c71fe84245bdd91ff770215bd54b90a2ee5dd56054a6bba29ed4ed766c551bb7d7c6f66806f23e207
-  data.tar.gz: 4f509c7e557271f414aad29db6dd04063aa9d29a45a49985fb12e89192e88d5bee5c8ad73a561faad3d196e04c4ff3ad2f1471ea3f67f0bd63f54060518cac27
+  metadata.gz: 239185c1c4a70275d394c1c7e702b1afaa8c8cdd22b2ff0ba25a1b042ca036a1e3eddc26aeb9b8ce638c9f8e81b372cd4eccdd230238b74ffe28060e754707ad
+  data.tar.gz: 1dd1af400141ed99a0ccf31234f48311d935f23d7ac8367eb48f44e0f845193af973a6c4b00dc554c45ae07c25067d83828fba2a151df1d20082394541a24fd5

data/lib/ruby_event_store/batch_enumerator.rb

@@ -3,9 +3,9 @@
 module RubyEventStore
   class BatchEnumerator
     def initialize(batch_size, total_limit, reader)
-      @batch_size  = batch_size
+      @batch_size = batch_size
       @total_limit = total_limit
-      @reader      = reader
+      @reader = reader
     end
 
     def each
@@ -13,7 +13,7 @@ module RubyEventStore
 
       0.step(total_limit - 1, batch_size) do |batch_offset|
         batch_limit = [batch_size, total_limit - batch_offset].min
-        result      = reader.call(batch_offset, batch_limit)
+        result = reader.call(batch_offset, batch_limit)
 
         break if result.empty?
         yield result

data/lib/ruby_event_store/broker.rb

@@ -9,9 +9,7 @@ module RubyEventStore
 
     def call(event, record)
       subscribers = subscriptions.all_for(event.event_type)
-      subscribers.each do |subscriber|
-        dispatcher.call(subscriber, event, record)
-      end
+      subscribers.each { |subscriber| dispatcher.call(subscriber, event, record) }
     end
 
     def add_subscription(subscriber, event_types)
@@ -35,11 +33,14 @@ module RubyEventStore
     end
 
     private
+
     attr_reader :dispatcher, :subscriptions
 
     def verify_subscription(subscriber)
       raise SubscriberNotExist, "subscriber must be first argument or block" unless subscriber
-      raise InvalidHandler.new("Handler #{subscriber} is invalid for dispatcher #{dispatcher}") unless dispatcher.verify(subscriber)
+      unless dispatcher.verify(subscriber)
+        raise InvalidHandler.new("Handler #{subscriber} is invalid for dispatcher #{dispatcher}")
+      end
     end
   end
 end

data/lib/ruby_event_store/client.rb

@@ -1,27 +1,26 @@
 # frozen_string_literal: true
 
-require 'concurrent'
+require "concurrent"
 
 module RubyEventStore
   class Client
-    def initialize(repository:,
-                   mapper: Mappers::Default.new,
-                   subscriptions: Subscriptions.new,
-                   dispatcher: Dispatcher.new,
-                   clock: default_clock,
-                   correlation_id_generator: default_correlation_id_generator)
-
-
-      @repository     = repository
-      @mapper         = mapper
-      @subscriptions  = subscriptions
-      @broker         = Broker.new(subscriptions: subscriptions, dispatcher: dispatcher)
-      @clock          = clock
-      @metadata       = Concurrent::ThreadLocalVar.new
+    def initialize(
+      repository:,
+      mapper: Mappers::Default.new,
+      subscriptions: Subscriptions.new,
+      dispatcher: Dispatcher.new,
+      clock: default_clock,
+      correlation_id_generator: default_correlation_id_generator
+    )
+      @repository = repository
+      @mapper = mapper
+      @subscriptions = subscriptions
+      @broker = Broker.new(subscriptions: subscriptions, dispatcher: dispatcher)
+      @clock = clock
+      @metadata = Concurrent::ThreadLocalVar.new
       @correlation_id_generator = correlation_id_generator
     end
 
-
     # Persists events and notifies subscribed handlers about them
     #
     # @param events [Array<Event>, Event] event(s)
@@ -30,13 +29,10 @@ module RubyEventStore
     # @return [self]
     def publish(events, stream_name: GLOBAL_STREAM, expected_version: :any)
       enriched_events = enrich_events_metadata(events)
-      records         = transform(enriched_events)
+      records = transform(enriched_events)
       append_records_to_stream(records, stream_name: stream_name, expected_version: expected_version)
       enriched_events.zip(records) do |event, record|
-        with_metadata(
-          correlation_id: event.metadata.fetch(:correlation_id),
-          causation_id:   event.event_id,
-        ) do
+        with_metadata(correlation_id: event.metadata.fetch(:correlation_id), causation_id: event.event_id) do
           broker.(event, record)
         end
       end
@@ -94,6 +90,43 @@ module RubyEventStore
       repository.streams_of(event_id)
     end
 
+    # Gets position of the event in given stream
+    #
+    # The position is always nonnegative.
+    # Returns nil if the event has no specific position in stream.
+    # Raise error if event is not present in stream.
+    #
+    # @param event_id [String]
+    # @param stream_name [String]
+    # @return [Integer] nonnegative integer position of event in stream
+    # @raise [EventNotInStream]
+    def position_in_stream(event_id, stream_name)
+      repository.position_in_stream(event_id, Stream.new(stream_name))
+    end
+
+    # Gets position of the event in global stream
+    #
+    # The position is always nonnegative.
+    # Global position may have gaps, meaning, there may be event at
+    # position 40, but no event at position 39.
+    #
+    # @param event_id [String]
+    # @raise [EventNotFound]
+    # @return [Integer] nonnegno ative integer position of event in global stream
+    def global_position(event_id)
+      repository.global_position(event_id)
+    end
+
+    # Checks whether event is linked in given stream
+    #
+    # @param event_id [String]
+    # @param stream_name [String]
+    # @return [Boolean] true if event is linked to given stream, false otherwise
+    def event_in_stream?(event_id, stream_name)
+      stream = Stream.new(stream_name)
+      stream.global? ? repository.has_event?(event_id) : repository.event_in_stream?(event_id, stream)
+    end
+
     # Subscribes a handler (subscriber) that will be invoked for published events of provided type.
     #
     # @overload subscribe(subscriber, to:)
@@ -143,7 +176,7 @@ module RubyEventStore
         @block = block
         @broker = broker
         @global_subscribers = []
-        @subscribers = Hash.new {[]}
+        @subscribers = Hash.new { [] }
       end
 
       # Subscribes temporary handlers that
@@ -175,7 +208,7 @@ module RubyEventStore
       #   @param to [Array<Class>] types of events to subscribe
       #   @param handler [Proc] handler passed as proc
       #   @return [self]
-      def subscribe(handler=nil, to:, &handler2)
+      def subscribe(handler = nil, to:, &handler2)
         raise ArgumentError if handler && handler2
         @subscribers[handler || handler2] += Array(to)
         self
@@ -187,7 +220,7 @@ module RubyEventStore
       #
       # @return [Object] value returned by the invoked block of code
       def call
-        unsubs  = add_thread_global_subscribers
+        unsubs = add_thread_global_subscribers
         unsubs += add_thread_subscribers
         @block.call
       ensure
@@ -197,15 +230,11 @@ module RubyEventStore
       private
 
       def add_thread_subscribers
-        @subscribers.map do |subscriber, types|
-          @broker.add_thread_subscription(subscriber, types)
-        end
+        @subscribers.map { |subscriber, types| @broker.add_thread_subscription(subscriber, types) }
       end
 
       def add_thread_global_subscribers
-        @global_subscribers.map do |subscriber|
-          @broker.add_thread_global_subscription(subscriber)
-        end
+        @global_subscribers.map { |subscriber| @broker.add_thread_global_subscription(subscriber) }
       end
     end
 
@@ -238,19 +267,19 @@ module RubyEventStore
     #
     # @return [Event] deserialized event
     def deserialize(serializer:, event_type:, event_id:, data:, metadata:, timestamp: nil, valid_at: nil)
-      extract_timestamp = lambda do |m|
-        (m[:timestamp] || Time.parse(m.fetch('timestamp'))).iso8601
-      end
+      extract_timestamp = lambda { |m| (m[:timestamp] || Time.parse(m.fetch("timestamp"))).iso8601 }
 
       mapper.record_to_event(
-        SerializedRecord.new(
-          event_type: event_type,
-          event_id:   event_id,
-          data:       data,
-          metadata:   metadata,
-          timestamp:  timestamp || timestamp_ = extract_timestamp[serializer.load(metadata)],
-          valid_at:   valid_at  || timestamp_,
-        ).deserialize(serializer)
+        SerializedRecord
+          .new(
+            event_type: event_type,
+            event_id: event_id,
+            data: data,
+            metadata: metadata,
+            timestamp: timestamp || timestamp_ = extract_timestamp[serializer.load(metadata)],
+            valid_at: valid_at || timestamp_
+          )
+          .deserialize(serializer)
       )
     end
 
@@ -311,14 +340,14 @@ module RubyEventStore
 
     def enrich_events_metadata(events)
       events = Array(events)
-      events.each{|event| enrich_event_metadata(event) }
+      events.each { |event| enrich_event_metadata(event) }
       events
     end
 
     def enrich_event_metadata(event)
       metadata.each { |key, value| event.metadata[key] ||= value }
-      event.metadata[:timestamp]      ||= clock.call
-      event.metadata[:valid_at]       ||= event.metadata.fetch(:timestamp)
+      event.metadata[:timestamp] ||= clock.call
+      event.metadata[:valid_at] ||= event.metadata.fetch(:timestamp)
       event.metadata[:correlation_id] ||= correlation_id_generator.call
     end
 
@@ -337,11 +366,11 @@ module RubyEventStore
     end
 
     def default_clock
-      ->{ Time.now.utc.round(TIMESTAMP_PRECISION) }
+      -> { Time.now.utc.round(TIMESTAMP_PRECISION) }
     end
 
     def default_correlation_id_generator
-      ->{ SecureRandom.uuid }
+      -> { SecureRandom.uuid }
     end
 
     attr_reader :repository, :mapper, :subscriptions, :broker, :clock, :correlation_id_generator

data/lib/ruby_event_store/composed_dispatcher.rb

@@ -16,9 +16,7 @@ module RubyEventStore
     end
 
     def verify(subscriber)
-      @dispatchers.any? do |dispatcher|
-        dispatcher.verify(subscriber)
-      end
+      @dispatchers.any? { |dispatcher| dispatcher.verify(subscriber) }
     end
   end
 end

data/lib/ruby_event_store/correlated_commands.rb

@@ -2,7 +2,6 @@
 
 module RubyEventStore
   class CorrelatedCommands
-
     def initialize(event_store, command_bus)
       @event_store = event_store
       @command_bus = command_bus
@@ -13,23 +12,13 @@ module RubyEventStore
 
     def call(command)
       correlation_id = event_store.metadata[:correlation_id]
-      causation_id   = event_store.metadata[:causation_id]
+      causation_id = event_store.metadata[:causation_id]
 
       if correlation_id && causation_id
-        command.correlate_with(MiniEvent.new(
-          correlation_id,
-          causation_id,
-        )) if command.respond_to?(:correlate_with)
-        event_store.with_metadata(
-          causation_id: command.message_id,
-        ) do
-          command_bus.call(command)
-        end
+        command.correlate_with(MiniEvent.new(correlation_id, causation_id)) if command.respond_to?(:correlate_with)
+        event_store.with_metadata(causation_id: command.message_id) { command_bus.call(command) }
       else
-        event_store.with_metadata(
-          correlation_id: command.message_id,
-          causation_id: command.message_id,
-        ) do
+        event_store.with_metadata(correlation_id: command.message_id, causation_id: command.message_id) do
           command_bus.call(command)
         end
       end

data/lib/ruby_event_store/errors.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
 
 module RubyEventStore
-  Error                     = Class.new(StandardError)
+  Error = Class.new(StandardError)
   WrongExpectedEventVersion = Class.new(Error)
-  InvalidExpectedVersion    = Class.new(Error)
-  IncorrectStreamData       = Class.new(Error)
-  SubscriberNotExist        = Class.new(Error)
-  InvalidPageStart          = Class.new(Error)
-  InvalidPageStop           = Class.new(Error)
-  InvalidPageSize           = Class.new(Error)
-  EventDuplicatedInStream   = Class.new(Error)
-  ReservedInternalName      = Class.new(Error)
-  InvalidHandler            = Class.new(Error)
+  InvalidExpectedVersion = Class.new(Error)
+  IncorrectStreamData = Class.new(Error)
+  SubscriberNotExist = Class.new(Error)
+  InvalidPageStart = Class.new(Error)
+  InvalidPageStop = Class.new(Error)
+  InvalidPageSize = Class.new(Error)
+  EventDuplicatedInStream = Class.new(Error)
+  ReservedInternalName = Class.new(Error)
+  InvalidHandler = Class.new(Error)
+  EventNotFoundInStream = Class.new(Error)
 
   class EventNotFound < Error
     attr_reader :event_id

data/lib/ruby_event_store/event.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require 'securerandom'
+require "securerandom"
 
 module RubyEventStore
-
   # Data structure representing an event
   class Event
     # Instantiates a new event
@@ -17,7 +16,7 @@ module RubyEventStore
     def initialize(event_id: SecureRandom.uuid, metadata: nil, data: {})
       @event_id = event_id.to_s
       @metadata = Metadata.new(metadata.to_h)
-      @data     = data
+      @data = data
     end
 
     attr_reader :event_id, :metadata, :data
@@ -31,7 +30,7 @@ module RubyEventStore
     # Type of event. Used when matching with subscribed handlers.
     # @return [String]
     def event_type
-      self.class.name
+      metadata[:event_type] || self.class.name
     end
 
     # Timestamp from metadata
@@ -50,6 +49,7 @@ module RubyEventStore
 
     # Two events are equal if:
     # * they are of the same class
+    # * have identical event type
     # * have identical event id
     # * have identical data (verified with eql? method)
     #
@@ -58,9 +58,8 @@ module RubyEventStore
     # Event equality ignores metadata!
     # @return [TrueClass, FalseClass]
     def ==(other_event)
-      other_event.instance_of?(self.class) &&
-        other_event.event_id.eql?(event_id) &&
-        other_event.data.eql?(data)
+      other_event.instance_of?(self.class) && other_event.event_type.eql?(event_type) &&
+        other_event.event_id.eql?(event_id) && other_event.data.eql?(data)
     end
 
     # @private
@@ -78,11 +77,7 @@ module RubyEventStore
     # * data
     def hash
       # We don't use metadata because == does not use metadata
-      [
-        self.class,
-        event_id,
-        data
-      ].hash ^ BIG_VALUE
+      [self.class, event_type, event_id, data].hash ^ BIG_VALUE
     end
 
     # Reads correlation_id from metadata.
@@ -116,7 +111,7 @@ module RubyEventStore
     # @param val [String]
     # @return [String]
     def causation_id=(val)
-      metadata[:causation_id]= val
+      metadata[:causation_id] = val
     end
 
     # Sets correlation_id and causation_id in metadata based
@@ -127,7 +122,7 @@ module RubyEventStore
     # @return [String] set causation_id
     def correlate_with(other_message)
       self.correlation_id = other_message.correlation_id || other_message.message_id
-      self.causation_id   = other_message.message_id
+      self.causation_id = other_message.message_id
       self
     end
 

data/lib/ruby_event_store/expected_version.rb

@@ -21,7 +21,7 @@ module RubyEventStore
 
     def initialize(version)
       @version = version
-      invalid_version! unless [Integer, :any, :none, :auto].any? {|i| i === version}
+      invalid_version! unless [Integer, :any, :none, :auto].any? { |i| i === version }
     end
 
     def any?
@@ -53,15 +53,11 @@ module RubyEventStore
     private_constant :BIG_VALUE
 
     def hash
-      [
-        self.class,
-        version
-      ].hash ^ BIG_VALUE
+      [self.class, version].hash ^ BIG_VALUE
     end
 
     def ==(other_expected_version)
-      other_expected_version.instance_of?(self.class) &&
-        other_expected_version.version.equal?(version)
+      other_expected_version.instance_of?(self.class) && other_expected_version.version.equal?(version)
     end
 
     alias_method :eql?, :==

data/lib/ruby_event_store/in_memory_repository.rb

@@ -1,26 +1,49 @@
 # frozen_string_literal: true
 
-require 'ostruct'
+require "ostruct"
 module RubyEventStore
   class InMemoryRepository
+    class UnsupportedVersionAnyUsage < StandardError
+      def initialize
+        super <<~EOS
+        Mixing expected version :any and specific position (or :auto) is unsupported.
+
+        Read more about expected versions here:
+        https://railseventstore.org/docs/v2/expected_version/
+        EOS
+      end
+    end
+
+    class EventInStream
+      def initialize(event_id, position)
+        @event_id = event_id
+        @position = position
+      end
+
+      attr_reader :event_id, :position
+    end
 
-    def initialize(serializer: NULL)
+    def initialize(serializer: NULL, ensure_supported_any_usage: false)
       @serializer = serializer
       @streams = Hash.new { |h, k| h[k] = Array.new }
-      @mutex   = Mutex.new
+      @mutex = Mutex.new
       @storage = Hash.new
+      @ensure_supported_any_usage = ensure_supported_any_usage
     end
 
     def append_to_stream(records, stream, expected_version)
       serialized_records = records.map { |record| record.serialize(serializer) }
 
       with_synchronize(expected_version, stream) do |resolved_version|
-        raise WrongExpectedEventVersion unless last_stream_version(stream).equal?(resolved_version)
+        ensure_supported_any_usage(resolved_version, stream)
+        unless resolved_version.nil? || last_stream_version(stream).equal?(resolved_version)
+          raise WrongExpectedEventVersion
+        end
 
-        serialized_records.each do |serialized_record|
+        serialized_records.each_with_index do |serialized_record, index|
           raise EventDuplicatedInStream if has_event?(serialized_record.event_id)
           storage[serialized_record.event_id] = serialized_record
-          streams[stream.name] << serialized_record.event_id
+          add_to_stream(stream, serialized_record, resolved_version, index)
         end
       end
       self
@@ -30,11 +53,14 @@ module RubyEventStore
       serialized_records = event_ids.map { |id| read_event(id) }
 
       with_synchronize(expected_version, stream) do |resolved_version|
-        raise WrongExpectedEventVersion unless last_stream_version(stream).equal?(resolved_version)
+        ensure_supported_any_usage(resolved_version, stream)
+        unless resolved_version.nil? || last_stream_version(stream).equal?(resolved_version)
+          raise WrongExpectedEventVersion
+        end
 
-        serialized_records.each do |serialized_record|
+        serialized_records.each_with_index do |serialized_record, index|
           raise EventDuplicatedInStream if has_event_in_stream?(serialized_record.event_id, stream.name)
-          streams[stream.name] << serialized_record.event_id
+          add_to_stream(stream, serialized_record, resolved_version, index)
         end
       end
       self
@@ -69,9 +95,7 @@ module RubyEventStore
         serialized_records.last&.deserialize(serializer)
       else
         Enumerator.new do |y|
-          serialized_records.each do |serialized_record|
-            y << serialized_record.deserialize(serializer)
-          end
+          serialized_records.each { |serialized_record| y << serialized_record.deserialize(serializer) }
         end
       end
     end
@@ -84,38 +108,61 @@ module RubyEventStore
       records.each do |record|
         read_event(record.event_id)
         serialized_record =
-          Record.new(
-            event_id:   record.event_id,
-            event_type: record.event_type,
-            data:       record.data,
-            metadata:   record.metadata,
-            timestamp:  Time.iso8601(storage.fetch(record.event_id).timestamp),
-            valid_at:   record.valid_at,
-          ).serialize(serializer)
+          Record
+            .new(
+              event_id: record.event_id,
+              event_type: record.event_type,
+              data: record.data,
+              metadata: record.metadata,
+              timestamp: Time.iso8601(storage.fetch(record.event_id).timestamp),
+              valid_at: record.valid_at
+            )
+            .serialize(serializer)
         storage[record.event_id] = serialized_record
       end
     end
 
     def streams_of(event_id)
-      streams
-        .select { |name,| has_event_in_stream?(event_id, name) }
-        .map    { |name,| Stream.new(name) }
+      streams.select { |name,| has_event_in_stream?(event_id, name) }.map { |name,| Stream.new(name) }
+    end
+
+    def position_in_stream(event_id, stream)
+      event_in_stream = streams[stream.name].find { |event_in_stream| event_in_stream.event_id.eql?(event_id) }
+      raise EventNotFoundInStream if event_in_stream.nil?
+      event_in_stream.position
+    end
+
+    def global_position(event_id)
+      storage.keys.index(event_id) or raise EventNotFound.new(event_id)
+    end
+
+    def event_in_stream?(event_id, stream)
+      !streams[stream.name].find { |event_in_stream| event_in_stream.event_id.eql?(event_id) }.nil?
     end
 
     private
+
     def read_scope(spec)
       serialized_records = serialized_records_of_stream(spec.stream)
       serialized_records = ordered(serialized_records, spec)
-      serialized_records = serialized_records.select{|e| spec.with_ids.any?{|x| x.eql?(e.event_id)}} if spec.with_ids?
-      serialized_records = serialized_records.select{|e| spec.with_types.any?{|x| x.eql?(e.event_type)}} if spec.with_types?
+      serialized_records = serialized_records.select { |e| spec.with_ids.any? { |x| x.eql?(e.event_id) } } if spec
+        .with_ids?
+      serialized_records = serialized_records.select { |e| spec.with_types.any? { |x| x.eql?(e.event_type) } } if spec
+        .with_types?
       serialized_records = serialized_records.reverse if spec.backward?
       serialized_records = serialized_records.drop(index_of(serialized_records, spec.start) + 1) if spec.start
       serialized_records = serialized_records.take(index_of(serialized_records, spec.stop)) if spec.stop
       serialized_records = serialized_records.take(spec.limit) if spec.limit?
-      serialized_records = serialized_records.select { |sr| Time.iso8601(sr.timestamp) < spec.older_than } if spec.older_than
-      serialized_records = serialized_records.select { |sr| Time.iso8601(sr.timestamp) <= spec.older_than_or_equal } if spec.older_than_or_equal
-      serialized_records = serialized_records.select { |sr| Time.iso8601(sr.timestamp) > spec.newer_than } if spec.newer_than
-      serialized_records = serialized_records.select { |sr| Time.iso8601(sr.timestamp) >= spec.newer_than_or_equal } if spec.newer_than_or_equal
+      serialized_records = serialized_records.select { |sr| Time.iso8601(sr.timestamp) < spec.older_than } if spec
+        .older_than
+      serialized_records =
+        serialized_records.select { |sr| Time.iso8601(sr.timestamp) <= spec.older_than_or_equal } if spec
+        .older_than_or_equal
+      serialized_records = serialized_records.select { |sr| Time.iso8601(sr.timestamp) > spec.newer_than } if spec
+        .newer_than
+      serialized_records =
+        serialized_records.select { |sr| Time.iso8601(sr.timestamp) >= spec.newer_than_or_equal } if spec
+        .newer_than_or_equal
       serialized_records
     end
 
@@ -124,7 +171,7 @@ module RubyEventStore
     end
 
     def event_ids_of_stream(stream)
-      streams.fetch(stream.name, Array.new)
+      streams.fetch(stream.name, Array.new).map(&:event_id)
     end
 
     def serialized_records_of_stream(stream)
@@ -143,7 +190,7 @@ module RubyEventStore
     end
 
     def last_stream_version(stream)
-      event_ids_of_stream(stream).size - 1
+      streams.fetch(stream.name, Array.new).size - 1
     end
 
     def with_synchronize(expected_version, stream, &block)
@@ -157,18 +204,34 @@ module RubyEventStore
       # conditions more likely. And we only use mutex.synchronize for writing
       # not for the whole read+write algorithm.
       Thread.pass
-      mutex.synchronize do
-        resolved_version = last_stream_version(stream) if expected_version.any?
-        block.call(resolved_version)
-      end
+      mutex.synchronize { block.call(resolved_version) }
     end
 
     def has_event_in_stream?(event_id, stream_name)
-      streams.fetch(stream_name, Array.new).any? { |id| id.eql?(event_id) }
+      streams.fetch(stream_name, Array.new).any? { |event_in_stream| event_in_stream.event_id.eql?(event_id) }
     end
 
     def index_of(source, event_id)
-      source.index {|item| item.event_id.eql?(event_id)}
+      source.index { |item| item.event_id.eql?(event_id) }
+    end
+
+    def compute_position(resolved_version, index)
+      resolved_version + index + 1 unless resolved_version.nil?
+    end
+
+    def add_to_stream(stream, serialized_record, resolved_version, index)
+      streams[stream.name] << EventInStream.new(serialized_record.event_id, compute_position(resolved_version, index))
+    end
+
+    def ensure_supported_any_usage(resolved_version, stream)
+      if @ensure_supported_any_usage
+        stream_positions = streams.fetch(stream.name, Array.new).map(&:position)
+        if resolved_version.nil?
+          raise UnsupportedVersionAnyUsage if !stream_positions.compact.empty?
+        else
+          raise UnsupportedVersionAnyUsage if stream_positions.include?(nil)
+        end
+      end
     end
 
     attr_reader :streams, :mutex, :storage, :serializer