ruby_event_store 0.22.1 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ca7b23b2a1c5533065ed14f956c2362fd3f83d8
-  data.tar.gz: 2e13648476ce9588576a7594fef6e0d0d852728a
+  metadata.gz: d1f525f7137ed8264fed0f4a6a9a6dbbdd61eb8a
+  data.tar.gz: 7ec64d4322faa52c1a4801536043cd2fd26aa2a5
 SHA512:
-  metadata.gz: 116834c1b91ee8687b4cb6376ae7dbaa24546946080ad486c738a6eafda1141274d75a7302ed26a5fa00aaea0154133a7585c0c4a85c8cf2d2db6dba16d5e720
-  data.tar.gz: 5508e933980aa496e2d0e1d179c06143b36eff5afd721c16e1214c72e78512d587efe9f7f567301965ad1be1b5fd21a8533dfa7da83ddcc40b0f791f4a53cb5f
+  metadata.gz: 9ce82455b9dc557beb7ce246e8c4b01f6cf456b634c7fafee9b477b275e6d9c6823e8214e89ed12399834fc2c0424fe9a4c35e5554c2d546f3bb77c59290eba5
+  data.tar.gz: 26ae782dc1817cf2d547d4a1fbf5b1d5c3b9ab8bc31057658622eea77ae1b1de87a7fc59dfdb10ed32d9121e3e72a93ec835d04b7da39f6a96acd4f10bf98b32

data/Makefile

@@ -10,7 +10,15 @@ test: ## Run tests
 
 mutate: test  ## Run mutation tests
 	@echo "Running mutation tests - only 100% free mutation will be accepted"
-	@bundle exec mutant --include lib --require ruby_event_store --use rspec "RubyEventStore*" --ignore-subject "RubyEventStore.const_missing" --ignore-subject "RubyEventStore::InMemoryRepository#append_with_synchronize" --ignore-subject "RubyEventStore::InMemoryRepository#normalize_to_array" --ignore-subject "RubyEventStore::Client#normalize_to_array" --ignore-subject "RubyEventStore::SerializedRecord"
+	@bundle exec mutant --include lib --require ruby_event_store --use rspec "RubyEventStore*" \
+		--ignore-subject "RubyEventStore.const_missing" \
+		--ignore-subject "RubyEventStore::InMemoryRepository#append_with_synchronize" \
+		--ignore-subject "RubyEventStore::InMemoryRepository#normalize_to_array" \
+		--ignore-subject "RubyEventStore::Client#normalize_to_array" \
+		--ignore-subject "RubyEventStore::SerializedRecord" \
+		--ignore-subject "RubyEventStore::Projection#read_events_from_stream" \
+		--ignore-subject "RubyEventStore::Projection#read_events_from_all_streams"
+
 
 build:
 	@gem build -V ruby_event_store.gemspec

data/lib/ruby_event_store/projection.rb

@@ -58,16 +58,53 @@ module RubyEventStore
     end
 
     private
+    def valid_starting_point?(start)
+      return true if start === :head
+      if streams.any?
+        (start.instance_of?(Array) && start.size === streams.size)
+      else
+        start.instance_of?(String)
+      end
+    end
+
+    def reduce_events(events, initial_state)
+      events.reduce(initial_state, &method(:transition))
+    end
+
+    def read_events_from_stream(event_store, stream_name, start, count)
+      event_store.read_events_forward(stream_name, start: start, count: count)
+    end
+
     def reduce_from_streams(event_store, start, count)
-      raise ArgumentError.new('Start must be an array with event ids or :head') unless (start.instance_of?(Array) && start.size === streams.size) || start === :head
+      raise ArgumentError.new('Start must be an array with event ids or :head') unless valid_starting_point?(start)
       streams.zip(start_events(start)).reduce(initial_state) do |state, (stream_name, start_event_id)|
-        event_store.read_events_forward(stream_name, start: start_event_id, count: count).reduce(state, &method(:transition))
+        reader = ->(from){ read_events_from_stream(event_store, stream_name, from, count) }
+        read(state, start_event_id, reader)
       end
     end
 
+    def read_events_from_all_streams(event_store, start, count)
+      event_store.read_all_streams_forward(start: start, count: count)
+    end
+
     def reduce_from_all_streams(event_store, start, count)
-      raise ArgumentError.new('Start must be valid event id or :head') unless start.instance_of?(String) || start === :head
-      event_store.read_all_streams_forward(start: start, count: count).reduce(initial_state, &method(:transition))
+      raise ArgumentError.new('Start must be valid event id or :head') unless valid_starting_point?(start)
+      reader = ->(from){ read_events_from_all_streams(event_store, from, count) }
+      read(initial_state, start, reader)
+    end
+
+    def read(initial_state, start, reader)
+      state = initial_state
+
+      loop do
+        events = reader.call(start)
+        break if events.empty?
+
+        reduce_events(events, state)
+        start = events.last.event_id
+      end
+
+      state
     end
 
     def start_events(start)

data/lib/ruby_event_store/version.rb

@@ -1,3 +1,3 @@
 module RubyEventStore
-  VERSION = "0.22.1"
+  VERSION = "0.23.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.23.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport