ruby_event_store 0.38.1 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae2342adc48ba108f06f9232aa334244c40a5c9ed5ffcf3064ca2eb921e53085
-  data.tar.gz: 1d31c578fe5c5be2fb6b23379d8f12262374baa06bfc256cedeec073bd319d8d
+  metadata.gz: 93c4fb13b69f6c54171be328e0bb2f10ad9172afbad3b367762a831754523700
+  data.tar.gz: e3ee2f58ed04b5df00c2e44685b9f6d1172fce73f8df639d35bae021930af3ae
 SHA512:
-  metadata.gz: ba69556b416acc5ea6d559fd0e607fe57f25cea8ca97bab2796d1b86a353799ac0984635dc9102fbd2b7dd3630b1724d6b6630e2af511c7354027719887ada3c
-  data.tar.gz: 71db45ebec0b62858655d20e71ed91fb30732ff4c714592b1d334c7f2fafba2bc1191431eecd726566378159f394076e978af22379a3efb1e5a6732895650480
+  metadata.gz: 3fd6b0a07e06ec3faf668a57e7564c8d151b567d0b24e07097042a29032ec9e598d430a9107c64d581dcb83f89a4ea52420798ee6039e7b08da5d417db337ef7
+  data.tar.gz: e7426bddb8d654198b340c7aba9d882cb2296bf379dab83dd6182cb824ff3fd3f2839cdc17f2ddd8d3bd4a5f0846cf38c82fa29d9925bc7cc0dac4852fcf9677

data/Gemfile

@@ -1,8 +1,10 @@
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
 gemspec
 
-eval_gemfile File.expand_path('../lib/Gemfile.shared', __dir__)
+eval_gemfile File.expand_path('../support/bundler/Gemfile.shared', __dir__)
 
 gem 'protobuf_nested_struct'
-gem 'google-protobuf', '= 3.6.1', source: 'https://gem.fury.io/pawelpacana/'
+gem 'google-protobuf', '~> 3.7.0'
 gem 'activesupport', '~> 5.0'

data/Makefile

@@ -7,12 +7,15 @@ IGNORE      = RubyEventStore::InMemoryRepository\#append_with_synchronize \
               RubyEventStore::Client::Within\#call \
               RubyEventStore::Mappers::InMemoryEncryptionKeyRepository\#prepare_encrypt \
               RubyEventStore::Mappers::EncryptionKey\#prepare_encrypt \
-              RubyEventStore::Mappers::EncryptionKey\#prepare_decrypt
+              RubyEventStore::Mappers::EncryptionKey\#prepare_decrypt \
+              RubyEventStore::Mappers::EncryptionKey\#prepare_auth_data \
+              RubyEventStore::Mappers::EncryptionKey\#encrypt_authenticated \
+              RubyEventStore::Mappers::EncryptionKey\#ciphertext_from_authenticated
 
 SUBJECT     ?= RubyEventStore*
 
-include ../lib/install.mk
-include ../lib/test.mk
-include ../lib/mutant.mk
-include ../lib/gem.mk
-include ../lib/help.mk
+include ../support/make/install.mk
+include ../support/make/test.mk
+include ../support/make/mutant.mk
+include ../support/make/gem.mk
+include ../support/make/help.mk

data/lib/ruby_event_store/in_memory_repository.rb

@@ -72,7 +72,7 @@ module RubyEventStore
       events = events.select{|e| spec.with_ids.any?{|x| x.eql?(e.event_id)}} if spec.with_ids?
       events = events.select{|e| spec.with_types.any?{|x| x.eql?(e.event_type)}} if spec.with_types?
       events = events.reverse if spec.backward?
-      events = events.drop(index_of(events, spec.start) + 1) unless spec.head?
+      events = events.drop(index_of(events, spec.start) + 1) if spec.start
       events = events.take(index_of(events, spec.stop)) if spec.stop
       events = events[0...spec.limit] if spec.limit?
       events

data/lib/ruby_event_store/mappers/encryption_mapper.rb

@@ -25,7 +25,7 @@ module RubyEventStore
     end
 
     class InMemoryEncryptionKeyRepository
-      DEFAULT_CIPHER = 'aes-256-cbc'.freeze
+      DEFAULT_CIPHER = 'aes-256-gcm'.freeze
 
       def initialize
         @keys = {}
@@ -63,14 +63,25 @@ module RubyEventStore
         crypto     = prepare_encrypt(cipher)
         crypto.iv  = iv
         crypto.key = key
-        crypto.update(message) + crypto.final
+
+        if crypto.authenticated?
+          encrypt_authenticated(crypto, message)
+        else
+          crypto.update(message) + crypto.final
+        end
       end
 
       def decrypt(message, iv)
         crypto     = prepare_decrypt(cipher)
         crypto.iv  = iv
         crypto.key = key
-        (crypto.update(message) + crypto.final).force_encoding("UTF-8")
+        ciphertext =
+          if crypto.authenticated?
+            ciphertext_from_authenticated(crypto, message)
+          else
+            message
+          end
+        (crypto.update(ciphertext) + crypto.final).force_encoding("UTF-8")
       end
 
       def random_iv
@@ -82,6 +93,22 @@ module RubyEventStore
 
       private
 
+      def ciphertext_from_authenticated(crypto, message)
+        prepare_auth_data(crypto)
+        crypto.auth_tag = message[-16...message.length]
+        message[0...-16]
+      end
+
+      def encrypt_authenticated(crypto, message)
+        prepare_auth_data(crypto)
+        crypto.update(message) + crypto.final + crypto.auth_tag
+      end
+
+      def prepare_auth_data(crypto)
+        crypto.auth_data = ""
+        crypto
+      end
+
       def prepare_encrypt(cipher)
         crypto = OpenSSL::Cipher.new(cipher)
         crypto.encrypt

data/lib/ruby_event_store/mappers/null_mapper.rb

@@ -1,13 +1,26 @@
+require 'forwardable'
+
 module RubyEventStore
   module Mappers
     class NullMapper
-      def event_to_serialized_record(domain_event)
-        domain_event
+      extend Forwardable
+      class NULL
+        def self.dump(event)
+          event
+        end
+
+        def self.load(record)
+          record
+        end
       end
+      private_constant :NULL
 
-      def serialized_record_to_event(record)
-        record
+
+      def initialize
+        @mapper = Default.new(serializer: NULL)
       end
+
+      def_delegators :@mapper, :event_to_serialized_record, :serialized_record_to_event
     end
   end
 end

data/lib/ruby_event_store/projection.rb

@@ -49,7 +49,7 @@ module RubyEventStore
       handlers.keys
     end
 
-    def run(event_store, start: :head, count: PAGE_SIZE)
+    def run(event_store, start: nil, count: PAGE_SIZE)
       if streams.any?
         reduce_from_streams(event_store, start, count)
       else
@@ -60,7 +60,7 @@ module RubyEventStore
     private
 
     def valid_starting_point?(start)
-      return true if start === :head
+      return true unless start
       if streams.any?
         (start.instance_of?(Array) && start.size === streams.size)
       else
@@ -69,19 +69,26 @@ module RubyEventStore
     end
 
     def reduce_from_streams(event_store, start, count)
-      raise ArgumentError.new('Start must be an array with event ids or :head') unless valid_starting_point?(start)
+      raise ArgumentError.new('Start must be an array with event ids') unless valid_starting_point?(start)
       streams.zip(start_events(start)).reduce(initial_state) do |state, (stream_name, start_event_id)|
-        event_store.read.in_batches(count).stream(stream_name).from(start_event_id).reduce(state, &method(:transition))
+        read_scope(event_store, stream_name, count, start_event_id).reduce(state, &method(:transition))
       end
     end
 
     def reduce_from_all_streams(event_store, start, count)
-      raise ArgumentError.new('Start must be valid event id or :head') unless valid_starting_point?(start)
-      event_store.read.in_batches(count).from(start).reduce(initial_state, &method(:transition))
+      raise ArgumentError.new('Start must be valid event id') unless valid_starting_point?(start)
+      read_scope(event_store, nil, count, start).reduce(initial_state, &method(:transition))
+    end
+
+    def read_scope(event_store, stream, count, start)
+      scope = event_store.read.in_batches(count)
+      scope = scope.stream(stream) if stream
+      scope = scope.from(start) if start
+      scope
     end
 
     def start_events(start)
-      start === :head ? Array.new(streams.size) { :head } : start
+      start ? start : Array.new
     end
 
     def transition(state, event)

data/lib/ruby_event_store/serialized_record.rb

@@ -2,7 +2,7 @@ module RubyEventStore
   class SerializedRecord
     StringsRequired = Class.new(StandardError)
     def initialize(event_id:, data:, metadata:, event_type:)
-      raise StringsRequired unless [event_id, data, metadata, event_type].all? { |v| v.instance_of?(String) }
+      raise StringsRequired unless [event_id, event_type].all? { |v| v.instance_of?(String) }
       @event_id   = event_id
       @data       = data
       @metadata   = metadata

data/lib/ruby_event_store/spec/event_repository_lint.rb

@@ -1212,9 +1212,7 @@ module RubyEventStore
       expect(repository.count(specification.stream('not-existing-stream').result)).to eq(0)
 
       repository.append_to_stream([SRecord.new(event_type: Type1.to_s)], dummy, version_any)
-      expect(repository.count(specification.from(:head).result)).to eq(5)
       expect(repository.count(specification.from(event_id).result)).to eq(1)
-      expect(repository.count(specification.stream("Dummy").from(:head).result)).to eq(2)
       expect(repository.count(specification.stream("Dummy").from(event_id).result)).to eq(1)
       expect(repository.count(specification.stream("Dummy").to(event_id).result)).to eq(0)
 

data/lib/ruby_event_store/spec/mapper_lint.rb

@@ -0,0 +1,17 @@
+module RubyEventStore
+  RSpec.shared_examples :mapper do |mapper, domain_event|
+    specify "event_to_serialized_record returns instance of SerializedRecord" do
+      record = mapper.event_to_serialized_record(domain_event)
+
+      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)
+    end
+
+    specify "serialize and deserialize gives equal event" do
+      record = mapper.event_to_serialized_record(domain_event)
+
+      expect(mapper.serialized_record_to_event(record)).to eq(domain_event)
+    end
+  end
+end

data/lib/ruby_event_store/specification.rb

@@ -22,23 +22,11 @@ module RubyEventStore
     # Limits the query to events before or after another event.
     # {http://railseventstore.org/docs/read/ Find out more}.
     #
-    # @param start [:head, String] id of event to start reading from.
-    #   :head can mean the beginning or end of the stream, depending on the
-    #   #direction
+    # @param start [String] id of event to start reading from.
     # @return [Specification]
     def from(start)
-      if start.equal?(:head)
-        warn <<~EOW
-          `:head` has been deprecated. Use event_id or skip from instead.
-        EOW
-      end
-      case start
-      when Symbol
-        raise InvalidPageStart unless start.equal?(:head)
-      else
-        raise InvalidPageStart if start.nil? || start.empty?
-        raise EventNotFound.new(start) unless reader.has_event?(start)
-      end
+      raise InvalidPageStart if start.nil? || start.empty?
+      raise EventNotFound.new(start) unless reader.has_event?(start)
       Specification.new(reader, result.dup { |r| r.start = start })
     end
 

data/lib/ruby_event_store/specification_result.rb

@@ -1,7 +1,7 @@
 module RubyEventStore
   class SpecificationResult
     def initialize(direction: :forward,
-                   start: :head,
+                   start: nil,
                    stop: nil,
                    count: nil,
                    stream: Stream.new(GLOBAL_STREAM),
@@ -38,18 +38,10 @@ module RubyEventStore
       attributes.stream
     end
 
-    # Starting position. True is starting from head
+    # Starting position. Event id of starting event
     # {http://railseventstore.org/docs/read/ Find out more}.
     #
-    # @return [Boolean]
-    def head?
-      start.equal?(:head)
-    end
-
-    # Starting position. Event id of starting event or :head
-    # {http://railseventstore.org/docs/read/ Find out more}.
-    #
-    # @return [String|Symbol]
+    # @return [String]
     def start
       attributes.start
     end

data/lib/ruby_event_store/version.rb

@@ -1,3 +1,3 @@
 module RubyEventStore
-  VERSION = "0.38.1"
+  VERSION = "0.39.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store
 version: !ruby/object:Gem::Version
-  version: 0.38.1
+  version: 0.39.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -64,6 +64,7 @@ files:
 - lib/ruby_event_store/spec/dispatcher_lint.rb
 - lib/ruby_event_store/spec/event_lint.rb
 - lib/ruby_event_store/spec/event_repository_lint.rb
+- lib/ruby_event_store/spec/mapper_lint.rb
 - lib/ruby_event_store/spec/scheduler_lint.rb
 - lib/ruby_event_store/spec/subscriptions_lint.rb
 - lib/ruby_event_store/specification.rb
@@ -96,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Event Store in Ruby