activerecord-bitemporal 4.1.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09a592f0b1e43e737bd1fdbc8a88f025af734bf3c0d42c4fa2297dbaa72a68e5'
-  data.tar.gz: b591ee586a0d5fc3f109444787f86bc5c399f22d33c44d84d80bde6f91b141ac
+  metadata.gz: ff0157d808949658d0eb00a07b819670383ace1c7896537f6b6e5dfeda9e6c32
+  data.tar.gz: 1e14b06aac74ca12b3db6ee75144078eef8e793eda6048c7179fd8ef3025b01d
 SHA512:
-  metadata.gz: b0d9d4f5dd752200b2e803bca72b123ed067165bd61092755fb091b10eb35fd58b82617f7957d48f738b8f9ec09c480d8338553c3b33098202056d2d20e94d09
-  data.tar.gz: d90e6bbb55b783bc75f650c00c4bbaf226b4d5ba67c86e004bfecbe75224031c0a0ad69c95955741c0b560bdc85fc2a4f3945d07885d0b128ecbf0416f003569
+  metadata.gz: 6e6ba80c96e30d975d5a1fe5edff0f631e8e4793d98c97e0c859d57948f5919d5aa47ab2990a456712888e8e25913bb370fc0bf3640c9d04eef3686774a00370
+  data.tar.gz: cd5d42d05eb0efe13355906b1547f86605aa1e327d1fae87aebb83475c4fe4162f2cba00875e92e6dcc497451d8a6c0bbe8bfffcbad543c972e5b229a05d0a60

data/.gitignore

@@ -1,2 +1,4 @@
 .bundle/
+.rspec_status
+Gemfile.lock
 gemfiles/*.gemfile.lock

data/CHANGELOG.md

@@ -1,5 +1,45 @@
 # Changelog
 
+## 4.3.0
+
+### Added
+
+- [Add `previously_force_updated?` #142](https://github.com/kufu/activerecord-bitemporal/pull/142)
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Chores
+
+- [Remove unneeded spec for Rails 5.x #143](https://github.com/kufu/activerecord-bitemporal/pull/143)
+
+## 4.2.0
+
+### Added
+
+- [Allow passing `operated_at` to destroy #138](https://github.com/kufu/activerecord-bitemporal/pull/138)
+
+### Changed
+
+- [Change not to create history when destroying with `force_update` #135](https://github.com/kufu/activerecord-bitemporal/pull/135)
+- [Raise `ValidDatetimeRangeError` instead of `RecordInvalid` in `_update_row` #136](https://github.com/kufu/activerecord-bitemporal/pull/136)
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Chores
+
+- [Fix for RSpec deprecated warning #132](https://github.com/kufu/activerecord-bitemporal/pull/132)
+- [Add some files to .gitignore #134](https://github.com/kufu/activerecord-bitemporal/pull/134)
+
 ## 4.1.0
 
 ### Added

data/lib/activerecord-bitemporal/bitemporal.rb

@@ -277,12 +277,13 @@ module ActiveRecord
         end
 
         refine ActiveRecord::Base do
-          # MEMO: Do not copy `swapped_id`
+          # MEMO: Do not copy bitemporal internal status
           def dup(*)
             super.tap { |itself|
               itself.instance_exec do
                 @_swapped_id_previously_was = nil
                 @_swapped_id = nil
+                @previously_force_updated = false
               end unless itself.frozen?
             }
           end
@@ -320,6 +321,7 @@ module ActiveRecord
           before_instance&.save_without_bitemporal_callbacks!(validate: false)
           # NOTE: after_instance always exists
           after_instance.save_without_bitemporal_callbacks!(validate: false)
+          @previously_force_updated = self.force_update?
 
           # update 後に新しく生成したインスタンスのデータを移行する
           @_swapped_id_previously_was = swapped_id
@@ -334,30 +336,33 @@ module ActiveRecord
         end || false
       end
 
-      def destroy(force_delete: false)
+      def destroy(force_delete: false, operated_at: Time.current)
         return super() if force_delete
 
-        current_time = Time.current
-        target_datetime = valid_datetime || current_time
+        target_datetime = valid_datetime || operated_at
 
         duplicated_instance = self.class.find_at_time(target_datetime, self.id).dup
 
         ActiveRecord::Base.transaction(requires_new: true, joinable: false) do
           @destroyed = false
           _run_destroy_callbacks {
-            @destroyed = update_transaction_to(current_time)
-
-            # 削除時の状態を履歴レコードとして保存する
-            duplicated_instance.valid_to = target_datetime
-            duplicated_instance.transaction_from = current_time
-            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.transaction_from = duplicated_instance.transaction_from
-              self.transaction_to = duplicated_instance.transaction_to
+            @destroyed = update_transaction_to(operated_at)
+            @previously_force_updated = force_update?
+
+            # force_update の場合は削除時の状態の履歴を残さない
+            unless force_update?
+              # 削除時の状態を履歴レコードとして保存する
+              duplicated_instance.valid_to = 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.transaction_from = duplicated_instance.transaction_from
+                self.transaction_to = duplicated_instance.transaction_to
+              end
             end
           }
           raise ActiveRecord::RecordInvalid unless @destroyed
@@ -395,6 +400,7 @@ module ActiveRecord
             # NOTE: Hook to copying swapped_id
             @_swapped_id_previously_was = nil
             @_swapped_id = fresh_object.swapped_id
+            @previously_force_updated = false
             self
           end
         elsif Gem::Version.new("6.1.0") <= ActiveRecord.version
@@ -418,6 +424,7 @@ module ActiveRecord
             # NOTE: Hook to copying swapped_id
             @_swapped_id_previously_was = nil
             @_swapped_id = fresh_object.swapped_id
+            @previously_force_updated = false
             self
           end
         else
@@ -440,6 +447,7 @@ module ActiveRecord
             # NOTE: Hook to copying swapped_id
             @_swapped_id_previously_was = nil
             @_swapped_id = fresh_object.swapped_id
+            @previously_force_updated = false
             self
           end
         end
@@ -499,13 +507,17 @@ module ActiveRecord
 
           # 以前の履歴データは valid_to を詰めて保存
           before_instance.valid_to = target_datetime
-          raise ActiveRecord::RecordInvalid.new(before_instance) if before_instance.valid_from_cannot_be_greater_equal_than_valid_to
+          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}")
+          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
-          raise ActiveRecord::RecordInvalid.new(after_instance) if after_instance.valid_from_cannot_be_greater_equal_than_valid_to
+          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}")
+          end
           after_instance.transaction_from = current_time
 
         # 有効なレコードがない場合

data/lib/activerecord-bitemporal/callbacks.rb

@@ -10,7 +10,7 @@ module ActiveRecord::Bitemporal
       define_model_callbacks :bitemporal_destroy
     end
 
-    def destroy
+    def destroy(...)
       perform_bitemporal_callbacks? ? run_callbacks(:bitemporal_destroy) { super } : super
     end
 

data/lib/activerecord-bitemporal/errors.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module ActiveRecord::Bitemporal
+  class BitemporalError < StandardError; end
+
+  class ValidDatetimeRangeError < BitemporalError; end
+end

data/lib/activerecord-bitemporal/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Bitemporal
-    VERSION = "4.1.0"
+    VERSION = "4.3.0"
   end
 end

data/lib/activerecord-bitemporal.rb

@@ -4,6 +4,7 @@ require "active_record"
 require "active_support/core_ext/time/calculations"
 require "activerecord-bitemporal/bitemporal"
 require "activerecord-bitemporal/scope"
+require "activerecord-bitemporal/errors"
 require "activerecord-bitemporal/patches"
 require "activerecord-bitemporal/version"
 require "activerecord-bitemporal/visualizer"
@@ -103,6 +104,10 @@ module ActiveRecord::Bitemporal::Bitemporalize
       swapped_id.presence || super
     end
 
+    def previously_force_updated?
+      @previously_force_updated
+    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")
@@ -140,10 +145,12 @@ module ActiveRecord::Bitemporal::Bitemporalize
       # MEMO: #update_columns is not call #_update_row (and validations, callbacks)
       update_columns(bitemporal_id_key => swapped_id) unless send(bitemporal_id_key)
       swap_id!(without_clear_changes_information: true)
+      @previously_force_updated = false
     end
 
     after_find do
       self.swap_id! if self.send(bitemporal_id_key).present?
+      @previously_force_updated = false
     end
 
     # Callback hook to `validates :xxx, uniqueness: true`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bitemporal
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.3.0
 platform: ruby
 authors:
 - SmartHR
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -166,6 +166,7 @@ files:
 - lib/activerecord-bitemporal.rb
 - lib/activerecord-bitemporal/bitemporal.rb
 - lib/activerecord-bitemporal/callbacks.rb
+- lib/activerecord-bitemporal/errors.rb
 - lib/activerecord-bitemporal/patches.rb
 - lib/activerecord-bitemporal/scope.rb
 - lib/activerecord-bitemporal/version.rb