activerecord-bitemporal 5.0.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0e6cafe3d918cd4bdf47c2610eaf3760cfcedbec0365a7675ef99790a05baaf
-  data.tar.gz: 79b7823949b22cbcacdfb75b561c70808135ebd3dc1c6a5ff0ef8152c75b8d79
+  metadata.gz: 690af251479740f03e0dafd504a9b906672e8860c6f8734b37b24f0d2c0c2b5d
+  data.tar.gz: 2b41e3d362d267e4b573911ec75a1b03de9c4259bf8312c6fae9759aae29bf34
 SHA512:
-  metadata.gz: 4331c2b17a26dfea76b5c1c85a6a0feac925a1c0b7d634fa734e35e5f7732e0d49d04172ae4bf6af5ae62b213481bd09da7807312f241578e72f2a9ee952f640
-  data.tar.gz: 98ffa072e196a6af9b61ef01ee5e7d8e3ef83a94abd8f666738831783b35bb16551fd0bd1d561f76a6a55aa522d4609274ec3e6a6a78d311b7c76e53c860b1c4
+  metadata.gz: d86c42c61e77843ef9a76e45868d71722f08e8af28f6c1747f2d4ea55ecd1bf5d5731d3e4b41ad82827c59e0f8e21f3b9ab714a7dc2a442c387c17c97858c8bc
+  data.tar.gz: e53538e79ab1b48563e804080a23f8e8aa6f67f6fa71a54880fa7c93696a9e8778fc5248937ea653cefe72f8cb215e84aec223559f1436506354f65ade735f8d

data/.circleci/config.yml

@@ -33,7 +33,6 @@ workflows:
                 - rails_6.1
                 - rails_7.0
                 - rails_7.1
-                - rails_main
             exclude:
               - ruby-version: '3.2'
                 gemfile: rails_6.1

data/Appraisals

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-appraise "rails-main" do
-  gem "rails", git: 'https://github.com/rails/rails.git', branch: "main"
-end
-
 appraise "rails-6.1" do
   gem "rails", "~> 6.1.0"
 end

data/CHANGELOG.md

@@ -1,5 +1,42 @@
 # Changelog
 
+## 5.2.0
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+- [Delegate CollectionProxy#bitemporal_value to Relation #168](https://github.com/kufu/activerecord-bitemporal/pull/168)
+- [Fix unintended valid_datetime set when `CollectionProxy#load` #169](https://github.com/kufu/activerecord-bitemporal/pull/169)
+
+### Chores
+
+- [Do not run CI against rails_main #166](https://github.com/kufu/activerecord-bitemporal/pull/166)
+
+## 5.1.0
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+- [Remove `joinable: false` #156](https://github.com/kufu/activerecord-bitemporal/pull/156)
+
+### Chores
+
+- [Remove database_cleaner #162](https://github.com/kufu/activerecord-bitemporal/pull/162)
+
 ## 5.0.1
 
 - [Fix a typo #157](https://github.com/kufu/activerecord-bitemporal/pull/157)

data/activerecord-bitemporal.gemspec

@@ -31,6 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pg"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "timecop"
 end

data/lib/activerecord-bitemporal/bitemporal.rb

@@ -359,7 +359,7 @@ module ActiveRecord
       def destroy(force_delete: false, operated_at: nil)
         return super() if force_delete
 
-        ActiveRecord::Base.transaction(requires_new: true, joinable: false) do
+        ActiveRecord::Base.transaction(requires_new: true) do
           @destroyed = false
           _run_destroy_callbacks {
             operated_at ||= Time.current

data/lib/activerecord-bitemporal/scope.rb

@@ -141,6 +141,22 @@ module ActiveRecord::Bitemporal
     end
   end
 
+  module CollectionProxy
+    # Delegate to ActiveRecord::Bitemporal::Relation
+    # @see https://github.com/rails/rails/blob/v7.1.3.4/activerecord/lib/active_record/associations/collection_proxy.rb#L1115-L1124
+    #
+    # In order to update the CollectionProxy state, `load` needs to be excluded.
+    # The reason for using `@association` instead of delegating this method is to preserve state such as `loaded`.
+    # @see https://github.com/rails/rails/blob/v7.1.3.4/activerecord/lib/active_record/associations/collection_proxy.rb#L44
+    #
+    # There is no need to delegate to `scope` as `ActiveRecord::Bitemporal::Relation::Finder`'s methods are delegated
+    # by `ActiveRecord::Delegation`. This is not a problem because `scoping` used in this is delegated to `scope`.
+    # @see https://github.com/rails/rails/blob/v7.1.3.4/activerecord/lib/active_record/relation/delegation.rb#L117
+    delegate :bitemporal_value, :bitemporal_value=, :valid_datetime, :valid_date,
+             :transaction_datetime, :bitemporal_option, :bitemporal_option_merge!,
+             :build_arel, :primary_key, to: :scope
+  end
+
   module Scope
     extend ActiveSupport::Concern
 

data/lib/activerecord-bitemporal/version.rb

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

data/lib/activerecord-bitemporal.rb

@@ -29,7 +29,6 @@ module ActiveRecord::Bitemporal::Bitemporalize
         def prepend_relation_delegate_class(mod)
           relation_delegate_class(ActiveRecord::Relation).prepend mod
           relation_delegate_class(ActiveRecord::AssociationRelation).prepend mod
-          relation_delegate_class(ActiveRecord::Associations::CollectionProxy).prepend mod
         end
       end
     end
@@ -58,6 +57,7 @@ module ActiveRecord::Bitemporal::Bitemporalize
     def inherited(klass)
       super
       klass.prepend_relation_delegate_class ActiveRecord::Bitemporal::Relation
+      klass.relation_delegate_class(ActiveRecord::Associations::CollectionProxy).prepend ActiveRecord::Bitemporal::CollectionProxy
       if relation_delegate_class(ActiveRecord::Relation).ancestors.include? ActiveRecord::Bitemporal::Relation::MergeWithExceptBitemporalDefaultScope
         klass.relation_delegate_class(ActiveRecord::Relation).prepend ActiveRecord::Bitemporal::Relation::MergeWithExceptBitemporalDefaultScope
       end
@@ -169,6 +169,7 @@ module ActiveRecord::Bitemporal::Bitemporalize
     validates bitemporal_id_key, uniqueness: true, allow_nil: true, strict: enable_strict_by_validates_bitemporal_id
 
     prepend_relation_delegate_class ActiveRecord::Bitemporal::Relation
+    relation_delegate_class(ActiveRecord::Associations::CollectionProxy).prepend ActiveRecord::Bitemporal::CollectionProxy
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bitemporal
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.2.0
 platform: ruby
 authors:
 - SmartHR
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-10 00:00:00.000000000 Z
+date: 2024-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  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: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +148,6 @@ files:
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
 - gemfiles/rails_7.1.gemfile
-- gemfiles/rails_main.gemfile
 - lib/activerecord-bitemporal.rb
 - lib/activerecord-bitemporal/bitemporal.rb
 - lib/activerecord-bitemporal/callbacks.rb

data/gemfiles/rails_main.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
-
-gemspec path: "../"