activerecord-bitemporal 4.0.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4be4f1dd46241e22de6ea7acf687531b3313fdd83f2deab6e9a7d249cc6b5853
-  data.tar.gz: 70b235bbe03555fa5db6ba0309af3147d2fb4f80708a13ac421944f6c4603a0b
+  metadata.gz: 97a21996b6ff931bf324653432cd481eac86731ee3de16445c98627987683639
+  data.tar.gz: 34178dcfc6e5fe4cbd1f01554499f075d1be90208f05cc2d39a0039941d03607
 SHA512:
-  metadata.gz: 8817c135d2f0ea3ec5d8979f0360ac5772ad32ff244d5ebf65b6111954452e41ada1b9466669313775356cf3838fc522289344125392c9a4700c869c6705c0fd
-  data.tar.gz: 28a09497a4e6d7c085a6e44b6f4262a6fa2d6ac0f79d499b1bd6d6b946bacaaf78a14ab1f2389d9d96a719fee4168c0374ddad5b4994b34e07f8738c6462ba0f
+  metadata.gz: da5f747f97ec3c16f14b65d592482b23cc8a0d8ba2d1c691dc98df8b5f84d5dfd8c92e8be67362f8b6be38b0bd584c2bfdd97f5169f9e4d91347a7286ad87770
+  data.tar.gz: 2a1b5d95ac36a751943a87adcb9231b81633f61139a6ca38ca3d34859a7e9a2f647ce204b549eda50efca9cc48245d7aff7c21499397d4ef673d1f4c02de84a4

data/.gitignore

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

data/CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## 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
+- [add label option #127](https://github.com/kufu/activerecord-bitemporal/pull/127)
+
+### Changed
+- [Support for inverse_of of Rails 6.1 or higher #130](https://github.com/kufu/activerecord-bitemporal/pull/130)
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
 ## 4.0.0
 
 ### Breaking Changed

data/lib/activerecord-bitemporal/bitemporal.rb

@@ -334,30 +334,32 @@ 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)
+
+            # 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
@@ -499,13 +501,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/patches.rb

@@ -79,6 +79,18 @@ module ActiveRecord::Bitemporal
       def bi_temporal_model?
         owner.class.bi_temporal_model? && klass&.bi_temporal_model?
       end
+
+      def matches_foreign_key?(record)
+        return super unless owner.class.bi_temporal_model?
+
+        begin
+          original_owner_id = owner.id
+          owner.id = owner.read_attribute(owner.class.bitemporal_id_key)
+          super
+        ensure
+          owner.id = original_owner_id
+        end
+      end
     end
 
     module ThroughAssociation

data/lib/activerecord-bitemporal/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Bitemporal
-    VERSION = "4.0.0"
+    VERSION = "4.2.0"
   end
 end

data/lib/activerecord-bitemporal/visualizer.rb

@@ -91,8 +91,17 @@ module ActiveRecord::Bitemporal
           end
         end
       end
-  
-      "#{headers.to_s}\n#{body.to_s}"
+
+      transaction_label = 'transaction_datetime'
+      right_margin = time_length + 1 - transaction_label.size
+
+      label = if right_margin >= 0
+        "#{transaction_label + ' ' * right_margin}| valid_datetime"
+      else
+        "#{transaction_label[0...right_margin]}| valid_datetime"
+      end
+
+      "#{label}\n#{headers.to_s}\n#{body.to_s}"
     end
   
     # Compute a dictionary of where each time should be plotted.

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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bitemporal
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.2.0
 platform: ruby
 authors:
 - SmartHR
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2023-07-24 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
@@ -189,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: BiTemporal Data Model for ActiveRecord