ruby_event_store-rom 0.36.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0657b44931013a36c0db15e739957207921bc1344dceffd3046c6ab7636de06
-  data.tar.gz: 52a47bed2d4bd98d83928a28f26e85446b7c1ee3cf574f30cbe773dd8ca08071
+  metadata.gz: cdb72faeabaf9d243e4007d4f178255d256e2539ed233ee64759040d2a7b164b
+  data.tar.gz: ed46bc64d97dd849acdcec553de83579b47ef82c519343c768604316cc6c600e
 SHA512:
-  metadata.gz: 89d84ef8613d86632e570c0179ee3ef273eecd73c0f0e9779e237b0512c0d7690a44a958e5feccf34191bbbfddd10d4f479a520d96d450bf40506483db6a398a
-  data.tar.gz: bc6bfc3cc17b4568b172f15eae603a888d0dcdfbd019a5b5b9620cde86a09c5f1511dbe7ee96611674fa6e175a0008ee59554ce90f3bdefba3fe3ab8f61706f0
+  metadata.gz: 50945fc17724bcb456eea6eed14eee8bac87fde62f0c04c8d65d383ba3fb5b5bca12daedb96f25bcde517d09dbf016a0bf5b63d810b1f52fb3f4de2cd07fb9a8
+  data.tar.gz: 07a8991a92e9be43e93eebdcd9b70d88c454d13f2cb0a34e285ea7018b659d05c2b2ed0491ed197cb38e2759398d6a2623c8e118899311581b23b7ce734ab3fc

data/lib/ruby_event_store/rom/adapters/memory/relations/stream_entries.rb

@@ -65,12 +65,12 @@ module RubyEventStore
           end
 
           DIRECTION_MAP = {
-            forward: [false, :>],
-            backward: [true, :<]
+            forward: [false, :>, :<],
+            backward: [true, :<, :>]
           }.freeze
 
-          def ordered(direction, stream, offset_entry_id = nil)
-            reverse, operator = DIRECTION_MAP[direction]
+          def ordered(direction, stream, offset_entry_id = nil, stop_entry_id = nil)
+            reverse, operator_offset, operator_stop = DIRECTION_MAP[direction]
 
             raise ArgumentError, 'Direction must be :forward or :backward' if order.nil?
 
@@ -78,7 +78,8 @@ module RubyEventStore
             order_columns.delete(:position) if stream.global?
 
             query = by_stream(stream)
-            query = query.restrict { |tuple| tuple[:id].public_send(operator, offset_entry_id) } if offset_entry_id
+            query = query.restrict { |tuple| tuple[:id].public_send(operator_offset, offset_entry_id) } if offset_entry_id
+            query = query.restrict { |tuple| tuple[:id].public_send(operator_stop, stop_entry_id) } if stop_entry_id
             query = query.order(*order_columns)
             query = new(query.dataset.reverse) if reverse
 

data/lib/ruby_event_store/rom/adapters/sql/relations/stream_entries.rb

@@ -40,12 +40,12 @@ module RubyEventStore
           end
 
           DIRECTION_MAP = {
-            forward: %i[asc >],
-            backward: %i[desc <]
+            forward: %i[asc > <],
+            backward: %i[desc < >]
           }.freeze
 
-          def ordered(direction, stream, offset_entry_id = nil)
-            order, operator = DIRECTION_MAP[direction]
+          def ordered(direction, stream, offset_entry_id = nil, stop_entry_id = nil)
+            order, operator_offset, operator_stop = DIRECTION_MAP[direction]
 
             raise ArgumentError, 'Direction must be :forward or :backward' if order.nil?
 
@@ -53,7 +53,8 @@ module RubyEventStore
             order_columns.delete(:position) if stream.global?
 
             query = by_stream(stream)
-            query = query.where { id.public_send(operator, offset_entry_id) } if offset_entry_id
+            query = query.where { id.public_send(operator_offset, offset_entry_id) } if offset_entry_id
+            query = query.where { id.public_send(operator_stop, stop_entry_id) } if stop_entry_id
             query.order { |r| order_columns.map { |c| r[:stream_entries][c].public_send(order) } }
           end
 

data/lib/ruby_event_store/rom/event_repository.rb

@@ -18,7 +18,7 @@ module RubyEventStore
       end
 
       def append_to_stream(events, stream, expected_version)
-        events = normalize_to_array(events)
+        events = Array(events)
         event_ids = events.map(&:event_id)
 
         guard_for(:unique_violation) do
@@ -41,7 +41,7 @@ module RubyEventStore
       end
 
       def link_to_stream(event_ids, stream, expected_version)
-        event_ids = normalize_to_array(event_ids)
+        event_ids = Array(event_ids)
 
         # Validate event IDs
         @events
@@ -100,14 +100,6 @@ module RubyEventStore
         @stream_entries.streams_of(event_id)
                        .map { |name| Stream.new(name) }
       end
-
-      private
-
-      def normalize_to_array(events)
-        return events if events.is_a?(Enumerable)
-
-        [events]
-      end
     end
   end
 end

data/lib/ruby_event_store/rom/repositories/events.rb

@@ -45,7 +45,7 @@ module RubyEventStore
             ).each
           else
             query = query_builder(query, limit: (specification.limit if specification.limit?))
-            if specification.head?
+            if specification.head? && !specification.stop
               specification.first? || specification.last? ? query.first : query.each
             elsif specification.last?
               query.to_ary.last
@@ -65,14 +65,15 @@ module RubyEventStore
 
         def read_scope(specification)
           offset_entry_id = stream_entries.by_stream_and_event_id(specification.stream, specification.start).fetch(:id) unless specification.head?
+          stop_entry_id = stream_entries.by_stream_and_event_id(specification.stream, specification.stop).fetch(:id) if specification.stop
 
           direction = specification.forward? ? :forward : :backward
 
-          if specification.last? && specification.head?
+          if specification.last? && specification.head? && !specification.stop
             direction = specification.forward? ? :backward : :forward
           end
 
-          query = stream_entries.ordered(direction, specification.stream, offset_entry_id)
+          query = stream_entries.ordered(direction, specification.stream, offset_entry_id, stop_entry_id)
           query = query.by_event_id(specification.with_ids) if specification.with_ids
           query = query.by_event_type(specification.with_types) if specification.with_types?
           query

data/lib/ruby_event_store/rom/version.rb

@@ -1,5 +1,5 @@
 module RubyEventStore
   module ROM
-    VERSION = "0.36.0"
+    VERSION = "0.37.0"
   end
 end

data/lib/ruby_event_store/spec/rom/event_repository_lint.rb

@@ -15,8 +15,6 @@ module RubyEventStore::ROM
 
     let(:test_race_conditions_auto)  { rom_helper.has_connection_pooling? }
     let(:test_race_conditions_any)   { rom_helper.has_connection_pooling? }
-    let(:test_expected_version_auto) { true }
-    let(:test_link_events_to_stream) { true }
     let(:test_binary) { false }
     let(:test_change) { rom_helper.supports_upsert? }
 
@@ -27,7 +25,8 @@ module RubyEventStore::ROM
     let(:reader) { RubyEventStore::SpecificationReader.new(repository, mapper) }
     let(:specification) { RubyEventStore::Specification.new(reader) }
 
-    it_behaves_like :event_repository, repository_class
+    require 'ruby_event_store/rom/sql'
+    it_behaves_like :event_repository, repository_class, [ROM::SQL::Error]
 
     specify '#initialize requires ROM::Env' do
       expect { repository_class.new(rom: nil) }.to raise_error do |err|

data/ruby_event_store-rom.gemspec

@@ -26,9 +26,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'dry-initializer', '= 2.5.0'
   spec.add_dependency 'dry-types', '~> 0.12.2'
+  spec.add_dependency 'dry-container', '< 0.7.0'
   spec.add_dependency 'rom-changeset', '>= 1.0'
   spec.add_dependency 'rom-repository', '>= 2.0'
   spec.add_dependency 'rom-sql', '>= 2.4'
-  spec.add_dependency 'ruby_event_store', '= 0.36.0'
+  spec.add_dependency 'ruby_event_store', '= 0.37.0'
   spec.add_dependency 'sequel', '>= 5.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store-rom
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.0
 platform: ruby
 authors:
 - Joel Van Horn
 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: dry-initializer
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.2
+- !ruby/object:Gem::Dependency
+  name: dry-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rom-changeset
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,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: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +196,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: ROM events repository for Ruby Event Store