aggregate_root 2.19.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a981cffad71bcec9a31feb1dd5380b28cfd84d85492eb8514f7170ebf6f39a87
-  data.tar.gz: 7021c52bc34f625b674fd54cd63e6fa3d76d01c5c9deb6c8c402bc30551c24ad
+  metadata.gz: e887ac1f5bda1b99e0e5c811ba763f9ba9c8bfdf65ffad97f855b3409a77dfe7
+  data.tar.gz: a32c4c968a6b1f2cb909f90b06a224c396da701a96a871194798250de8a1fa67
 SHA512:
-  metadata.gz: 6130d6ab8071b2a0a33f0cd80e09be49cf8529eb816f03dfbc66167a1166724d3dc8371fa59584e11bb9766a11ad5464bcdc4a167640b450ff739b615e540e3c
-  data.tar.gz: b15afa9d209eba616e46c4fc317faf498e9a6e749c31c62f27c74b2c1eef43c985936706dd35567c00942f7993406dcda34080c31690a25ac4216b8936ff56d9
+  metadata.gz: dfa906dd122a959b0f4dd016442ef5c1f65530fe1533461f54654f16b2b339f97b79c16579a96dc91cea560f5de42b02c2ef47eea235bbddc880743f1a283c63
+  data.tar.gz: 507c0ab80f3c52593f877cc9adfaf83e9701426dd370add27a5f645c1a383d67b2a1c782321e0a04a4051e9572d6b14e6af4ebe0c916fb6a37532392b82161f8

data/lib/aggregate_root/default_apply_strategy.rb

@@ -2,55 +2,32 @@
 
 module AggregateRoot
   MissingHandler = Class.new(StandardError)
+  NullHandler    = Proc.new {}
 
   class DefaultApplyStrategy
-    DEPRECATION_MESSAGE = <<~EOW
-      Handling events via apply_* method naming convention is deprecated and will be removed in the next major release.
-
-      Use the on DSL instead:
-
-        on %s do |event|
-          # your code
-        end
-    EOW
-    private_constant :DEPRECATION_MESSAGE
-
     def initialize(strict: true)
       @strict = strict
     end
 
     def call(aggregate, event)
-      name = handler_name(aggregate, event)
-      if aggregate.respond_to?(name, true)
-        aggregate.method(name).call(event)
-      else
-        raise MissingHandler.new("Missing handler method #{name} on aggregate #{aggregate.class}") if strict
-      end
+      on_handler(aggregate, event.event_type)[event]
     end
 
     private
 
-    def handler_name(aggregate, event)
-      on_dsl_handler_name(aggregate, event.event_type) || apply_handler_name(aggregate, event.event_type)
+    def on_handler(aggregate, event_type)
+      on_method_name = aggregate.class.on_methods.fetch(event_type)
+      aggregate.method(on_method_name)
+    rescue KeyError, NoMethodError
+      missing_handler(aggregate, event_type)
     end
 
-    def on_dsl_handler_name(aggregate, event_type)
-      aggregate.class.on_methods[event_type] if aggregate.class.respond_to?(:on_methods)
-    end
-
-    def apply_handler_name(aggregate, event_type)
-      name = "apply_#{Transform.to_snake_case(event_type(event_type))}"
-      if aggregate.respond_to?(name, true)
-        RubyEventStore::Deprecations.warn(
-          :"apply_naming_convention_#{event_type}",
-          message: DEPRECATION_MESSAGE % event_type,
-        )
+    def missing_handler(aggregate, event_type)
+      if strict
+        lambda { |event| raise MissingHandler.new("Missing handler method on aggregate #{aggregate.class} for #{event_type}") }
+      else
+        NullHandler
       end
-      name
-    end
-
-    def event_type(event_type)
-      event_type.split(/::|\./).last
     end
 
     attr_reader :strict, :on_methods

data/lib/aggregate_root/repository.rb

@@ -2,7 +2,7 @@
 
 module AggregateRoot
   class Repository
-    def initialize(event_store = default_event_store)
+    def initialize(event_store)
       @event_store = event_store
     end
 
@@ -31,9 +31,5 @@ module AggregateRoot
     private
 
     attr_reader :event_store
-
-    def default_event_store
-      AggregateRoot.configuration.default_event_store
-    end
   end
 end

data/lib/aggregate_root/version.rb

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

data/lib/aggregate_root.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
-require "ruby_event_store/deprecations"
 require_relative "aggregate_root/version"
-require_relative "aggregate_root/configuration"
-require_relative "aggregate_root/transform"
 require_relative "aggregate_root/default_apply_strategy"
 require_relative "aggregate_root/repository"
 require_relative "aggregate_root/instrumented_repository"
@@ -79,18 +76,6 @@ module AggregateRoot
     end
   end
 
-  def self.with_default_apply_strategy
-    Module.new do
-      def self.included(host_class)
-        host_class.include AggregateRoot
-      end
-    end
-  end
-
-  def self.with_strategy(strategy)
-    with(strategy: strategy)
-  end
-
   def self.with(strategy: -> { DefaultApplyStrategy.new }, event_type_resolver: ->(value) { value.to_s })
     Module.new do
       define_singleton_method :included do |host_class|
@@ -112,5 +97,3 @@ module AggregateRoot
     host_class.include with
   end
 end
-
-require_relative "aggregate_root/deprecated"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggregate_root
 version: !ruby/object:Gem::Version
-  version: 2.19.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Arkency
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.19.2
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.19.2
+        version: 3.0.0
 email: dev@arkency.com
 executables: []
 extensions: []
@@ -31,14 +31,11 @@ extra_rdoc_files:
 files:
 - README.md
 - lib/aggregate_root.rb
-- lib/aggregate_root/configuration.rb
 - lib/aggregate_root/default_apply_strategy.rb
-- lib/aggregate_root/deprecated.rb
 - lib/aggregate_root/instrumented_apply_strategy.rb
 - lib/aggregate_root/instrumented_repository.rb
 - lib/aggregate_root/repository.rb
 - lib/aggregate_root/snapshot_repository.rb
-- lib/aggregate_root/transform.rb
 - lib/aggregate_root/version.rb
 homepage: https://railseventstore.org
 licenses:
@@ -63,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Event sourced aggregate root implementation for RubyEventStore
 test_files: []

data/lib/aggregate_root/configuration.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module AggregateRoot
-  class << self
-    attr_accessor :configuration
-  end
-
-  def self.configure
-    self.configuration ||= Configuration.new
-    yield(configuration)
-  end
-
-  class Configuration
-    attr_accessor :default_event_store
-  end
-end

data/lib/aggregate_root/deprecated.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module AggregateRoot
-  RubyEventStore::Deprecations.register(
-    :with_default_apply_strategy,
-    "Please replace include AggregateRoot.with_default_apply_strategy with include AggregateRoot",
-  )
-  RubyEventStore::Deprecations.deprecate_class_method(
-    AggregateRoot,
-    :with_default_apply_strategy,
-    key: :with_default_apply_strategy,
-  )
-
-  RubyEventStore::Deprecations.register(
-    :with_strategy,
-    "Please replace include AggregateRoot.with_strategy(...) with include AggregateRoot.with(strategy: ...)",
-  )
-  RubyEventStore::Deprecations.deprecate_class_method(AggregateRoot, :with_strategy, key: :with_strategy)
-
-  RubyEventStore::Deprecations.register(
-    :aggregate_root_configure,
-    "`AggregateRoot.configure` and `AggregateRoot::Configuration` are deprecated and will be removed in the next major release.\n" \
-      "Use `AggregateRoot::Repository.new(event_store)` with explicit event store injection instead.",
-  )
-  RubyEventStore::Deprecations.deprecate_class_method(AggregateRoot, :configure, key: :aggregate_root_configure)
-
-  RubyEventStore::Deprecations.register(
-    :repository_default_event_store,
-    "Calling `AggregateRoot::Repository.new` without an event store argument relies on `AggregateRoot::Configuration` which is deprecated and will be removed in the next major release.\n" \
-      "Use `AggregateRoot::Repository.new(event_store)` with explicit event store injection instead.",
-  )
-  RubyEventStore::Deprecations.deprecate(Repository, :default_event_store, key: :repository_default_event_store)
-end

data/lib/aggregate_root/transform.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module AggregateRoot
-  class Transform
-    def self.to_snake_case(name)
-      name.gsub(/([A-Z])([A-Z][a-z])/, '\1_\2').gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase
-    end
-  end
-end