ruby_event_store 0.33.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72b0e4a52d4e09c87ef8b190fd2e310c306469d053b517c3d93facf2fee6a918
-  data.tar.gz: ff0344153ae4e205e709da00b703b3a85605ac0c4c3aafb5b20439adce26a60e
+  metadata.gz: 212817e54f12a8231a77260d38f5c41980d0e0c4d465ac3fae5ef49fb5b5301d
+  data.tar.gz: c24731e1641aa7874d8417acda1550cd182df6d24c79f2f0906bdbb17b0e8e8f
 SHA512:
-  metadata.gz: 1bd120b03290fa27864af3ab4aa7d07cbda4bf1786beb7523103e67d04d02ec2c3fdeb5af6fea9df304a296a658cff944aefd91790ea21839cbc213a53313b60
-  data.tar.gz: 710cba6e537aa3378ad677d72d6f170a91fb2c617e8bdc583aa35f03ebe78d202f0c4c40b48e6a3c88728bbcefc422a7414335d8205c6813ebd87b86b12fb892
+  metadata.gz: d13612719037ba3a5e703f9eb34280968957056a5bd4f53c169817cdeec59c1965c984aeb322843f826e7baa875cd25690f7073900718a0ae2c86fd747d0718e
+  data.tar.gz: eb230b36b3103386bbe315765a165842d1bc287400f6543f8c9b0625a42c7e85e9cbb8583b4fd8897f3429e26bdb021243aac6954802155d8417e37fd8f57063

data/lib/ruby_event_store/batch_enumerator.rb

@@ -18,6 +18,14 @@ module RubyEventStore
       end
     end
 
+    def first
+      each.first
+    end
+
+    def to_a
+      each.to_a
+    end
+
     private
 
     attr_accessor :batch_size, :total_limit, :reader

data/lib/ruby_event_store/client.rb

@@ -255,7 +255,7 @@ module RubyEventStore
     #
     # @example Add data and metadata to existing events
     #
-    #   events = event_store.read.limit(10).each.to_a
+    #   events = event_store.read.limit(10).to_a
     #   events.each do |ev|
     #     ev.data[:tenant_id] = 1
     #     ev.metadata[:server_id] = "eu-west-2"

data/lib/ruby_event_store/deprecated_read_api_rewriter.rb

@@ -40,7 +40,7 @@ module RubyEventStore
       query << ".from(#{start})" if start
       query << ".limit(#{count})" if count
 
-      replace(range, "#{query}.each.to_a")
+      replace(range, "#{query}.to_a")
     end
 
     def parse_args(args)

data/lib/ruby_event_store/errors.rb

@@ -1,17 +1,19 @@
 module RubyEventStore
-  WrongExpectedEventVersion  = Class.new(StandardError)
-  InvalidExpectedVersion     = Class.new(StandardError)
-  IncorrectStreamData        = Class.new(StandardError)
-  SubscriberNotExist         = Class.new(StandardError)
-  InvalidPageStart           = Class.new(ArgumentError)
-  InvalidPageSize            = Class.new(ArgumentError)
-  EventDuplicatedInStream    = Class.new(StandardError)
-  NotSupported               = Class.new(StandardError)
-  ReservedInternalName       = Class.new(StandardError)
-  InvalidHandler             = Class.new(StandardError)
+  WrongExpectedEventVersion = Class.new(StandardError)
+  InvalidExpectedVersion    = Class.new(StandardError)
+  IncorrectStreamData       = Class.new(StandardError)
+  SubscriberNotExist        = Class.new(StandardError)
+  InvalidPageStart          = Class.new(ArgumentError)
+  InvalidPageSize           = Class.new(ArgumentError)
+  EventDuplicatedInStream   = Class.new(StandardError)
+  NotSupported              = Class.new(StandardError)
+  ReservedInternalName      = Class.new(StandardError)
+  InvalidHandler            = Class.new(StandardError)
+  ProtobufEncodingFailed    = Class.new(StandardError)
 
   class EventNotFound < StandardError
     attr_reader :event_id
+
     def initialize(event_id)
       super("Event not found: #{event_id}")
       @event_id = event_id

data/lib/ruby_event_store/event.rb

@@ -12,10 +12,10 @@ module RubyEventStore
     #   part of your domain such as remote_ip, request_id, correlation_id,
     #   causation_id etc.
     # @return [Event]
-    def initialize(event_id: SecureRandom.uuid, metadata: nil, data: nil)
+    def initialize(event_id: SecureRandom.uuid, metadata: nil, data: {})
       @event_id = event_id.to_s
       @metadata = Metadata.new(metadata.to_h)
-      @data     = data.to_h
+      @data     = data
     end
 
     attr_reader :event_id, :metadata, :data

data/lib/ruby_event_store/in_memory_repository.rb

@@ -34,6 +34,7 @@ module RubyEventStore
     def read(spec)
       events = spec.stream.global? ? global : stream_of(spec.stream.name)
       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[0...spec.limit] if spec.limit?
@@ -62,7 +63,7 @@ module RubyEventStore
 
     def streams_of(event_id)
       streams.select do |_, stream_events|
-        stream_events.any? { |event| event.event_id.equal?(event_id) }
+        stream_events.any? { |event| event.event_id.eql?(event_id) }
       end.map { |name, _| Stream.new(name) }
     end
 

data/lib/ruby_event_store/mappers/default.rb

@@ -21,7 +21,7 @@ module RubyEventStore
         event_type = events_class_remapping.fetch(record.event_type) { record.event_type }
         Object.const_get(event_type).new(
           event_id: record.event_id,
-          metadata: serializer.load(record.metadata),
+          metadata: symbolize(serializer.load(record.metadata)),
           data:     serializer.load(record.data)
         )
       end
@@ -30,6 +30,11 @@ module RubyEventStore
 
       attr_reader :serializer, :events_class_remapping
 
+      def symbolize(hash)
+        hash.each_with_object({}) do |(k, v), memo|
+          memo[k.to_sym] = v
+        end
+      end
     end
   end
 end

data/lib/ruby_event_store/mappers/protobuf.rb

@@ -1,11 +1,5 @@
 module RubyEventStore
   class Proto < RubyEventStore::Event
-    def initialize(event_id: SecureRandom.uuid, metadata: nil, data:)
-      @event_id = event_id
-      @metadata = Metadata.new(metadata.to_h)
-      @data     = data
-    end
-
     def type
       data.class.descriptor.name
     end
@@ -47,8 +41,8 @@ module RubyEventStore
       def event_to_serialized_record(domain_event)
         SerializedRecord.new(
           event_id:   domain_event.event_id,
-          metadata:   ProtobufNestedStruct::HashMapStringValue.dump(domain_event.metadata.each_with_object({}){|(k,v),h| h[k.to_s] =v }),
-          data:       domain_event.data.class.encode(domain_event.data),
+          metadata:   ProtobufNestedStruct::HashMapStringValue.dump(domain_event.metadata.each_with_object({}) {|(k, v), h| h[k.to_s] = v}),
+          data:       encode_data(domain_event.data),
           event_type: domain_event.type
         )
       end
@@ -76,6 +70,14 @@ module RubyEventStore
         Google::Protobuf::DescriptorPool.generated_pool.lookup(event_type).msgclass.decode(protobuf_data)
       end
 
+      def encode_data(domain_event_data)
+        begin
+          domain_event_data.class.encode(domain_event_data)
+        rescue NoMethodError
+          raise ProtobufEncodingFailed
+        end
+      end
+
       def require_optional_dependency
         require 'protobuf_nested_struct'
       rescue LoadError

data/lib/ruby_event_store/spec/event_repository_lint.rb

@@ -15,6 +15,13 @@ module RubyEventStore
       )
     end
   end
+
+  # @private
+  Type1 = Class.new(RubyEventStore::Event)
+  # @private
+  Type2 = Class.new(RubyEventStore::Event)
+  # @private
+  Type3 = Class.new(RubyEventStore::Event)
 end
 
 module RubyEventStore
@@ -983,6 +990,17 @@ module RubyEventStore
       )
     end
 
+    specify do
+      expect(repository.read(specification.in_batches.result)).to be_kind_of(Enumerator)
+      events = Array.new(10) { SRecord.new }
+      repository.append_to_stream(
+        events,
+        Stream.new("Dummy"),
+        ExpectedVersion.none
+      )
+      expect(repository.read(specification.in_batches.result)).to be_kind_of(Enumerator)
+    end
+
     specify do
       events = Array.new(400) { SRecord.new }
       repository.append_to_stream(
@@ -1157,10 +1175,9 @@ module RubyEventStore
 
     specify do
       skip unless test_link_events_to_stream
-      event_1 = SRecord.new
-      event_2 = SRecord.new
-      event_3 = SRecord.new
-      event_4 = SRecord.new
+      event_1 = SRecord.new(event_id: '8a6f053e-3ce2-4c82-a55b-4d02c66ae6ea')
+      event_2 = SRecord.new(event_id: '8cee1139-4f96-483a-a175-2b947283c3c7')
+      event_3 = SRecord.new(event_id: 'd345f86d-b903-4d78-803f-38990c078d9e')
       stream_a = Stream.new('Stream A')
       stream_b = Stream.new('Stream B')
       stream_c = Stream.new('Stream C')
@@ -1168,10 +1185,10 @@ module RubyEventStore
       repository.append_to_stream([event_3], stream_b, version_any)
       repository.link_to_stream(event_1.event_id, stream_c, version_none)
 
-      expect(repository.streams_of(event_1.event_id)).to eq [stream_a, stream_c]
-      expect(repository.streams_of(event_2.event_id)).to eq [stream_a]
-      expect(repository.streams_of(event_3.event_id)).to eq [stream_b]
-      expect(repository.streams_of(event_4.event_id)).to eq []
+      expect(repository.streams_of('8a6f053e-3ce2-4c82-a55b-4d02c66ae6ea')).to eq [stream_a, stream_c]
+      expect(repository.streams_of('8cee1139-4f96-483a-a175-2b947283c3c7')).to eq [stream_a]
+      expect(repository.streams_of('d345f86d-b903-4d78-803f-38990c078d9e')).to eq [stream_b]
+      expect(repository.streams_of('d10c8fe9-2163-418d-ba47-88c9a1f9391b')).to eq []
     end
 
     specify do
@@ -1194,6 +1211,20 @@ module RubyEventStore
         '8a6f053e-3ce2-4c82-a55b-4d02c66ae6ea',
         'd345f86d-b903-4d78-803f-38990c078d9e'
       ]).in_batches.result).to_a[0]).to eq([e1,e3])
+      expect(repository.read(specification.with_id([]).result).to_a).to eq([])
+    end
+
+    specify do
+      e1 = SRecord.new(event_type: Type1.to_s)
+      e2 = SRecord.new(event_type: Type2.to_s)
+      e3 = SRecord.new(event_type: Type1.to_s)
+      stream = Stream.new('Stream A')
+      repository.append_to_stream([e1, e2, e3], stream, version_any)
+
+      expect(repository.read(specification.of_type([Type1]).result).to_a).to eq([e1,e3])
+      expect(repository.read(specification.of_type([Type2]).result).to_a).to eq([e2])
+      expect(repository.read(specification.of_type([Type3]).result).to_a).to eq([])
+      expect(repository.read(specification.of_type([Type1, Type2, Type3]).result).to_a).to eq([e1,e2,e3])
     end
   end
 end

data/lib/ruby_event_store/specification.rb

@@ -91,6 +91,15 @@ module RubyEventStore
       end
     end
 
+    # Executes the query based on the specification built up to this point.
+    # Returns array of domain events.
+    # {http://railseventstore.org/docs/read/ Find out more}.
+    #
+    # @return [Array<Event, Proto>]
+    def to_a
+      each.to_a
+    end
+
     # Specifies that events should be obtained in batches.
     # {http://railseventstore.org/docs/read/ Find out more}.
     #
@@ -143,6 +152,15 @@ module RubyEventStore
       reader.one(read_last.result)
     end
 
+    # Limits the query to certain event types.
+    # {http://railseventstore.org/docs/read/ Find out more}.
+    #
+    # @types [Array(Class)] types of event to look for.
+    # @return [Specification]
+    def of_type(types)
+      Specification.new(reader, result.dup{ |r| r.with_types = types })
+    end
+
     # Limits the query to certain events by given even ids.
     # {http://railseventstore.org/docs/read/ Find out more}.
     #
@@ -152,7 +170,7 @@ module RubyEventStore
       Specification.new(reader, result.dup{ |r| r.with_ids = event_ids })
     end
 
-    # Executes the query based on the specification built up to this point.
+    # Reads single event from repository.
     # Returns the event with specified id or nil if event is not found
     # in specified collection of events.
     # {http://railseventstore.org/docs/read/ Find out more}.
@@ -162,8 +180,8 @@ module RubyEventStore
       reader.one(read_first.with_id([event_id]).result)
     end
 
-    # Executes the query based on the specification built up to this point.
-    # Returns the event with specified id or raises [EventNotFound[ error if
+    # Reads single existing event from repository.
+    # Returns the event with specified id or raises [EventNotFound] error if
     # event is not found in specified collection of events.
     # {http://railseventstore.org/docs/read/ Find out more}.
     #
@@ -172,13 +190,13 @@ module RubyEventStore
       event(event_id) or raise EventNotFound.new(event_id)
     end
 
-    # Executes the query based on the specification built up to this point.
+    # Reads all events of given ids from repository.
     # Yields each event (found by id in specified collection of events)
     # read from the store if block given. Otherwise, returns enumerable collection.
     # {http://railseventstore.org/docs/read/ Find out more}.
     #
     # @yield [Event, Proto] event
-    # @return [Enumerator, nil] Enumerator is returned when block not given
+    # @return [Enumerator] Enumerator is returned when block not given
     def events(event_ids)
       with_id(event_ids).each
     end

data/lib/ruby_event_store/specification_result.rb

@@ -6,9 +6,10 @@ module RubyEventStore
                    stream: Stream.new(GLOBAL_STREAM),
                    read_as: :all,
                    batch_size: Specification::DEFAULT_BATCH_SIZE,
-                   with_ids: nil)
-      @attributes = Struct.new(:direction, :start, :count, :stream, :read_as, :batch_size, :with_ids)
-        .new(direction, start, count, stream, read_as, batch_size, with_ids)
+                   with_ids: nil,
+                   with_types: nil)
+      @attributes = Struct.new(:direction, :start, :count, :stream, :read_as, :batch_size, :with_ids, :with_types)
+        .new(direction, start, count, stream, read_as, batch_size, with_ids, with_types)
       freeze
     end
 
@@ -89,7 +90,23 @@ module RubyEventStore
     #
     # @return [Boolean]
     def with_ids?
-      !(with_ids || []).empty?
+      !with_ids.nil?
+    end
+
+    # Event types to be read (if any given)
+    # {http://railseventstore.org/docs/read/ Find out more}.
+    #
+    # @return [Array|nil]
+    def with_types
+      attributes.with_types&.map(&:to_s)
+    end
+
+    # Read by specified event types. True if event types have been specified.
+    # {http://railseventstore.org/docs/read/ Find out more}.
+    #
+    # @return [Boolean]
+    def with_types?
+      !(with_types || []).empty?
     end
 
     # Read strategy. True if items will be read in batches
@@ -163,6 +180,7 @@ module RubyEventStore
     # * read_as
     # * batch_size
     # * with_ids
+    # * with_types
     #
     # @return [Integer]
     def hash
@@ -175,6 +193,7 @@ module RubyEventStore
         attributes.read_as,
         batch_size,
         with_ids,
+        with_types,
       ].hash ^ BIG_VALUE
     end
 

data/lib/ruby_event_store/version.rb

@@ -1,3 +1,3 @@
 module RubyEventStore
-  VERSION = "0.33.0"
+  VERSION = "0.34.0"
 end

data/ruby_event_store.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.6'
-  spec.add_development_dependency 'mutant-rspec', '~> 0.8.17'
+  spec.add_development_dependency 'mutant-rspec', '= 0.8.17'
   spec.add_development_dependency 'parser'
   spec.add_development_dependency 'unparser'
   spec.add_development_dependency 'astrolabe'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.34.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -70,14 +70,14 @@ dependencies:
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.8.17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.8.17
 - !ruby/object:Gem::Dependency
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 3.0.0.beta1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Event Store in Ruby