rails_event_store 0.31.1 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9021e0a62f2cab10e085fc92f7cc027d402faff4faf7c37c4ac22f83c229db2
-  data.tar.gz: c91f784bed01bf82051e0fb0484a68a3914c0cd1742c681850897f3dea1226de
+  metadata.gz: 13ff46085fbcdeaecb358c34eeb5d44e28e9e6faf46d51c1f59a2fb9aebbfbfb
+  data.tar.gz: 2e06d9c2d992829cbaae4b6016dbdca2a580381c0b5b07a8d6535c0318df9905
 SHA512:
-  metadata.gz: ce797385c611d702b1198ca8a78ef285d63311f41abb5d3ca986fc4f97d4632206addd3014caf21616571eba9ae3a8f3bf32c0f0f1e10b99df943fdf66e48401
-  data.tar.gz: ef89e18be44a397849271e650c48aa8aadf53a5bd0a61d943e1ac40a3f98af48e23b040a023e150d517639dcf39003a7493d1d37efd13afc811d63432108f2b1
+  metadata.gz: 45e142da1c62a00f6e0c46d6d60050905548947cc87934422f16c3851638a29d4e19801f1c8f8ff9e0ec033f3f58dda88441375566a408a0cfe8ee1d6f2a66ef
+  data.tar.gz: c068371effa39534e6d8d9b3c6e0eb4dc6797d4df60a37dfeeda7612ee4f1b35b36872ec65e447d39399c0e0e679d5544a266bffde9a1ee1c82261ec1d984153

data/Makefile

@@ -1,10 +1,11 @@
 GEM_VERSION = $(shell cat ../RES_VERSION)
 GEM_NAME    = rails_event_store
 REQUIRE     = $(GEM_NAME)
-IGNORE      = RailsEventStore.const_missing \
-              RailsEventStore::Client\#initialize \
-              RailsEventStore::AsyncProxyStrategy::AfterCommit::AsyncRecord\#rolledback! \
-              RailsEventStore::AsyncProxyStrategy::AfterCommit::AsyncRecord\#before_committed!
+IGNORE      = RailsEventStore::Client\#initialize \
+              RailsEventStore::AfterCommitAsyncDispatcher::AsyncRecord\#rolledback! \
+              RailsEventStore::AsyncProxyStrategy::AfterCommit* \
+              RailsEventStore::ActiveJobDispatcher* \
+
 SUBJECT     ?= RailsEventStore*
 
 install: ## Install gem dependencies
@@ -23,7 +24,7 @@ test: ## Run unit tests
 
 mutate: test ## Run mutation tests
 	@echo "Running mutation tests"
-	@bundle exec mutant --include lib \
+	@MUTATING=true bundle exec mutant --include lib \
 		$(addprefix --require ,$(REQUIRE)) \
 		$(addprefix --ignore-subject ,$(IGNORE)) \
 		--use rspec "$(SUBJECT)"

data/lib/rails_event_store/active_job_dispatcher.rb

@@ -1,12 +1,26 @@
 require 'active_job'
 
 module RailsEventStore
+  # @deprecated Use RailsEventStore::ComposedDispatcher and RailsEventStore::ActiveJobScheduler instead
   class ActiveJobDispatcher < RubyEventStore::AsyncDispatcher
     def initialize(proxy_strategy: AsyncProxyStrategy::Inline.new)
       super(proxy_strategy: proxy_strategy, scheduler: ActiveJobScheduler.new)
+      warn <<~EOW
+        RailsEventStore::ActiveJobDispatcher has been deprecated.
+
+        Use RailsEventStore::ComposedDispatcher and RailsEventStore::ActiveJobScheduler instead
+      EOW
     end
 
+    # @deprecated Use RailsEventStore::ActiveJobScheduler with RubyEventStore::ImmediateAsyncDispatcher or RailsEventStore::AfterCommitAsyncDispatcher instead
     class ActiveJobScheduler
+      def initialize
+        warn <<~EOW
+          RailsEventStore::ActiveJobDispatcher::ActiveJobScheduler has been deprecated.
+
+          Use RailsEventStore::ActiveJobScheduler with RubyEventStore::ImmediateAsyncDispatcher or RailsEventStore::AfterCommitAsyncDispatcher instead
+        EOW
+      end
       def call(klass, serialized_event)
         klass.perform_later(serialized_event.to_h)
       end

data/lib/rails_event_store/active_job_scheduler.rb

@@ -0,0 +1,11 @@
+module RailsEventStore
+  class ActiveJobScheduler
+    def call(klass, serialized_event)
+      klass.perform_later(serialized_event.to_h)
+    end
+
+    def verify(subscriber)
+      Class === subscriber && !!(subscriber < ActiveJob::Base)
+    end
+  end
+end

data/lib/rails_event_store/after_commit_async_dispatcher.rb

@@ -0,0 +1,52 @@
+module RailsEventStore
+  class AfterCommitAsyncDispatcher
+    def initialize(scheduler:)
+      @scheduler = scheduler
+    end
+
+    def call(subscriber, _, serialized_event)
+      run do
+        @scheduler.call(subscriber, serialized_event)
+      end
+    end
+
+    def run(&schedule_proc)
+      if ActiveRecord::Base.connection.transaction_open?
+        ActiveRecord::Base.
+          connection.
+          current_transaction.
+          add_record(AsyncRecord.new(self, schedule_proc))
+      else
+        yield
+      end
+    end
+
+    def verify(subscriber)
+      @scheduler.verify(subscriber)
+    end
+
+    private
+    class AsyncRecord
+      def initialize(dispatcher, schedule_proc)
+        @dispatcher = dispatcher
+        @schedule_proc = schedule_proc
+      end
+
+      def committed!
+        schedule_proc.call
+      end
+
+      def rolledback!(*)
+      end
+
+      def before_committed!
+      end
+
+      def add_to_transaction
+        dispatcher.run(&schedule_proc)
+      end
+
+      attr_reader :schedule_proc, :dispatcher
+    end
+  end
+end

data/lib/rails_event_store/all.rb

@@ -3,10 +3,11 @@ require 'rails_event_store/async_proxy_strategy'
 require 'rails_event_store/active_job_dispatcher'
 require 'rails_event_store/async_handler_helpers'
 require 'rails_event_store/link_by_metadata'
+require 'rails_event_store/after_commit_async_dispatcher'
+require 'rails_event_store/active_job_scheduler'
 require 'rails_event_store/client'
 require 'rails_event_store/version'
 require 'rails_event_store/railtie'
-require 'rails_event_store/deprecations'
 
 module RailsEventStore
   Event                       = RubyEventStore::Event
@@ -26,4 +27,5 @@ module RailsEventStore
   PAGE_SIZE                   = RubyEventStore::PAGE_SIZE
   AsyncProxyStrategy::Inline  = RubyEventStore::AsyncProxyStrategy::Inline
   AsyncDispatcher             = RubyEventStore::AsyncDispatcher
+  ImmediateAsyncDispatcher    = RubyEventStore::ImmediateAsyncDispatcher
 end

data/lib/rails_event_store/async_proxy_strategy.rb

@@ -1,6 +1,15 @@
 module RailsEventStore
   module AsyncProxyStrategy
+    # @deprecated Use RailsEventStore::AfterCommitAsyncDispatcher instead
     class AfterCommit
+      def initialize
+        warn <<~EOW
+          RailsEventStore::AsyncProxyStrategy::AfterCommit has been deprecated.
+
+          Use RailsEventStore::AfterCommitAsyncDispatcher instead
+        EOW
+      end
+
       def call(schedule_proc)
         if ActiveRecord::Base.connection.transaction_open?
           ActiveRecord::Base.

data/lib/rails_event_store/client.rb

@@ -5,14 +5,15 @@ module RailsEventStore
     def initialize(repository: RailsEventStoreActiveRecord::EventRepository.new,
                    mapper: RubyEventStore::Mappers::Default.new,
                    subscriptions: RubyEventStore::PubSub::Subscriptions.new,
-                   dispatcher: ActiveJobDispatcher.new,
-                   request_metadata: default_request_metadata,
-                   page_size: PAGE_SIZE)
-      super(repository: repository,
+                   dispatcher: RubyEventStore::ComposedDispatcher.new(
+                     RubyEventStore::ImmediateAsyncDispatcher.new(scheduler: ActiveJobScheduler.new),
+                     RubyEventStore::PubSub::Dispatcher.new),
+                   request_metadata: default_request_metadata)
+      super(repository: RubyEventStore::InstrumentedRepository.new(repository, ActiveSupport::Notifications),
             mapper: mapper,
             subscriptions: subscriptions,
-            dispatcher: dispatcher,
-            page_size: page_size)
+            dispatcher: RubyEventStore::InstrumentedDispatcher.new(dispatcher, ActiveSupport::Notifications)
+            )
       @request_metadata = request_metadata
     end
 

data/lib/rails_event_store/link_by_metadata.rb

@@ -2,26 +2,26 @@ module RailsEventStore
 
   class LinkByMetadata < RubyEventStore::LinkByMetadata
     def initialize(event_store: Rails.configuration.event_store, key:, prefix: nil)
-      super(event_store: event_store, key: key, prefix: prefix)
+      super
     end
   end
 
   class LinkByCorrelationId < RubyEventStore::LinkByCorrelationId
     def initialize(event_store: Rails.configuration.event_store, prefix: nil)
-      super(event_store: event_store, prefix: prefix)
+      super
     end
   end
 
   class LinkByCausationId < RubyEventStore::LinkByCausationId
     def initialize(event_store: Rails.configuration.event_store, prefix: nil)
-      super(event_store: event_store, prefix: prefix)
+      super
     end
   end
 
   class LinkByEventType < RubyEventStore::LinkByEventType
     def initialize(event_store: Rails.configuration.event_store, prefix: nil)
-      super(event_store: event_store, prefix: prefix)
+      super
     end
   end
-  
-end
+
+end

data/lib/rails_event_store/version.rb

@@ -1,3 +1,3 @@
 module RailsEventStore
-  VERSION = "0.31.1"
+  VERSION = "0.32.0"
 end

data/rails_event_store.gemspec

@@ -31,14 +31,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rails', '~> 5.2'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'rack-test'
-  spec.add_development_dependency 'mutant-rspec', '~> 0.8.14'
+  spec.add_development_dependency 'mutant-rspec', '~> 0.8.17'
   spec.add_development_dependency 'google-protobuf', '~> 3.5.1.2'
   spec.add_development_dependency 'pry'
 
-  spec.add_dependency 'ruby_event_store', '= 0.31.1'
-  spec.add_dependency 'rails_event_store_active_record', '= 0.31.1'
-  spec.add_dependency 'aggregate_root', '= 0.31.1'
-  spec.add_dependency 'bounded_context', '= 0.31.1'
+  spec.add_dependency 'ruby_event_store', '= 0.32.0'
+  spec.add_dependency 'rails_event_store_active_record', '= 0.32.0'
+  spec.add_dependency 'aggregate_root', '= 0.32.0'
+  spec.add_dependency 'bounded_context', '= 0.32.0'
   spec.add_dependency 'activesupport', '>= 3.0'
   spec.add_dependency 'activemodel', '>= 3.0'
   spec.add_dependency 'activejob', '>= 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_store
 version: !ruby/object:Gem::Version
-  version: 0.31.1
+  version: 0.32.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.14
+        version: 0.8.17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.14
+        version: 0.8.17
 - !ruby/object:Gem::Dependency
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -142,56 +142,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.1
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.1
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: rails_event_store_active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.1
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.1
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: aggregate_root
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.1
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.1
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: bounded_context
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.1
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.1
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -261,11 +261,12 @@ files:
 - README.md
 - lib/rails_event_store.rb
 - lib/rails_event_store/active_job_dispatcher.rb
+- lib/rails_event_store/active_job_scheduler.rb
+- lib/rails_event_store/after_commit_async_dispatcher.rb
 - lib/rails_event_store/all.rb
 - lib/rails_event_store/async_handler_helpers.rb
 - lib/rails_event_store/async_proxy_strategy.rb
 - lib/rails_event_store/client.rb
-- lib/rails_event_store/deprecations.rb
 - lib/rails_event_store/link_by_metadata.rb
 - lib/rails_event_store/middleware.rb
 - lib/rails_event_store/railtie.rb

data/lib/rails_event_store/deprecations.rb

@@ -1,7 +0,0 @@
-module RailsEventStore
-  def self.const_missing(const_name)
-    super unless const_name == :MethodNotDefined
-    warn "`RailsEventStore::MethodNotDefined` has been deprecated. Use `RailsEventStore::InvalidHandler` instead."
-    InvalidHandler
-  end
-end