ruby_event_store 0.43.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dec78069a189ba48a3eacb8c3ff06629e9c9067ea21f23480dbb521394fbaeb
-  data.tar.gz: d4d466bf64f7402b5f6341228628cebbd73c1a42aecab7e51362c8a6b4f38bb8
+  metadata.gz: 6b30f1a52e6c803267914de53968b2885b7262c96f86e8399749ffcf189ad967
+  data.tar.gz: 9aa5d056ace06dec409e292e5562b3c6b177cdc4fceec2b98f1f936807b403cf
 SHA512:
-  metadata.gz: 80b4dfbda828a29dfe5cdc0f2606eddc10588822869f6bbd4a880f4407c8d422341ed7e57f639d04c417c15e1ba163343d1bfe51a0f61c23c59aa066443586dc
-  data.tar.gz: 265efe01bb2bb7bf2a3c6a4b68affd55b28aa04392223884359e0164b9a798b7707cb232291ce756877c51be71e36b1ccbca727140c390863697770e989cfa9f
+  metadata.gz: f953e8453922bbc437efafab4716533172d1e1c4c14d0c9ed3c426b569ef4b415edb9095ec95fa47ca70dd92412ab57489111f8d22e216a20033fc838b2bf4e9
+  data.tar.gz: b5ff8f63294fe88bcfe982ec494989c30f1748926990a68310a629b8eaa3c15b995c5ec015c373512c6f1ff3a6f46773d3f1c0f3a4a00b219fdb744f624c6ede

data/Gemfile

@@ -6,5 +6,5 @@ gemspec
 eval_gemfile File.expand_path('../support/bundler/Gemfile.shared', __dir__)
 
 gem 'protobuf_nested_struct'
-gem 'google-protobuf', '~> 3.7.0'
+gem 'google-protobuf', '~> 3.12.2', '>= 3.12.2'
 gem 'activesupport', '~> 5.0'

data/Makefile

@@ -5,6 +5,7 @@ IGNORE      = RubyEventStore::InMemoryRepository\#append_with_synchronize \
               RubyEventStore::Client::Within\#add_thread_subscribers \
               RubyEventStore::Client::Within\#add_thread_global_subscribers \
               RubyEventStore::Client::Within\#call \
+              RubyEventStore::Client\#default_correlation_id_generator \
               RubyEventStore::Mappers::InMemoryEncryptionKeyRepository\#prepare_encrypt \
               RubyEventStore::Mappers::EncryptionKey\#prepare_encrypt \
               RubyEventStore::Mappers::EncryptionKey\#prepare_decrypt \

data/lib/ruby_event_store/batch_enumerator.rb

@@ -10,9 +10,10 @@ module RubyEventStore
 
     def each
       return to_enum unless block_given?
+
       0.step(total_limit - 1, batch_size) do |batch_offset|
-        batch_limit  = [batch_size, total_limit - batch_offset].min
-        result       = reader.call(batch_offset, batch_limit)
+        batch_limit = [batch_size, total_limit - batch_offset].min
+        result      = reader.call(batch_offset, batch_limit)
 
         break if result.empty?
         yield result
@@ -29,6 +30,6 @@ module RubyEventStore
 
     private
 
-    attr_accessor :batch_size, :total_limit, :reader
+    attr_reader :batch_size, :total_limit, :reader
   end
 end

data/lib/ruby_event_store/broker.rb

@@ -8,7 +8,7 @@ module RubyEventStore
     end
 
     def call(event, serialized_event)
-      subscribers = subscriptions.all_for(event.type)
+      subscribers = subscriptions.all_for(event.event_type)
       subscribers.each do |subscriber|
         dispatcher.call(subscriber, event, serialized_event)
       end

data/lib/ruby_event_store/client.rb

@@ -4,17 +4,18 @@ 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
       @broker         = Broker.new(subscriptions: subscriptions, dispatcher: dispatcher)
       @clock          = clock
       @metadata       = Concurrent::ThreadLocalVar.new
+      @correlation_id_generator = correlation_id_generator
     end
 
 
@@ -30,7 +31,7 @@ module RubyEventStore
       append_to_stream_serialized_events(serialized_events, stream_name: stream_name, expected_version: expected_version)
       enriched_events.zip(serialized_events) do |event, serialized_event|
         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)
@@ -293,7 +294,8 @@ 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[:correlation_id] ||= correlation_id_generator.call
     end
 
     def append_to_stream_serialized_events(serialized_events, stream_name:, expected_version:)
@@ -306,6 +308,14 @@ module RubyEventStore
       @metadata.value = value
     end
 
-    attr_reader :repository, :mapper, :broker, :clock
+    def default_clock
+      ->{ Time.now.utc }
+    end
+
+    def default_correlation_id_generator
+      ->{ SecureRandom.uuid }
+    end
+
+    attr_reader :repository, :mapper, :broker, :clock, :correlation_id_generator
   end
 end

data/lib/ruby_event_store/event.rb

@@ -30,24 +30,10 @@ module RubyEventStore
 
     # Type of event. Used when matching with subscribed handlers.
     # @return [String]
-    def type
+    def event_type
       self.class.name
     end
 
-    # Returns a hash representation of the event.
-    #
-    # Metadata is converted to hash as well
-    #
-    # @return [Hash] with :event_id, :metadata, :data, :type keys
-    def to_h
-      {
-          event_id:   event_id,
-          metadata:   metadata.to_h,
-          data:       data,
-          type:       type,
-      }
-    end
-
     # Timestamp from metadata
     #
     # @return [Time, nil]
@@ -140,4 +126,4 @@ module RubyEventStore
 
     alias_method :eql?, :==
   end
-end
+end

data/lib/ruby_event_store/link_by_metadata.rb

@@ -13,7 +13,7 @@ module RubyEventStore
       return unless event.metadata.has_key?(@key)
 
       @event_store.link(
-        [event.message_id],
+        [event.event_id],
         stream_name: "#{@prefix}#{event.metadata.fetch(@key)}"
       )
     end
@@ -48,10 +48,10 @@ module RubyEventStore
 
     def call(event)
       @event_store.link(
-        [event.message_id],
-        stream_name: "#{@prefix}#{event.type}"
+        [event.event_id],
+        stream_name: "#{@prefix}#{event.event_type}"
       )
     end
   end
 
-end
+end

data/lib/ruby_event_store/mappers/protobuf.rb

@@ -2,15 +2,9 @@
 
 module RubyEventStore
   class Proto < RubyEventStore::Event
-    def type
+    def event_type
       data.class.descriptor.name
     end
-
-    def ==(other_event)
-      other_event.instance_of?(self.class) &&
-        other_event.event_id.eql?(event_id) &&
-        other_event.data == data # https://github.com/google/protobuf/issues/4455
-    end
   end
 
   module Mappers

data/lib/ruby_event_store/mappers/transformation/domain_event.rb

@@ -9,7 +9,7 @@ module RubyEventStore
             event_id:   domain_event.event_id,
             metadata:   domain_event.metadata.to_h,
             data:       domain_event.data,
-            event_type: domain_event.type
+            event_type: domain_event.event_type
           )
         end
 

data/lib/ruby_event_store/mappers/transformation/encryption.rb

@@ -82,14 +82,14 @@ module RubyEventStore
 
         def encrypt_data(data, meta)
           meta.reduce(data) do |acc, (key, value)|
-            acc[key] = encrypt_attribute(acc, key, value)
+            acc[key] = encrypt_attribute(acc, key, value) if data.has_key?(key)
             acc
           end
         end
 
         def decrypt_data(data, meta)
           meta.reduce(data) do |acc, (key, value)|
-            acc[key] = decrypt_attribute(data, key, value)
+            acc[key] = decrypt_attribute(data, key, value) if data.has_key?(key)
             acc
           end
         end
@@ -98,7 +98,7 @@ module RubyEventStore
           case meta
           when Leaf
             value = data.fetch(attribute)
-            return unless value
+            return if value.nil?
 
             encryption_key = key_repository.key_of(meta.fetch(:identifier))
             encryption_key.encrypt(serializer.dump(value), meta.fetch(:iv))

data/lib/ruby_event_store/mappers/transformation/protobuf_nested_struct_metadata.rb

@@ -9,8 +9,7 @@ module RubyEventStore
         end
 
         def dump(item)
-          stringify = StringifyMetadataKeys.new
-          metadata = ProtobufNestedStruct::HashMapStringValue.dump(stringify.dump(item).metadata)
+          metadata = ProtobufNestedStruct::HashMapStringValue.dump(item.metadata)
           item.merge(metadata: metadata)
         end
 

data/lib/ruby_event_store/projection.rb

@@ -15,8 +15,8 @@ module RubyEventStore
 
     def initialize(streams: [])
       @streams  = streams
-      @handlers = Hash.new { ->(_, _) {} }
-      @init     = -> { Hash.new }
+      @handlers = {}
+      @init     = -> { {} }
     end
 
     attr_reader :streams, :handlers
@@ -43,7 +43,7 @@ module RubyEventStore
     end
 
     def call(event)
-      handlers.fetch(event.type).(current_state, event)
+      handlers.fetch(event.event_type).(current_state, event)
     end
 
     def handled_events
@@ -51,6 +51,7 @@ module RubyEventStore
     end
 
     def run(event_store, start: nil, count: PAGE_SIZE)
+      return initial_state if handled_events.empty?
       if streams.any?
         reduce_from_streams(event_store, start, count)
       else
@@ -83,6 +84,7 @@ module RubyEventStore
 
     def read_scope(event_store, stream, count, start)
       scope = event_store.read.in_batches(count)
+      scope = scope.of_type(handled_events)
       scope = scope.stream(stream) if stream
       scope = scope.from(start) if start
       scope
@@ -93,7 +95,7 @@ module RubyEventStore
     end
 
     def transition(state, event)
-      handlers[event.type].(state, event)
+      handlers.fetch(event.event_type).call(state, event)
       state
     end
   end

data/lib/ruby_event_store/spec/broker_lint.rb

@@ -1,5 +1,5 @@
 RSpec.shared_examples :broker do |broker_klass|
-  let(:event) { instance_double(::RubyEventStore::Event, type: 'EventType') }
+  let(:event) { instance_double(::RubyEventStore::Event, event_type: 'EventType') }
   let(:serialized_event) { instance_double(::RubyEventStore::SerializedRecord)  }
   let(:handler) { HandlerClass.new }
   let(:subscriptions) { ::RubyEventStore::Subscriptions.new }

data/lib/ruby_event_store/spec/event_lint.rb

@@ -1,9 +1,7 @@
-RSpec.shared_examples :event do |event_class|
+RSpec.shared_examples :event do |event_class, data, metadata|
   it 'allows initialization' do
     expect {
-      metadata = double(:metadata)
-      allow(metadata).to receive(:to_h).and_return({})
-      event_class.new(event_id: Object.new, data: Object.new, metadata: metadata)
+      event_class.new(event_id: Object.new, data: data || Object.new, metadata: metadata || {})
     }.not_to raise_error
   end
 
@@ -29,11 +27,11 @@ RSpec.shared_examples :event do |event_class|
     expect(event.event_id).to eq '1234567890'
   end
 
-  it 'provides type as string' do
+  it 'provides event type as string' do
     event = event_class.new
-    expect(event.type).to be_an_instance_of(String)
-    expect(event.type).not_to eq ''
-    expect(event.type).not_to eq nil
+    expect(event.event_type).to be_an_instance_of(String)
+    expect(event.event_type).not_to eq ''
+    expect(event.event_type).not_to eq nil
   end
 
   it "provides data" do

data/lib/ruby_event_store/spec/mapper_lint.rb

@@ -5,7 +5,7 @@ module RubyEventStore
 
       expect(record).to            be_kind_of(SerializedRecord)
       expect(record.event_id).to   eq(domain_event.event_id)
-      expect(record.event_type).to eq(domain_event.type)
+      expect(record.event_type).to eq(domain_event.event_type)
     end
 
     specify "serialize and deserialize gives equal event" do

data/lib/ruby_event_store/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyEventStore
-  VERSION = "0.43.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store
 version: !ruby/object:Gem::Version
-  version: 0.43.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Arkency
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -105,7 +105,7 @@ metadata:
   changelog_uri: https://github.com/RailsEventStore/rails_event_store/releases
   source_code_uri: https://github.com/RailsEventStore/rails_event_store
   bug_tracker_uri: https://github.com/RailsEventStore/rails_event_store/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -120,8 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Event Store in Ruby
 test_files: []