inline_forms 8.1.15 → 8.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58e6670831f8bce627752b9797371fb20d2f3b14f571a4bc8c879478b71f5ff6
-  data.tar.gz: 32fd5f2f3503126e9113d10a3bea9ba23468667f11cc4db8252d78078b101af8
+  metadata.gz: a523b9082f8bf1ada004984c1d3cc66e745cae0e525e36acbf66df97b7015e98
+  data.tar.gz: d82f9950bde7f293ea70ef2e63162bcb304a0fac44eb6c8f645f88bbefe947da
 SHA512:
-  metadata.gz: d9e59af7820b05e5ef046c1771a85f37ee1d7dd4ab9affbe0f8e2dfda03fe49db57d9452972406a889f699732165b8117bb56ecdee6c6a5edf9c05b0d14642f8
-  data.tar.gz: 55be4d675321e511079de4a362688b664e65dce704dd56ef5929c8db2a286f0fef034312a2572016138808155a18e4f7150472a26aa904adb65e926d762da949
+  metadata.gz: 275bec7794f426e5131ae69843dfcb9bd2cec55ae9124075bc59ae0e171fc6df3d406ae776d78526a918a12dbc87aa41b0b12ade138fd4f520d75254570e6b01
+  data.tar.gz: 33bb93de6e2f017d664b610e07105afea73708b5ee67a269b48bd68de6b3d0fa8b9688eab4c21882ea408a8fc7ab68fcf6e2a18ff733d56fad29110e5863790e

data/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project are documented in this file.
 
 ## [Unreleased]
 
+## [8.1.16] - 2026-05-28
+
+### Fixed
+
+- **`RecordNotUnique` on `action_text_rich_texts.id` when undoing a delete more than once.** Restoring rich text after parent undo used `reify.save!`, which INSERTs the old primary key. A second delete/undo cycle (or an already-restored row) hit SQLite's unique constraint. Restoration now upserts by `(record_type, record_id, name)` and copies `body` only, and only the latest PaperTrail `destroy` version per attribute is applied.
+
+### Added
+
+- **Regression test:** nested Photo delete → undo → delete → undo.
+
 ## [8.1.15] - 2026-05-28
 
 ### Fixed

data/app/controllers/inline_forms_controller.rb

@@ -331,23 +331,49 @@ class InlineFormsController < ApplicationController
   # Undoing a parent +destroy+ reifies the Apartment/Photo row only. ActionText
   # bodies live in +action_text_rich_texts+ and get their own PaperTrail
   # +destroy+ versions; those rows are gone after +parent.destroy+, so we also
-  # reify and save each matching +ActionText::RichText+ destroy snapshot.
+  # reify each matching +ActionText::RichText+ destroy snapshot.
+  #
+  # Use +find_or_initialize_by(record_type, record_id, name)+ and copy +body+
+  # only. Reified rows carry the old PK; +save!+ on a new record would INSERT
+  # that id and raise +RecordNotUnique+ on a second delete/undo cycle when the
+  # row already exists. Only the newest destroy version per attribute name is
+  # applied (repeat delete/undo leaves multiple RT destroy versions in the table).
   def restore_rich_texts_for_reverted_parent!(parent)
     return unless defined?(ActionText::RichText)
 
     record_type = parent.class.base_class.name
     record_id = parent.id
+    versions_by_name = {}
+
+    PaperTrail::Version
+      .where(item_type: "ActionText::RichText", event: "destroy")
+      .order(id: :desc)
+      .each do |version|
+        attrs = version.object_deserialized
+        next unless attrs.is_a?(Hash)
 
-    PaperTrail::Version.where(item_type: "ActionText::RichText", event: "destroy").find_each do |version|
-      attrs = version.object_deserialized
-      next unless attrs.is_a?(Hash)
+        type = attrs["record_type"] || attrs[:record_type]
+        rid = attrs["record_id"] || attrs[:record_id]
+        next unless type == record_type && rid.to_i == record_id
 
-      type = attrs["record_type"] || attrs[:record_type]
-      rid = attrs["record_id"] || attrs[:record_id]
-      next unless type == record_type && rid.to_i == record_id
+        name = (attrs["name"] || attrs[:name]).to_s
+        next if name.empty?
+
+        versions_by_name[name] ||= version
+      end
 
-      rich_text = version.reify
-      rich_text&.save!
+    versions_by_name.each_value do |version|
+      reified = version.reify
+      next unless reified
+
+      name = reified.name.to_s
+      record = ActionText::RichText.find_or_initialize_by(
+        record_type: record_type,
+        record_id: record_id,
+        name: name
+      )
+      record.body = reified.body if reified.respond_to?(:body)
+      record.save!
     end
   end
 

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "8.1.15"
+  VERSION = "8.1.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 8.1.15
+  version: 8.1.16
 platform: ruby
 authors:
 - Ace Suares