ruby_event_store 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c14775d70ee44777790b8b916ceee3b7801439494711a701aabb5a8904e8270
-  data.tar.gz: 9c11cdd6cc8a13a8e16749928acb174c1cc11ca5a5e56aae2d9338fbbb42f842
+  metadata.gz: f3c88fc2b8bb6cc690ca8518b0d05e81e648969f21047aaa630c122b3d62d039
+  data.tar.gz: 62de2a86056dfe64d42bcdb58b37054152bda5cec7e8614239ffab7ea06b14a8
 SHA512:
-  metadata.gz: 15c4530f8da5f71f6e411296a7e228ccea5dc0a3b836cfa90d7ba6c9f1462881d85963d1f68e0995f7b86bf27f9ae4981a551e3fbd1aa8b5213238488144ecba
-  data.tar.gz: d925c31f958e72529c43fe4a006e74a0140b37bbddd667e1ac19cebca66963c59903a1aac136f1b080b2977b2019bb5e79c21bf9ab6bca5aa23c9f1db45293a8
+  metadata.gz: 5cd0b9296fdf313dd30ee7d5dc4ce3d09f83b10675da8cf735dbbab8043ee1725e13d3c29e574d3bc16f0e57b7059dc5856f2a406b444cdbb514f511b35bad32
+  data.tar.gz: 40624c5a6101794364f0c952e78b74e127924b6aade3b53e028d7715d72b198ca58bf4a0fe2bc001220e1c4a5f580221ff686ec40994edff2abb6b4bd42b7620

data/.mutant.yml

@@ -0,0 +1 @@
+../.mutant.yml

data/Gemfile

@@ -3,8 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
-eval_gemfile File.expand_path('../support/bundler/Gemfile.shared', __dir__)
+eval_gemfile '../support/bundler/Gemfile.shared'
 
-gem 'protobuf_nested_struct'
-gem 'google-protobuf', '~> 3.12.2', '>= 3.12.2'
-gem 'activesupport', '~> 5.0'
+gem 'activesupport', '6.0.3.4'
+gem 'concurrent-ruby', github: 'ruby-concurrency/concurrent-ruby', ref: 'c4cbc968c55e5b983dae953095761896220c46d1'

data/Gemfile.lock

@@ -0,0 +1,118 @@
+GIT
+  remote: https://github.com/ruby-concurrency/concurrent-ruby.git
+  revision: c4cbc968c55e5b983dae953095761896220c46d1
+  ref: c4cbc968c55e5b983dae953095761896220c46d1
+  specs:
+    concurrent-ruby (1.1.7)
+
+PATH
+  remote: .
+  specs:
+    ruby_event_store (2.0.0)
+      concurrent-ruby (~> 1.0, >= 1.1.6)
+
+GEM
+  remote: https://rubygems.org/
+  remote: https://oss:7AXfeZdAfCqL1PvHm2nvDJO6Zd9UW8IK@gem.mutant.dev/
+  specs:
+    abstract_type (0.0.7)
+    activesupport (6.0.3.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    adamantium (0.2.0)
+      ice_nine (~> 0.11.0)
+      memoizable (~> 0.4.0)
+    anima (0.3.2)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2)
+      equalizer (~> 0.0.11)
+    ast (2.4.1)
+    concord (0.1.6)
+      adamantium (~> 0.2.0)
+      equalizer (~> 0.0.9)
+    diff-lcs (1.4.4)
+    equalizer (0.0.11)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    ice_nine (0.11.2)
+    memoizable (0.4.2)
+      thread_safe (~> 0.3, >= 0.3.1)
+    minitest (5.14.2)
+    mprelude (0.1.0)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      concord (~> 0.1.5)
+      equalizer (~> 0.0.9)
+      ice_nine (~> 0.11.1)
+      procto (~> 0.0.2)
+    mutant (0.10.22)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      anima (~> 0.3.1)
+      ast (~> 2.2)
+      concord (~> 0.1.5)
+      diff-lcs (~> 1.3)
+      equalizer (~> 0.0.9)
+      ice_nine (~> 0.11.1)
+      memoizable (~> 0.4.2)
+      mprelude (~> 0.1.0)
+      parser (~> 3.0.0)
+      procto (~> 0.0.2)
+      unparser (~> 0.5.6)
+      variable (~> 0.0.1)
+    mutant-license (0.1.1.2.1627430819213747598431630701693729869473.0)
+    mutant-rspec (0.10.22)
+      mutant (= 0.10.22)
+      rspec-core (>= 3.8.0, < 4.0.0)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    procto (0.0.3)
+    rake (13.0.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+    unparser (0.5.6)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      anima (~> 0.3.1)
+      concord (~> 0.1.5)
+      diff-lcs (~> 1.3)
+      equalizer (~> 0.0.9)
+      mprelude (~> 0.1.0)
+      parser (>= 3.0.0)
+      procto (~> 0.0.2)
+    variable (0.0.1)
+      equalizer (~> 0.0.11)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (= 6.0.3.4)
+  concurrent-ruby!
+  mutant (~> 0.10.21)
+  mutant-license!
+  mutant-rspec (~> 0.10.21)
+  rake (>= 10.0)
+  rspec (~> 3.6)
+  ruby_event_store!
+
+BUNDLED WITH
+   2.1.4

data/Makefile

@@ -1,7 +1,10 @@
 GEM_VERSION = $(shell cat ../RES_VERSION)
 GEM_NAME    = ruby_event_store
 REQUIRE     = $(GEM_NAME)
-IGNORE      = RubyEventStore::InMemoryRepository\#append_with_synchronize \
+IGNORE      = RubyEventStore::InMemoryRepository\#with_synchronize \
+              RubyEventStore::Client\#initialize \
+              RubyEventStore::Client\#default_clock \
+              RubyEventStore::Client\#default_correlation_id_generator \
               RubyEventStore::Client::Within\#add_thread_subscribers \
               RubyEventStore::Client::Within\#add_thread_global_subscribers \
               RubyEventStore::Client::Within\#call \
@@ -10,7 +13,15 @@ IGNORE      = RubyEventStore::InMemoryRepository\#append_with_synchronize \
               RubyEventStore::Mappers::EncryptionKey\#prepare_decrypt \
               RubyEventStore::Mappers::EncryptionKey\#prepare_auth_data \
               RubyEventStore::Mappers::EncryptionKey\#encrypt_authenticated \
-              RubyEventStore::Mappers::EncryptionKey\#ciphertext_from_authenticated
+              RubyEventStore::Mappers::EncryptionKey\#ciphertext_from_authenticated \
+              RubyEventStore::Mappers::Default\#serializer \
+              RubyEventStore::Mappers::JSONMapper\#serializer \
+              RubyEventStore::Mappers::NullMapper\#serializer \
+              RubyEventStore::Mappers::EncryptionMapper\#serializer \
+              RubyEventStore::Mappers::PipelineMapper\#serializer \
+              RubyEventStore::Mappers::DeprecatedWrapper\#serializer \
+              RubyEventStore::Mappers::InstrumentedMapper\#serializer \
+              RubyEventStore::Mappers::Transformation::Serialization*
 
 SUBJECT     ?= RubyEventStore*
 

data/lib/ruby_event_store.rb

@@ -15,30 +15,27 @@ require 'ruby_event_store/specification_reader'
 require 'ruby_event_store/event'
 require 'ruby_event_store/stream'
 require 'ruby_event_store/expected_version'
+require 'ruby_event_store/record'
 require 'ruby_event_store/serialized_record'
+require 'ruby_event_store/null'
 require 'ruby_event_store/transform_keys'
 require 'ruby_event_store/mappers/encryption_key'
 require 'ruby_event_store/mappers/in_memory_encryption_key_repository'
 require 'ruby_event_store/mappers/transformation/domain_event'
 require 'ruby_event_store/mappers/transformation/encryption'
 require 'ruby_event_store/mappers/transformation/event_class_remapper'
-require 'ruby_event_store/mappers/transformation/item'
-require 'ruby_event_store/mappers/transformation/proto_event'
-require 'ruby_event_store/mappers/transformation/protobuf_encoder'
-require 'ruby_event_store/mappers/transformation/protobuf_nested_struct_metadata'
-require 'ruby_event_store/mappers/transformation/serialization'
-require 'ruby_event_store/mappers/transformation/serialized_record'
 require 'ruby_event_store/mappers/transformation/stringify_metadata_keys'
 require 'ruby_event_store/mappers/transformation/symbolize_metadata_keys'
+require 'ruby_event_store/mappers/transformation/serialization'
 require 'ruby_event_store/mappers/pipeline'
 require 'ruby_event_store/mappers/pipeline_mapper'
+require 'ruby_event_store/mappers/deprecated_wrapper'
 require 'ruby_event_store/mappers/default'
 require 'ruby_event_store/mappers/forgotten_data'
 require 'ruby_event_store/mappers/encryption_mapper'
 require 'ruby_event_store/mappers/instrumented_mapper'
 require 'ruby_event_store/mappers/json_mapper'
 require 'ruby_event_store/mappers/null_mapper'
-require 'ruby_event_store/mappers/protobuf'
 require 'ruby_event_store/batch_enumerator'
 require 'ruby_event_store/correlated_commands'
 require 'ruby_event_store/link_by_metadata'

data/lib/ruby_event_store/broker.rb

@@ -7,10 +7,10 @@ module RubyEventStore
       @dispatcher = dispatcher
     end
 
-    def call(event, serialized_event)
+    def call(event, record)
       subscribers = subscriptions.all_for(event.event_type)
       subscribers.each do |subscriber|
-        dispatcher.call(subscriber, event, serialized_event)
+        dispatcher.call(subscriber, event, record)
       end
     end
 
@@ -35,7 +35,7 @@ module RubyEventStore
     end
 
     private
-    attr_reader :subscriptions, :dispatcher
+    attr_reader :dispatcher, :subscriptions
 
     def verify_subscription(subscriber)
       raise SubscriberNotExist, "subscriber must be first argument or block" unless subscriber

data/lib/ruby_event_store/client.rb

@@ -4,36 +4,40 @@ require 'concurrent'
 
 module RubyEventStore
   class Client
-
     def initialize(repository:,
                    mapper: Mappers::Default.new,
                    subscriptions: Subscriptions.new,
                    dispatcher: Dispatcher.new,
-                   clock: ->{ Time.now.utc })
+                   clock: default_clock,
+                   correlation_id_generator: default_correlation_id_generator)
+
+
       @repository     = repository
-      @mapper         = mapper
+      @mapper         = Mappers::DeprecatedWrapper.new(mapper)
+      @subscriptions  = subscriptions
       @broker         = Broker.new(subscriptions: subscriptions, dispatcher: dispatcher)
       @clock          = clock
       @metadata       = Concurrent::ThreadLocalVar.new
+      @correlation_id_generator = correlation_id_generator
     end
 
 
     # Persists events and notifies subscribed handlers about them
     #
-    # @param events [Array<Event, Proto>, Event, Proto] event(s)
+    # @param events [Array<Event>, Event] event(s)
     # @param stream_name [String] name of the stream for persisting events.
     # @param expected_version [:any, :auto, :none, Integer] controls optimistic locking strategy. {http://railseventstore.org/docs/expected_version/ Read more}
     # @return [self]
     def publish(events, stream_name: GLOBAL_STREAM, expected_version: :any)
       enriched_events = enrich_events_metadata(events)
-      serialized_events = serialize_events(enriched_events)
-      append_to_stream_serialized_events(serialized_events, stream_name: stream_name, expected_version: expected_version)
-      enriched_events.zip(serialized_events) do |event, serialized_event|
+      records         = transform(enriched_events)
+      append_records_to_stream(records, stream_name: stream_name, expected_version: expected_version)
+      enriched_events.zip(records) do |event, record|
         with_metadata(
-          correlation_id: event.metadata[:correlation_id] || event.event_id,
+          correlation_id: event.metadata.fetch(:correlation_id),
           causation_id:   event.event_id,
         ) do
-          broker.(event, serialized_event)
+          broker.(event, record)
         end
       end
       self
@@ -44,8 +48,11 @@ module RubyEventStore
     # @param (see #publish)
     # @return [self]
     def append(events, stream_name: GLOBAL_STREAM, expected_version: :any)
-      serialized_events = serialize_events(enrich_events_metadata(events))
-      append_to_stream_serialized_events(serialized_events, stream_name: stream_name, expected_version: expected_version)
+      append_records_to_stream(
+        transform(enrich_events_metadata(events)),
+        stream_name: stream_name,
+        expected_version: expected_version
+      )
       self
     end
 
@@ -120,6 +127,14 @@ module RubyEventStore
       broker.add_global_subscription(subscriber || proc)
     end
 
+    # Get list of handlers subscribed to an event
+    #
+    # @param to [Class, String] type of events to get list of sybscribed handlers
+    # @return [Array<Object, Class>]
+    def subscribers_for(event_type)
+      subscriptions.all_for(event_type.to_s)
+    end
+
     # Builder object for collecting temporary handlers (subscribers)
     # which are active only during the invocation of the provided
     # block of code.
@@ -221,9 +236,22 @@ module RubyEventStore
     # Deserialize event which was serialized for async event handlers
     # {http://railseventstore.org/docs/subscribe/#async-handlers Read more}
     #
-    # @return [Event, Proto] deserialized event
-    def deserialize(event_type:, event_id:, data:, metadata:)
-      mapper.serialized_record_to_event(SerializedRecord.new(event_type: event_type, event_id: event_id, data: data, metadata: metadata))
+    # @return [Event] deserialized event
+    def deserialize(serializer:, event_type:, event_id:, data:, metadata:, timestamp: nil, valid_at: nil)
+      extract_timestamp = lambda do |m|
+        (m[:timestamp] || Time.parse(m.fetch('timestamp'))).iso8601
+      end
+
+      mapper.record_to_event(
+        SerializedRecord.new(
+          event_type: event_type,
+          event_id:   event_id,
+          data:       data,
+          metadata:   metadata,
+          timestamp:  timestamp || timestamp_ = extract_timestamp[serializer.load(metadata)],
+          valid_at:   valid_at  || timestamp_,
+        ).deserialize(serializer)
+      )
     end
 
     # Read additional metadata which will be added for published events
@@ -261,12 +289,10 @@ module RubyEventStore
     #   end
     #   event_store.overwrite(events)
     #
-    # @param events [Array<Event, Proto>, Event, Proto] event(s) to serialize and overwrite again
+    # @param events [Array<Event>, Event] event(s) to serialize and overwrite again
     # @return [self]
     def overwrite(events_or_event)
-      events = Array(events_or_event)
-      serialized_events = serialize_events(events)
-      repository.update_messages(serialized_events)
+      repository.update_messages(transform(Array(events_or_event)))
       self
     end
 
@@ -279,10 +305,8 @@ module RubyEventStore
 
     private
 
-    def serialize_events(events)
-      events.map do |ev|
-        mapper.event_to_serialized_record(ev)
-      end
+    def transform(events)
+      events.map { |ev| mapper.event_to_record(ev) }
     end
 
     def enrich_events_metadata(events)
@@ -293,11 +317,13 @@ module RubyEventStore
 
     def enrich_event_metadata(event)
       metadata.each { |key, value| event.metadata[key] ||= value }
-      event.metadata[:timestamp] ||= clock.call
+      event.metadata[:timestamp]      ||= clock.call
+      event.metadata[:valid_at]       ||= event.metadata.fetch(:timestamp)
+      event.metadata[:correlation_id] ||= correlation_id_generator.call
     end
 
-    def append_to_stream_serialized_events(serialized_events, stream_name:, expected_version:)
-      repository.append_to_stream(serialized_events, Stream.new(stream_name), ExpectedVersion.new(expected_version))
+    def append_records_to_stream(records, stream_name:, expected_version:)
+      repository.append_to_stream(records, Stream.new(stream_name), ExpectedVersion.new(expected_version))
     end
 
     protected
@@ -306,6 +332,14 @@ module RubyEventStore
       @metadata.value = value
     end
 
-    attr_reader :repository, :mapper, :broker, :clock
+    def default_clock
+      ->{ Time.now.utc.round(TIMESTAMP_PRECISION) }
+    end
+
+    def default_correlation_id_generator
+      ->{ SecureRandom.uuid }
+    end
+
+    attr_reader :repository, :mapper, :subscriptions, :broker, :clock, :correlation_id_generator
   end
 end

data/lib/ruby_event_store/composed_dispatcher.rb

@@ -6,10 +6,10 @@ module RubyEventStore
       @dispatchers = dispatchers
     end
 
-    def call(subscriber, event, serialized_event)
+    def call(subscriber, event, record)
       @dispatchers.each do |dispatcher|
         if dispatcher.verify(subscriber)
-          dispatcher.call(subscriber, event, serialized_event)
+          dispatcher.call(subscriber, event, record)
           break
         end
       end

data/lib/ruby_event_store/constants.rb

@@ -3,4 +3,5 @@
 module RubyEventStore
   GLOBAL_STREAM = Object.new
   PAGE_SIZE = 100.freeze
+  TIMESTAMP_PRECISION = 6
 end

data/lib/ruby_event_store/errors.rb

@@ -12,7 +12,6 @@ module RubyEventStore
   EventDuplicatedInStream   = Class.new(Error)
   ReservedInternalName      = Class.new(Error)
   InvalidHandler            = Class.new(Error)
-  ProtobufEncodingFailed    = Class.new(Error)
 
   class EventNotFound < Error
     attr_reader :event_id

data/lib/ruby_event_store/event.rb

@@ -41,6 +41,13 @@ module RubyEventStore
       metadata[:timestamp]
     end
 
+    # Validity time from metadata
+    #
+    # @return [Time, nil]
+    def valid_at
+      metadata[:valid_at]
+    end
+
     # Two events are equal if:
     # * they are of the same class
     # * have identical event id
@@ -116,7 +123,7 @@ module RubyEventStore
     # on correlation_id and message_id of the provided message.
     # {http://railseventstore.org/docs/correlation_causation/ Find out more}
     #
-    # @param other_message [Event, Proto, command] message to correlate with. Most likely an event or a command. Must respond to correlation_id and message_id.
+    # @param other_message [Event, command] message to correlate with. Most likely an event or a command. Must respond to correlation_id and message_id.
     # @return [String] set causation_id
     def correlate_with(other_message)
       self.correlation_id = other_message.correlation_id || other_message.message_id