ruby_event_store 2.9.1 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 034aa1fb571c22b4e87df0161a00192535fdf8d6637df0e3db2fa9dc14c928d6
-  data.tar.gz: bbb8846d15f41eadf5e0c4cb3d63697ed80c536cfbd2c921453038ec40d0b3f9
+  metadata.gz: a13012b6cc672274f7818f51f777a864dd52e301023bdb2892a83adda5805550
+  data.tar.gz: 6f00d31f07180e67e20abe178d30f9f38606e813bc8ccf69c5f327687d6fb067
 SHA512:
-  metadata.gz: 5deb5169c06c20dfb077a0972a262fbf43fb1bf1e27257dd756a22d6f42eb34d1b486f34cebf7d55579bddb271b729ccd5e377d9f30ca5ed0abe814bba046ea5
-  data.tar.gz: 5188078974d0eb3d2311d00de74e69e5756e5d27b9afd7d1dc0cbbdc7b164fb26e6c27f52025215e2cd4978dc11e9eaa41f92f70502bd5516439a2205d8166b9
+  metadata.gz: a42330d20f5a09086428f5f83ea14383020ae027fa9ebaf36688e98e86a93f28808a214d384dbd3ee99d433027be42ac2556be9b7341b745f6b1e3b3ee4e7f9c
+  data.tar.gz: 421b823b296a89afc6f224ea340187520d48b762c412f9583172a0c89bc28822a9476bb418bc7f0fd5cc7ddada03360546c6293c8e53146e31d7debc97e193a7

data/lib/ruby_event_store/client.rb

@@ -10,7 +10,8 @@ module RubyEventStore
       subscriptions: Subscriptions.new,
       dispatcher: Dispatcher.new,
       clock: default_clock,
-      correlation_id_generator: default_correlation_id_generator
+      correlation_id_generator: default_correlation_id_generator,
+      event_type_resolver: EventTypeResolver.new
     )
       @repository = repository
       @mapper = mapper
@@ -19,6 +20,7 @@ module RubyEventStore
       @clock = clock
       @metadata = Concurrent::ThreadLocalVar.new
       @correlation_id_generator = correlation_id_generator
+      @event_type_resolver = event_type_resolver
     end
 
     # Persists events and notifies subscribed handlers about them
@@ -142,7 +144,7 @@ module RubyEventStore
     def subscribe(subscriber = nil, to:, &proc)
       raise ArgumentError, "subscriber must be first argument or block, cannot be both" if subscriber && proc
       subscriber ||= proc
-      broker.add_subscription(subscriber, to)
+      broker.add_subscription(subscriber, to.map { |event_klass| event_type_resolver.call(event_klass) })
     end
 
     # Subscribes a handler (subscriber) that will be invoked for all published events
@@ -172,11 +174,12 @@ module RubyEventStore
     # which are active only during the invocation of the provided
     # block of code.
     class Within
-      def initialize(block, broker)
+      def initialize(block, broker, resolver)
         @block = block
         @broker = broker
         @global_subscribers = []
         @subscribers = Hash.new { [] }
+        @resolver = resolver
       end
 
       # Subscribes temporary handlers that
@@ -210,7 +213,7 @@ module RubyEventStore
       #   @return [self]
       def subscribe(handler = nil, to:, &handler2)
         raise ArgumentError if handler && handler2
-        @subscribers[handler || handler2] += Array(to)
+        @subscribers[handler || handler2] += Array(to).map { |event_klass| resolver.call(event_klass) }
         self
       end
 
@@ -228,6 +231,7 @@ module RubyEventStore
       end
 
       private
+      attr_reader :resolver
 
       def add_thread_subscribers
         @subscribers.map { |subscriber, types| @broker.add_thread_subscription(subscriber, types) }
@@ -245,7 +249,7 @@ module RubyEventStore
     # @return [Within] builder object which collects temporary subscriptions
     def within(&block)
       raise ArgumentError if block.nil?
-      Within.new(block, broker)
+      Within.new(block, broker, event_type_resolver)
     end
 
     # Set additional metadata for all events published within the provided block
@@ -357,10 +361,6 @@ module RubyEventStore
 
     protected
 
-    def event_type_resolver
-      subscriptions.event_type_resolver
-    end
-
     def metadata=(value)
       @metadata.value = value
     end
@@ -373,6 +373,6 @@ module RubyEventStore
       -> { SecureRandom.uuid }
     end
 
-    attr_reader :repository, :mapper, :subscriptions, :broker, :clock, :correlation_id_generator
+    attr_reader :repository, :mapper, :subscriptions, :broker, :clock, :correlation_id_generator, :event_type_resolver
   end
 end

data/lib/ruby_event_store/event_type_resolver.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module RubyEventStore
+  class EventTypeResolver
+    def call(value)
+      value.to_s
+    end
+  end
+end

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

@@ -91,8 +91,8 @@ module RubyEventStore
             end
           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
+          data = restore_type(record.data, data_types)
+          metadata = restore_type(record.metadata, metadata_types)
 
           Record.new(
             event_id: record.event_id,
@@ -151,7 +151,7 @@ module RubyEventStore
         end
 
         def restore_type(argument, type)
-          case argument
+          case type
           when Hash
             restore_types(argument, type)
           when Array

data/lib/ruby_event_store/spec/event_repository_lint.rb

@@ -69,7 +69,7 @@ module RubyEventStore
       read_events(repository, specification.backward, stream, from: from, to: to, count: count)
     end
 
-    it "just created is empty" do
+    specify "just created is empty" do
       expect(read_events_forward(repository)).to be_empty
     end
 

data/lib/ruby_event_store/spec/subscriptions_lint.rb

@@ -22,8 +22,8 @@ RSpec.shared_examples :subscriptions do |subscriptions_class|
     another_handler = TestHandler.new
     global_handler = TestHandler.new
 
-    subscriptions.add_subscription(handler, [Test1DomainEvent, Test3DomainEvent])
-    subscriptions.add_subscription(another_handler, [Test2DomainEvent])
+    subscriptions.add_subscription(handler, ['Test1DomainEvent', 'Test3DomainEvent'])
+    subscriptions.add_subscription(another_handler, ['Test2DomainEvent'])
     subscriptions.add_global_subscription(global_handler)
 
     expect(subscriptions.all_for("Test1DomainEvent")).to eq([handler, global_handler])
@@ -36,15 +36,14 @@ RSpec.shared_examples :subscriptions do |subscriptions_class|
     another_handler = TestHandler.new
     global_handler = TestHandler.new
 
-    subscriptions.add_thread_subscription(handler, [Test1DomainEvent, Test3DomainEvent])
-    subscriptions.add_thread_subscription(another_handler, [Test2DomainEvent])
+    subscriptions.add_thread_subscription(handler, ['Test1DomainEvent', 'Test3DomainEvent'])
+    subscriptions.add_thread_subscription(another_handler, ['Test2DomainEvent'])
     subscriptions.add_thread_global_subscription(global_handler)
-    t =
-      Thread.new do
-        subscriptions.add_thread_subscription(handler, [Test2DomainEvent])
-        subscriptions.add_thread_global_subscription(another_handler)
-        expect(subscriptions.all_for("Test2DomainEvent")).to eq([another_handler, handler])
-      end
+    t = Thread.new do
+      subscriptions.add_thread_subscription(handler, ['Test2DomainEvent'])
+      subscriptions.add_thread_global_subscription(another_handler)
+      expect(subscriptions.all_for('Test2DomainEvent')).to eq([another_handler, handler])
+    end
 
     expect(subscriptions.all_for("Test1DomainEvent")).to eq([global_handler, handler])
     expect(subscriptions.all_for("Test2DomainEvent")).to eq([global_handler, another_handler])
@@ -78,9 +77,9 @@ RSpec.shared_examples :subscriptions do |subscriptions_class|
   it "revokes subscription" do
     handler = TestHandler.new
 
-    revoke = subscriptions.add_subscription(handler, [Test1DomainEvent, Test2DomainEvent])
-    expect(subscriptions.all_for("Test1DomainEvent")).to eq([handler])
-    expect(subscriptions.all_for("Test2DomainEvent")).to eq([handler])
+    revoke    = subscriptions.add_subscription(handler, ['Test1DomainEvent', 'Test2DomainEvent'])
+    expect(subscriptions.all_for('Test1DomainEvent')).to eq([handler])
+    expect(subscriptions.all_for('Test2DomainEvent')).to eq([handler])
     revoke.()
     expect(subscriptions.all_for("Test1DomainEvent")).to eq([])
     expect(subscriptions.all_for("Test2DomainEvent")).to eq([])
@@ -100,9 +99,9 @@ RSpec.shared_examples :subscriptions do |subscriptions_class|
   it "revokes thread subscription" do
     handler = TestHandler.new
 
-    revoke = subscriptions.add_thread_subscription(handler, [Test1DomainEvent, Test2DomainEvent])
-    expect(subscriptions.all_for("Test1DomainEvent")).to eq([handler])
-    expect(subscriptions.all_for("Test2DomainEvent")).to eq([handler])
+    revoke    = subscriptions.add_thread_subscription(handler, ['Test1DomainEvent', 'Test2DomainEvent'])
+    expect(subscriptions.all_for('Test1DomainEvent')).to eq([handler])
+    expect(subscriptions.all_for('Test2DomainEvent')).to eq([handler])
     revoke.()
     expect(subscriptions.all_for("Test1DomainEvent")).to eq([])
     expect(subscriptions.all_for("Test2DomainEvent")).to eq([])
@@ -116,10 +115,10 @@ RSpec.shared_examples :subscriptions do |subscriptions_class|
     expect(subscriptions.all_for("Test1DomainEvent")).to eq([handler, handler])
   end
 
-  it "subscribes by type of event which is a class" do
+  it 'subscribes by type of event which is a class' do
     handler = TestHandler.new
-    subscriptions.add_subscription(handler, [Test1DomainEvent])
-    subscriptions.add_thread_subscription(handler, [Test1DomainEvent])
+    subscriptions.add_subscription(handler, ['Test1DomainEvent'])
+    subscriptions.add_thread_subscription(handler, ['Test1DomainEvent'])
 
     expect(subscriptions.all_for("Test1DomainEvent")).to eq([handler, handler])
   end

data/lib/ruby_event_store/subscriptions.rb

@@ -4,15 +4,14 @@ require "concurrent"
 
 module RubyEventStore
   class Subscriptions
-    def initialize(event_type_resolver: default_event_type_resolver)
-      @event_type_resolver = event_type_resolver
+    def initialize
       @local = LocalSubscriptions.new
       @global = GlobalSubscriptions.new
       @thread = ThreadSubscriptions.new
     end
 
     def add_subscription(subscriber, event_types)
-      local.add(subscriber, resolve_event_types(event_types))
+      local.add(subscriber, event_types)
     end
 
     def add_global_subscription(subscriber)
@@ -20,7 +19,7 @@ module RubyEventStore
     end
 
     def add_thread_subscription(subscriber, event_types)
-      thread.local.add(subscriber, resolve_event_types(event_types))
+      thread.local.add(subscriber, event_types)
     end
 
     def add_thread_global_subscription(subscriber)
@@ -31,24 +30,10 @@ module RubyEventStore
       [local, global, thread].map { |r| r.all_for(event_type) }.reduce(&:+)
     end
 
-    attr_reader :event_type_resolver
-
     private
 
     attr_reader :local, :global, :thread
 
-    def default_event_type_resolver
-      ->(value) { value.to_s }
-    end
-
-    def resolve_event_types(event_types)
-      event_types.map(&method(:resolve_event_type))
-    end
-
-    def resolve_event_type(type)
-      event_type_resolver.call(type)
-    end
-
     class ThreadSubscriptions
       def initialize
         @local = ThreadLocalSubscriptions.new

data/lib/ruby_event_store/version.rb

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

data/lib/ruby_event_store.rb

@@ -46,3 +46,4 @@ 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"
+require_relative "ruby_event_store/event_type_resolver"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.11.0
 platform: ruby
 authors:
 - Arkency
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2023-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -50,6 +50,7 @@ files:
 - lib/ruby_event_store/dispatcher.rb
 - lib/ruby_event_store/errors.rb
 - lib/ruby_event_store/event.rb
+- lib/ruby_event_store/event_type_resolver.rb
 - lib/ruby_event_store/expected_version.rb
 - lib/ruby_event_store/immediate_async_dispatcher.rb
 - lib/ruby_event_store/in_memory_repository.rb
@@ -118,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Implementation of an event store in Ruby