active_event_store 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e89b6923e7b41bac70b72e2f535d964be074e8a22ada023af08899895a286793
-  data.tar.gz: 29c61f9350f3fc6575e0f95ed799ef164bd275b5c6f7a070f26637793957c6d0
+  metadata.gz: 8791927b35712c61094dcb6cc915e2b27912129e675c84230cd6f5271585902e
+  data.tar.gz: fe58f1151444dc521caa4666adf06dd97d00bc37882843b1252d776683a98dcf
 SHA512:
-  metadata.gz: ae0e00e377d9bebafe57fa92cdfd4c2c6d6fd7005eca1ca7e612400476a2392211d568f5497dfad7299a4445ecb0bbeebdc4e906220521d089da07344fcfa355
-  data.tar.gz: 305cf18193777091f474193a9d5b4591e3ad505a485caafa2bb127bcc1f0ec5794d159857db0503e3a89639bb6a2c2bcd71fc748038dc5d01a0ef046ebf1d4c0
+  metadata.gz: 95f22443b58343d34b93b0400b53c63bf5190ff5f0c8e56c3c96c2e9ebf3d8137bee3136035f7f12d17f8c4488f8bdebef3a4e971eb67dfd17dbafdb48b857ba
+  data.tar.gz: c947302a3db94490b5a781f3fb74bacc0b45d437240599766dd33138147b8807119604105b55034482861254463f4a49919dba2689d52eb16599459c2fe15b7a

data/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## master
 
+## 1.0.0 (2021-01-14)
+
+- Ruby 2.6+, Rails 6+ and RailsEventStore 2.1+ is required.
 ## 0.2.1 (2020-09-30)
 
 - Fix Active Support load hook name. ([@palkan][])

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2020 Vladimir Dementyev
+Copyright (c) 2020-2021 Vladimir Dementyev
 
 MIT License
 

data/README.md

@@ -21,7 +21,7 @@ Add the gem to your project:
 
 ```ruby
 # Gemfile
-gem "active_event_store"
+gem "active_event_store", "~> 1.0"
 ```
 
 Setup database according to the [Rails Event Store docs](https://railseventstore.org/docs/install/#setup-data-model):
@@ -33,8 +33,9 @@ rails db:migrate
 
 ### Requirements
 
-- Ruby (MRI) >= 2.5.0
-- Rails >= 5.0
+- Ruby (MRI) >= 2.6
+- Rails >= 6.0
+- RailsEventStore >= 2.1
 
 ## Usage
 

data/lib/active_event_store/config.rb

@@ -1,11 +1,17 @@
 # frozen_string_literal: true
 
+require "json"
+
 module ActiveEventStore
   class Config
-    attr_writer :repository, :job_queue_name, :store_options
+    attr_writer :repository, :serializer, :job_queue_name, :store_options
 
     def repository
-      @repository ||= RailsEventStoreActiveRecord::EventRepository.new
+      @repository ||= RailsEventStoreActiveRecord::EventRepository.new(serializer: serializer)
+    end
+
+    def serializer
+      @serializer ||= JSON
     end
 
     def job_queue_name

data/lib/active_event_store/engine.rb

@@ -18,7 +18,11 @@ module ActiveEventStore
       # See https://railseventstore.org/docs/subscribe/#scheduling-async-handlers-after-commit
       ActiveEventStore.event_store = RailsEventStore::Client.new(
         dispatcher: RubyEventStore::ComposedDispatcher.new(
-          RailsEventStore::AfterCommitAsyncDispatcher.new(scheduler: RailsEventStore::ActiveJobScheduler.new),
+          RailsEventStore::AfterCommitAsyncDispatcher.new(
+            scheduler: RailsEventStore::ActiveJobScheduler.new(
+              serializer: ActiveEventStore.config.serializer
+            )
+          ),
           RubyEventStore::Dispatcher.new
         ),
         repository: ActiveEventStore.config.repository,

data/lib/active_event_store/event.rb

@@ -68,20 +68,12 @@ module ActiveEventStore
       super(**{event_id: event_id, metadata: metadata, data: params}.compact)
     end
 
-    # RES 0.44+
-    # https://github.com/RailsEventStore/rails_event_store/pull/724
-    if method_defined?(:event_type)
-      def event_type
-        self.class.identifier
-      end
-    else
-      def type
-        self.class.identifier
-      end
-
-      alias event_type type
+    def type
+      self.class.identifier
     end
 
+    alias_method :event_type, :type
+
     def inspect
       "#{self.class.name}<#{event_type}##{message_id}>, data: #{data}, metadata: #{metadata}"
     end

data/lib/active_event_store/mapper.rb

@@ -1,44 +1,44 @@
 # frozen_string_literal: true
 
-require "json"
-
 module ActiveEventStore
-  using(Module.new do
+  using(Module.new {
     refine Hash do
       def symbolize_keys
         RubyEventStore::TransformKeys.symbolize(self)
       end
     end
-  end)
+  })
 
   # Custom mapper for RES events.
   #
   # See https://github.com/RailsEventStore/rails_event_store/blob/v0.35.0/ruby_event_store/lib/ruby_event_store/mappers/default.rb
   class Mapper
-    def initialize(mapping:, serializer: JSON)
+    def initialize(mapping:, serializer: ActiveEventStore.config.serializer)
       @serializer = serializer
       @mapping = mapping
     end
 
-    def event_to_serialized_record(domain_event)
+    def event_to_record(domain_event)
       # lazily add type to mapping
       # NOTE: use class name instead of a class to handle code reload
       # in development (to avoid accessing orphaned classes)
       mapping.register(domain_event.event_type, domain_event.class.name) unless mapping.exist?(domain_event.event_type)
 
-      RubyEventStore::SerializedRecord.new(
+      RubyEventStore::Record.new(
         event_id: domain_event.event_id,
         metadata: serializer.dump(domain_event.metadata.to_h),
         data: serializer.dump(domain_event.data),
-        event_type: domain_event.event_type
+        event_type: domain_event.event_type,
+        timestamp: domain_event.timestamp,
+        valid_at: domain_event.valid_at
       )
     end
 
-    def serialized_record_to_event(record)
-      event_class = mapping.fetch(record.event_type) do
+    def record_to_event(record)
+      event_class = mapping.fetch(record.event_type) {
         raise "Don't know how to deserialize event: \"#{record.event_type}\". " \
-              "Add explicit mapping: ActiveEventStore.mapper.register \"#{record.event_type}\", \"<Class Name>\""
-      end
+              "Add explicit mapping: ActiveEventStore.mapping.register \"#{record.event_type}\", \"<Class Name>\""
+      }
 
       Object.const_get(event_class).new(
         **serializer.load(record.data).symbolize_keys,

data/lib/active_event_store/rspec/have_enqueued_async_subscriber_for.rb

@@ -21,7 +21,10 @@ module ActiveEventStore
       end
 
       def matches?(actual_serialized)
-        actual = ActiveEventStore.event_store.deserialize(actual_serialized)
+        actual = ActiveEventStore.event_store.deserialize(
+          **actual_serialized,
+          serializer: ActiveEventStore.config.serializer
+        )
 
         actual.event_type == event.event_type && data_matches?(actual.data)
       end
@@ -62,9 +65,9 @@ module ActiveEventStore
 end
 
 RSpec.configure do |config|
-  config.include(Module.new do
+  config.include(Module.new {
     def have_enqueued_async_subscriber_for(*args)
       ActiveEventStore::HaveEnqueuedAsyncSubscriberFor.new(*args)
     end
-  end)
+  })
 end

data/lib/active_event_store/subscriber_job.rb

@@ -38,7 +38,7 @@ module ActiveEventStore
     end
 
     def perform(payload)
-      event = event_store.deserialize(payload)
+      event = event_store.deserialize(**payload, serializer: ActiveEventStore.config.serializer)
 
       event_store.with_metadata(**event.metadata.to_h) do
         subscriber.call(event)

data/lib/active_event_store/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveEventStore # :nodoc:
-  VERSION = "0.2.1"
+  VERSION = "1.0.0"
 end

data/lib/active_event_store.rb

@@ -24,8 +24,8 @@ module ActiveEventStore
       @config ||= Config.new
     end
 
-    def subscribe(subscriber = nil, to: nil, sync: false)
-      subscriber ||= Proc.new
+    def subscribe(subscriber = nil, to: nil, sync: false, &block)
+      subscriber ||= block
 
       to ||= infer_event_from_subscriber(subscriber) if subscriber.is_a?(Module)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_event_store
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Vladimir Dementyev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_event_store
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ metadata:
   documentation_uri: http://github.com/palkan/active_event_store
   homepage_uri: http://github.com/palkan/active_event_store
   source_code_uri: http://github.com/palkan/active_event_store
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,15 +119,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Rails Event Store in a more Rails way
 test_files: []