activerecord-bitemporal 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07ac44707e66e1fdad8071804841ee77a3dddb2e74ea87269e8f9a18f261131a
-  data.tar.gz: 5d8f788c53af5f9265465d97e59fde78f6f4ca30eae0b9a5320da0a78634d676
+  metadata.gz: 6c03b187851d427db0ff32c1d8cc721eaf71da732877d096d0e9cc843b54550a
+  data.tar.gz: 126840e0fc964919ff80a3d403e820958cf81096dca79ff7abd4f40fa603ea27
 SHA512:
-  metadata.gz: c2a9cf9a8322c2a2ecbd8e1a4cd80101a69c2484261cfc48385c35f592e039141aeaf3813f9308ed7801b06b0691426beee0bc3d995c95eb52282e9f94ff125a
-  data.tar.gz: 611bc03e7821ff4179cae17d81adda035b0cdb4e96a7ea20e66edc8e323a064359d965150a665b843cfef98168d5be84ac1f57cb5bbefebe9aee07a1adca61f4
+  metadata.gz: aac42b7ea34a98bd646c2a2d516f91cd1fc7ca4b86db45fe78e28699ea6dfe0159e7169ed44402be46d7fdcfbe0ff6e2795e69d08df0a5910fc4ceedda0455d8
+  data.tar.gz: b9a7a842b205529e3bdc89352e9cd505435a009c179bdf54353942747d0b3275d48985628e2347dc31887d85da351a7af0d2d18fd7ac4e89fdcc1074aef73078

data/.circleci/config.yml

@@ -1,26 +1,15 @@
 version: 2.1
 
-executors:
-  ruby_2_7:
-    docker:
-      - image: ruby:2.7.5
-      - image: circleci/postgres:11-alpine
-
-  ruby_3_0:
-    docker:
-      - image: ruby:3.0.3
-      - image: circleci/postgres:11-alpine
-
-  ruby_3_1:
-    docker:
-      - image: ruby:3.1.0
-      - image: circleci/postgres:11-alpine
-
-commands:
-  run_rspec:
+jobs:
+  rspec:
     parameters:
+      ruby-version:
+        type: string
       gemfile:
         type: string
+    docker:
+      - image: ruby:<< parameters.ruby-version >>
+      - image: cimg/postgres:11.16
     steps:
       - checkout
       - run: gem install bundler
@@ -28,86 +17,28 @@ commands:
       - run: bundle exec appraisal << parameters.gemfile >> bundle install
       - run: bundle exec appraisal << parameters.gemfile >> rspec
 
-jobs:
-  ruby_2_7_rails_5_2:
-    executor: ruby_2_7
-    steps:
-      - run_rspec:
-          gemfile: rails-5.2
-
-  ruby_2_7_rails_6_0:
-    executor: ruby_2_7
-    steps:
-      - run_rspec:
-          gemfile: rails-6.0
-
-  ruby_2_7_rails_6_1:
-    executor: ruby_2_7
-    steps:
-      - run_rspec:
-          gemfile: rails-6.1
-
-  ruby_2_7_rails_7_0:
-    executor: ruby_2_7
-    steps:
-      - run_rspec:
-          gemfile: rails-7.0
-
-  ruby_2_7_rails_main:
-    executor: ruby_2_7
-    steps:
-      - run_rspec:
-          gemfile: rails-main
-
-  ruby_3_0_rails_6_1:
-    executor: ruby_3_0
-    steps:
-      - run_rspec:
-          gemfile: rails-6.1
-
-  ruby_3_0_rails_7_0:
-    executor: ruby_3_0
-    steps:
-      - run_rspec:
-          gemfile: rails-7.0
-
-  ruby_3_0_rails_main:
-    executor: ruby_3_0
-    steps:
-      - run_rspec:
-          gemfile: rails-main
-
-  ruby_3_1_rails_6_1:
-    executor: ruby_3_1
-    steps:
-      - run_rspec:
-          gemfile: rails-6.1
-
-  ruby_3_1_rails_7_0:
-    executor: ruby_3_1
-    steps:
-      - run_rspec:
-          gemfile: rails-7.0
-
-  ruby_3_1_rails_main:
-    executor: ruby_3_1
-    steps:
-      - run_rspec:
-          gemfile: rails-main
-
 workflows:
-  version: 2
-
   test:
-    jobs: &jobs
-      - ruby_2_7_rails_5_2
-      - ruby_2_7_rails_6_0
-      - ruby_2_7_rails_6_1
-      - ruby_2_7_rails_7_0
-      - ruby_2_7_rails_main
-      - ruby_3_0_rails_6_1
-      - ruby_3_0_rails_7_0
-      - ruby_3_0_rails_main
-      - ruby_3_1_rails_6_1
-      - ruby_3_1_rails_7_0
-      - ruby_3_1_rails_main
+    jobs:
+      - rspec:
+          matrix:
+            parameters:
+              ruby-version:
+                - '2.7'
+                - '3.0'
+                - '3.1'
+              gemfile:
+                - rails-5.2
+                - rails-6.0
+                - rails-6.1
+                - rails-7.0
+                - rails-main
+            exclude:
+              - ruby-version: '3.0'
+                gemfile: rails-5.2
+              - ruby-version: '3.0'
+                gemfile: rails-6.0
+              - ruby-version: '3.1'
+                gemfile: rails-5.2
+              - ruby-version: '3.1'
+                gemfile: rails-6.0

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## 2.3.0
+
+### Breaking Changed
+
+### Added
+- [Add `InstanceMethods#swapped_id_previously_was`](https://github.com/kufu/activerecord-bitemporal/pull/114)
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+## 2.2.0
+
+### Breaking Changed
+
+### Added
+- [replace postgres docker image](https://github.com/kufu/activerecord-bitemporal/pull/103)
+- [use Matrix Jobs in CircleCI](https://github.com/kufu/activerecord-bitemporal/pull/107)
+- [Add support changing swapped_id, when called #destroy](https://github.com/kufu/activerecord-bitemporal/pull/110)
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
 ## 2.1.0
 
 ### Breaking Changed

data/Gemfile.lock

@@ -1,36 +1,35 @@
 PATH
   remote: .
   specs:
-    activerecord-bitemporal (0.1.0)
+    activerecord-bitemporal (2.3.0)
       activerecord (>= 5.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activerecord (6.1.3)
-      activemodel (= 6.1.3)
-      activesupport (= 6.1.3)
-    activesupport (6.1.3)
+    activemodel (7.0.4.2)
+      activesupport (= 7.0.4.2)
+    activerecord (7.0.4.2)
+      activemodel (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     byebug (10.0.2)
     coderay (1.1.2)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.2.0)
     database_cleaner (1.7.0)
     diff-lcs (1.3)
-    i18n (1.8.9)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     method_source (0.9.0)
-    minitest (5.14.4)
+    minitest (5.17.0)
     pg (1.1.3)
     pry (0.11.3)
       coderay (~> 1.1.0)
@@ -54,9 +53,8 @@ GEM
     rspec-support (3.8.0)
     thor (0.20.3)
     timecop (0.9.1)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -74,4 +72,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   2.2.3
+   2.2.33

data/lib/activerecord-bitemporal/bitemporal.rb

@@ -280,7 +280,10 @@ module ActiveRecord
           # MEMO: Do not copy `swapped_id`
           def dup(*)
             super.tap { |itself|
-              itself.instance_exec { @_swapped_id = nil } unless itself.frozen?
+              itself.instance_exec do
+                @_swapped_id_previously_was = nil
+                @_swapped_id = nil
+              end unless itself.frozen?
             }
           end
         end
@@ -319,6 +322,7 @@ module ActiveRecord
           after_instance.save!(validate: false)
 
           # 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
@@ -345,6 +349,10 @@ module ActiveRecord
             duplicated_instance.valid_to = target_datetime
             duplicated_instance.transaction_from = current_time
             duplicated_instance.save!(validate: false)
+            if @destroyed
+              @_swapped_id_previously_was = swapped_id
+              @_swapped_id = duplicated_instance.swapped_id
+            end
           }
           raise ActiveRecord::RecordInvalid unless @destroyed
 
@@ -379,6 +387,7 @@ module ActiveRecord
             @new_record = false
             @previously_new_record = false
             # NOTE: Hook to copying swapped_id
+            @_swapped_id_previously_was = nil
             @_swapped_id = fresh_object.swapped_id
             self
           end
@@ -401,6 +410,7 @@ module ActiveRecord
             @new_record = false
             @previously_new_record = false
             # NOTE: Hook to copying swapped_id
+            @_swapped_id_previously_was = nil
             @_swapped_id = fresh_object.swapped_id
             self
           end
@@ -422,6 +432,7 @@ module ActiveRecord
             @attributes = fresh_object.instance_variable_get("@attributes")
             @new_record = false
             # NOTE: Hook to copying swapped_id
+            @_swapped_id_previously_was = nil
             @_swapped_id = fresh_object.swapped_id
             self
           end

data/lib/activerecord-bitemporal/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Bitemporal
-    VERSION = "2.1.0"
+    VERSION = "2.3.0"
   end
 end

data/lib/activerecord-bitemporal.rb

@@ -76,6 +76,7 @@ module ActiveRecord::Bitemporal::Bitemporalize
     include ActiveRecord::Bitemporal::Persistence
 
     def swap_id!(without_clear_changes_information: false)
+      @_swapped_id_previously_was = nil
       @_swapped_id = self.id
       self.id = self.send(bitemporal_id_key)
       clear_attribute_changes([:id]) unless without_clear_changes_information
@@ -85,6 +86,10 @@ module ActiveRecord::Bitemporal::Bitemporalize
       @_swapped_id || self.id
     end
 
+    def swapped_id_previously_was
+      @_swapped_id_previously_was
+    end
+
     def bitemporal_id_key
       self.class.bitemporal_id_key
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bitemporal
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - SmartHR
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord