rails_event_store_active_record 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 291ce390bf636caf06d9949f79aa697799079a547b282095afe8f40f27d6c84a
-  data.tar.gz: ea74678de5019d72b1c82779815f12778e01871695aeeed3d704835ea64a9120
+  metadata.gz: c0bef98dccdd36a255c20ef3bd059921c483fe3e9e448bd53c48fa23c6032692
+  data.tar.gz: 02f25563e5d185d4d19fbe79e92d83d2c8abe14281797f2d365db970664f464e
 SHA512:
-  metadata.gz: ae73534ca38d6ecb19bc599aa8ceb0b4e3705a20b38b3981637e0f7a313b3b3e29adb2bffc1048afb4b8c41733a41e0ca51030835271ddcb79d30aae1a8e4204
-  data.tar.gz: 881dd61f6e62165dd76112b8852a20a84283d1de2fa6d601b92a8e859aab9267d55b58e8ee65cb90e04ec0c08d91f3de75c4d05bc35ecc1441443fed879c17a3
+  metadata.gz: 3949e5687ec1647b7257c25cf337f488f012df089226819e4b4198937b72eb8d3d1c1e8d09fbb4cf46711abf583743c49edfd76c00def3f1f5800b555db0fa1e
+  data.tar.gz: 5dd00bbb2a01217095c8e5ed4130582e0f8a23b6cb0fdaf6cb8c94f70afe371648197b3f5cbf8a98e0711e529b3ae87c02619a1372be3679f808ee2367e49f26

data/lib/rails_event_store_active_record.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'rails_event_store_active_record/generators/migration_generator'
-require 'rails_event_store_active_record/event'
-require 'rails_event_store_active_record/with_default_models'
-require 'rails_event_store_active_record/with_abstract_base_class'
-require 'rails_event_store_active_record/event_repository'
-require 'rails_event_store_active_record/batch_enumerator'
-require 'rails_event_store_active_record/event_repository_reader'
-require 'rails_event_store_active_record/index_violation_detector'
-require 'rails_event_store_active_record/pg_linearized_event_repository'
-require 'rails_event_store_active_record/version'
+require_relative 'rails_event_store_active_record/generators/migration_generator'
+require_relative 'rails_event_store_active_record/event'
+require_relative 'rails_event_store_active_record/with_default_models'
+require_relative 'rails_event_store_active_record/with_abstract_base_class'
+require_relative 'rails_event_store_active_record/event_repository'
+require_relative 'rails_event_store_active_record/batch_enumerator'
+require_relative 'rails_event_store_active_record/event_repository_reader'
+require_relative 'rails_event_store_active_record/index_violation_detector'
+require_relative 'rails_event_store_active_record/pg_linearized_event_repository'
+require_relative 'rails_event_store_active_record/version'

data/lib/rails_event_store_active_record/event_repository_reader.rb

@@ -20,14 +20,8 @@ module RailsEventStoreActiveRecord
 
     def read(spec)
       stream = read_scope(spec)
-
       if spec.batched?
-        batch_reader = ->(offset_id, limit) do
-          search_in = spec.stream.global? ? @event_klass.table_name : @stream_klass.table_name
-          records = offset_id.nil? ? stream.limit(limit) : stream.where(start_offset_condition(spec, offset_id, search_in)).limit(limit)
-          [records.map(&method(:record)), records.last]
-        end
-        BatchEnumerator.new(spec.batch_size, spec.limit, batch_reader).each
+        spec.time_sort_by ? offset_limit_batch_reader(spec, stream) : monotonic_id_batch_reader(spec, stream)
       elsif spec.first?
         record_ = stream.first
         record(record_) if record_
@@ -46,6 +40,25 @@ module RailsEventStoreActiveRecord
     private
     attr_reader :serializer
 
+    def offset_limit_batch_reader(spec, stream)
+      batch_reader = ->(offset, limit) do
+        stream
+          .offset(offset)
+          .limit(limit)
+          .map(&method(:record))
+      end
+      RubyEventStore::BatchEnumerator.new(spec.batch_size, spec.limit, batch_reader).each
+    end
+
+    def monotonic_id_batch_reader(spec, stream)
+      batch_reader = ->(offset_id, limit) do
+        search_in = spec.stream.global? ? @event_klass.table_name : @stream_klass.table_name
+        records = offset_id.nil? ? stream.limit(limit) : stream.where(start_offset_condition(spec, offset_id, search_in)).limit(limit)
+        [records.map(&method(:record)), records.last]
+      end
+      BatchEnumerator.new(spec.batch_size, spec.limit, batch_reader).each
+    end
+
     def read_scope(spec)
       if spec.stream.global?
         stream = @event_klass

data/lib/rails_event_store_active_record/generators/templates/create_event_store_events_template.rb

@@ -5,7 +5,6 @@ class CreateEventStoreEvents < ActiveRecord::Migration<%= migration_version %>
     postgres = ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
     sqlite   = ActiveRecord::Base.connection.adapter_name == "SQLite"
 
-    enable_extension "pgcrypto" if postgres
     create_table(:event_store_events_in_streams, force: false) do |t|
       t.string      :stream,      null: false
       t.integer     :position,    null: true

data/lib/rails_event_store_active_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsEventStoreActiveRecord
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_store_active_record
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Arkency
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-04-09 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: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="