ruby_event_store 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88203a9b943002241df25fa83c6f067e7944810e66d713eeb11e8cebf13271e2
-  data.tar.gz: 1b032e898517d787a2e6d0cb6b15775792591abc094e68d2483590f916e69c9e
+  metadata.gz: 28fef13a18c820b5e2e67ffef0aa6ee04b171a427fe9f7a9a4323dbab9db61bb
+  data.tar.gz: 8aa4bcf65629ae5e1912651d08be52de870f0dc0c274bd046796400d6a50bf34
 SHA512:
-  metadata.gz: 780c9e0f6064311d45be29c0553c47e65e679a3967b91e6caca48a55ef9c34a06070e421b1413c1a35634c6e45c1452204ac29fae2aa706fe7a0e46d1dd99f40
-  data.tar.gz: 66b7a11ce2d3b58a5f9c2690a7f7f998fc9130c302343923cdd5a57a63d6a398ea258cced2d1b3161e07d9fb081d04bd7c4f305d6576cae59bd6e50f50ba6a92
+  metadata.gz: 2717723ff31551edb75469a884d88a5e64f97432f218a54c71fe84245bdd91ff770215bd54b90a2ee5dd56054a6bba29ed4ed766c551bb7d7c6f66806f23e207
+  data.tar.gz: 4f509c7e557271f414aad29db6dd04063aa9d29a45a49985fb12e89192e88d5bee5c8ad73a561faad3d196e04c4ff3ad2f1471ea3f67f0bd63f54060518cac27

data/lib/ruby_event_store.rb

@@ -1,45 +1,45 @@
 # frozen_string_literal: true
 
-require 'ruby_event_store/dispatcher'
-require 'ruby_event_store/subscriptions'
-require 'ruby_event_store/broker'
-require 'ruby_event_store/in_memory_repository'
-require 'ruby_event_store/projection'
-require 'ruby_event_store/errors'
-require 'ruby_event_store/constants'
-require 'ruby_event_store/client'
-require 'ruby_event_store/metadata'
-require 'ruby_event_store/specification'
-require 'ruby_event_store/specification_result'
-require 'ruby_event_store/specification_reader'
-require 'ruby_event_store/event'
-require 'ruby_event_store/stream'
-require 'ruby_event_store/expected_version'
-require 'ruby_event_store/record'
-require 'ruby_event_store/serialized_record'
-require 'ruby_event_store/null'
-require 'ruby_event_store/transform_keys'
-require 'ruby_event_store/mappers/encryption_key'
-require 'ruby_event_store/mappers/in_memory_encryption_key_repository'
-require 'ruby_event_store/mappers/transformation/domain_event'
-require 'ruby_event_store/mappers/transformation/encryption'
-require 'ruby_event_store/mappers/transformation/event_class_remapper'
-require 'ruby_event_store/mappers/transformation/upcast'
-require 'ruby_event_store/mappers/transformation/stringify_metadata_keys'
-require 'ruby_event_store/mappers/transformation/symbolize_metadata_keys'
-require 'ruby_event_store/mappers/pipeline'
-require 'ruby_event_store/mappers/pipeline_mapper'
-require 'ruby_event_store/mappers/default'
-require 'ruby_event_store/mappers/forgotten_data'
-require 'ruby_event_store/mappers/encryption_mapper'
-require 'ruby_event_store/mappers/instrumented_mapper'
-require 'ruby_event_store/mappers/json_mapper'
-require 'ruby_event_store/mappers/null_mapper'
-require 'ruby_event_store/batch_enumerator'
-require 'ruby_event_store/correlated_commands'
-require 'ruby_event_store/link_by_metadata'
-require 'ruby_event_store/immediate_async_dispatcher'
-require 'ruby_event_store/composed_dispatcher'
-require 'ruby_event_store/version'
-require 'ruby_event_store/instrumented_repository'
-require 'ruby_event_store/instrumented_dispatcher'
+require_relative 'ruby_event_store/dispatcher'
+require_relative 'ruby_event_store/subscriptions'
+require_relative 'ruby_event_store/broker'
+require_relative 'ruby_event_store/in_memory_repository'
+require_relative 'ruby_event_store/projection'
+require_relative 'ruby_event_store/errors'
+require_relative 'ruby_event_store/constants'
+require_relative 'ruby_event_store/client'
+require_relative 'ruby_event_store/metadata'
+require_relative 'ruby_event_store/specification'
+require_relative 'ruby_event_store/specification_result'
+require_relative 'ruby_event_store/specification_reader'
+require_relative 'ruby_event_store/event'
+require_relative 'ruby_event_store/stream'
+require_relative 'ruby_event_store/expected_version'
+require_relative 'ruby_event_store/record'
+require_relative 'ruby_event_store/serialized_record'
+require_relative 'ruby_event_store/null'
+require_relative 'ruby_event_store/transform_keys'
+require_relative 'ruby_event_store/mappers/encryption_key'
+require_relative 'ruby_event_store/mappers/in_memory_encryption_key_repository'
+require_relative 'ruby_event_store/mappers/transformation/domain_event'
+require_relative 'ruby_event_store/mappers/transformation/encryption'
+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/pipeline'
+require_relative 'ruby_event_store/mappers/pipeline_mapper'
+require_relative 'ruby_event_store/mappers/default'
+require_relative 'ruby_event_store/mappers/forgotten_data'
+require_relative 'ruby_event_store/mappers/encryption_mapper'
+require_relative 'ruby_event_store/mappers/instrumented_mapper'
+require_relative 'ruby_event_store/mappers/json_mapper'
+require_relative 'ruby_event_store/mappers/null_mapper'
+require_relative 'ruby_event_store/batch_enumerator'
+require_relative 'ruby_event_store/correlated_commands'
+require_relative 'ruby_event_store/link_by_metadata'
+require_relative 'ruby_event_store/immediate_async_dispatcher'
+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'

data/lib/ruby_event_store/client.rb

@@ -131,8 +131,8 @@ module RubyEventStore
     #
     # @param to [Class, String] type of events to get list of sybscribed handlers
     # @return [Array<Object, Class>]
-    def subscribers_for(event_type)
-      subscriptions.all_for(event_type)
+    def subscribers_for(event_class)
+      subscriptions.all_for(event_type_resolver.call(event_class))
     end
 
     # Builder object for collecting temporary handlers (subscribers)
@@ -328,6 +328,10 @@ module RubyEventStore
 
     protected
 
+    def event_type_resolver
+      subscriptions.event_type_resolver
+    end
+
     def metadata=(value)
       @metadata.value = value
     end

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

@@ -5,9 +5,9 @@ module RubyEventStore
     module Transformation
       class DomainEvent
         def dump(domain_event)
-          metadata = domain_event.metadata.to_h
+          metadata  = domain_event.metadata.dup.to_h
           timestamp = metadata.delete(:timestamp)
-          valid_at = metadata.delete(:valid_at)
+          valid_at  = metadata.delete(:valid_at)
           Record.new(
             event_id:   domain_event.event_id,
             metadata:   metadata,

data/lib/ruby_event_store/spec/event_repository_lint.rb

@@ -972,6 +972,8 @@ module RubyEventStore
 
     specify do
       expect(repository.read(specification.in_batches.result)).to be_kind_of(Enumerator)
+      expect(repository.read(specification.in_batches.as_at.result)).to be_kind_of(Enumerator)
+      expect(repository.read(specification.in_batches.as_of.result)).to be_kind_of(Enumerator)
       events = Array.new(10) { SRecord.new }
       repository.append_to_stream(
         events,
@@ -979,6 +981,9 @@ module RubyEventStore
         ExpectedVersion.none
       )
       expect(repository.read(specification.in_batches.result)).to be_kind_of(Enumerator)
+      expect(repository.read(specification.in_batches.as_at.result)).to be_kind_of(Enumerator)
+      expect(repository.read(specification.in_batches.as_of.result)).to be_kind_of(Enumerator)
+
     end
 
     specify do
@@ -1390,5 +1395,21 @@ module RubyEventStore
       expect(repository.read(specification.as_of.result).map(&:event_id)).to eq [e3, e2, e1]
       expect(repository.read(specification.as_of.backward.result).map(&:event_id)).to eq [e1, e2, e3]
     end
+
+    specify "time order is respected with batches" do
+      repository.append_to_stream([
+        SRecord.new(event_id: e1 = SecureRandom.uuid, timestamp: Time.new(2020,1,1), valid_at: Time.new(2020,1,9)),
+        SRecord.new(event_id: e2 = SecureRandom.uuid, timestamp: Time.new(2020,1,3), valid_at: Time.new(2020,1,6)),
+        SRecord.new(event_id: e3 = SecureRandom.uuid, timestamp: Time.new(2020,1,2), valid_at: Time.new(2020,1,3)),
+      ],
+        Stream.new("Dummy"),
+        ExpectedVersion.any
+      )
+      expect(repository.read(specification.in_batches.result).to_a.flatten.map(&:event_id)).to eq [e1, e2, e3]
+      expect(repository.read(specification.in_batches.as_at.result).to_a.flatten.map(&:event_id)).to eq [e1, e3, e2]
+      expect(repository.read(specification.in_batches.as_at.backward.result).to_a.flatten.map(&:event_id)).to eq [e2, e3, e1]
+      expect(repository.read(specification.in_batches.as_of.result).to_a.flatten.map(&:event_id)).to eq [e3, e2, e1]
+      expect(repository.read(specification.in_batches.as_of.backward.result).to_a.flatten.map(&:event_id)).to eq [e1, e2, e3]
+    end
   end
 end

data/lib/ruby_event_store/spec/subscriptions_lint.rb

@@ -121,16 +121,5 @@ RSpec.shared_examples :subscriptions do |subscriptions_class|
     subscriptions.add_thread_subscription(handler, [Test1DomainEvent])
 
     expect(subscriptions.all_for('Test1DomainEvent')).to eq([handler, handler])
-    expect(subscriptions.all_for(Test1DomainEvent)).to eq([handler, handler])
-  end
-
-  it 'subscribes by type of event which is a class or string with custom type resolver' do
-    subscriptions = subscriptions_class.new(event_type_resolver: ->(type) { type.to_s.reverse })
-    handler         = TestHandler.new
-    subscriptions.add_subscription(handler, [Test1DomainEvent])
-    subscriptions.add_thread_subscription(handler, ['Test1DomainEvent'])
-
-    expect(subscriptions.all_for('Test1DomainEvent')).to eq([handler, handler])
-    expect(subscriptions.all_for(Test1DomainEvent)).to eq([handler, handler])
   end
 end

data/lib/ruby_event_store/subscriptions.rb

@@ -28,10 +28,11 @@ module RubyEventStore
     end
 
     def all_for(event_type)
-      resolved_event_type = resolve_event_type(event_type)
-      [local, global, thread].map{|r| r.all_for(resolved_event_type)}.reduce(&:+)
+      [local, global, thread].map{|r| r.all_for(event_type)}.reduce(&:+)
     end
 
+    attr_reader :event_type_resolver
+
     private
     attr_reader :local, :global, :thread
 
@@ -44,7 +45,7 @@ module RubyEventStore
     end
 
     def resolve_event_type(type)
-      @event_type_resolver.call(type)
+      event_type_resolver.call(type)
     end
 
     class ThreadSubscriptions

data/lib/ruby_event_store/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Arkency
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="