rails_event_store_active_record 2.0.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1180031ce1ab5bdb3d3168d7864853b4c223b4018d272b9976eabdaf597f1f95
-  data.tar.gz: f6788c7baec9ab5b36110bfebbb1248d48e7db920c77dfdd166b24b9ac565b5f
+  metadata.gz: 47f9fb4041eeafab89312eabfbf9cada70da41480032fef06dcf3311f0e35d56
+  data.tar.gz: 79e021816506f4e49ff72e6f66f66820c9d588a30d1f3f8736d29cc478400340
 SHA512:
-  metadata.gz: 44369db992b76de8adfa6bfc092895927dd58c0c3a611f1b9f425364b06cbbfbd52f095fb7a740175e14ffd3bf2fd7dcc0ac10cc25ff5594c45933d9c6b37f43
-  data.tar.gz: 685a3d450effc7893d1f765af0d7dddcabc998bed05e3280d1c77bbb548696c173520de075dde9c13f87fc4979c4f78a3076677493a4a2ceeaf85799d7dc18a2
+  metadata.gz: cfc072dd9e99031459dcc037cece006477f08c8b5ec014b592f579b3de403e57b7224a68691548b6e2e1b1d0d735aba841cb7a969f0d22916b8165360f4d64df
+  data.tar.gz: 440e6a1a06e37a05ec12590de43be4445314c8244d480f8a8a2ad261e5adcce05e5aa2115a9001011fcb063779ab6a74ff4e518dc0a463812bebe0eea67c50ff

data/README.md

@@ -1,5 +1,7 @@
 # RailsEventStoreActiveRecord
 
-An Active Record based implementation of events repository for [Rails Event Store](https://github.com/RailsEventStore/rails_event_store).
+Persistent event repository implementation for RubyEventStore based on ActiveRecord. Ships with database schema and migrations suitable for PostgreSQL, MySQL ans SQLite database engines.
 
-This is the default repository used in `rails_event_store` gem.
+Includes repository implementation with linearized writes to achieve log-like properties of streams on top of SQL database engine.
+
+Find out more at [https://railseventstore.org](https://railseventstore.org/)

data/lib/rails_event_store_active_record/event.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'active_record'
+require "active_record"
 
 module RailsEventStoreActiveRecord
   class Event < ::ActiveRecord::Base
     self.primary_key = :id
-    self.table_name = 'event_store_events'
+    self.table_name = "event_store_events"
   end
 
   class EventInStream < ::ActiveRecord::Base
     self.primary_key = :id
-    self.table_name = 'event_store_events_in_streams'
+    self.table_name = "event_store_events_in_streams"
     belongs_to :event, primary_key: :event_id
   end
 end

data/lib/rails_event_store_active_record/event_repository.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/array'
-require 'activerecord-import'
+require "active_support/core_ext/array"
+require "activerecord-import"
 
 module RailsEventStoreActiveRecord
   class EventRepository
@@ -18,7 +18,7 @@ module RailsEventStoreActiveRecord
     def append_to_stream(records, stream, expected_version)
       hashes    = []
       event_ids = []
-      Array(records).each do |record|
+      records.each do |record|
         hashes    << import_hash(record, record.serialize(serializer))
         event_ids << record.event_id
       end
@@ -28,7 +28,6 @@ module RailsEventStoreActiveRecord
     end
 
     def link_to_stream(event_ids, stream, expected_version)
-      event_ids = Array(event_ids)
       (event_ids - @event_klass.where(event_id: event_ids).pluck(:event_id)).each do |id|
         raise RubyEventStore::EventNotFound.new(id)
       end
@@ -56,7 +55,7 @@ module RailsEventStoreActiveRecord
     end
 
     def update_messages(records)
-      hashes  = Array(records).map{|record| import_hash(record, record.serialize(serializer)) }
+      hashes  = records.map { |record| import_hash(record, record.serialize(serializer)) }
       for_update = records.map(&:event_id)
       start_transaction do
         existing = @event_klass.where(event_id: for_update).pluck(:event_id, :id).to_h
@@ -67,9 +66,15 @@ module RailsEventStoreActiveRecord
     end
 
     def streams_of(event_id)
-      @stream_klass.where(event_id: event_id)
-        .pluck(:stream)
-        .map{|name| RubyEventStore::Stream.new(name)}
+      @repo_reader.streams_of(event_id)
+    end
+
+    def position_in_stream(event_id, stream)
+      @repo_reader.position_in_stream(event_id, stream)
+    end
+
+    def global_position(event_id)
+      @repo_reader.global_position(event_id)
     end
 
     private
@@ -88,7 +93,6 @@ module RailsEventStoreActiveRecord
             event_id: event_id,
           }
         end
-        fill_ids(in_stream)
         @stream_klass.import(in_stream) unless stream.global?
       end
       self
@@ -128,10 +132,6 @@ module RailsEventStoreActiveRecord
       valid_at unless valid_at.eql?(created_at)
     end
 
-    # Overwritten in a sub-class
-    def fill_ids(_in_stream)
-    end
-
     def start_transaction(&block)
       @event_klass.transaction(requires_new: true, &block)
     end

data/lib/rails_event_store_active_record/event_repository_reader.rb

@@ -14,20 +14,14 @@ module RailsEventStoreActiveRecord
     end
 
     def last_stream_event(stream)
-      record_ = @stream_klass.where(stream: stream.name).order('position DESC, id DESC').first
+      record_ = @stream_klass.where(stream: stream.name).order("position DESC, id DESC").first
       record(record_) if record_
     end
 
     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_
@@ -43,9 +37,46 @@ module RailsEventStoreActiveRecord
       read_scope(spec).count
     end
 
+    def streams_of(event_id)
+      @stream_klass.where(event_id: event_id)
+        .pluck(:stream)
+        .map { |name| RubyEventStore::Stream.new(name) }
+    end
+
+    def position_in_stream(event_id, stream)
+      record = @stream_klass.select("position").where(stream: stream.name).find_by(event_id: event_id)
+      raise RubyEventStore::EventNotFoundInStream if record.nil?
+      record.position
+    end
+
+    def global_position(event_id)
+      record = @event_klass.select("id").find_by(event_id: event_id)
+      raise RubyEventStore::EventNotFound.new(event_id) if record.nil?
+      record.id - 1
+    end
+
     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
@@ -65,7 +96,7 @@ module RailsEventStoreActiveRecord
         stream = stream.where(event_id: spec.with_ids)                                                if spec.with_ids?
         stream = stream.where(@event_klass.table_name => {event_type: spec.with_types}) if spec.with_types?
         stream = ordered(stream.joins(:event), spec)
-        stream = stream.order(position: order(spec), id: order(spec))
+        stream = stream.order(id: order(spec))
         stream = stream.limit(spec.limit)                                        if spec.limit?
         stream = stream.where(start_condition(spec))                             if spec.start
         stream = stream.where(stop_condition(spec))                              if spec.stop
@@ -139,7 +170,7 @@ module RailsEventStoreActiveRecord
     end
 
     def order(spec)
-      spec.forward? ? 'ASC' : 'DESC'
+      spec.forward? ? "ASC" : "DESC"
     end
 
     def record(record)

data/lib/rails_event_store_active_record/generators/migration_generator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 begin
-  require 'rails/generators'
+  require "rails/generators"
 rescue LoadError
 end
 
@@ -11,12 +11,12 @@ module RailsEventStoreActiveRecord
 
     DATA_TYPES = %w(binary json jsonb).freeze
 
-    source_root File.expand_path(File.join(File.dirname(__FILE__), '../generators/templates'))
+    source_root File.expand_path(File.join(File.dirname(__FILE__), "../generators/templates"))
     class_option(
       :data_type,
       type: :string,
-      default: 'binary',
-      desc: "Configure the data type for `data` and `meta data` feilds in Postgres migration (options: #{DATA_TYPES.join('/')})"
+      default: "binary",
+      desc: "Configure the data type for `data` and `meta data` fields in Postgres migration (options: #{DATA_TYPES.join('/')})"
     )
 
     def initialize(*args)
@@ -34,15 +34,10 @@ module RailsEventStoreActiveRecord
     private
 
     def data_type
-      options.fetch('data_type')
-    end
-
-    def rails_version
-      Rails::VERSION::STRING
+      options.fetch("data_type")
     end
 
     def migration_version
-      return nil if Gem::Version.new(rails_version) < Gem::Version.new("5.0.0")
       "[4.2]"
     end
 

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

@@ -2,38 +2,42 @@
 
 class CreateEventStoreEvents < ActiveRecord::Migration<%= migration_version %>
   def change
-    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
-      if postgres
-        t.references :event, null: false, type: :uuid
-      else
-        t.references :event, null: false, type: :string, limit: 36
-      end
-      if postgres
+    postgres =
+      ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
+    if postgres
+      create_table(:event_store_events_in_streams, id: :bigserial, force: false) do |t|
+        t.string      :stream,      null: false
+        t.integer     :position,    null: true
+        t.references  :event,       null: false, type: :uuid
         t.datetime    :created_at,  null: false
-      else
-        t.datetime    :created_at,  null: false, precision: 6
       end
-    end
-    add_index :event_store_events_in_streams, [:stream, :position], unique: true
-    add_index :event_store_events_in_streams, [:created_at]
-    add_index :event_store_events_in_streams, [:stream, :event_id], unique: true
+      add_index :event_store_events_in_streams, [:stream, :position], unique: true
+      add_index :event_store_events_in_streams, [:created_at]
+      add_index :event_store_events_in_streams, [:stream, :event_id], unique: true
 
-    if postgres
-      create_table(:event_store_events, force: false) do |t|
+      create_table(:event_store_events, id: :bigserial, force: false) do |t|
         t.references  :event,       null: false, type: :uuid
         t.string      :event_type,  null: false
         t.<%= data_type %>      :metadata
-        t.<%= data_type %>      :data,        null: false
+        t.<%= data_type %>      :data, null: false
         t.datetime    :created_at,  null: false
         t.datetime    :valid_at,    null: true
       end
+      add_index :event_store_events, :event_id, unique: true
+      add_index :event_store_events, :created_at
+      add_index :event_store_events, :valid_at
+      add_index :event_store_events, :event_type
     else
+      create_table(:event_store_events_in_streams, force: false) do |t|
+        t.string      :stream,      null: false
+        t.integer     :position,    null: true
+        t.references  :event,       null: false, type: :string, limit: 36
+        t.datetime    :created_at,  null: false, precision: 6
+      end
+      add_index :event_store_events_in_streams, [:stream, :position], unique: true
+      add_index :event_store_events_in_streams, [:created_at]
+      add_index :event_store_events_in_streams, [:stream, :event_id], unique: true
+
       create_table(:event_store_events, force: false) do |t|
         t.references  :event,       null: false, type: :string, limit: 36
         t.string      :event_type,  null: false
@@ -42,10 +46,10 @@ class CreateEventStoreEvents < ActiveRecord::Migration<%= migration_version %>
         t.datetime    :created_at,  null: false, precision: 6
         t.datetime    :valid_at,    null: true,  precision: 6
       end
+      add_index :event_store_events, :event_id, unique: true
+      add_index :event_store_events, :created_at
+      add_index :event_store_events, :valid_at
+      add_index :event_store_events, :event_type
     end
-    add_index :event_store_events, :event_id, unique: true
-    add_index :event_store_events, :created_at
-    add_index :event_store_events, :valid_at
-    add_index :event_store_events, :event_type
   end
 end

data/lib/rails_event_store_active_record/pg_linearized_event_repository.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'activerecord-import'
+require "activerecord-import"
 
 module RailsEventStoreActiveRecord
   class PgLinearizedEventRepository < EventRepository

data/lib/rails_event_store_active_record/version.rb

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

data/lib/rails_event_store_active_record/with_abstract_base_class.rb

@@ -21,7 +21,7 @@ module RailsEventStoreActiveRecord
       Object.const_set("Event_#{instance_id}",
         Class.new(@base_klass) do
           self.primary_key = :id
-          self.table_name  = 'event_store_events'
+          self.table_name  = "event_store_events"
         end
       )
     end
@@ -30,7 +30,7 @@ module RailsEventStoreActiveRecord
       Object.const_set("EventInStream_#{instance_id}",
         Class.new(@base_klass) do
           self.primary_key = :id
-          self.table_name = 'event_store_events_in_streams'
+          self.table_name = "event_store_events_in_streams"
           belongs_to :event, primary_key: :event_id, class_name: "Event_#{instance_id}"
         end
       )

data/lib/rails_event_store_active_record.rb

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
 
-require 'rails_event_store_active_record/generators/migration_generator'
-require 'rails_event_store_active_record/generators/add_valid_at_generator'
-require 'rails_event_store_active_record/generators/created_at_precision_generator'
-require 'rails_event_store_active_record/generators/no_global_stream_entries_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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_store_active_record
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Arkency
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
@@ -16,42 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
@@ -66,52 +52,36 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
-description: Implementation of events repository based on Rails Active Record for
-  Rails Event Store
-email:
-- dev@arkency.com
+description: |
+  Persistent event repository implementation for RubyEventStore based on ActiveRecord. Ships with database schema
+  and migrations suitable for PostgreSQL, MySQL ans SQLite database engines.
+
+  Includes repository implementation with linearized writes to achieve log-like properties of streams
+  on top of SQL database engine.
+email: dev@arkency.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
 files:
-- ".mutant.yml"
-- CHANGELOG.md
-- Gemfile
-- Gemfile.lock
-- Gemfile.rails_5_0
-- Gemfile.rails_5_0.lock
-- Gemfile.rails_5_1
-- Gemfile.rails_5_1.lock
-- Gemfile.rails_5_2
-- Gemfile.rails_5_2.lock
-- Gemfile.rails_6_0
-- Gemfile.rails_6_0.lock
-- Makefile
 - README.md
 - lib/rails_event_store_active_record.rb
 - lib/rails_event_store_active_record/batch_enumerator.rb
 - lib/rails_event_store_active_record/event.rb
 - lib/rails_event_store_active_record/event_repository.rb
 - lib/rails_event_store_active_record/event_repository_reader.rb
-- lib/rails_event_store_active_record/generators/add_valid_at_generator.rb
-- lib/rails_event_store_active_record/generators/created_at_precision_generator.rb
 - lib/rails_event_store_active_record/generators/migration_generator.rb
-- lib/rails_event_store_active_record/generators/no_global_stream_entries_generator.rb
-- lib/rails_event_store_active_record/generators/templates/add_valid_at_template.rb
 - lib/rails_event_store_active_record/generators/templates/create_event_store_events_template.rb
-- lib/rails_event_store_active_record/generators/templates/created_at_precision_template.rb
-- lib/rails_event_store_active_record/generators/templates/no_global_stream_entries_template.rb
 - lib/rails_event_store_active_record/index_violation_detector.rb
 - lib/rails_event_store_active_record/pg_linearized_event_repository.rb
 - lib/rails_event_store_active_record/version.rb
 - lib/rails_event_store_active_record/with_abstract_base_class.rb
 - lib/rails_event_store_active_record/with_default_models.rb
-- rails_event_store_active_record.gemspec
 homepage: https://railseventstore.org
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://railseventstore.org/
+  homepage_uri: https://railseventstore.org
   changelog_uri: https://github.com/RailsEventStore/rails_event_store/releases
   source_code_uri: https://github.com/RailsEventStore/rails_event_store
   bug_tracker_uri: https://github.com/RailsEventStore/rails_event_store/issues
@@ -123,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -133,5 +103,5 @@ requirements: []
 rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
-summary: Active Record events repository for Rails Event Store
+summary: Persistent event repository implementation for RubyEventStore based on ActiveRecord
 test_files: []