ruby_event_store-active_record 2.12.1 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9c93dedba2d77d5d9a3b8d72346baae945137d0a454435533114cbc7a12dfe8
-  data.tar.gz: 6a2c214fd8433e874b25f29e5a34ebd7ddc58fe2b0368573bba94bdd919b2f9f
+  metadata.gz: 768f44df1b698a3b20ceb63698ce08c0a33b311e8b93b44c727a3065cb8c27cb
+  data.tar.gz: 1cdde67b7c6199bc27e305da173fc0bdb6a036e730cea0c2f1e01a2545464617
 SHA512:
-  metadata.gz: 723e4cf7240697d8615a65fd2af425650df2b61274857e49665c82a4cf7d8916a904bb7ce3d9f0126955c7da96e43d2f3518e0ed2025170df14cccdde18487c2
-  data.tar.gz: 6ed6cafb966c3a2d60df79fdf4a192f39d32f2425375b5b23c6a51166482663dcf554d16f5e9cf24d227d784242495fba68679419fdb3597d7a859f9c5207fec
+  metadata.gz: 1e63b20b1c818ef39e88c4ed13de111894676e9b804acea6a2442310899b6609d84e1d6e60a0aa2c1c896dcec3eb131650dea7c4b7948eafd91e4dd5c0f20516
+  data.tar.gz: 7b774ec7afa20277cfcec9d0c4fa825fc6822c8ff037cef7c3310c512f324696e3ce80720fe95a8f959d498d60625cbb4f55bef4b0275fbdd036e3b41e081b4a

data/lib/rails_event_store_active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "ruby_event_store/active_record"
 
 RailsEventStoreActiveRecord = RubyEventStore::ActiveRecord

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

@@ -45,10 +45,6 @@ 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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "erb"
 
 module RubyEventStore

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "../generators/migration_generator"
 
 desc "Generate migration"

data/lib/ruby_event_store/active_record/version.rb

@@ -2,6 +2,6 @@
 
 module RubyEventStore
   module ActiveRecord
-    VERSION = "2.12.1"
+    VERSION = "2.14.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.1
+  version: 2.14.0
 platform: ruby
 authors:
 - Arkency
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-05 00:00:00.000000000 Z
+date: 2024-01-29 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.1
+        version: 2.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.14.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.3.7
+rubygems_version: 3.5.5
 signing_key:
 specification_version: 4
 summary: Persistent event repository implementation for RubyEventStore based on ActiveRecord