para 0.11.2 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f6fa00155104b2a8b6557c6ec04c3c64ae456eaeea26605757f0b4fef347fcc
-  data.tar.gz: 91243a2554514c1acbffec0d730276ffe5db4063b21723b91f0ed842b9ccb228
+  metadata.gz: 7e85115947c19d8b42e046fca2d3f6c6fbc4de0c6ec23d7941936508a6b5ef67
+  data.tar.gz: 400dce7d9cc881e1fd4a94efa11eba4f71f8bcc3cb169acb0f5e1a476bc42bd9
 SHA512:
-  metadata.gz: 6842f6aa0f5ed769519fe0ce471ea9cb5bde60458974debc956ba094f93eb799dfbb4d0f9d6a0728e2131c3376088ecf7cd904130a228345b9d204664fdf8a7b
-  data.tar.gz: 9de0c468a9e29066ca22a2cd0f2d5f600c0d4d7397b63034ab8a9a53784aa255901f1ea95e3f9759103a2a411d3f163c3a3bdb763b6e02e1c76008f90e29c2d3
+  metadata.gz: 2f83c8f52b7c04547afc074473d5f75ee3c7c1a4acd0b8b32725f0ae5985fca258a3a5a21399763b90c117ecc283d8241ffb15a1271666aa33f850a47044348f
+  data.tar.gz: 8d45c55a0805a8965bb5ea8eae588f7ca43b2f2318ebf0cbb195dffae962f6e15f68bbeb54bb2e40c78c70758bbf4b6783861f873e79270f33fb5320a0db4a29

data/app/views/para/inputs/nested_many/_add_with_subclasses.html.haml

@@ -1,9 +1,15 @@
-.add-button.nested-many-inset-add-button.dropdown
-  %button.btn.btn-shadow.dropdown-toggle{ class: add_button_class, type: 'button', data: { toggle: 'dropdown' } }
+- if subclasses.one?
+  - submodel = subclasses.first
+
+  = link_to_add_association form, attribute_name, wrap_object: proc { with_inverse_association_for(submodel.new, attribute_name, form.object) }, partial: find_partial_for(model, 'nested_many/container', partial_dir: 'inputs'), form_name: 'form', class: "btn btn-shadow add-button nested-many-inset-add-button #{add_button_class}", data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, orderable: orderable, locals: { model: submodel, nested_locals: nested_locals, inset: inset, uncollapsed: uncollapsed, render_partial: render_partial, remote_partial_params: remote_partial_params } } do
     = add_button_label
-    %i.fa.fa-angle-down
-  %ul.dropdown-menu
-    - subclasses.each do |submodel|
-      %li
-        = link_to_add_association form, attribute_name, wrap_object: proc { with_inverse_association_for(submodel.new, attribute_name, form.object) }, partial: find_partial_for(submodel, 'nested_many/container', partial_dir: 'inputs'), form_name: 'form', class: 'dropdown-link', data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, orderable: orderable, locals: { model: submodel, nested_locals: nested_locals, inset: inset, uncollapsed: uncollapsed, render_partial: render_partial, remote_partial_params: remote_partial_params } } do
-          = submodel.model_name.human
+- else
+  .add-button.nested-many-inset-add-button.dropdown
+    %button.btn.btn-shadow.dropdown-toggle{ class: add_button_class, type: 'button', data: { toggle: 'dropdown' } }
+      = add_button_label
+      %i.fa.fa-angle-down
+    %ul.dropdown-menu
+      - subclasses.each do |submodel|
+        %li
+          = link_to_add_association form, attribute_name, wrap_object: proc { with_inverse_association_for(submodel.new, attribute_name, form.object) }, partial: find_partial_for(submodel, 'nested_many/container', partial_dir: 'inputs'), form_name: 'form', class: 'dropdown-link', data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, orderable: orderable, locals: { model: submodel, nested_locals: nested_locals, inset: inset, uncollapsed: uncollapsed, render_partial: render_partial, remote_partial_params: remote_partial_params } } do
+            = submodel.model_name.human

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.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.4
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-24 00:00:00.000000000 Z
+date: 2023-11-20 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