rails_event_store_active_record 0.36.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36a5383474a79cf9cbc254f18f21d93042303fb02bcad2a055808c91fec35495
-  data.tar.gz: 99e12ab33094ea9873b2bd203d8d43976f5eb86ce968ea04f81dd1ad1b8fc895
+  metadata.gz: d0ab57886513b2d851e3f1a3dd245d5a5b56b6f6bc904093d168808b2edd4113
+  data.tar.gz: 0ccd5a20a64dd73e25c5c1f0fc304649b2b0f57601c768db59e7dc4c47e626bb
 SHA512:
-  metadata.gz: 1fe6b41a3bbdeb22692c0ab73c52afab4c9cb5da1dd34b5e9a40b9d38f79c9d987469c9e735503d13e4dee9a7c07c9d9b1ccc045d361e537c4ee48a096995e58
-  data.tar.gz: 63ec9fd3e10431d8cdfb7eef15101c76d7669a5b10cec837da0340f04592722e330476ce6d2b6c98af6df5cda19e5e9bd468e05891f90d5051c56c52badcdde5
+  metadata.gz: 7c9d699980582f08680bf71b824b0bfcc9d9c37c9c3ab7aea32a98bebec34d51725dea3f931bef04392ebf801b70d0ddf8d361b20fca7e8a7782a18c7e474d57
+  data.tar.gz: 9ce0d3dc5d62dabc6443c91e187b0467c112ff3c389e19b6158f3e51b7d507acdddcaa81b54e3cd79476681eb52b9c87d3f3f750d499c401b90dc291e967d335

data/lib/rails_event_store_active_record/event_repository.rb

@@ -11,17 +11,18 @@ module RailsEventStoreActiveRecord
     end
 
     def append_to_stream(events, stream, expected_version)
-      add_to_stream(normalize_to_array(events), stream, expected_version, true) do |event|
+      add_to_stream(Array(events), stream, expected_version, true) do |event|
         build_event_record(event).save!
         event.event_id
       end
     end
 
     def link_to_stream(event_ids, stream, expected_version)
-      (normalize_to_array(event_ids) - Event.where(id: event_ids).pluck(:id)).each do |id|
+      event_ids = Array(event_ids)
+      (event_ids - Event.where(id: event_ids).pluck(:id)).each do |id|
         raise RubyEventStore::EventNotFound.new(id)
       end
-      add_to_stream(normalize_to_array(event_ids), stream, expected_version, nil) do |event_id|
+      add_to_stream(event_ids, stream, expected_version, nil) do |event_id|
         event_id
       end
     end
@@ -121,11 +122,6 @@ module RailsEventStoreActiveRecord
       )
     end
 
-    def normalize_to_array(events)
-      return events if events.is_a?(Enumerable)
-      [events]
-    end
-
     def verify_correct_schema_present
       CorrectSchemaVerifier.new.verify
     end

data/lib/rails_event_store_active_record/event_repository_reader.rb

@@ -44,6 +44,7 @@ module RailsEventStoreActiveRecord
       stream = stream.order(position: order(spec)) unless spec.stream.global?
       stream = stream.limit(spec.limit) if spec.limit?
       stream = stream.where(start_condition(spec)) unless spec.head?
+      stream = stream.where(stop_condition(spec)) if spec.stop
       stream = stream.order(id: order(spec))
       stream
     end
@@ -59,6 +60,13 @@ module RailsEventStoreActiveRecord
       [condition, event_record]
     end
 
+    def stop_condition(specification)
+      event_record =
+        EventInStream.find_by!(event_id: specification.stop, stream: normalize_stream_name(specification))
+      condition = specification.forward? ? 'event_store_events_in_streams.id < ?' : 'event_store_events_in_streams.id > ?'
+      [condition, event_record]
+    end
+
     def order(spec)
       spec.forward? ? 'ASC' : 'DESC'
     end

data/lib/rails_event_store_active_record/version.rb

@@ -1,3 +1,3 @@
 module RailsEventStoreActiveRecord
-  VERSION = "0.36.0"
+  VERSION = "0.37.0"
 end

data/rails_event_store_active_record.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'ruby_event_store', '= 0.36.0'
+  spec.add_dependency 'ruby_event_store', '= 0.37.0'
   spec.add_dependency 'activesupport', '>= 3.0'
   spec.add_dependency 'activemodel', '>= 3.0'
   spec.add_dependency 'activerecord-import', '~> 0.21'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_store_active_record
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.36.0
+        version: 0.37.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.36.0
+        version: 0.37.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Active Record events repository for Rails Event Store