aggregate_root 2.16.0 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fbab65de865e737b300acd20554eab403703f8f23378a1bb170a564cb6656cd
-  data.tar.gz: 7418635bb0e6537298fabcc7333495ba7459d06b9420ced41f0ce08412219f36
+  metadata.gz: ec3c57bd9d2903a392c849933d4d108cfe511a4477ab306e809701ca664520ab
+  data.tar.gz: a30551197ae98c554afcd5ecffdd3b5121b856a24dd2f98e5396d2a136a04267
 SHA512:
-  metadata.gz: 2ebef6c52a289ae6ca12221a9e70e35bc28bddfef16467a25f944195b2c428618a1a32ba66d80a485673db27fd87fb205f7ddc18541453883b152146921fbd75
-  data.tar.gz: e562b45555e93439035ca938d0d25a28a9327b4d078ac088befda074df216db41a5a744a143010b72ead43c8d5b4320c70bfeefce9b399e200ce962bff487aeb
+  metadata.gz: 7d02749d90d889cdf25784d0786ed2de633877c157cbc9d850d16ffbff8bb88515b639e4a23a6e4d70652651142011479412bf462d4b7809f877c2f9e281d8e7
+  data.tar.gz: 0e6ebcb2c9632d762c1d35adab32e694699cc399cf90b03abfcc154a64c7d7768f541c6ec70085749ecafa931f4b9fd440e2aebcd257d282b0260802f47d1911

data/lib/aggregate_root/instrumented_apply_strategy.rb

@@ -8,9 +8,7 @@ module AggregateRoot
     end
 
     def call(aggregate, event)
-      instrumentation.instrument("apply.aggregate_root",
-        aggregate: aggregate,
-        event:     event) do
+      instrumentation.instrument("apply.aggregate_root", aggregate: aggregate, event: event) do
         strategy.call(aggregate, event)
       end
     end

data/lib/aggregate_root/instrumented_repository.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'delegate'
+require "delegate"
 module AggregateRoot
   class InstrumentedRepository
     def initialize(repository, instrumentation)
@@ -21,7 +21,7 @@ module AggregateRoot
         aggregate: aggregate,
         version: aggregate.version,
         stored_events: aggregate.unpublished_events.to_a,
-        stream: stream_name
+        stream: stream_name,
       ) { repository.store(aggregate, stream_name) }
     end
 

data/lib/aggregate_root/repository.rb

@@ -16,7 +16,7 @@ module AggregateRoot
       event_store.publish(
         aggregate.unpublished_events.to_a,
         stream_name: stream_name,
-        expected_version: aggregate.version
+        expected_version: aggregate.version,
       )
       aggregate.version = aggregate.version + aggregate.unpublished_events.count
     end

data/lib/aggregate_root/snapshot_repository.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ruby_event_store/event'
+require "ruby_event_store/event"
 
 module AggregateRoot
   class SnapshotRepository
@@ -10,11 +10,11 @@ module AggregateRoot
     NotDumpableAggregateRoot = Class.new(StandardError)
 
     def initialize(event_store, interval = DEFAULT_SNAPSHOT_INTERVAL)
-      raise ArgumentError, 'interval must be an Integer' unless interval.instance_of?(Integer)
-      raise ArgumentError, 'interval must be greater than 0' unless interval > 0
+      raise ArgumentError, "interval must be an Integer" unless interval.instance_of?(Integer)
+      raise ArgumentError, "interval must be greater than 0" unless interval > 0
       @event_store = event_store
       @interval = interval
-      @error_handler = ->(_) { }
+      @error_handler = ->(_) {}
     end
 
     attr_writer :error_handler
@@ -41,9 +41,7 @@ module AggregateRoot
 
     def store(aggregate, stream_name)
       events = aggregate.unpublished_events.to_a
-      event_store.publish(events,
-                          stream_name: stream_name,
-                          expected_version: aggregate.version)
+      event_store.publish(events, stream_name: stream_name, expected_version: aggregate.version)
 
       aggregate.version = aggregate.version + events.count
 
@@ -63,16 +61,21 @@ module AggregateRoot
     def publish_snapshot_event(aggregate, stream_name, last_event_id)
       event_store.publish(
         Snapshot.new(
-          data: { marshal: build_marshal(aggregate), last_event_id: last_event_id, version: aggregate.version }
+          data: {
+            marshal: build_marshal(aggregate),
+            last_event_id: last_event_id,
+            version: aggregate.version,
+          },
         ),
-        stream_name: SNAPSHOT_STREAM_PATTERN.(stream_name)
+        stream_name: SNAPSHOT_STREAM_PATTERN.(stream_name),
       )
     end
 
     def build_marshal(aggregate)
       Marshal.dump(aggregate)
     rescue TypeError
-      raise NotDumpableAggregateRoot, "#{aggregate.class} cannot be dumped.
+      raise NotDumpableAggregateRoot,
+            "#{aggregate.class} cannot be dumped.
 It may be caused by instance variables being: bindings, procedure or method objects, instances of class IO, or singleton objects.
 Snapshot skipped."
     end
@@ -84,7 +87,8 @@ Snapshot skipped."
     def load_marshal(snpashot_event)
       Marshal.load(snpashot_event.data.fetch(:marshal))
     rescue TypeError, ArgumentError
-      raise NotRestorableSnapshot, "Aggregate root cannot be restored from the last snapshot (event id: #{snpashot_event.event_id}).
+      raise NotRestorableSnapshot,
+            "Aggregate root cannot be restored from the last snapshot (event id: #{snpashot_event.event_id}).
 It may be caused by aggregate class rename or Marshal version mismatch.
 Loading aggregate based on the whole stream."
     end
@@ -95,4 +99,4 @@ Loading aggregate based on the whole stream."
       just_published_events > events_since_time_for_snapshot
     end
   end
-end
+end

data/lib/aggregate_root/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AggregateRoot
-  VERSION = "2.16.0"
+  VERSION = "2.17.0"
 end

data/lib/aggregate_root.rb

@@ -15,7 +15,7 @@ module AggregateRoot
 
     def on(*event_klasses, &block)
       event_klasses.each do |event_klass|
-        name = event_klass.to_s
+        name = event_type_for(event_klass)
         raise(ArgumentError, "Anonymous class is missing name") if name.start_with? ANONYMOUS_CLASS
 
         handler_name = "on_#{name}"
@@ -62,36 +62,48 @@ module AggregateRoot
       @unpublished_events.each
     end
 
-    UNMARSHALED_VARIABLES = [:@version, :@unpublished_events]
+    UNMARSHALED_VARIABLES = %i[@version @unpublished_events]
 
     def marshal_dump
-      instance_variables.reject{|m| UNMARSHALED_VARIABLES.include? m}.inject({}) do |vars, attr|
-        vars[attr] = instance_variable_get(attr)
-        vars
-      end
+      instance_variables
+        .reject { |m| UNMARSHALED_VARIABLES.include? m }
+        .inject({}) do |vars, attr|
+          vars[attr] = instance_variable_get(attr)
+          vars
+        end
     end
 
     def marshal_load(vars)
-      vars.each do |attr, value|
-        instance_variable_set(attr, value) unless UNMARSHALED_VARIABLES.include?(attr)
-      end
+      vars.each { |attr, value| instance_variable_set(attr, value) unless UNMARSHALED_VARIABLES.include?(attr) }
     end
   end
 
   def self.with_default_apply_strategy
     Module.new do
       def self.included(host_class)
-        host_class.extend OnDSL
-        host_class.include AggregateRoot.with_strategy(-> { DefaultApplyStrategy.new })
+        warn <<~EOW
+          Please replace include AggregateRoot.with_default_apply_strategy with include AggregateRoot
+        EOW
+        host_class.include AggregateRoot
       end
     end
   end
 
   def self.with_strategy(strategy)
+    warn <<~EOW
+      Please replace include AggregateRoot.with_strategy(...) with include AggregateRoot.with(strategy: ...)
+    EOW
+    with(strategy: strategy)
+  end
+
+  def self.with(strategy: -> { DefaultApplyStrategy.new }, event_type_resolver: ->(value) { value.to_s })
     Module.new do
-      def self.included(host_class)
+      define_singleton_method :included do |host_class|
         host_class.extend Constructor
         host_class.include AggregateMethods
+        host_class.define_singleton_method :event_type_for do |value|
+          event_type_resolver.call(value)
+        end
       end
 
       define_method :apply_strategy do
@@ -101,6 +113,7 @@ module AggregateRoot
   end
 
   def self.included(host_class)
-    host_class.include with_default_apply_strategy
+    host_class.extend OnDSL
+    host_class.include with
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: aggregate_root
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 2.17.0
 platform: ruby
 authors:
 - Arkency
 bindir: bin
 cert_chain: []
-date: 2025-03-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 2.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 2.17.0
 email: dev@arkency.com
 executables: []
 extensions: []
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Event sourced aggregate root implementation for RubyEventStore
 test_files: []