rails_event_store 2.16.0 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f60a7813fa529e632edcb3a33c0f30f9c22e29e6952237dacf4f4e270fbdf2b
-  data.tar.gz: ee7d89d9b1c50a579983ddfe2b0efe969323456dfb06ca4025d3ec60d2a3203b
+  metadata.gz: bcf4331ca95c4367a205cd887ab2dbbd72fb6871942d747c50f0459dc486268f
+  data.tar.gz: 548b8e0272378cc3ea5f0295c164ea1fe930491636d2f3fd0892e9b693cad45b
 SHA512:
-  metadata.gz: 17c4e4429677c8f9a636fd4f4cd663f92987e03f18108ce8eaf99b823ead2a7ad101c9a4e45e66a3031a2b89a75d4b68dd0fb4ae36ba9fb11e802526df15c006
-  data.tar.gz: 5349b00fe74c9815361100cfda7de42875eeb91332f1c23da35fd74c30e6338a8693b4bf07f0519a076c337363dd05bf3ea6512275d612d5857b52b4e6860760
+  metadata.gz: 8eeb81eaa66884a4139f34bd737de32469c3e1bbb76b63935bbd383135379537427b26684cc951548fbee0a5a0b6cb339d67ae78a693b9d643658b9483f4997d
+  data.tar.gz: e4fa1bc07d76f0170ed2ed993cd0ba7edb48a5790d226ea0a88ec750689d719cb61d33b7d5856bf4fc039e44b4eed5026919fca84d35d4c6bbaa07b023295ad5

data/lib/generators/rails_event_store/bounded_context_generator.rb

@@ -11,7 +11,7 @@ module RailsEventStore
       def create_bounded_context
         create_file "#{bounded_context_name}/lib/#{bounded_context_name}/.keep"
 
-        template "module.rb", "#{bounded_context_name}/lib/#{bounded_context_name}.rb"
+        template "module.erb", "#{bounded_context_name}/lib/#{bounded_context_name}.rb"
 
         application { "config.paths.add '#{bounded_context_name}/lib', eager_load: true" }
       end

data/lib/generators/rails_event_store/rspec_generator.rb

@@ -8,15 +8,15 @@ module RailsEventStore
       source_root File.expand_path(File.join(File.dirname(__FILE__), "../templates"))
 
       def spec_helper
-        template "spec_helper.rb", "#{bounded_context_name}/spec/spec_helper.rb"
+        template "spec_helper.erb", "#{bounded_context_name}/spec/spec_helper.rb"
       end
 
       def bc_spec
-        template "bc_spec.rb", "#{bounded_context_name}/spec/#{bounded_context_name}_spec.rb"
+        template "bc_spec.erb", "#{bounded_context_name}/spec/#{bounded_context_name}_spec.rb"
       end
 
       def require_bc_spec
-        template "require_bc_spec.rb", "spec/#{bounded_context_name}_spec.rb"
+        template "require_bc_spec.erb", "spec/#{bounded_context_name}_spec.rb"
       end
 
       private

data/lib/generators/rails_event_store/test_unit_generator.rb

@@ -8,11 +8,11 @@ module RailsEventStore
       source_root File.expand_path(File.join(File.dirname(__FILE__), "../templates"))
 
       def test_helper
-        template "test_helper.rb", "#{bounded_context_name}/test/test_helper.rb"
+        template "test_helper.erb", "#{bounded_context_name}/test/test_helper.rb"
       end
 
       def require_bc_test
-        template "require_bc_test.rb", "test/#{bounded_context_name}_test.rb"
+        template "require_bc_test.erb", "test/#{bounded_context_name}_test.rb"
       end
 
       private

data/lib/rails_event_store/after_commit_async_dispatcher.rb

@@ -37,11 +37,14 @@ module RailsEventStore
         schedule_proc.call
       end
 
-      def rolledback!(*); end
+      def rolledback!(*)
+      end
 
-      def before_committed!; end
+      def before_committed!
+      end
 
-      def trigger_transactional_callbacks?; end
+      def trigger_transactional_callbacks?
+      end
 
       attr_reader :schedule_proc
     end

data/lib/rails_event_store/all.rb

@@ -5,7 +5,7 @@ require_relative "async_handler_helpers"
 require_relative "link_by_metadata"
 require_relative "after_commit_async_dispatcher"
 require_relative "active_job_scheduler"
-require_relative 'active_job_id_only_scheduler'
+require_relative "active_job_id_only_scheduler"
 require_relative "client"
 require_relative "json_client"
 require_relative "version"

data/lib/rails_event_store/async_handler_helpers.rb

@@ -13,8 +13,12 @@ module RailsEventStore
     )
       Module.new do
         define_method :perform do |payload|
-          event_store = event_store_locator.call if event_store_locator
-          super(event_store.deserialize(serializer: serializer, **payload.transform_keys(&:to_sym)))
+          if Hash === payload
+            event_store = event_store_locator.call if event_store_locator
+            super(event_store.deserialize(serializer: serializer, **payload.transform_keys(&:to_sym)))
+          else
+            super(payload)
+          end
         end
       end
     end
@@ -29,10 +33,7 @@ module RailsEventStore
       with
     end
 
-    def self.with(
-      event_store: Rails.configuration.event_store,
-      event_store_locator: nil
-    )
+    def self.with(event_store: Rails.configuration.event_store, event_store_locator: nil)
       Module.new do
         define_method :perform do |payload|
           event_store = event_store_locator.call if event_store_locator
@@ -46,7 +47,6 @@ module RailsEventStore
     end
   end
 
-
   module CorrelatedHandler
     def perform(event)
       Rails

data/lib/rails_event_store/client.rb

@@ -5,28 +5,80 @@ module RailsEventStore
     attr_reader :request_metadata
 
     def initialize(
-      mapper: RubyEventStore::Mappers::Default.new,
+      mapper: RubyEventStore::Mappers::BatchMapper.new,
       repository: RubyEventStore::ActiveRecord::EventRepository.new(serializer: RubyEventStore::Serializers::YAML),
-      subscriptions: RubyEventStore::Subscriptions.new,
-      dispatcher: RubyEventStore::ComposedDispatcher.new(
-        RailsEventStore::AfterCommitAsyncDispatcher.new(
-          scheduler: ActiveJobScheduler.new(serializer: RubyEventStore::Serializers::YAML)
-        ),
-        RubyEventStore::Dispatcher.new
-      ),
+      subscriptions: nil,
+      dispatcher: nil,
+      message_broker: nil,
       clock: default_clock,
       correlation_id_generator: default_correlation_id_generator,
       request_metadata: default_request_metadata
     )
       super(
         repository: RubyEventStore::InstrumentedRepository.new(repository, ActiveSupport::Notifications),
-        mapper: RubyEventStore::Mappers::InstrumentedMapper.new(mapper, ActiveSupport::Notifications),
-        subscriptions: RubyEventStore::InstrumentedSubscriptions.new(subscriptions, ActiveSupport::Notifications),
+        mapper:
+          (
+            if batch_mapper?(mapper)
+              RubyEventStore::Mappers::InstrumentedBatchMapper.new(mapper, ActiveSupport::Notifications)
+            else
+              RubyEventStore::Mappers::InstrumentedMapper.new(mapper, ActiveSupport::Notifications)
+            end
+          ),
+        subscriptions: nil,
         clock: clock,
         correlation_id_generator: correlation_id_generator,
-        dispatcher: RubyEventStore::InstrumentedDispatcher.new(dispatcher, ActiveSupport::Notifications)
+        dispatcher: nil,
+        message_broker:
+          RubyEventStore::InstrumentedBroker.new(
+            message_broker ||
+              RubyEventStore::Broker.new(
+                subscriptions:
+                  RubyEventStore::InstrumentedSubscriptions.new(
+                    subscriptions || RubyEventStore::Subscriptions.new,
+                    ActiveSupport::Notifications,
+                  ),
+                dispatcher:
+                  RubyEventStore::InstrumentedDispatcher.new(
+                    dispatcher ||
+                      RubyEventStore::ComposedDispatcher.new(
+                        RailsEventStore::AfterCommitAsyncDispatcher.new(
+                          scheduler: ActiveJobScheduler.new(serializer: RubyEventStore::Serializers::YAML),
+                        ),
+                        RubyEventStore::Dispatcher.new,
+                      ),
+                    ActiveSupport::Notifications,
+                  ),
+              ),
+            ActiveSupport::Notifications,
+          ),
       )
       @request_metadata = request_metadata
+
+      if (subscriptions || dispatcher)
+        warn <<~EOW
+          Passing subscriptions and dispatcher to #{self.class} has been deprecated.
+
+          Pass it using message_broker argument. For example:
+
+          event_store = #{self.class}.new(
+            message_broker: RubyEventStore::Broker.new(
+              subscriptions: RubyEventStore::Subscriptions.new,
+              dispatcher: RubyEventStore::ComposedDispatcher.new(
+                RailsEventStore::AfterCommitAsyncDispatcher.new(
+                  scheduler: RailsEventStore::ActiveJobScheduler.new(serializer: RubyEventStore::Serializers::YAML)
+                ),
+                RubyEventStore::Dispatcher.new
+              )
+            )
+          )
+        EOW
+
+        warn <<~EOW if (message_broker)
+
+            Because message_broker has been provided,
+            arguments passed by subscriptions or dispatcher will be ignored.
+          EOW
+      end
     end
 
     def with_request_metadata(env, &block)

data/lib/rails_event_store/json_client.rb

@@ -1,84 +1,62 @@
 # frozen_string_literal: true
 
+require "json"
+
 module RailsEventStore
   class JSONClient < Client
     def initialize(
-      mapper: RubyEventStore::Mappers::PipelineMapper.new(
-        RubyEventStore::Mappers::Pipeline.new(
-          {
-            Symbol => {
-              serializer: ->(v) { v.to_s },
-              deserializer: ->(v) { v.to_sym },
-            },
-            Time => {
-              serializer: ->(v) { v.iso8601(RubyEventStore::TIMESTAMP_PRECISION) },
-              deserializer: ->(v) { Time.iso8601(v) },
-            },
-            ActiveSupport::TimeWithZone => {
-              serializer: ->(v) { v.iso8601(RubyEventStore::TIMESTAMP_PRECISION) },
-              deserializer: ->(v) { Time.iso8601(v).in_time_zone },
-              stored_type: ->(*) { "ActiveSupport::TimeWithZone" },
-            },
-            Date => {
-              serializer: ->(v) { v.iso8601 },
-              deserializer: ->(v) { Date.iso8601(v) },
-            },
-            DateTime => {
-              serializer: ->(v) { v.iso8601 },
-              deserializer: ->(v) { DateTime.iso8601(v) },
-            },
-            BigDecimal => {
-              serializer: ->(v) { v.to_s },
-              deserializer: ->(v) { BigDecimal(v) },
-            },
-          }.merge(
-            if defined?(OpenStruct)
-              {
-                OpenStruct => {
-                  serializer: ->(v) { v.to_h },
-                  deserializer: ->(v) { OpenStruct.new(v) },
-                },
-              }
-            else
-              {}
-            end,
-          )
-            .reduce(
-              RubyEventStore::Mappers::Transformation::PreserveTypes.new,
-            ) { |preserve_types, (klass, options)| preserve_types.register(klass, **options) },
-          RubyEventStore::Mappers::Transformation::SymbolizeMetadataKeys.new,
-        ),
-      ),
-      repository: RubyEventStore::ActiveRecord::EventRepository.new(
-        serializer: RubyEventStore::NULL,
-      ),
-      subscriptions: RubyEventStore::Subscriptions.new,
-      dispatcher: RubyEventStore::ComposedDispatcher.new(
-        RailsEventStore::AfterCommitAsyncDispatcher.new(
-          scheduler: ActiveJobScheduler.new(serializer: RubyEventStore::Serializers::YAML),
+      mapper: RubyEventStore::Mappers::BatchMapper.new(
+        RubyEventStore::Mappers::PipelineMapper.new(
+          RubyEventStore::Mappers::Pipeline.new(
+            {
+              Symbol => {
+                serializer: ->(v) { v.to_s },
+                deserializer: ->(v) { v.to_sym },
+              },
+              Time => {
+                serializer: ->(v) { v.iso8601(RubyEventStore::TIMESTAMP_PRECISION) },
+                deserializer: ->(v) { Time.iso8601(v) },
+              },
+              ActiveSupport::TimeWithZone => {
+                serializer: ->(v) { v.iso8601(RubyEventStore::TIMESTAMP_PRECISION) },
+                deserializer: ->(v) { Time.iso8601(v).in_time_zone },
+                stored_type: ->(*) { "ActiveSupport::TimeWithZone" },
+              },
+              Date => {
+                serializer: ->(v) { v.iso8601 },
+                deserializer: ->(v) { Date.iso8601(v) },
+              },
+              DateTime => {
+                serializer: ->(v) { v.iso8601 },
+                deserializer: ->(v) { DateTime.iso8601(v) },
+              },
+              BigDecimal => {
+                serializer: ->(v) { v.to_s },
+                deserializer: ->(v) { BigDecimal(v) },
+              },
+            }.merge(
+              if defined?(OpenStruct)
+                { OpenStruct => { serializer: ->(v) { v.to_h }, deserializer: ->(v) { OpenStruct.new(v) } } }
+              else
+                {}
+              end,
+            )
+              .reduce(RubyEventStore::Mappers::Transformation::PreserveTypes.new) do |preserve_types, (klass, options)|
+                preserve_types.register(klass, **options)
+              end,
+            RubyEventStore::Mappers::Transformation::SymbolizeMetadataKeys.new,
+          ),
         ),
-        RubyEventStore::Dispatcher.new,
       ),
+      repository: RubyEventStore::ActiveRecord::EventRepository.new(serializer: JSON),
+      subscriptions: nil,
+      dispatcher: nil,
+      message_broker: nil,
       clock: default_clock,
       correlation_id_generator: default_correlation_id_generator,
       request_metadata: default_request_metadata
     )
-      super(
-        mapper:
-          RubyEventStore::Mappers::InstrumentedMapper.new(mapper, ActiveSupport::Notifications),
-        repository:
-          RubyEventStore::InstrumentedRepository.new(repository, ActiveSupport::Notifications),
-        subscriptions:
-          RubyEventStore::InstrumentedSubscriptions.new(
-            subscriptions,
-            ActiveSupport::Notifications,
-          ),
-        clock: clock,
-        correlation_id_generator: correlation_id_generator,
-        dispatcher:
-          RubyEventStore::InstrumentedDispatcher.new(dispatcher, ActiveSupport::Notifications),
-      )
-      @request_metadata = request_metadata
+      super
     end
   end
 end

data/lib/rails_event_store/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_store
 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,56 +15,56 @@ 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
 - !ruby/object:Gem::Dependency
   name: ruby_event_store-browser
   requirement: !ruby/object:Gem::Requirement
     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
 - !ruby/object:Gem::Dependency
   name: rails_event_store_active_record
   requirement: !ruby/object:Gem::Requirement
     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
 - !ruby/object:Gem::Dependency
   name: aggregate_root
   requirement: !ruby/object:Gem::Requirement
     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
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -135,12 +135,12 @@ files:
 - lib/generators/rails_event_store/bounded_context_generator.rb
 - lib/generators/rails_event_store/rspec_generator.rb
 - lib/generators/rails_event_store/test_unit_generator.rb
-- lib/generators/templates/bc_spec.rb
-- lib/generators/templates/module.rb
-- lib/generators/templates/require_bc_spec.rb
-- lib/generators/templates/require_bc_test.rb
-- lib/generators/templates/spec_helper.rb
-- lib/generators/templates/test_helper.rb
+- lib/generators/templates/bc_spec.erb
+- lib/generators/templates/module.erb
+- lib/generators/templates/require_bc_spec.erb
+- lib/generators/templates/require_bc_test.erb
+- lib/generators/templates/spec_helper.erb
+- lib/generators/templates/test_helper.erb
 - lib/rails_event_store.rb
 - lib/rails_event_store/active_job_id_only_scheduler.rb
 - lib/rails_event_store/active_job_scheduler.rb
@@ -177,7 +177,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: Rails wrapper for RubyEventStore with batteries included
 test_files: []