rails_event_store 0.30.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d4e0009af4124fcd60998861a6a397048887b9e5b3ea57dcf5356b2fd3c2c0
-  data.tar.gz: f62347ca2d8bf35e365647b09720c6410cb0096b1c512f11176c77f09cc7a808
+  metadata.gz: 6b49527704051efaa6da205c5b8b29d7f3ac4e64ea40140ee025388d3a633697
+  data.tar.gz: 1d11601df7b08bd465ed6d0cf9148d2a5354f510f3518f3715aad2cbb3529687
 SHA512:
-  metadata.gz: 59fd5ddb62bf2fb5e4db8c28771a1888b63bb6b2bbf3e16b0fc703d50a6e2956e65218eb0d6eb5fd3df417b8d49dc0c04a8eb8296a8e686ce32ee1b3721cfce0
-  data.tar.gz: 8b2720a1bd23f634d5ae5475cad76e39c2a5845f73e99b4059421818af5b2bf34f278186bf807fdb615b146581055e10ab950c6079364262564eb5d789c0cb55
+  metadata.gz: 564be64cbbb736bf85b5e45a6f79da57f3b7f0dfb0c6d0ad800e218bdac5e6cb6190ada11703af6ebb7d45bf905a9d5e566951ab713edee9f6a15fbb7c3b8e5b
+  data.tar.gz: aa43290fe05178d900bf9e401de737fd809d4b7a20bbdd128a378ba586a706bb70084dcdf1cc24d14d397376f9e71c6b75a515e81d48600c0e142cabe978ea99

data/Gemfile

@@ -2,10 +2,12 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'ruby_event_store',                path: '../ruby_event_store'
+gem 'ruby_event_store-browser',        path: '../ruby_event_store-browser'
 gem 'rails_event_store_active_record', path: '../rails_event_store_active_record'
 gem 'aggregate_root',                  path: '../aggregate_root'
 gem 'bounded_context',                 path: '../bounded_context'
 gem 'protobuf_nested_struct'
+gem 'sidekiq'
 
 if v = ENV['RAILS_VERSION']
   gem 'rails', v

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,71 +1,33 @@
 require 'active_job'
 
 module RailsEventStore
-  module AsyncProxyStrategy
-    class AfterCommit
-      def call(klass, event)
-        if ActiveRecord::Base.connection.transaction_open?
-          ActiveRecord::Base.
-            connection.
-            current_transaction.
-            add_record(AsyncRecord.new(klass, event))
-        else
-          klass.perform_later(YAML.dump(event))
-        end
-      end
-
-      private
-      class AsyncRecord
-        def initialize(klass, event)
-          @klass = klass
-          @event = event
-        end
-
-        def committed!
-          @klass.perform_later(YAML.dump(@event))
-        end
+  # @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.
 
-        def rolledback!(*)
-        end
+        Use RailsEventStore::ComposedDispatcher and RailsEventStore::ActiveJobScheduler instead
+      EOW
+    end
 
-        def before_committed!
-        end
+    # @deprecated Use RailsEventStore::ActiveJobScheduler with RubyEventStore::ImmediateAsyncDispatcher or RailsEventStore::AfterCommitAsyncDispatcher instead
+    class ActiveJobScheduler
+      def initialize
+        warn <<~EOW
+          RailsEventStore::ActiveJobDispatcher::ActiveJobScheduler has been deprecated.
 
-        def add_to_transaction
-          AfterCommit.new.call(@klass, @event)
-        end
+          Use RailsEventStore::ActiveJobScheduler with RubyEventStore::ImmediateAsyncDispatcher or RailsEventStore::AfterCommitAsyncDispatcher instead
+        EOW
       end
-    end
-
-    class Inline
-      def call(klass, event)
-        klass.perform_later(YAML.dump(event))
+      def call(klass, serialized_event)
+        klass.perform_later(serialized_event.to_h)
       end
-    end
-  end
 
-  class ActiveJobDispatcher < RubyEventStore::PubSub::Dispatcher
-    def initialize(proxy_strategy: AsyncProxyStrategy::Inline.new)
-      @async_proxy_strategy = proxy_strategy
-    end
-
-    def call(subscriber, event)
-      if async_handler?(subscriber)
-        @async_proxy_strategy.call(subscriber, event)
-      else
-        super
+      def async_handler?(klass)
+        Class === klass && klass < ActiveJob::Base
       end
     end
-
-    def verify(subscriber)
-      super unless async_handler?(subscriber)
-    end
-
-    private
-
-    def async_handler?(klass)
-      Class === klass && klass < ActiveJob::Base
-    end
-
   end
-end
+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

@@ -1,23 +1,32 @@
 require 'ruby_event_store'
+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'
+require 'rails_event_store/browser'
 
 module RailsEventStore
-  Event                     = RubyEventStore::Event
-  InMemoryRepository        = RubyEventStore::InMemoryRepository
-  EventBroker               = RubyEventStore::PubSub::Broker
-  Projection                = RubyEventStore::Projection
-  WrongExpectedEventVersion = RubyEventStore::WrongExpectedEventVersion
-  InvalidExpectedVersion    = RubyEventStore::InvalidExpectedVersion
-  IncorrectStreamData       = RubyEventStore::IncorrectStreamData
-  EventNotFound             = RubyEventStore::EventNotFound
-  SubscriberNotExist        = RubyEventStore::SubscriberNotExist
-  InvalidHandler            = RubyEventStore::InvalidHandler
-  InvalidPageStart          = RubyEventStore::InvalidPageStart
-  InvalidPageSize           = RubyEventStore::InvalidPageSize
-  GLOBAL_STREAM             = RubyEventStore::GLOBAL_STREAM
-  PAGE_SIZE                 = RubyEventStore::PAGE_SIZE
-end
+  Event                       = RubyEventStore::Event
+  InMemoryRepository          = RubyEventStore::InMemoryRepository
+  Subscriptions               = RubyEventStore::PubSub::Subscriptions
+  Projection                  = RubyEventStore::Projection
+  WrongExpectedEventVersion   = RubyEventStore::WrongExpectedEventVersion
+  InvalidExpectedVersion      = RubyEventStore::InvalidExpectedVersion
+  IncorrectStreamData         = RubyEventStore::IncorrectStreamData
+  EventNotFound               = RubyEventStore::EventNotFound
+  SubscriberNotExist          = RubyEventStore::SubscriberNotExist
+  InvalidHandler              = RubyEventStore::InvalidHandler
+  InvalidPageStart            = RubyEventStore::InvalidPageStart
+  InvalidPageSize             = RubyEventStore::InvalidPageSize
+  CorrelatedCommands          = RubyEventStore::CorrelatedCommands
+  GLOBAL_STREAM               = RubyEventStore::GLOBAL_STREAM
+  PAGE_SIZE                   = RubyEventStore::PAGE_SIZE
+  AsyncProxyStrategy::Inline  = RubyEventStore::AsyncProxyStrategy::Inline
+  AsyncDispatcher             = RubyEventStore::AsyncDispatcher
+  ImmediateAsyncDispatcher    = RubyEventStore::ImmediateAsyncDispatcher
+end

data/lib/rails_event_store/async_handler_helpers.rb

@@ -0,0 +1,20 @@
+module RailsEventStore
+
+  module AsyncHandler
+    def perform(payload)
+      super(Rails.configuration.event_store.deserialize(payload))
+    end
+  end
+
+  module CorrelatedHandler
+    def perform(event)
+      Rails.configuration.event_store.with_metadata(
+        correlation_id: event.metadata[:correlation_id] || event.event_id,
+        causation_id: event.event_id
+      ) do
+        super
+      end
+    end
+  end
+
+end

data/lib/rails_event_store/async_proxy_strategy.rb

@@ -0,0 +1,48 @@
+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.
+            connection.
+            current_transaction.
+            add_record(AsyncRecord.new(schedule_proc))
+        else
+          schedule_proc.call
+        end
+      end
+
+      private
+      class AsyncRecord
+        def initialize(schedule_proc)
+          @schedule_proc = schedule_proc
+        end
+
+        def committed!
+          schedule_proc.call
+        end
+
+        def rolledback!(*)
+        end
+
+        def before_committed!
+        end
+
+        def add_to_transaction
+          AfterCommit.new.call(schedule_proc)
+        end
+
+        attr_reader :schedule_proc
+      end
+    end
+  end
+end

data/lib/rails_event_store/browser.rb

@@ -0,0 +1,5 @@
+require 'ruby_event_store/browser/app'
+
+module RailsEventStore
+  Browser = RubyEventStore::Browser::App.for(event_store_locator: -> { Rails.configuration.event_store })
+end

data/lib/rails_event_store/client.rb

@@ -4,13 +4,16 @@ module RailsEventStore
 
     def initialize(repository: RailsEventStoreActiveRecord::EventRepository.new,
                    mapper: RubyEventStore::Mappers::Default.new,
-                   event_broker: EventBroker.new(dispatcher: ActiveJobDispatcher.new),
-                   request_metadata: default_request_metadata,
-                   page_size: PAGE_SIZE)
-      super(repository: repository,
+                   subscriptions: RubyEventStore::PubSub::Subscriptions.new,
+                   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,
-            event_broker: event_broker,
-            page_size: page_size)
+            subscriptions: subscriptions,
+            dispatcher: RubyEventStore::InstrumentedDispatcher.new(dispatcher, ActiveSupport::Notifications)
+            )
       @request_metadata = request_metadata
     end
 

data/lib/rails_event_store/link_by_metadata.rb

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

data/lib/rails_event_store/version.rb

@@ -1,3 +1,3 @@
 module RailsEventStore
-  VERSION = "0.30.0"
+  VERSION = "0.34.0"
 end

data/rails_event_store.gemspec

@@ -31,13 +31,15 @@ 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.30.0'
-  spec.add_dependency 'rails_event_store_active_record', '= 0.30.0'
-  spec.add_dependency 'aggregate_root', '= 0.30.0'
-  spec.add_dependency 'bounded_context', '= 0.30.0'
+  spec.add_dependency 'ruby_event_store', '= 0.34.0'
+  spec.add_dependency 'ruby_event_store-browser', '= 0.34.0'
+  spec.add_dependency 'rails_event_store_active_record', '= 0.34.0'
+  spec.add_dependency 'aggregate_root', '= 0.34.0'
+  spec.add_dependency 'bounded_context', '= 0.34.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.30.0
+  version: 0.34.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,16 +98,16 @@ dependencies:
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     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
@@ -122,62 +122,90 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.1.2
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.34.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.34.0
+- !ruby/object:Gem::Dependency
+  name: ruby_event_store-browser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.34.0
 - !ruby/object:Gem::Dependency
   name: rails_event_store_active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.34.0
 - !ruby/object:Gem::Dependency
   name: aggregate_root
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.34.0
 - !ruby/object:Gem::Dependency
   name: bounded_context
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.34.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -247,14 +275,18 @@ 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/browser.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
 - lib/rails_event_store/version.rb
 - rails_event_store.gemspec
-- tmp/.keep
 homepage: https://railseventstore.org
 licenses:
 - MIT

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