rails_event_store 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d4e0009af4124fcd60998861a6a397048887b9e5b3ea57dcf5356b2fd3c2c0
-  data.tar.gz: f62347ca2d8bf35e365647b09720c6410cb0096b1c512f11176c77f09cc7a808
+  metadata.gz: b76f46be4f7d613e250ca140d1da214c785132518e52cd0001e9282aaa3f037d
+  data.tar.gz: 2b44dd20664323a79d47b57ede062ba202f674ea4196ce15e5d51f4f4cae6cb0
 SHA512:
-  metadata.gz: 59fd5ddb62bf2fb5e4db8c28771a1888b63bb6b2bbf3e16b0fc703d50a6e2956e65218eb0d6eb5fd3df417b8d49dc0c04a8eb8296a8e686ce32ee1b3721cfce0
-  data.tar.gz: 8b2720a1bd23f634d5ae5475cad76e39c2a5845f73e99b4059421818af5b2bf34f278186bf807fdb615b146581055e10ab950c6079364262564eb5d789c0cb55
+  metadata.gz: 726f8eed5f15a7697e6c628b0e2a051f9d76497d7488700a4178a65cc712c97ad124c3beb838bca3b58aab7365d9a6658fe8b49162d4b03526d1be4fbc5d49fb
+  data.tar.gz: f8214c5acfc208ad8d840c558a44d59ac41296099b9ca513d05db68d5ab87f4c4be6e26bb39ba27202b7881aa0610f69be97bfd7d90cd994812fdb41a6da35c3

data/Gemfile

@@ -6,6 +6,7 @@ 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/lib/rails_event_store/active_job_dispatcher.rb

@@ -1,71 +1,19 @@
 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
-
-        def rolledback!(*)
-        end
-
-        def before_committed!
-        end
-
-        def add_to_transaction
-          AfterCommit.new.call(@klass, @event)
-        end
-      end
-    end
-
-    class Inline
-      def call(klass, event)
-        klass.perform_later(YAML.dump(event))
-      end
-    end
-  end
-
-  class ActiveJobDispatcher < RubyEventStore::PubSub::Dispatcher
+  class ActiveJobDispatcher < RubyEventStore::AsyncDispatcher
     def initialize(proxy_strategy: AsyncProxyStrategy::Inline.new)
-      @async_proxy_strategy = proxy_strategy
+      super(proxy_strategy: proxy_strategy, scheduler: ActiveJobScheduler.new)
     end
 
-    def call(subscriber, event)
-      if async_handler?(subscriber)
-        @async_proxy_strategy.call(subscriber, event)
-      else
-        super
+    class ActiveJobScheduler
+      def call(klass, serialized_event)
+        klass.perform_later(serialized_event.to_h)
       end
-    end
 
-    def verify(subscriber)
-      super unless async_handler?(subscriber)
-    end
-
-    private
-
-    def async_handler?(klass)
-      Class === klass && klass < ActiveJob::Base
+      def async_handler?(klass)
+        Class === klass && klass < ActiveJob::Base
+      end
     end
-
   end
-end
+end

data/lib/rails_event_store/all.rb

@@ -1,23 +1,29 @@
 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/client'
 require 'rails_event_store/version'
 require 'rails_event_store/railtie'
 require 'rails_event_store/deprecations'
 
 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
+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,39 @@
+module RailsEventStore
+  module AsyncProxyStrategy
+    class AfterCommit
+      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/client.rb

@@ -4,12 +4,14 @@ module RailsEventStore
 
     def initialize(repository: RailsEventStoreActiveRecord::EventRepository.new,
                    mapper: RubyEventStore::Mappers::Default.new,
-                   event_broker: EventBroker.new(dispatcher: ActiveJobDispatcher.new),
+                   subscriptions: RubyEventStore::PubSub::Subscriptions.new,
+                   dispatcher: ActiveJobDispatcher.new,
                    request_metadata: default_request_metadata,
                    page_size: PAGE_SIZE)
       super(repository: repository,
             mapper: mapper,
-            event_broker: event_broker,
+            subscriptions: subscriptions,
+            dispatcher: dispatcher,
             page_size: page_size)
       @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(event_store: event_store, key: key, prefix: prefix)
+    end
+  end
+
+  class LinkByCorrelationId < RubyEventStore::LinkByCorrelationId
+    def initialize(event_store: Rails.configuration.event_store, prefix: nil)
+      super(event_store: event_store, prefix: prefix)
+    end
+  end
+
+  class LinkByCausationId < RubyEventStore::LinkByCausationId
+    def initialize(event_store: Rails.configuration.event_store, prefix: nil)
+      super(event_store: event_store, prefix: prefix)
+    end
+  end
+
+  class LinkByEventType < RubyEventStore::LinkByEventType
+    def initialize(event_store: Rails.configuration.event_store, prefix: nil)
+      super(event_store: event_store, prefix: prefix)
+    end
+  end
+  
+end

data/lib/rails_event_store/version.rb

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

data/rails_event_store.gemspec

@@ -33,11 +33,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'mutant-rspec', '~> 0.8.14'
   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.31.0'
+  spec.add_dependency 'rails_event_store_active_record', '= 0.31.0'
+  spec.add_dependency 'aggregate_root', '= 0.31.0'
+  spec.add_dependency 'bounded_context', '= 0.31.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.31.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,62 +122,76 @@ 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.31.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.31.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.31.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.31.0
 - !ruby/object:Gem::Dependency
   name: aggregate_root
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.31.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.31.0
 - !ruby/object:Gem::Dependency
   name: bounded_context
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.31.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.31.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -248,8 +262,11 @@ files:
 - lib/rails_event_store.rb
 - lib/rails_event_store/active_job_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
 - lib/rails_event_store/version.rb