ruby_event_store-active_record 2.12.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9987cdb6acdbe0954d31ef08815daeea9cf3bab6b0069bf5e03e2a60463bf13e
-  data.tar.gz: bd8b1464de23ef8cc10e256ff90eee0c1851010cd23634f7484e1a1e9dc9544d
+  metadata.gz: 844a72fb4397a85af4951552a503d02f3f46fee88add52b3d4da559da0a578e1
+  data.tar.gz: c09cd8f7af18e4b3a276c09efa2a31f4e3ee5e62d29394f7022ab83ab7763ae5
 SHA512:
-  metadata.gz: 61ceca1ee73adec8f023606dda0afb08f3b00f0bfe09be545ef909b093a71467a097ee2f2cf28224552e4b1c724d9eb23c8dd7b121c2925afc67861b5fccadb6
-  data.tar.gz: 657b3186c572ed9f0e457640f1e5721b01e089aa330edc6886dac2fddd86c8f92b23a62d7a7f0dbf857c0daba9b987843c3997ea413a766fff9984d04ebfecb0
+  metadata.gz: 523f386852a08972217416c04335113e99f8c9bbe167100aed3035bc39e866f83d4cafb59d270ef314fbe974f2e1f23090479407eabe6bb44cf39382e0e953a8
+  data.tar.gz: a1974be5b9e5fe233e9dc27f23e98b4140bc51dced795a61f1cfc714d3af959c6fc6a5da40fd6c5cd508f408fa5a24b2840e7e06a435807c981cd2887ba9133c

data/lib/ruby_event_store/active_record/batch_enumerator.rb

@@ -17,8 +17,8 @@ module RubyEventStore
           batch_limit = [batch_size, total_limit - batch_offset].min
           results, offset_id = reader.call(offset_id, batch_limit)
 
-          break if results.empty?
-          yield results
+          yield results if results.any?
+          break if results.size < batch_size
         end
       end
 

data/lib/ruby_event_store/active_record/event_repository_reader.rb

@@ -96,7 +96,7 @@ module RubyEventStore
           stream = stream.where(newer_than_or_equal_condition(spec)) if spec.newer_than_or_equal
           stream.order(id: order(spec))
         else
-          stream = @stream_klass.preload(:event).where(stream: spec.stream.name)
+          stream = @stream_klass.includes(:event).where(stream: spec.stream.name)
           stream = stream.where(event_id: spec.with_ids) if spec.with_ids?
           stream = stream.joins(:event).where(@event_klass.table_name => { event_type: spec.with_types }) if spec.with_types?
           stream = stream.joins(:event).order(as_at(spec)) if spec.time_sort_by_as_at?

data/lib/ruby_event_store/active_record/generators/database_adapter.rb

@@ -6,13 +6,13 @@ module RubyEventStore
     InvalidDataTypeForAdapter = Class.new(StandardError)
 
     class DatabaseAdapter
-      NOT_SET = Object.new.freeze
+      NONE = Object.new.freeze
 
       class PostgreSQL < self
         SUPPORTED_DATA_TYPES = %w[binary json jsonb].freeze
 
-        def initialize(data_type = NOT_SET)
-          super("postgresql", data_type)
+        def adapter_name
+          "postgresql"
         end
 
         def template_directory
@@ -23,8 +23,8 @@ module RubyEventStore
       class MySQL < self
         SUPPORTED_DATA_TYPES = %w[binary json].freeze
 
-        def initialize(data_type = NOT_SET)
-          super("mysql2", data_type)
+        def adapter_name
+          "mysql2"
         end
 
         def template_directory
@@ -35,21 +35,20 @@ module RubyEventStore
       class SQLite < self
         SUPPORTED_DATA_TYPES = %w[binary].freeze
 
-        def initialize(data_type = NOT_SET)
-          super("sqlite", data_type)
+        def adapter_name
+          "sqlite"
         end
       end
 
-      def initialize(adapter_name, data_type)
+      def initialize(data_type = NONE)
         raise UnsupportedAdapter if instance_of?(DatabaseAdapter)
 
         validate_data_type!(data_type)
 
-        @adapter_name = adapter_name
         @data_type = data_type
       end
 
-      attr_reader :adapter_name, :data_type
+      attr_reader :data_type
 
       def supported_data_types
         self.class::SUPPORTED_DATA_TYPES
@@ -68,7 +67,7 @@ module RubyEventStore
       def template_directory
       end
 
-      def self.from_string(adapter_name, data_type = NOT_SET)
+      def self.from_string(adapter_name, data_type = NONE)
         raise NoMethodError unless eql?(DatabaseAdapter)
 
         case adapter_name.to_s.downcase
@@ -86,7 +85,7 @@ module RubyEventStore
       private
 
       def validate_data_type!(data_type)
-        if !data_type.eql?(NOT_SET) && !supported_data_types.include?(data_type)
+        if !data_type.eql?(NONE) && !supported_data_types.include?(data_type)
           raise InvalidDataTypeForAdapter,
                 "#{class_name} doesn't support #{data_type.inspect}. Supported types are: #{supported_data_types.join(", ")}."
         end

data/lib/ruby_event_store/active_record/generators/foreign_key_on_event_id_migration_generator.rb

@@ -3,10 +3,10 @@
 module RubyEventStore
   module ActiveRecord
     class ForeignKeyOnEventIdMigrationGenerator
-      def call(database_adapter_name, migration_path)
-        database_adapter = DatabaseAdapter.from_string(database_adapter_name)
-        each_migration(database_adapter) do |migration_name|
-          path = build_path(migration_path, migration_name)
+      def call(database_adapter, migration_path)
+        time = Time.now
+        each_migration(database_adapter) do |migration_name, i|
+          path = build_path(migration_path, migration_name, time + i)
           write_to_file(path, migration_code(database_adapter, migration_name))
         end
       end
@@ -22,7 +22,7 @@ module RubyEventStore
           ]
         else
           ['add_foreign_key_on_event_id_to_event_store_events_in_streams']
-        end.each(&block)
+        end.each.with_index(&block)
       end
 
       def absolute_path(path)
@@ -45,16 +45,16 @@ module RubyEventStore
         ::ActiveRecord::Migration.current_version
       end
 
-      def timestamp
-        Time.now.strftime("%Y%m%d%H%M%S")
-      end
-
       def write_to_file(path, migration_code)
         File.write(path, migration_code)
       end
 
-      def build_path(migration_path, migration_name)
-        File.join("#{migration_path}", "#{timestamp}_#{migration_name}.rb")
+      def build_path(migration_path, migration_name, time)
+        File.join("#{migration_path}", "#{migration_verion_number(time)}_#{migration_name}.rb")
+      end
+
+      def migration_verion_number(time)
+        time.strftime("%Y%m%d%H%M%S")
       end
     end
   end

data/lib/ruby_event_store/active_record/generators/rails_foreign_key_on_event_id_migration_generator.rb

@@ -27,13 +27,14 @@ if defined?(Rails::Generators::Base)
         def create_migration
           case @database_adapter
           when DatabaseAdapter::PostgreSQL
+            time = Time.now
             template "#{@database_adapter.template_directory}add_foreign_key_on_event_id_to_event_store_events_in_streams_template.erb",
-                     "db/migrate/#{timestamp}_add_foreign_key_on_event_id_to_event_store_events_in_streams.rb"
+                     "db/migrate/#{migration_verion_number(time)}_add_foreign_key_on_event_id_to_event_store_events_in_streams.rb"
             template "#{@database_adapter.template_directory}validate_add_foreign_key_on_event_id_to_event_store_events_in_streams_template.erb",
-                     "db/migrate/#{timestamp}_validate_add_foreign_key_on_event_id_to_event_store_events_in_streams.rb"
+                     "db/migrate/#{migration_verion_number(time + 1)}_validate_add_foreign_key_on_event_id_to_event_store_events_in_streams.rb"
           else
             template "#{@database_adapter.template_directory}add_foreign_key_on_event_id_to_event_store_events_in_streams_template.erb",
-                     "db/migrate/#{timestamp}_add_foreign_key_on_event_id_to_event_store_events_in_streams.rb"
+                     "db/migrate/#{migration_verion_number(Time.now)}_add_foreign_key_on_event_id_to_event_store_events_in_streams.rb"
           end
         end
 
@@ -47,8 +48,8 @@ if defined?(Rails::Generators::Base)
           ::ActiveRecord::Migration.current_version
         end
 
-        def timestamp
-          Time.now.strftime("%Y%m%d%H%M%S")
+        def migration_verion_number(time)
+          time.strftime("%Y%m%d%H%M%S")
         end
       end
     end

data/lib/ruby_event_store/active_record/generators/templates/add_foreign_key_on_event_id_to_event_store_events_in_streams_template.erb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddForeginKeyOnEventIdToEventStoreEventsInStreams < ActiveRecord::Migration[<%= migration_version %>]
+class AddForeignKeyOnEventIdToEventStoreEventsInStreams < ActiveRecord::Migration[<%= migration_version %>]
   def change
     add_foreign_key :event_store_events_in_streams, :event_store_events, column: :event_id, primary_key: :event_id, if_not_exists: true
   end

data/lib/ruby_event_store/active_record/generators/templates/mysql/add_foreign_key_on_event_id_to_event_store_events_in_streams_template.erb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddForeginKeyOnEventIdToEventStoreEventsInStreams < ActiveRecord::Migration[<%= migration_version %>]
+class AddForeignKeyOnEventIdToEventStoreEventsInStreams < ActiveRecord::Migration[<%= migration_version %>]
   def change
     add_foreign_key :event_store_events_in_streams, :event_store_events, column: :event_id, primary_key: :event_id, if_not_exists: true
   end

data/lib/ruby_event_store/active_record/generators/templates/postgres/add_foreign_key_on_event_id_to_event_store_events_in_streams_template.erb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddForeginKeyOnEventIdToEventStoreEventsInStreams < ActiveRecord::Migration[<%= migration_version %>]
+class AddForeignKeyOnEventIdToEventStoreEventsInStreams < ActiveRecord::Migration[<%= migration_version %>]
   def change
     add_foreign_key :event_store_events_in_streams, :event_store_events, column: :event_id, primary_key: :event_id, if_not_exists: true, validate: false
   end

data/lib/ruby_event_store/active_record/generators/templates/postgres/validate_add_foreign_key_on_event_id_to_event_store_events_in_streams_template.erb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class ValidateAddForeginKeyOnEventIdToEventStoreEventsInStreams < ActiveRecord::Migration[<%= migration_version %>]
+class ValidateAddForeignKeyOnEventIdToEventStoreEventsInStreams < ActiveRecord::Migration[<%= migration_version %>]
   def change
     validate_foreign_key :event_store_events_in_streams, :event_store_events, column: :event_id, primary_key: :event_id
   end

data/lib/ruby_event_store/active_record/tasks/migration_tasks.rake

@@ -2,33 +2,60 @@ require_relative "../generators/migration_generator"
 
 desc "Generate migration"
 task "db:migrations:copy" do
-  data_type =
-    ENV["DATA_TYPE"] || raise("Specify data type (binary, json, jsonb): rake db:migrations:copy DATA_TYPE=json")
-  ::ActiveRecord::Base.establish_connection(ENV["DATABASE_URL"])
-  database_adapter =
-    RubyEventStore::ActiveRecord::DatabaseAdapter.from_string(::ActiveRecord::Base.connection.adapter_name, data_type)
+  task = MigrationTask.new("db:migrations:copy")
+  task.establish_connection
 
   path =
-    RubyEventStore::ActiveRecord::MigrationGenerator.new.call(database_adapter, ENV["MIGRATION_PATH"] || "db/migrate")
+    RubyEventStore::ActiveRecord::MigrationGenerator.new.call(task.adapter, task.migration_path)
 
   puts "Migration file created #{path}"
 end
 
 desc "Generate migration for missing event_id index"
 task "db:migrations:fix_missing_event_id_index" do
-  ::ActiveRecord::Base.establish_connection(ENV["DATABASE_URL"])
+  task = MigrationTask.new("db:migrations:fix_missing_event_id_index")
+  task.establish_connection
 
-  path = RubyEventStore::ActiveRecord::EventIdIndexMigrationGenerator.new.call(ENV["MIGRATION_PATH"] || "db/migrate")
+  path = RubyEventStore::ActiveRecord::EventIdIndexMigrationGenerator.new.call(task.migration_path)
 
   puts "Migration file created #{path}"
 end
 
 desc "Generate migration for adding foreign key on event_store_events_in_streams.event_id"
 task "db:migrations:add_foreign_key_on_event_id" do
-  ::ActiveRecord::Base.establish_connection(ENV["DATABASE_URL"])
+  task = MigrationTask.new("db:migrations:add_foreign_key_on_event_id")
+  task.establish_connection
 
   path =
-    RubyEventStore::ActiveRecord::ForeignKeyOnEventIdMigrationGenerator.new.call(ENV["MIGRATION_PATH"] || "db/migrate")
+    RubyEventStore::ActiveRecord::ForeignKeyOnEventIdMigrationGenerator.new.call(task.adapter, task.migration_path)
 
   puts "Migration file created #{path}"
 end
+
+class MigrationTask
+  def initialize(
+    task,
+    database_url: ENV["DATABASE_URL"],
+    data_type: ENV["DATA_TYPE"],
+    migration_path: ENV["MIGRATION_PATH"]
+  )
+    @task = task
+    @data_type = data_type
+    @migration_path = migration_path
+    @database_url = database_url
+  end
+
+  def establish_connection
+    ::ActiveRecord::Base.establish_connection(@database_url)
+  end
+
+  def adapter
+    data_type = @data_type || raise("Specify data type (binary, json, jsonb): rake #{@task} DATA_TYPE=json")
+
+    RubyEventStore::ActiveRecord::DatabaseAdapter.from_string(::ActiveRecord::Base.connection.adapter_name, data_type)
+  end
+
+  def migration_path
+    @migration_path || "db/migrate"
+  end
+end

data/lib/ruby_event_store/active_record/version.rb

@@ -2,6 +2,6 @@
 
 module RubyEventStore
   module ActiveRecord
-    VERSION = "2.12.0"
+    VERSION = "2.13.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store-active_record
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.13.0
 platform: ruby
 authors:
 - Arkency
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-04 00:00:00.000000000 Z
+date: 2023-12-07 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.12.0
+        version: 2.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Persistent event repository implementation for RubyEventStore based on ActiveRecord