para 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f6fa00155104b2a8b6557c6ec04c3c64ae456eaeea26605757f0b4fef347fcc
-  data.tar.gz: 91243a2554514c1acbffec0d730276ffe5db4063b21723b91f0ed842b9ccb228
+  metadata.gz: 9ecad01c0560b48fbe495db67c73c5f3275096b45b4a99a9c9bc0075a39d111e
+  data.tar.gz: aedd600ea37ee165dccf2d8ac8452b316999a10de5092c5dea3ab72c1ef0d4a9
 SHA512:
-  metadata.gz: 6842f6aa0f5ed769519fe0ce471ea9cb5bde60458974debc956ba094f93eb799dfbb4d0f9d6a0728e2131c3376088ecf7cd904130a228345b9d204664fdf8a7b
-  data.tar.gz: 9de0c468a9e29066ca22a2cd0f2d5f600c0d4d7397b63034ab8a9a53784aa255901f1ea95e3f9759103a2a411d3f163c3a3bdb763b6e02e1c76008f90e29c2d3
+  metadata.gz: ff73f38e195cb79654b75b8e0e145873e540f8b351b887dfeb871548fb73f73f698dc641f62116fbc820e7909db80a22fb933e990625ede8de89aa133d0436a9
+  data.tar.gz: 74b34f00a147194d45060346895a46581eda59cd5d6a27f2963093557ba4331b570c866c8a98acc70395c89422ce5485a040373ec6167955ff41e649a9841ac7

data/lib/para/cloneable/attachments_cloner.rb

@@ -17,7 +17,7 @@ module Para
 
         attachment_reflections = original.class.reflections.select do |name, reflection|
           name.to_s.match(ATTACHMENTS_RELATION_REGEX) &&
-          reflection.options[:class_name] == "ActiveStorage::Attachment"
+            reflection.options[:class_name] == 'ActiveStorage::Attachment'
         end
 
         attachment_reflections.each do |name, reflection|
@@ -26,16 +26,27 @@ module Para
 
           if reflection.collection?
             association_target.each do |attachment|
-              clone_attachment(name, attachment)
+              clone_attachment_if_needed(name, attachment)
             end
           else
-            clone_attachment(name, association_target)
+            clone_attachment_if_needed(name, association_target)
           end
         end
       end
 
+      def clone_attachment_if_needed(name, attachment)
+        return if attachment.nil?
+
+        store_key = store_key_for(attachment)
+
+        # If the attachment has already been cloned, we don't need to clone it again
+        return if dictionary[store_key]&.key?(attachment)
+
+        clone_attachment(name, attachment)
+      end
+
       def clone_attachment(name, original_attachment)
-        association_name = name.gsub(ATTACHMENTS_RELATION_REGEX, "")
+        association_name = name.gsub(ATTACHMENTS_RELATION_REGEX, '')
         original_blob = original_attachment.blob
 
         # Handle missing file in storage service by bypassing the attachment cloning
@@ -45,7 +56,7 @@ module Para
           attachment_target = clone.send(association_name)
 
           cloned_blob = ActiveStorage::Blob.create_and_upload!(
-            io: tempfile, 
+            io: tempfile,
             filename: original_blob.filename,
             content_type: original_blob.content_type
           )
@@ -67,10 +78,10 @@ module Para
       # doesn't always return the same, so for now we still handle the Rails 5.2 case.
       def find_cloned_attachment(attachment_target, original_blob)
         attachments = if attachment_target.attachments.any?
-          attachment_target.attachments
-        else
-          [attachment_target.attachment]
-        end
+                        attachment_target.attachments
+                      else
+                        [attachment_target.attachment]
+                      end
 
         attachment = attachments.find do |att|
           att.blob.checksum == original_blob.checksum
@@ -81,11 +92,15 @@ module Para
       # simulates what the deep_cloneable gem does when it clones a resource
       #
       def store_cloned(source, clone)
-        store_key = source.class.name.tableize.to_sym
+        store_key = store_key_for(source)
 
         dictionary[store_key] ||= {}
         dictionary[store_key][source] = clone
       end
+
+      def store_key_for(attachment)
+        attachment.class.name.tableize.to_sym
+      end
     end
   end
 end

data/lib/para/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Para
-  VERSION = '0.11.2'
+  VERSION = '0.11.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-24 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_decorator
@@ -862,7 +862,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.4
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: Rails admin engine