para 0.11.1 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8200df9f27fa2f27d322ee3458aca86afe26c70629be160848bb12629586057
-  data.tar.gz: 6a931b1665e21f17304bc1f918cb32b686796accadd3184532d4b47230414c46
+  metadata.gz: 9ecad01c0560b48fbe495db67c73c5f3275096b45b4a99a9c9bc0075a39d111e
+  data.tar.gz: aedd600ea37ee165dccf2d8ac8452b316999a10de5092c5dea3ab72c1ef0d4a9
 SHA512:
-  metadata.gz: 27faad84e404aea146d51ece49a8d5091f1dc3f201a44c16841733c28ecfdc8aab1560f080887216949db150d0c19e1e5ced913cdb2cace01462608b735c77f9
-  data.tar.gz: 0b11a0c0239a54e99408d15deb17c0ff4174be9719dd0fa592faebce81affa2b69f9e68fd3697160d31db2f8b12fe50c2519e8f622e787cdd5e02c00573425b3
+  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/inputs/nested_base_input.rb

@@ -1,14 +1,14 @@
 module Para
   module Inputs
     class NestedBaseInput < SimpleForm::Inputs::Base
-      GLOBAL_NESTED_FIELD_KEY = "para.nested_field.parent"
+      GLOBAL_NESTED_FIELD_KEY = 'para.nested_field.parent'
 
       private
 
       def dom_identifier
         @dom_identifier ||= begin
           name = attribute_name
-          id = @builder.object.id || "_new_#{ parent_nested_field&.attribute_name }_"
+          id = @builder.object.id || "_new_#{parent_nested_field&.attribute_name}_"
           time = (Time.now.to_f * 1000).to_i
           random = (rand * 1000).to_i
           [name, id, time, random].join('-')
@@ -22,7 +22,7 @@ module Para
       def subclasses
         options.fetch(:subclasses, [])
       end
-      
+
       def add_button_label
         options.fetch(:add_button_label) { I18n.t('para.form.nested.add') }
       end
@@ -39,13 +39,13 @@ module Para
         @parent_nested_field = RequestStore.store[GLOBAL_NESTED_FIELD_KEY]
         RequestStore.store[GLOBAL_NESTED_FIELD_KEY] = self
 
-        block.call.tap do
-          RequestStore.store[GLOBAL_NESTED_FIELD_KEY] = @parent_nested_field
-        end
+        block.call
+      ensure
+        RequestStore.store[GLOBAL_NESTED_FIELD_KEY] = @parent_nested_field
       end
 
-      def parent_nested_field
-        @parent_nested_field || RequestStore.store[GLOBAL_NESTED_FIELD_KEY]
+      def parent_nested_field(fallback_to_self: true)
+        @parent_nested_field || (RequestStore.store[GLOBAL_NESTED_FIELD_KEY] if fallback_to_self)
       end
     end
   end

data/lib/para/inputs/nested_many_input.rb

@@ -4,7 +4,7 @@ module Para
       attr_reader :resource
 
       def input(_wrapper_options = nil)
-        input_html_options[:class] << "nested-many"
+        input_html_options[:class] << 'nested-many'
 
         orderable = options.fetch(:orderable, model.orderable?)
         add_button = options.fetch(:add_button, true)
@@ -40,6 +40,15 @@ module Para
         end
       end
 
+      protected
+
+      def render_partial?
+        options[:render_partial] ||
+          object.errors.any? ||
+          (object.persisted? && uncollapsed?) ||
+          parent_nested_field(fallback_to_self: false)&.render_partial?
+      end
+
       private
 
       def parent_model
@@ -58,10 +67,6 @@ module Para
         inset? && Para.config.uncollapse_inset_nested_fields
       end
 
-      def render_partial?
-        options[:render_partial] || object.errors.any? || (object.persisted? && uncollapsed?)
-      end
-
       def remote_partial_params
         @remote_partial_params ||= options.fetch(:remote_partial_params, {}).merge(
           namespace: :nested_form

data/lib/para/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.3
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-10 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.2
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: Rails admin engine