activerecord-bitemporal 5.2.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 690af251479740f03e0dafd504a9b906672e8860c6f8734b37b24f0d2c0c2b5d
-  data.tar.gz: 2b41e3d362d267e4b573911ec75a1b03de9c4259bf8312c6fae9759aae29bf34
+  metadata.gz: b36848b2facc997f9179abd32f96d7fde53cd9464f9009fa25a1ca5f13f57890
+  data.tar.gz: 8498da159a6e051841ce253b7051f0722b0cb33d2358fc13a1b3f5c0664cf1f7
 SHA512:
-  metadata.gz: d86c42c61e77843ef9a76e45868d71722f08e8af28f6c1747f2d4ea55ecd1bf5d5731d3e4b41ad82827c59e0f8e21f3b9ab714a7dc2a442c387c17c97858c8bc
-  data.tar.gz: e53538e79ab1b48563e804080a23f8e8aa6f67f6fa71a54880fa7c93696a9e8778fc5248937ea653cefe72f8cb215e84aec223559f1436506354f65ade735f8d
+  metadata.gz: bd8c531ad27a3ba0693d3923a00f62abb4b730251e235d0f3a78b449f2fdc7336052a4e5c0115748330e95a6f75eff2f20dcfc71d3fa1360d3d7e4c98c2b38af
+  data.tar.gz: fe72790fbcb1372f8127afe702cf2696f930c901aaa2b6243c913243b299a74917bca867d068e09039a6df001c942f7db81b0a3c64daa54a919bbdb4714de4ac

data/.github/auto_assign.yml

@@ -10,8 +10,8 @@ reviewers:
   - lighty
   - mkmn
   - osyo-manga
-  - wata727
   - yono
+  - kumaie-shr
 
 # A list of keywords to be skipped the process that add reviewers if pull requests include it
 skipKeywords:

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/release.yml

@@ -19,11 +19,11 @@ jobs:
       GEM_HOST_API_KEY: ${{ secrets.GEM_HOST_API_KEY }}
       GEM_HOST_OTP_CODE: ${{ github.event.inputs.rubygems-otp-code }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
           fetch-depth: 0
 
-    - uses: ruby/setup-ruby@v1
+    - uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
       with:
         ruby-version: '3.1'
         bundler-cache: true

data/.github/workflows/test.yml

@@ -0,0 +1,49 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+
+name: Test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - '3.1'
+          - '3.2'
+          - '3.3'
+          - '3.4'
+        gemfile:
+          - rails_7.0
+          - rails_7.1
+          - rails_7.2
+    services:
+      postgres:
+        image: postgres:14
+        env:
+          POSTGRES_PASSWORD: postgres
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - run: bundle exec rspec

data/Appraisals

@@ -1,13 +1,23 @@
 # frozen_string_literal: true
 
-appraise "rails-6.1" do
-  gem "rails", "~> 6.1.0"
-end
-
 appraise "rails-7.0" do
   gem "rails", "~> 7.0.1"
+
+  # for Ruby 3.4
+  gem "base64"
+  gem "bigdecimal"
+  gem "mutex_m"
+
+  # NOTE: concurrent-ruby gem no longer loads the logger gem since v1.3.5.
+  #       https://github.com/ruby-concurrency/concurrent-ruby/pull/1062
+  #       https://github.com/rails/rails/pull/54264
+  gem "concurrent-ruby", "< 1.3.5"
 end
 
 appraise "rails-7.1" do
   gem "rails", "~> 7.1.0"
 end
+
+appraise "rails-7.2" do
+  gem "rails", "~> 7.2.0"
+end

data/CHANGELOG.md

@@ -1,5 +1,69 @@
 # Changelog
 
+## 6.0.0
+
+### Breaking Changed
+
+- [Add Ruby 3.4 and remove Ruby 3.0 in CI #185](https://github.com/kufu/activerecord-bitemporal/pull/185)
+- [Drop support Rails 6.1 #192](https://github.com/kufu/activerecord-bitemporal/pull/192)
+
+### Added
+
+- [CI against Rails 7.2 #164](https://github.com/kufu/activerecord-bitemporal/pull/164)
+- [Support custom column names for valid time in .bitemporalize #200](https://github.com/kufu/activerecord-bitemporal/pull/200)
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+- [Prevent where clauses from ignored by `ignore_valid_datetime` #190](https://github.com/kufu/activerecord-bitemporal/pull/190)
+
+### Chores
+
+- [Add a note to the README that PostgreSQL is required to run the tests. #188](https://github.com/kufu/activerecord-bitemporal/pull/188)
+- [Remove specs for Rails 5.x #191](https://github.com/kufu/activerecord-bitemporal/pull/191)
+- [Update auto assgin member #193](https://github.com/kufu/activerecord-bitemporal/pull/193)
+- [Pin GitHub Actions dependencies to specific commit hashes #194](https://github.com/kufu/activerecord-bitemporal/pull/194)
+- [Bump ruby/setup-ruby from 1.227.0 to 1.229.0 #195](https://github.com/kufu/activerecord-bitemporal/pull/195)
+- [Bump ruby/setup-ruby from 1.229.0 to 1.233.0 #197](https://github.com/kufu/activerecord-bitemporal/pull/197)
+- [Bump ruby/setup-ruby from 1.233.0 to 1.235.0 #198](https://github.com/kufu/activerecord-bitemporal/pull/198)
+- [Bump ruby/setup-ruby from 1.235.0 to 1.237.0 #199](https://github.com/kufu/activerecord-bitemporal/pull/199)
+- [Bump ruby/setup-ruby from 1.237.0 to 1.238.0 #201](https://github.com/kufu/activerecord-bitemporal/pull/201)
+- [Bump ruby/setup-ruby from 1.238.0 to 1.242.0 #202](https://github.com/kufu/activerecord-bitemporal/pull/202)
+- [Bump ruby/setup-ruby from 1.242.0 to 1.244.0 #203](https://github.com/kufu/activerecord-bitemporal/pull/203)
+- [Update auto assgin member #204](https://github.com/kufu/activerecord-bitemporal/pull/204)
+
+## 5.3.0
+
+### Added
+
+### Changed
+
+- [Replace `default` overrides from `load_schema!` to `attribute` #172](https://github.com/kufu/activerecord-bitemporal/pull/172)
+- [`Or` node changed to `Nary` in Rails 7.2 #173](https://github.com/kufu/activerecord-bitemporal/pull/173)
+- [Exclude record valid range end in uniqueness validation #184](https://github.com/kufu/activerecord-bitemporal/pull/184)
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Chores
+
+- [Add specs under specific conditions #171](https://github.com/kufu/activerecord-bitemporal/pull/171)
+- [Add Dependabot for GitHub Actions #174](https://github.com/kufu/activerecord-bitemporal/pull/174)
+- [Bump actions/checkout from 3 to 4 #175](https://github.com/kufu/activerecord-bitemporal/pull/175)
+- [Replace CircleCI with GitHub Actions #177](https://github.com/kufu/activerecord-bitemporal/pull/177)
+- [Update README as `within_deleted` and `without_deleted` are deprecated #178](https://github.com/kufu/activerecord-bitemporal/pull/178)
+- [Fix typo #181](https://github.com/kufu/activerecord-bitemporal/pull/181)
+- [Fix #force_update block comment #183](https://github.com/kufu/activerecord-bitemporal/pull/183)
+- [Support Docker Compose V2 #186](https://github.com/kufu/activerecord-bitemporal/pull/186)
+
 ## 5.2.0
 
 ### Added

data/README.md

@@ -317,7 +317,7 @@ Timecop.freeze("2019/1/10") {
 }
 
 Timecop.freeze("2019/1/20") {
-  # #force_update のでは自身を受け取る
+  # #force_update のブロック内で自身を受け取る
   # このブロック内であれば履歴を生成せずにレコードの変更が行われる
   employee.force_update { |employee|
     employee.update(name: "Tom")
@@ -415,7 +415,7 @@ BTDM では DB からレコードを参照する場合、暗黙的に
 Timecop.freeze("2019/1/20") {
   # 現在の時間の履歴を返すために暗黙的に時間指定や論理削除されたレコードが除かれる
   puts Employee.all.to_sql
-  # => SELECT "employees".* FROM "employees" WHERE "employees"."valid_from" <= '2019-01-20 00:00:00' AND "employees"."valid_to" > '2019-01-20 00:00:00' AND "employees"."transaction_to" = '9999-12-31 00:00:00'
+  # => SELECT "employees".* FROM "employees" WHERE "employees"."valid_from" <= '2019-01-20 00:00:00' AND "employees"."valid_to" > '2019-01-20 00:00:00' AND "employees"."transaction_from" <= '2019-01-20 00:00:00' AND "employees"."transaction_to" > '2019-01-20 00:00:00'
 }
 ```
 
@@ -454,7 +454,7 @@ Timecop.freeze("2019/1/20") {
 
   # なぜなら暗黙的に時間指定のクエリが追加されている為
   puts Employee.where(name: "Jane").to_sql
-  # => SELECT "employees".* FROM "employees" WHERE "employees"."valid_from" <= '2019-01-20 00:00:00' AND "employees"."valid_to" > '2019-01-20 00:00:00' AND "employees"."transaction_to" = '9999-12-31 00:00:00' AND "employees"."name" = 'Jane'
+  # => SELECT "employees".* FROM "employees" WHERE "employees"."valid_from" <= '2019-01-20 00:00:00' AND "employees"."valid_to" > '2019-01-20 00:00:00' AND "employees"."transaction_from" <= '2019-01-20 00:00:00' AND "employees"."transaction_to" > '2019-01-20 00:00:00' AND "employees"."name" = 'Jane'
 }
 ```
 
@@ -464,7 +464,7 @@ Timecop.freeze("2019/1/20") {
 ```ruby
 # default_scope であれば unscoped で無効化することが出来るが、BTDM のデフォルトクエリはそのまま
 puts Employee.unscoped { Employee.all.to_sql }
-# => SELECT "employees".* FROM "employees" WHERE "employees"."valid_from" <= '2019-10-25 07:56:06.731259' AND "employees"."valid_to" > '2019-10-25 07:56:06.731259' AND "employees"."transaction_to" = '9999-12-31 00:00:00'
+# => SELECT "employees".* FROM "employees" WHERE "employees"."valid_from" <= '2019-10-25 07:56:06.731259' AND "employees"."valid_to" > '2019-10-25 07:56:06.731259' AND "employees"."transaction_from" <= '2019-10-25 07:56:06.731259' AND "employees"."transaction_to" > '2019-10-25 07:56:06.731259'
 ```
 
 
@@ -475,21 +475,21 @@ puts Employee.unscoped { Employee.all.to_sql }
 | スコープ | 動作 |
 | --- | --- |
 | `.ignore_valid_datetime` | 時間指定を無視する |
-| `.within_deleted` | 論理削除されているレコードを含める |
-| `.without_deleted` | 論理削除されているレコードを含めない |
+| `.ignore_transaction_datetime` | 論理削除されているレコードを含める |
+| `.ignore_bitemporal_datetime` | 全てのレコードを対象とする |
 
 ```ruby
 Timecop.freeze("2019/1/20") {
   # 時間指定をしているクエリを取り除く
   puts Employee.ignore_valid_datetime.to_sql
-  # => SELECT "employees".* FROM "employees" WHERE "employees"."transaction_to" = '9999-12-31 00:00:00'
+  # => SELECT "employees".* FROM "employees" WHERE "employees"."transaction_from" <= '2019-01-20 00:00:00' AND "employees"."transaction_to" > '2019-01-20 00:00:00'
 
   # 論理削除しているレコードも含める
-  puts Employee.within_deleted.to_sql
+  puts Employee.ignore_transaction_datetime.to_sql
   # => SELECT "employees".* FROM "employees" WHERE "employees"."valid_from" <= '2019-01-20 00:00:00' AND "employees"."valid_to" > '2019-01-20 00:00:00'
 
   # 全てのレコードを対象とする
-  puts Employee.ignore_valid_datetime.within_deleted.to_sql
+  puts Employee.ignore_bitemporal_datetime.to_sql
   # => SELECT "employees".* FROM "employees"
 }
 ```
@@ -534,7 +534,7 @@ Timecop.freeze("2019/1/15") {
 Timecop.freeze("2019/1/20") {
   # valid_at で任意の時間を参照して検索する事が出来る
   puts Employee.valid_at("2019/1/10").to_sql
-  # => SELECT "employees".* FROM "employees" WHERE "employees"."valid_from" <= '2019-01-10 00:00:00' AND "employees"."valid_to" > '2019-01-10 00:00:00' AND "employees"."transaction_to" = '9999-12-31 00:00:00'
+  # => SELECT "employees".* FROM "employees" WHERE "employees"."valid_from" <= '2019-01-10 00:00:00' AND "employees"."valid_to" > '2019-01-10 00:00:00' AND "employees"."transaction_from" <= '2019-01-20 00:00:00' AND "employees"."transaction_to" > '2019-01-20 00:00:00'
 
   pp Employee.valid_at("2019/1/10").map(&:name)
   # => ["Jane"]
@@ -696,7 +696,7 @@ BTDM では `find_by(id: xxx)` や `where(id: xxx)` を行う場合 `id` では
 Employee.find_by(id: employee.id)
 
 # OK : bitemporal_id で検索を行う
-# MEMO: id = bitemporal_id なの
+# MEMO: id = bitemporal_id なので
 #       find_by(bitemporal_id: employee.id)
 #       でも動作するが employee.bitemporal_id と書いたほうが意図が伝わりやすい
 Employee.find_by(bitemporal_id: employee.bitemporal_id)
@@ -711,7 +711,7 @@ Employee.where(bitemporal_id: employee.bitemporal_id)
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. And start PostgreSQL on port 5432. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/activerecord-bitemporal.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Enable ActiveRecord models to be handled as BiTemporal Data Model.}
   spec.homepage      = "https://github.com/kufu/activerecord-bitemporal"
   spec.license       = "Apache 2.0"
-  spec.required_ruby_version = ">= 3.0"
+  spec.required_ruby_version = ">= 3.1"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 6.1"
+  spec.add_dependency "activerecord", ">= 7.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 13.0"

data/{docker-compose.yml → compose.yml}

@@ -1,4 +1,3 @@
-version: '2.1'
 services:
   db:
     image: postgres:latest

data/gemfiles/rails_7.0.gemfile

@@ -4,5 +4,9 @@ source "https://rubygems.org"
 
 gem "appraisal"
 gem "rails", "~> 7.0.1"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
+gem "concurrent-ruby", "< 1.3.5"
 
 gemspec path: "../"

data/gemfiles/{rails_6.1.gemfile → rails_7.2.gemfile}

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "rails", "~> 6.1.0"
+gem "rails", "~> 7.2.0"
 
 gemspec path: "../"

data/lib/activerecord-bitemporal/bitemporal.rb

@@ -313,7 +313,7 @@ module ActiveRecord
       def _create_record(attribute_names = self.attribute_names)
         bitemporal_assign_initialize_value(valid_datetime: self.valid_datetime)
 
-        ActiveRecord::Bitemporal.valid_at!(self.valid_from) {
+        ActiveRecord::Bitemporal.valid_at!(self[valid_from_key]) {
           super()
         }
       end
@@ -346,8 +346,8 @@ module ActiveRecord
           # update 後に新しく生成したインスタンスのデータを移行する
           @_swapped_id_previously_was = swapped_id
           @_swapped_id = after_instance.swapped_id
-          self.valid_from = after_instance.valid_from
-          self.valid_to = after_instance.valid_to
+          self[valid_from_key] = after_instance[valid_from_key]
+          self[valid_to_key] = after_instance[valid_to_key]
           self.transaction_from = after_instance.transaction_from
           self.transaction_to = after_instance.transaction_to
 
@@ -373,14 +373,14 @@ module ActiveRecord
             # force_update の場合は削除時の状態の履歴を残さない
             unless force_update?
               # 削除時の状態を履歴レコードとして保存する
-              duplicated_instance.valid_to = target_datetime
+              duplicated_instance[valid_to_key] = target_datetime
               duplicated_instance.transaction_from = operated_at
               duplicated_instance.save_without_bitemporal_callbacks!(validate: false)
               if @destroyed
                 @_swapped_id_previously_was = swapped_id
                 @_swapped_id = duplicated_instance.swapped_id
-                self.valid_from = duplicated_instance.valid_from
-                self.valid_to = duplicated_instance.valid_to
+                self[valid_from_key] = duplicated_instance[valid_from_key]
+                self[valid_to_key] = duplicated_instance[valid_to_key]
                 self.transaction_from = duplicated_instance.transaction_from
                 self.transaction_to = duplicated_instance.transaction_to
               end
@@ -393,6 +393,7 @@ module ActiveRecord
       rescue => e
         @destroyed = false
         @_association_destroy_exception = ActiveRecord::RecordNotDestroyed.new("Failed to destroy the record: class=#{e.class}, message=#{e.message}", self)
+        @_association_destroy_exception.set_backtrace(e.backtrace)
         false
       end
 
@@ -411,55 +412,29 @@ module ActiveRecord
       module ::ActiveRecord::Persistence
         # MEMO: Must be override ActiveRecord::Persistence#reload
         alias_method :active_record_bitemporal_original_reload, :reload unless method_defined? :active_record_bitemporal_original_reload
-        if Gem::Version.new("7.0.0.alpha") <= ActiveRecord.version
-          def reload(options = nil)
-            return active_record_bitemporal_original_reload(options) unless self.class.bi_temporal_model?
-
-            self.class.connection.clear_query_cache
-
-            fresh_object =
-              ActiveRecord::Bitemporal.with_bitemporal_option(**bitemporal_option) {
-                if apply_scoping?(options)
-                  _find_record(options)
-                else
-                  self.class.unscoped { self.class.bitemporal_default_scope.scoping { _find_record(options) } }
-                end
-              }
+        def reload(options = nil)
+          return active_record_bitemporal_original_reload(options) unless self.class.bi_temporal_model?
 
-            @association_cache = fresh_object.instance_variable_get(:@association_cache)
-            @attributes = fresh_object.instance_variable_get(:@attributes)
-            @new_record = false
-            @previously_new_record = false
-            # NOTE: Hook to copying swapped_id
-            @_swapped_id_previously_was = nil
-            @_swapped_id = fresh_object.swapped_id
-            @previously_force_updated = false
-            self
-          end
-        else
-          def reload(options = nil)
-            return active_record_bitemporal_original_reload(options) unless self.class.bi_temporal_model?
-
-            self.class.connection.clear_query_cache
-
-            fresh_object =
-              ActiveRecord::Bitemporal.with_bitemporal_option(**bitemporal_option) {
-                if options && options[:lock]
-                  self.class.unscoped { self.class.lock(options[:lock]).bitemporal_default_scope.find(id) }
-                else
-                  self.class.unscoped { self.class.bitemporal_default_scope.find(id) }
-                end
-              }
+          self.class.connection.clear_query_cache
 
-            @attributes = fresh_object.instance_variable_get(:@attributes)
-            @new_record = false
-            @previously_new_record = false
-            # NOTE: Hook to copying swapped_id
-            @_swapped_id_previously_was = nil
-            @_swapped_id = fresh_object.swapped_id
-            @previously_force_updated = false
-            self
-          end
+          fresh_object =
+            ActiveRecord::Bitemporal.with_bitemporal_option(**bitemporal_option) {
+              if apply_scoping?(options)
+                _find_record(options)
+              else
+                self.class.unscoped { self.class.bitemporal_default_scope.scoping { _find_record(options) } }
+              end
+            }
+
+          @association_cache = fresh_object.instance_variable_get(:@association_cache)
+          @attributes = fresh_object.instance_variable_get(:@attributes)
+          @new_record = false
+          @previously_new_record = false
+          # NOTE: Hook to copying swapped_id
+          @_swapped_id_previously_was = nil
+          @_swapped_id = fresh_object.swapped_id
+          @previously_force_updated = false
+          self
         end
       end
 
@@ -467,7 +442,7 @@ module ActiveRecord
 
       def bitemporal_assign_initialize_value(valid_datetime:, current_time: Time.current)
         # 自身の `valid_from` を設定
-        self.valid_from = valid_datetime || current_time if self.valid_from == ActiveRecord::Bitemporal::DEFAULT_VALID_FROM
+        self[valid_from_key] = valid_datetime || current_time if self[valid_from_key] == ActiveRecord::Bitemporal::DEFAULT_VALID_FROM
 
         self.transaction_from = current_time if self.transaction_from == ActiveRecord::Bitemporal::DEFAULT_TRANSACTION_FROM
 
@@ -485,7 +460,7 @@ module ActiveRecord
       def bitemporal_build_update_records(valid_datetime:, current_time: Time.current, force_update: false)
         target_datetime = valid_datetime || current_time
         # NOTE: force_update の場合は自身のレコードを取得するような時間を指定しておく
-        target_datetime = valid_from_changed? ? valid_from_was : valid_from if force_update
+        target_datetime = attribute_changed?(valid_from_key) ? attribute_was(valid_from_key) : self[valid_from_key] if force_update
 
         # 対象基準日において有効なレコード
         # NOTE: 論理削除対象
@@ -516,26 +491,26 @@ module ActiveRecord
           current_valid_record.assign_transaction_to(current_time)
 
           # 以前の履歴データは valid_to を詰めて保存
-          before_instance.valid_to = target_datetime
+          before_instance[valid_to_key] = target_datetime
           if before_instance.valid_from_cannot_be_greater_equal_than_valid_to
-            raise ValidDatetimeRangeError.new("valid_from #{before_instance.valid_from} can't be greater equal than valid_to #{before_instance.valid_to}")
+            raise ValidDatetimeRangeError.new("#{valid_from_key} #{before_instance[valid_from_key]} can't be greater equal than #{valid_to_key} #{before_instance[valid_to_key]}")
           end
           before_instance.transaction_from = current_time
 
           # 以降の履歴データは valid_from と valid_to を調整して保存する
-          after_instance.valid_from = target_datetime
-          after_instance.valid_to = current_valid_record.valid_to
+          after_instance[valid_from_key] = target_datetime
+          after_instance[valid_to_key] = current_valid_record[valid_to_key]
           if after_instance.valid_from_cannot_be_greater_equal_than_valid_to
-            raise ValidDatetimeRangeError.new("valid_from #{after_instance.valid_from} can't be greater equal than valid_to #{after_instance.valid_to}")
+            raise ValidDatetimeRangeError.new("#{valid_from_key} #{after_instance[valid_from_key]} can't be greater equal than #{valid_to_key} #{after_instance[valid_to_key]}")
           end
           after_instance.transaction_from = current_time
 
         # 有効なレコードがない場合
         else
           # 一番近い未来にある Instance を取ってきて、その valid_from を valid_to に入れる
-          nearest_instance = self.class.where(bitemporal_id: bitemporal_id).valid_from_gt(target_datetime).ignore_valid_datetime.order(valid_from: :asc).first
+          nearest_instance = self.class.where(bitemporal_id: bitemporal_id).ignore_valid_datetime.valid_from_gt(target_datetime).order(valid_from_key => :asc).first
           if nearest_instance.nil?
-            message = "Update failed: Couldn't find #{self.class} with 'bitemporal_id'=#{self.bitemporal_id} and 'valid_from' < #{target_datetime}"
+            message = "Update failed: Couldn't find #{self.class} with 'bitemporal_id'=#{self.bitemporal_id} and '#{valid_from_key}' > #{target_datetime}"
             raise ActiveRecord::RecordNotFound.new(message, self.class, "bitemporal_id", self.bitemporal_id)
           end
 
@@ -546,8 +521,8 @@ module ActiveRecord
           before_instance = nil
 
           # 以降の履歴データは valid_from と valid_to を調整して保存する
-          after_instance.valid_from = target_datetime
-          after_instance.valid_to = nearest_instance.valid_from
+          after_instance[valid_from_key] = target_datetime
+          after_instance[valid_to_key] = nearest_instance[valid_from_key]
           after_instance.transaction_from = current_time
         end
 
@@ -569,7 +544,7 @@ module ActiveRecord
 
         target_datetime = record.valid_datetime || Time.current
 
-        valid_from = record.valid_from.yield_self { |valid_from|
+        valid_from = record[record.valid_from_key].yield_self { |valid_from|
           # NOTE: valid_from が初期値の場合は現在の時間を基準としてバリデーションする
           # valid_from が初期値の場合は Persistence#_create_record に Time.current が割り当てられる為
           # バリデーション時と生成時で若干時間がずれてしまうことには考慮する
@@ -586,17 +561,17 @@ module ActiveRecord
         }
 
         # MEMO: `force_update` does not refer to `valid_datetime`
-        valid_from = record.valid_from if record.force_update?
+        valid_from = record[record.valid_from_key] if record.force_update?
 
-        valid_to = record.valid_to.yield_self { |valid_to|
+        valid_to = record[record.valid_to_key].yield_self { |valid_to|
           # NOTE: `cover?` may give incorrect results, when the time zone is not UTC and `valid_from` is date type
           #   Therefore, cast to type of `valid_from`
-          record_valid_time = finder_class.type_for_attribute(:valid_from).cast(record.valid_datetime)
+          record_valid_time = finder_class.type_for_attribute(record.valid_from_key).cast(record.valid_datetime)
           # レコードを更新する時に valid_datetime が valid_from ~ valid_to の範囲外だった場合、
           #   一番近い未来の履歴レコードを参照して更新する
           # という仕様があるため、それを考慮して valid_to を設定する
-          if (record_valid_time && (record.valid_from..record.valid_to).cover?(record_valid_time)) == false && (record.persisted?)
-            finder_class.ignore_valid_datetime.where(bitemporal_id: record.bitemporal_id).valid_from_gt(target_datetime).order(valid_from: :asc).first.valid_from
+          if (record_valid_time && (record[record.valid_from_key]...record[record.valid_to_key]).cover?(record_valid_time)) == false && (record.persisted?)
+            finder_class.ignore_valid_datetime.where(bitemporal_id: record.bitemporal_id).valid_from_gteq(target_datetime).order(record.valid_from_key => :asc).first[record.valid_from_key]
           else
             valid_to
           end

data/lib/activerecord-bitemporal/scope.rb

@@ -27,6 +27,10 @@ module ActiveRecord::Bitemporal
   end
 
   module Relation
+    # see: https://github.com/rails/rails/pull/51492
+    NARY_NODE = ActiveRecord.gem_version >= Gem::Version.new("7.2.0") ? Arel::Nodes::Nary : Arel::Nodes::And
+    private_constant :NARY_NODE
+
     using Module.new {
       refine ActiveRecord::Relation::WhereClause do
         using Module.new {
@@ -56,7 +60,7 @@ module ActiveRecord::Bitemporal
                 case node
                 when Arel::Nodes::LessThan, Arel::Nodes::LessThanOrEqual, Arel::Nodes::GreaterThan, Arel::Nodes::GreaterThanOrEqual
                   y << node if node && node.left.respond_to?(:relation)
-                when Arel::Nodes::And
+                when NARY_NODE
                   each_operatable_node(node.children) { |node| y << node }
                 when Arel::Nodes::Binary
                   each_operatable_node(node.left) { |node| y << node }
@@ -82,9 +86,9 @@ module ActiveRecord::Bitemporal
 
       refine Relation do
         def bitemporal_clause(table_name = klass.table_name)
-          node_hash = where_clause.bitemporal_query_hash("valid_from", "valid_to", "transaction_from", "transaction_to")
-          valid_from = node_hash.dig(table_name, "valid_from", 1)
-          valid_to   = node_hash.dig(table_name, "valid_to", 1)
+          node_hash = where_clause.bitemporal_query_hash(valid_from_key, valid_to_key, "transaction_from", "transaction_to")
+          valid_from = node_hash.dig(table_name, valid_from_key, 1)
+          valid_to   = node_hash.dig(table_name, valid_to_key, 1)
           transaction_from = node_hash.dig(table_name, "transaction_from", 1)
           transaction_to   = node_hash.dig(table_name, "transaction_to", 1)
           {
@@ -251,19 +255,24 @@ module ActiveRecord::Bitemporal
             rewhere(table[attr_name].public_send(operator, predicate_builder.build_bind_attribute(attr_name, value)))
           end
 
-          %i(valid_from valid_to transaction_from transaction_to).each { |column|
+          [
+            [:valid_from, "\#{valid_from_key}"], # Evaluate `valid_from/to_key` at runtime using `\#`
+            [:valid_to, "\#{valid_to_key}"],
+            [:transaction_from, "transaction_from"],
+            [:transaction_to, "transaction_to"]
+          ].each { |column, column_name|
             module_eval <<-STR, __FILE__, __LINE__ + 1
               def _ignore_#{column}
-                unscope(where: :"\#{table.name}.#{column}")
-                  .tap { |relation| relation.unscope!(where: bitemporal_value[:through].arel_table["#{column}"]) if bitemporal_value[:through] }
+                unscope(where: :"\#{table.name}.#{column_name}")
+                  .tap { |relation| relation.unscope!(where: bitemporal_value[:through].arel_table["#{column_name}"]) if bitemporal_value[:through] }
               end
 
               def _except_#{column}
                 return self unless where_clause.send(:predicates).find { |node|
-                  node.bitemporal_include?("\#{table.name}.#{column}")
+                  node.bitemporal_include?("\#{table.name}.#{column_name}")
                 }
                 _ignore_#{column}.tap { |relation|
-                  relation.unscope_values.reject! { |query| query.equal_attribute_name("\#{table.name}.#{column}") }
+                  relation.unscope_values.reject! { |query| query.equal_attribute_name("\#{table.name}.#{column_name}") }
                 }
               end
             STR
@@ -277,8 +286,8 @@ module ActiveRecord::Bitemporal
               module_eval <<-STR, __FILE__, __LINE__ + 1
                 def _#{column}_#{op}(datetime)
                   target_datetime = datetime&.in_time_zone || Time.current
-                  bitemporal_rewhere_bind("#{column}", :#{op}, target_datetime)
-                    .tap { |relation| break relation.bitemporal_rewhere_bind("#{column}", :#{op}, target_datetime, bitemporal_value[:through].arel_table) if bitemporal_value[:through] }
+                  bitemporal_rewhere_bind("#{column_name}", :#{op}, target_datetime)
+                    .tap { |relation| break relation.bitemporal_rewhere_bind("#{column_name}", :#{op}, target_datetime, bitemporal_value[:through].arel_table) if bitemporal_value[:through] }
                 end
               STR
             }
@@ -424,17 +433,17 @@ module ActiveRecord::Bitemporal
         # beginless range
         if begin_
           # from < valid_to
-          relation = relation.bitemporal_where_bind("valid_to", :gt, begin_.in_time_zone.to_datetime)
+          relation = relation.bitemporal_where_bind(valid_to_key, :gt, begin_.in_time_zone.to_datetime)
         end
 
         # endless range
         if end_
           if range.exclude_end?
             # valid_from < to
-            relation = relation.bitemporal_where_bind("valid_from", :lt, end_.in_time_zone.to_datetime)
+            relation = relation.bitemporal_where_bind(valid_from_key, :lt, end_.in_time_zone.to_datetime)
           else
             # valid_from <= to
-            relation = relation.bitemporal_where_bind("valid_from", :lteq, end_.in_time_zone.to_datetime)
+            relation = relation.bitemporal_where_bind(valid_from_key, :lteq, end_.in_time_zone.to_datetime)
           end
         end
 
@@ -449,14 +458,14 @@ module ActiveRecord::Bitemporal
         begin_, end_ = range.begin, range.end
 
         if begin_
-          relation = relation.bitemporal_where_bind("valid_from", :gteq, begin_.in_time_zone.to_datetime)
+          relation = relation.bitemporal_where_bind(valid_from_key, :gteq, begin_.in_time_zone.to_datetime)
         end
 
         if end_
           if range.exclude_end?
             raise 'Range with excluding end is not supported'
           else
-            relation = relation.bitemporal_where_bind("valid_to", :lteq, end_.in_time_zone.to_datetime)
+            relation = relation.bitemporal_where_bind(valid_to_key, :lteq, end_.in_time_zone.to_datetime)
           end
         end
 
@@ -472,10 +481,10 @@ module ActiveRecord::Bitemporal
           ignore_valid_datetime.bitemporal_for(*ids)
         }
         def self.bitemporal_most_future(id)
-          bitemporal_histories(id).order(valid_from: :asc).last
+          bitemporal_histories(id).order(valid_from_key => :asc).last
         end
         def self.bitemporal_most_past(id)
-          bitemporal_histories(id).order(valid_from: :asc).first
+          bitemporal_histories(id).order(valid_from_key => :asc).first
         end
       end
     end

data/lib/activerecord-bitemporal/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Bitemporal
-    VERSION = "5.2.0"
+    VERSION = "6.0.0"
   end
 end

data/lib/activerecord-bitemporal/visualizer.rb

@@ -22,7 +22,7 @@ module ActiveRecord::Bitemporal
     module_function
 
     def visualize(record, height: 10, width: 40, highlight: true)
-      histories = record.class.ignore_bitemporal_datetime.bitemporal_for(record).order(:transaction_from, :valid_from)
+      histories = record.class.ignore_bitemporal_datetime.bitemporal_for(record).order(:transaction_from, record.valid_from_key)
 
       if highlight
         visualize_records(histories, [record], height: height, width: width)
@@ -36,7 +36,7 @@ module ActiveRecord::Bitemporal
       raise 'More than 3 relations are not supported' if relations.size >= 3
       records = relations.flatten
 
-      valid_times = (records.map(&:valid_from) + records.map(&:valid_to)).sort.uniq
+      valid_times = (records.map { _1[_1.valid_from_key] } + records.map { _1[_1.valid_to_key] }).sort.uniq
       transaction_times = (records.map(&:transaction_from) + records.map(&:transaction_to)).sort.uniq
   
       time_length = Time.zone.now.strftime('%F %T.%3N').length
@@ -60,9 +60,11 @@ module ActiveRecord::Bitemporal
 
         relation.each do |record|
           line = lines[record.transaction_from]
-          column = columns[record.valid_from]
+          valid_from = record[record.valid_from_key]
+          valid_to = record[record.valid_to_key]
+          column = columns[valid_from]
     
-          width = columns[record.valid_to] - columns[record.valid_from] - 1
+          width = columns[valid_to] - columns[valid_from] - 1
           height = lines[record.transaction_to] - lines[record.transaction_from] - 1
     
           body.print("#{record.transaction_from.strftime('%F %T.%3N')} ", line: line)

data/lib/activerecord-bitemporal.rb

@@ -37,13 +37,6 @@ module ActiveRecord::Bitemporal::Bitemporalize
   module ClassMethods
     include ActiveRecord::Bitemporal::Relation::Finder
 
-    DEFAULT_ATTRIBUTES = {
-      valid_from:       ActiveRecord::Bitemporal::DEFAULT_VALID_FROM,
-      valid_to:         ActiveRecord::Bitemporal::DEFAULT_VALID_TO,
-      transaction_from: ActiveRecord::Bitemporal::DEFAULT_TRANSACTION_FROM,
-      transaction_to:   ActiveRecord::Bitemporal::DEFAULT_TRANSACTION_TO
-    }.freeze
-
     def bitemporal_id_key
       'bitemporal_id'
     end
@@ -62,16 +55,6 @@ module ActiveRecord::Bitemporal::Bitemporalize
         klass.relation_delegate_class(ActiveRecord::Relation).prepend ActiveRecord::Bitemporal::Relation::MergeWithExceptBitemporalDefaultScope
       end
     end
-
-  private
-    def load_schema!
-      super
-
-      DEFAULT_ATTRIBUTES.each do |name, default_value|
-        type = type_for_attribute(name)
-        define_attribute(name.to_s, type, default: default_value)
-      end
-    end
   end
 
   module InstanceMethods
@@ -109,8 +92,8 @@ module ActiveRecord::Bitemporal::Bitemporalize
     end
 
     def valid_from_cannot_be_greater_equal_than_valid_to
-      if valid_from && valid_to && valid_from >= valid_to
-        errors.add(:valid_from, "can't be greater equal than valid_to")
+      if self[valid_from_key] && self[valid_to_key] && self[valid_from_key] >= self[valid_to_key]
+        errors.add(valid_from_key, "can't be greater equal than #{valid_to_key}")
       end
     end
 
@@ -124,10 +107,15 @@ module ActiveRecord::Bitemporal::Bitemporalize
   def bitemporalize(
     enable_strict_by_validates_bitemporal_id: false,
     enable_default_scope: true,
-    enable_merge_with_except_bitemporal_default_scope: false
+    enable_merge_with_except_bitemporal_default_scope: false,
+    valid_from_key: :valid_from,
+    valid_to_key: :valid_to
   )
+    return if ancestors.include? InstanceMethods
+
     extend ClassMethods
     include InstanceMethods
+    include ActiveRecord::Bitemporal
     include ActiveRecord::Bitemporal::Scope
     include ActiveRecord::Bitemporal::Callbacks
 
@@ -153,14 +141,22 @@ module ActiveRecord::Bitemporal::Bitemporalize
       @previously_force_updated = false
     end
 
+    self.class_attribute :valid_from_key, :valid_to_key, instance_writer: false
+    self.valid_from_key = valid_from_key.to_s
+    self.valid_to_key = valid_to_key.to_s
+    attribute valid_from_key, default: ActiveRecord::Bitemporal::DEFAULT_VALID_FROM
+    attribute valid_to_key, default: ActiveRecord::Bitemporal::DEFAULT_VALID_TO
+    attribute :transaction_from, default: ActiveRecord::Bitemporal::DEFAULT_TRANSACTION_FROM
+    attribute :transaction_to, default: ActiveRecord::Bitemporal::DEFAULT_TRANSACTION_TO
+
     # Callback hook to `validates :xxx, uniqueness: true`
     const_set(:UniquenessValidator, Class.new(ActiveRecord::Validations::UniquenessValidator) {
       prepend ActiveRecord::Bitemporal::Uniqueness
     })
 
     # validations
-    validates :valid_from, presence: true
-    validates :valid_to, presence: true
+    validates valid_from_key, presence: true
+    validates valid_to_key, presence: true
     validates :transaction_from, presence: true
     validates :transaction_to, presence: true
     validate :valid_from_cannot_be_greater_equal_than_valid_to

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bitemporal
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 6.0.0
 platform: ruby
 authors:
 - SmartHR
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-24 00:00:00.000000000 Z
+date: 2025-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -129,9 +129,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".github/auto_assign.yml"
+- ".github/dependabot.yml"
 - ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - Appraisals
 - CHANGELOG.md
@@ -144,10 +145,10 @@ files:
 - activerecord-bitemporal.gemspec
 - bin/console
 - bin/setup
-- docker-compose.yml
-- gemfiles/rails_6.1.gemfile
+- compose.yml
 - gemfiles/rails_7.0.gemfile
 - gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.2.gemfile
 - lib/activerecord-bitemporal.rb
 - lib/activerecord-bitemporal/bitemporal.rb
 - lib/activerecord-bitemporal/callbacks.rb
@@ -160,7 +161,7 @@ homepage: https://github.com/kufu/activerecord-bitemporal
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -168,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -176,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: BiTemporal Data Model for ActiveRecord
 test_files: []

data/.circleci/config.yml

@@ -1,40 +0,0 @@
-version: 2.1
-
-jobs:
-  rspec:
-    parameters:
-      ruby-version:
-        type: string
-      gemfile:
-        type: string
-    docker:
-      - image: ruby:<< parameters.ruby-version >>
-        environment:
-          BUNDLE_GEMFILE: gemfiles/<< parameters.gemfile >>.gemfile
-      - image: cimg/postgres:11.16
-    steps:
-      - checkout
-      - run: gem install bundler
-      - run: bundle install
-      - run: bundle exec rspec
-
-workflows:
-  test:
-    jobs:
-      - rspec:
-          matrix:
-            parameters:
-              ruby-version:
-                - '3.0'
-                - '3.1'
-                - '3.2'
-                - '3.3'
-              gemfile:
-                - rails_6.1
-                - rails_7.0
-                - rails_7.1
-            exclude:
-              - ruby-version: '3.2'
-                gemfile: rails_6.1
-              - ruby-version: '3.3'
-                gemfile: rails_6.1