chrono_model 2.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9dc931f360178771e212906ec3a02d1ff49ffc2393b457a7f531b101bc1e8ce
-  data.tar.gz: 7606b75d5eaf453e0d0f90c760607af50bdf862744f7048cc2c8061f41018bc5
+  metadata.gz: b8e1a4cdc29f1fa0435f82c9277674a7085e6caf445ea45673995864038d8a1b
+  data.tar.gz: 60df7e87f659a392cf22e8a754b608d7d1fc030d4f63a30dde4af1644ab7917d
 SHA512:
-  metadata.gz: e64bea647172199e03703f0f4be8538d48276a8cb02fedb2309a68913ed6dad910d01f9ed4498fe345119ff1a12e25a0dda16f2b5976a0cb1b587dc4548eef4a
-  data.tar.gz: e326f5fce5a0fc94df9e23618840edb6baeaf307e85bbb3449fad7540cd85863be533caca5e30d073fc880a2759ce21ceed74f471dbba4959ead30e9ce43e5b5
+  metadata.gz: 22333be09e65a5347f3413976eea41581b76c7ad94dc138924cd7e5e8f6cb36cd572567f6b195c896a14262d96a3623f7b49116ed2856dcf58441ad4f43ceff2
+  data.tar.gz: 9d96851d9dc3947e485a1c09c89eb06c0e5b07a0ddf9c43e75bdd1c3bb13ca4df599e7f4e8050268ba30c00de7878d1a6c496db1f70b2e3e9c76f0bb10d3d63c

data/LICENSE

@@ -1,8 +1,8 @@
 MIT License
 
-Copyright (c) 2012-2022 Marcello Barnaba <m.barnaba@ifad.org>
-Copyright (c) 2012-2022 Peter J. Brindisi <p.brindisi@ifad.org>
-Copyright (c) 2012-2022 IFAD
+Copyright (c) 2012-2024 Marcello Barnaba <m.barnaba@ifad.org>
+Copyright (c) 2012-2024 Peter J. Brindisi <p.brindisi@ifad.org>
+Copyright (c) 2012-2024 IFAD
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,7 +1,6 @@
 # Temporal database system on PostgreSQL using [updatable views][pg-updatable-views], [table inheritance][pg-table-inheritance] and [INSTEAD OF triggers][pg-instead-of-triggers].
 
 [![Build Status][build-status-badge]][build-status]
-[![Legacy Build Status][legacy-build-status-badge]][build-status]
 [![Code Climate][code-analysis-badge]][code-analysis]
 [![Test Coverage][test-coverage-badge]][test-coverage]
 [![Gem Version][gem-version-badge]][gem-version]
@@ -63,29 +62,24 @@ All timestamps are _forcibly_ stored in as UTC, bypassing the
 
 ## Requirements
 
-* Ruby >= 2.2.2
-* Active Record >= 5.0. See the [detailed supported versions matrix on Ruby GitHub Actions workflows](https://github.com/ifad/chronomodel/blob/master/.github/workflows)
-* PostgreSQL >= 9.4 (legacy support for 9.3)
+* Ruby >= 3.0
+* Active Record >= 7.0. See the [detailed supported versions matrix on Ruby GitHub Actions workflows](https://github.com/ifad/chronomodel/blob/master/.github/workflows)
+* PostgreSQL >= 9.4
 * The `btree_gist` PostgreSQL extension
 
-With Homebrew:
-
-    brew install postgres
-
-With apt:
-
-    apt-get install postgresql-11
-
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'chrono_model'
+```ruby
+gem 'chrono_model'
+```
 
 And then execute:
 
-    $ bundle
-
+```sh
+$ bundle
+```
 
 ## Configuration
 
@@ -100,7 +94,7 @@ development:
 Configure Active Record in your `config/application.rb` to use the `:sql` schema
 format:
 
-```rb
+```ruby
 config.active_record.schema_format = :sql
 ```
 
@@ -122,7 +116,7 @@ view and all the trigger machinery. Every other housekeeping of the temporal
 structure is handled behind the scenes by the other schema statements. E.g.:
 
  * `rename_table`  - renames tables, views, sequences, indexes and triggers
- * `drop_table`    - drops the temporal table and all dependant objects
+ * `drop_table`    - drops the temporal table and all dependent objects
  * `add_column`    - adds the column to the current table and updates triggers
  * `rename_column` - renames the current table column and updates the triggers
  * `remove_column` - removes the current table column and updates the triggers
@@ -193,10 +187,12 @@ occur (see https://github.com/ifad/chronomodel/issues/71).
 In such cases, ensure to add `no_journal: %w( your_counter_cache_column_name )`
 to your `create_table`. Example:
 
-    create_table 'sections', temporal: true, no_journal: %w( articles_count ) do |t|
-      t.string :name
-      t.integer :articles_count, default: 0
-    end
+```ruby
+create_table 'sections', temporal: true, no_journal: %w[articles_count] do |t|
+  t.string :name
+  t.integer :articles_count, default: 0
+end
+```
 
 ## Data querying
 
@@ -283,12 +279,12 @@ cannot be deleted.
 
 ChronoModel currently performs upgrades by dropping and re-creating the views
 that give access to current data. If you have built other database objects on
-these views, the upgrade cannot be performed automatically as the dependant
+these views, the upgrade cannot be performed automatically as the dependent
 objects must be dropped first.
 
 When booting, ChronoModel will issue a warning in your logs about the need of
 a structure upgrade. Structure usually changes across versions. In this case,
-you need to set up a rake task that drops your dependant objects, runs
+you need to set up a rake task that drops your dependent objects, runs
 ChronoModel.upgrade! and then re-creates them.
 
 A migration system should be introduced, but it is seen as overkill for now,
@@ -305,7 +301,9 @@ You need to connect as  a database superuser, because specs need to create the
 
 To run the full test suite, use
 
-    rake
+```sh
+$ rake
+```
 
 SQL queries are logged to `spec/debug.log`. If you want to see them in your
 output, set the `VERBOSE=true` environment variable.
@@ -314,36 +312,22 @@ Some tests check the nominal execution of rake tasks within a test Rails app,
 and those are quite time consuming. You can run the full ChronoModel tests
 only against ActiveRecord by using
 
-    rspec spec/chrono_model
+```sh
+$ rspec spec/chrono_model
+```
 
 Ensure to run the full test suite before pushing.
 
-## Usage with JSON (*not* JSONB) columns
-
-**DEPRECATED**: Please migrate to JSONB. It has an equality operator built-in,
-it's faster and stricter, and offers many more indexing abilities and better
-performance than JSON. It is going to be desupported soon because PostgreSQL 10
-does not support these anymore.
-
-The [JSON][pg-json-type] does not provide an [equality operator][pg-json-func].
-As both unnecessary update suppression and selective journaling require
-comparing the OLD and NEW rows fields, this fails by default.
-
-ChronoModel provides a naive and heavyweight JSON equality operator using
-[pl/python][pg-json-opclass] and associated Postgres objects.
-
-To set up you can use
-
-```ruby
-require 'chrono_model/json'
-ChronoModel::Json.create
-```
-
 ## Caveats
 
- * Rails 4+ support requires disabling tsrange parsing support, as it
-   [is broken][r4-tsrange-broken] and [incomplete][r4-tsrange-incomplete]
-   as of now, mainly due to a [design clash with ruby][pg-tsrange-and-ruby].
+ * Considering the nature of modern applications, it's crucial to understand
+   that the database time does not necessarily align with the application time
+   due to the delay introduced by communication between the application and
+   the database server. Consequently, there is no assurance that the application
+   time will always be less than the database time. Therefore, relying solely
+   on `created_at` and `updated_at` fields as timestamps to determine the state
+   of an object at a specific point in time within the application could
+   lead to inaccuracies.
 
  * The triggers and temporal indexes cannot be saved in schema.rb. The AR
    schema dumper is quite basic, and it isn't (currently) extensible.
@@ -364,13 +348,16 @@ ChronoModel::Json.create
  * Foreign keys are not supported. [See issue #174][gh-issue-174]
 
  * There may be unexpected results when combining eager loading and joins.
-  [See issue #186][gh-issue-186]
+   [See issue #186][gh-issue-186]
 
  * Global ID ignores historical objects. [See issue #192][gh-issue-192]
 
  * Different historical objects are considered the identical. [See issue
    #206][gh-issue-206]
 
+ * Use with caution when implementing inline editing features, as Chronomodel
+   creates a new record for each modification. This will lead to increased
+   storage requirements and bloated history
 
 ## Contributing
 
@@ -402,7 +389,6 @@ This software is Made in Italy :it: :smile:.
 [docs-analysis-badge]: https://inch-ci.org/github/ifad/chronomodel.svg?branch=master
 [gem-version]: https://rubygems.org/gems/chrono_model
 [gem-version-badge]: https://badge.fury.io/rb/chrono_model.svg
-[legacy-build-status-badge]: https://github.com/ifad/chronomodel/actions/workflows/legacy_ruby.yml/badge.svg
 [test-coverage]: https://codeclimate.com/github/ifad/chronomodel
 [test-coverage-badge]: https://codeclimate.com/github/ifad/chronomodel/badges/coverage.svg
 
@@ -423,7 +409,6 @@ This software is Made in Italy :it: :smile:.
 [pg-exclusion-constraints]: https://www.postgresql.org/docs/9.4/sql-createtable.html#SQL-CREATETABLE-EXCLUDE
 [pg-btree-gist]: https://www.postgresql.org/docs/9.4/btree-gist.html
 [pg-comment]: https://www.postgresql.org/docs/9.4/sql-comment.html
-[pg-tsrange-and-ruby]: https://bugs.ruby-lang.org/issues/6864
 [pg-ctes]: https://www.postgresql.org/docs/9.4/queries-with.html
 [pg-cte-optimization-fence]: https://www.postgresql.org/message-id/201209191305.44674.db@kavod.com
 [pg-cte-opt-out-fence]: https://www.postgresql.org/message-id/CAHyXU0zpM5+Dsb_pKxDmm-ZoWUAt=SkHHaiK_DBqcmtxTas6Nw@mail.gmail.com
@@ -431,9 +416,6 @@ This software is Made in Italy :it: :smile:.
 [pg-json-func]: https://www.postgresql.org/docs/9.4/functions-json.html
 [pg-json-opclass]: https://github.com/ifad/chronomodel/blob/master/sql/json_ops.sql
 
-[r4-tsrange-broken]: https://github.com/rails/rails/pull/13793#issuecomment-34608093
-[r4-tsrange-incomplete]: https://github.com/rails/rails/issues/14010
-
 [cm-readme-sql]: https://github.com/ifad/chronomodel/blob/master/README.sql
 [cm-timemachine]: https://github.com/ifad/chronomodel/blob/master/lib/chrono_model/time_machine.rb
 [cm-cte-impl]: https://github.com/ifad/chronomodel/commit/18f4c4b

data/lib/active_record/connection_adapters/chronomodel_adapter.rb

@@ -16,9 +16,7 @@ module ActiveRecord
     def chronomodel_connection(config) # :nodoc:
       return chronomodel_adapter_class.new(config) if ActiveRecord::VERSION::STRING >= '7.1'
 
-      conn_params = config.symbolize_keys
-
-      conn_params.delete_if { |_, v| v.nil? }
+      conn_params = config.symbolize_keys.compact
 
       # Map ActiveRecords param names to PGs.
       conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
@@ -28,7 +26,7 @@ module ActiveRecord
       valid_conn_param_keys = PG::Connection.conndefaults_hash.keys + [:requiressl]
       conn_params.slice!(*valid_conn_param_keys)
 
-      conn = PG.connect(conn_params) if ActiveRecord::VERSION::MAJOR >= 6
+      conn = PG.connect(conn_params)
 
       adapter = ChronoModel::Adapter.new(conn, logger, conn_params, config)
 
@@ -40,10 +38,6 @@ module ActiveRecord
       adapter.chrono_setup!
 
       adapter
-    rescue ::PG::Error => e
-      raise ActiveRecord::NoDatabaseError if e.message.include?(conn_params[:dbname])
-
-      raise
     end
   end
 end

data/lib/active_record/tasks/chronomodel_database_tasks.rb

@@ -24,8 +24,6 @@ module ActiveRecord
         filename = arguments.first
         sql = File.read(filename).gsub(/CREATE SCHEMA (?!IF NOT EXISTS)/, '\&IF NOT EXISTS ')
         File.open(filename, 'w') { |file| file << sql }
-
-        remove_sql_header_comments(filename) if ActiveRecord::VERSION::STRING < '5.1'
       end
 
       def data_dump(target)
@@ -48,15 +46,8 @@ module ActiveRecord
 
       private
 
-      # In Rails 6.1.x the configuration instance variable is not available
-      # and it's been replaced by @configuration_hash (which is frozen).
       def chronomodel_configuration
-        @chronomodel_configuration ||=
-          if defined?(@configuration_hash)
-            @configuration_hash
-          else
-            configuration.with_indifferent_access
-          end
+        @chronomodel_configuration ||= @configuration_hash
       end
 
       # If a schema search path is defined in the configuration file, it will
@@ -77,46 +68,15 @@ module ActiveRecord
 
         chronomodel_schema_search_path = "#{schema_search_path},#{CHRONOMODEL_SCHEMAS.join(',')}"
 
-        if defined?(@configuration_hash)
-          @configuration_hash = @configuration_hash.dup
-          @configuration_hash[:schema_search_path] = chronomodel_schema_search_path
-          @configuration_hash.freeze
-        else
-          configuration['schema_search_path'] = chronomodel_schema_search_path
-        end
+        @configuration_hash = @configuration_hash.dup
+        @configuration_hash[:schema_search_path] = chronomodel_schema_search_path
+        @configuration_hash.freeze
       end
 
       def reset_configuration!
-        if defined?(@configuration_hash)
-          @configuration_hash = @configuration_hash.dup
-          @configuration_hash[:schema_search_path] = @original_schema_search_path
-          @configuration_hash.freeze
-        else
-          configuration['schema_search_path'] = @original_schema_search_path
-        end
-      end
-
-      unless private_instance_methods.include?(:remove_sql_header_comments)
-        def remove_sql_header_comments(filename)
-          sql_comment_begin = '--'
-          removing_comments = true
-          tempfile = Tempfile.open('uncommented_structure.sql')
-          begin
-            File.foreach(filename) do |line|
-              unless removing_comments && (line.start_with?(sql_comment_begin) || line.blank?)
-                tempfile << line
-                removing_comments = false
-              end
-            end
-          ensure
-            tempfile.close
-          end
-          FileUtils.mv(tempfile.path, filename)
-        end
-      end
-
-      unless private_instance_methods.include?(:psql_env)
-        alias psql_env set_psql_env
+        @configuration_hash = @configuration_hash.dup
+        @configuration_hash[:schema_search_path] = @original_schema_search_path
+        @configuration_hash.freeze
       end
 
       def schema_search_path

data/lib/chrono_model/adapter/ddl.rb

@@ -82,7 +82,7 @@ module ChronoModel
       # allow setting the PK to a specific value (think migration scenario).
       #
       def chrono_create_INSERT_trigger(table, pk, current, history, fields, values)
-        execute <<-SQL.strip_heredoc # rubocop:disable Rails/SquishedSQLHeredocs
+        execute <<-SQL.strip_heredoc # rubocop:disable Rails/SquishedSQLHeredocs,Rails/StripHeredoc
             CREATE OR REPLACE FUNCTION chronomodel_#{table}_insert() RETURNS TRIGGER AS $$
                 BEGIN
                     #{insert_sequence_sql(pk, current)} INTO #{current} ( #{pk}, #{fields} )
@@ -135,7 +135,7 @@ module ChronoModel
 
         journal &= columns
 
-        execute <<-SQL.strip_heredoc # rubocop:disable Rails/SquishedSQLHeredocs
+        execute <<-SQL.strip_heredoc # rubocop:disable Rails/SquishedSQLHeredocs,Rails/StripHeredoc
             CREATE OR REPLACE FUNCTION chronomodel_#{table}_update() RETURNS TRIGGER AS $$
                 DECLARE _now timestamp;
                 DECLARE _hid integer;
@@ -189,7 +189,7 @@ module ChronoModel
       # DELETEd in the same transaction.
       #
       def chrono_create_DELETE_trigger(table, pk, current, history)
-        execute <<-SQL.strip_heredoc # rubocop:disable Rails/SquishedSQLHeredocs
+        execute <<-SQL.strip_heredoc # rubocop:disable Rails/SquishedSQLHeredocs,Rails/StripHeredoc
             CREATE OR REPLACE FUNCTION chronomodel_#{table}_delete() RETURNS TRIGGER AS $$
                 DECLARE _now timestamp;
                 BEGIN

data/lib/chrono_model/adapter/upgrade.rb

@@ -42,7 +42,7 @@ module ChronoModel
         return if upgrade.empty?
 
         logger.warn 'ChronoModel: There are tables needing a structure upgrade, and ChronoModel structures need to be recreated.'
-        logger.warn 'ChronoModel: Please run ChronoModel.upgrade! to attempt the upgrade. If you have dependant database objects'
+        logger.warn 'ChronoModel: Please run ChronoModel.upgrade! to attempt the upgrade. If you have dependent database objects'
         logger.warn 'ChronoModel: the upgrade will fail and you have to drop the dependent objects, run .upgrade! and create them'
         logger.warn 'ChronoModel: again. Sorry. Some features or the whole library may not work correctly until upgrade is complete.'
         logger.warn "ChronoModel: Tables pending upgrade: #{upgrade}"

data/lib/chrono_model/adapter.rb

@@ -3,16 +3,10 @@
 require 'active_record/connection_adapters/postgresql_adapter'
 
 require 'chrono_model/adapter/migrations'
-
-if ActiveRecord::VERSION::STRING >= '6.1'
-  require 'chrono_model/adapter/migrations_modules/stable'
-else
-  require 'chrono_model/adapter/migrations_modules/legacy'
-end
+require 'chrono_model/adapter/migrations_modules/stable'
 
 require 'chrono_model/adapter/ddl'
 require 'chrono_model/adapter/indexes'
-require 'chrono_model/adapter/tsrange'
 require 'chrono_model/adapter/upgrade'
 
 module ChronoModel
@@ -24,7 +18,6 @@ module ChronoModel
     include ChronoModel::Adapter::Migrations
     include ChronoModel::Adapter::DDL
     include ChronoModel::Adapter::Indexes
-    include ChronoModel::Adapter::TSRange
     include ChronoModel::Adapter::Upgrade
 
     # The schema holding current data

data/lib/chrono_model/conversions.rb

@@ -4,23 +4,10 @@ module ChronoModel
   module Conversions
     module_function
 
-    ISO_DATETIME = /\A(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)(?:\.(\d+))?\z/.freeze
-
-    # rubocop:disable Style/PerlBackrefs
-    def string_to_utc_time(string)
-      return string if string.is_a?(Time)
-
-      return unless string =~ ISO_DATETIME
-
-      # .1 is .100000, not .000001
-      usec = $7.ljust(6, '0') unless $7.nil?
-
-      Time.utc $1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, usec.to_i
-    end
-    # rubocop:enable Style/PerlBackrefs
+    ISO_DATETIME = /\A(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)(?:\.(\d+))?\z/
 
     def time_to_utc_string(time)
-      time.to_formatted_s(:db) << '.' << format('%06d', time.usec)
+      time.to_fs(:db) << '.' << format('%06d', time.usec)
     end
   end
 end

data/lib/chrono_model/db_console.rb

@@ -2,8 +2,4 @@
 
 require 'chrono_model/patches/db_console'
 
-if Rails.version < '6.1'
-  Rails::DBConsole.prepend ChronoModel::Patches::DBConsole::Config
-else
-  Rails::DBConsole.prepend ChronoModel::Patches::DBConsole::DbConfig
-end
+Rails::DBConsole.prepend ChronoModel::Patches::DBConsole::DbConfig

data/lib/chrono_model/patches/as_of_time_relation.rb

@@ -4,16 +4,6 @@ module ChronoModel
   module Patches
     # This class is a dummy relation whose scope is only to pass around the
     # as_of_time parameters across ActiveRecord call chains.
-    #
-    # With AR 5.2 a simple relation can be used, as the only required argument
-    # is the model. 5.0 and 5.1 require more arguments, that are passed here.
-    #
-    class AsOfTimeRelation < ActiveRecord::Relation
-      if ActiveRecord::VERSION::STRING.to_f < 5.2
-        def initialize(klass, table: klass.arel_table, predicate_builder: klass.predicate_builder, values: {})
-          super(klass, table, predicate_builder, values)
-        end
-      end
-    end
+    class AsOfTimeRelation < ActiveRecord::Relation; end
   end
 end

data/lib/chrono_model/patches/batches.rb

@@ -3,14 +3,10 @@
 module ChronoModel
   module Patches
     module Batches
-      module BatchEnumerator
-        def each(&block)
-          if @relation.try(:history?)
-            @relation.with_hid_pkey { super }
-          else
-            super
-          end
-        end
+      def in_batches(**)
+        return super unless try(:history?)
+
+        with_hid_pkey { super }
       end
     end
   end

data/lib/chrono_model/patches/relation.rb

@@ -5,17 +5,15 @@ module ChronoModel
     module Relation
       include ChronoModel::Patches::AsOfTimeHolder
 
-      if ActiveRecord::Associations::Preloader.instance_methods.include?(:call)
-        def preload_associations(records) # :nodoc:
-          preload = preload_values
-          preload += includes_values unless eager_loading?
-          scope = StrictLoadingScope if strict_loading_value
-
-          preload.each do |associations|
-            ActiveRecord::Associations::Preloader.new(
-              records: records, associations: associations, scope: scope, model: model, as_of_time: as_of_time
-            ).call
-          end
+      def preload_associations(records) # :nodoc:
+        preload = preload_values
+        preload += includes_values unless eager_loading?
+        scope = StrictLoadingScope if strict_loading_value
+
+        preload.each do |associations|
+          ActiveRecord::Associations::Preloader.new(
+            records: records, associations: associations, scope: scope, model: model, as_of_time: as_of_time
+          ).call
         end
       end
 

data/lib/chrono_model/railtie.rb

@@ -7,30 +7,11 @@ module ChronoModel
     TASKS_CLASS = ActiveRecord::Tasks::ChronomodelDatabaseTasks
 
     # Register our database tasks under our adapter name
-    if Rails.version < '5.2'
-      ActiveRecord::Tasks::DatabaseTasks.register_task(/chronomodel/, TASKS_CLASS)
-    else
-      ActiveRecord::Tasks::DatabaseTasks.register_task(/chronomodel/, TASKS_CLASS.to_s)
-    end
+    ActiveRecord::Tasks::DatabaseTasks.register_task(/chronomodel/, TASKS_CLASS.to_s)
 
     rake_tasks do
       def task_config
-        if Rails.version < '6.1'
-          ActiveRecord::Tasks::DatabaseTasks.current_config.with_indifferent_access
-        else
-          ActiveRecord::Base.connection_db_config
-        end
-      end
-
-      if Rails.version < '6.1'
-        # Make schema:dump and schema:load invoke structure:dump and structure:load
-        Rake::Task['db:schema:dump'].clear.enhance(['environment']) do
-          Rake::Task['db:structure:dump'].invoke
-        end
-
-        Rake::Task['db:schema:load'].clear.enhance(['environment']) do
-          Rake::Task['db:structure:load'].invoke
-        end
+        ActiveRecord::Base.connection_db_config
       end
 
       desc 'Dumps database into db/data.NOW.sql or file specified via DUMP='

data/lib/chrono_model/time_machine/history_model.rb

@@ -107,7 +107,7 @@ module ChronoModel
         # name has the "::History" suffix but that is never going to be
         # present in the data.
         #
-        # As such it is overriden here to return the same contents that
+        # As such it is overridden here to return the same contents that
         # the parent would have returned.
         delegate :sti_name, to: :superclass
 
@@ -132,7 +132,7 @@ module ChronoModel
       end
 
       # The history id is `hid`, but this cannot set as primary key
-      # or temporal assocations will break. Solutions are welcome.
+      # or temporal associations will break. Solutions are welcome.
       def id
         hid
       end
@@ -204,24 +204,24 @@ module ChronoModel
         self.class.superclass.find(rid)
       end
 
-      def record # :nodoc:
-        ActiveSupport::Deprecation.warn '.record is deprecated in favour of .current_version'
-        current_version
-      end
-
+      # Return `nil` instead of -Infinity/Infinity to preserve current
+      # Chronomodel behaviour and avoid failures with Rails 7.0 and
+      # unbounded time ranges
+      #
+      # Check if `begin` and `end` are `Time` because validity is a `tsrange`
+      # column, so it is either `Time`, `nil`, and in some cases Infinity.
+      #
+      # Ref: rails/rails#45099
+      # TODO: consider removing when Rails 7.0 support will be dropped
       def valid_from
-        validity.first
+        validity.begin if validity.begin.is_a?(Time)
       end
 
       def valid_to
-        validity.last
+        validity.end if validity.end.is_a?(Time)
       end
       alias as_of_time valid_to
 
-      def recorded_at
-        ChronoModel::Conversions.string_to_utc_time attributes_before_type_cast['recorded_at']
-      end
-
       # Starting from Rails 6.0, `.read_attribute` will use the memoized
       # `primary_key` if it detects that the attribute name is `id`.
       #

data/lib/chrono_model/time_machine/time_query.rb

@@ -46,7 +46,8 @@ module ChronoModel
       end
 
       def time_for_time_query(t, column)
-        if t == :now || t == :today
+        case t
+        when :now, :today
           now_for_column(column)
         else
           quoted_t = connection.quote(connection.quoted_date(t))

data/lib/chrono_model/time_machine/timeline.rb

@@ -59,7 +59,7 @@ module ChronoModel
         relation = relation.from("public.#{quoted_table_name}") unless chrono?
         relation = relation.where(id: rid) if rid
 
-        sql = "SELECT ts FROM ( #{relation.to_sql} ) AS foo WHERE ts IS NOT NULL".dup
+        sql = +"SELECT ts FROM ( #{relation.to_sql} ) AS foo WHERE ts IS NOT NULL"
 
         if options.key?(:before)
           sql << " AND ts < '#{Conversions.time_to_utc_string(options[:before])}'"
@@ -81,9 +81,7 @@ module ChronoModel
         sql << " LIMIT #{options[:limit].to_i}" if options.key?(:limit)
 
         connection.on_schema(Adapter::HISTORY_SCHEMA) do
-          connection.select_values(sql, "#{name} periods").map! do |ts|
-            Conversions.string_to_utc_time ts
-          end
+          connection.select_values(sql, "#{name} periods")
         end
       end
 

data/lib/chrono_model/time_machine.rb

@@ -22,37 +22,28 @@ module ChronoModel
       ChronoModel.history_models[table_name] = history
 
       class << self
-        if Rails.version >= '7.0'
-          def subclasses(with_history: false)
-            subclasses = super()
-            subclasses.reject!(&:history?) unless with_history
-            subclasses
-          end
-
-          def subclasses_with_history
-            subclasses(with_history: true)
-          end
+        def subclasses(with_history: false)
+          subclasses = super()
+          subclasses.reject!(&:history?) unless with_history
+          subclasses
+        end
 
-          # `direct_descendants` is deprecated method in 7.0 and has been
-          # removed in 7.1
-          if method_defined?(:direct_descendants)
-            alias_method :direct_descendants_with_history, :subclasses_with_history
-            alias_method :direct_descendants, :subclasses
-          end
+        def subclasses_with_history
+          subclasses(with_history: true)
+        end
 
-          # Ruby 3.1 has a native subclasses method and descendants is
-          # implemented with recursion of subclasses
-          if Class.method_defined?(:subclasses)
-            def descendants_with_history
-              subclasses_with_history.concat(subclasses.flat_map(&:descendants_with_history))
-            end
-          end
-        else
-          alias_method :descendants_with_history, :descendants
+        # `direct_descendants` is deprecated method in 7.0 and has been
+        # removed in 7.1
+        if method_defined?(:direct_descendants)
+          alias_method :direct_descendants_with_history, :subclasses_with_history
+          alias_method :direct_descendants, :subclasses
+        end
 
-          alias_method :direct_descendants_with_history, :direct_descendants
-          def direct_descendants
-            direct_descendants_with_history.reject(&:history?)
+        # Ruby 3.1 has a native subclasses method and descendants is
+        # implemented with recursion of subclasses
+        if Class.method_defined?(:subclasses)
+          def descendants_with_history
+            subclasses_with_history.concat(subclasses.flat_map(&:descendants_with_history))
           end
         end
 

data/lib/chrono_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ChronoModel
-  VERSION = '2.0.0'
+  VERSION = '4.0.0'
 end

data/lib/chrono_model.rb

@@ -33,7 +33,7 @@ module ChronoModel
   # Computed upon inclusion of the +TimeMachine+ module.
   #
   def self.history_models
-    @_history_models ||= {}
+    @history_models ||= {}
   end
 end
 
@@ -56,7 +56,7 @@ ActiveSupport.on_load :active_record do
 
   ActiveRecord::Associations::Preloader::ThroughAssociation.prepend ChronoModel::Patches::Preloader::ThroughAssociation
 
-  ActiveRecord::Batches::BatchEnumerator.prepend ChronoModel::Patches::Batches::BatchEnumerator
+  ActiveRecord::Batches.prepend ChronoModel::Patches::Batches
 end
 
 ActiveSupport.on_load :after_initialize do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chrono_model
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Marcello Barnaba
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -41,152 +41,12 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: hirb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -211,14 +71,11 @@ files:
 - lib/chrono_model/adapter/ddl.rb
 - lib/chrono_model/adapter/indexes.rb
 - lib/chrono_model/adapter/migrations.rb
-- lib/chrono_model/adapter/migrations_modules/legacy.rb
 - lib/chrono_model/adapter/migrations_modules/stable.rb
-- lib/chrono_model/adapter/tsrange.rb
 - lib/chrono_model/adapter/upgrade.rb
 - lib/chrono_model/chrono.rb
 - lib/chrono_model/conversions.rb
 - lib/chrono_model/db_console.rb
-- lib/chrono_model/json.rb
 - lib/chrono_model/patches.rb
 - lib/chrono_model/patches/as_of_time_holder.rb
 - lib/chrono_model/patches/as_of_time_relation.rb
@@ -252,14 +109,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Temporal extensions (SCD Type II) for Active Record

data/lib/chrono_model/adapter/migrations_modules/legacy.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module ChronoModel
-  class Adapter
-    module MigrationsModules
-      module Legacy
-        # If adding an index to a temporal table, add it to the one in the
-        # temporal schema and to the history one. If the `:unique` option is
-        # present, it is removed from the index created in the history table.
-        #
-        def add_index(table_name, column_name, options = {})
-          return super unless is_chrono?(table_name)
-
-          transaction do
-            on_temporal_schema { super }
-
-            # Uniqueness constraints do not make sense in the history table
-            options = options.dup.tap { |o| o.delete(:unique) } if options[:unique].present?
-
-            on_history_schema { super(table_name, column_name, options) }
-          end
-        end
-
-        # If removing an index from a temporal table, remove it both from the
-        # temporal and the history schemas.
-        #
-        def remove_index(table_name, options = {})
-          return super unless is_chrono?(table_name)
-
-          transaction do
-            on_temporal_schema { super }
-
-            on_history_schema { super }
-          end
-        end
-      end
-    end
-  end
-end
-
-ChronoModel::Adapter::Migrations.include ChronoModel::Adapter::MigrationsModules::Legacy

data/lib/chrono_model/adapter/tsrange.rb

@@ -1,72 +0,0 @@
-# frozen_string_literal: true
-
-module ChronoModel
-  class Adapter < ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-    module TSRange
-      # HACK: Redefine tsrange parsing support, as it is broken currently.
-      #
-      # This self-made API is here because currently AR4 does not support
-      # open-ended ranges. The reasons are poor support in Ruby:
-      #
-      #   https://bugs.ruby-lang.org/issues/6864
-      #
-      # and an instable interface in Active Record:
-      #
-      #   https://github.com/rails/rails/issues/13793
-      #   https://github.com/rails/rails/issues/14010
-      #
-      # so, for now, we are implementing our own.
-      #
-      class Type < ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Range
-        OID = 3908
-
-        def cast_value(value)
-          return if value == 'empty'
-          return value if value.is_a?(::Array)
-
-          extracted = extract_bounds(value)
-
-          from = Conversions.string_to_utc_time extracted[:from]
-          to   = Conversions.string_to_utc_time extracted[:to]
-
-          [from, to]
-        end
-
-        def extract_bounds(value)
-          from, to = value[1..-2].split(',')
-
-          from_bound =
-            if value[1] == ',' || from == '-infinity'
-              nil
-            else
-              from[1..-2]
-            end
-
-          to_bound =
-            if value[-2] == ',' || to == 'infinity'
-              nil
-            else
-              to[1..-2]
-            end
-
-          {
-            from: from_bound,
-            to: to_bound
-          }
-        end
-      end
-
-      def initialize_type_map(m = type_map)
-        super.tap do
-          typ = ChronoModel::Adapter::TSRange::Type
-          oid = typ::OID
-
-          ar_type = type_map.fetch(oid)
-          cm_type = typ.new(ar_type.subtype, ar_type.type)
-
-          type_map.register_type oid, cm_type
-        end
-      end
-    end
-  end
-end

data/lib/chrono_model/json.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module ChronoModel
-  module Json
-    extend self
-
-    def create
-      ActiveSupport::Deprecation.warn <<-MSG.squish
-        ChronoModel: JSON ops are deprecated. Please migrate to JSONB.
-      MSG
-
-      adapter.execute 'CREATE OR REPLACE LANGUAGE plpythonu'
-      adapter.execute File.read(sql('json_ops.sql'))
-    end
-
-    def drop
-      adapter.execute File.read(sql('uninstall-json_ops.sql'))
-      adapter.execute 'DROP LANGUAGE IF EXISTS plpythonu'
-    end
-
-    private
-
-    def sql(file)
-      "#{File.dirname(__FILE__)}/../../sql/#{file}"
-    end
-
-    def adapter
-      ActiveRecord::Base.connection
-    end
-  end
-end