bullet_train-super_scaffolding 1.7.16 → 1.7.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8cba07bbe66e0e722c0bea983663ba70c2919f8bcf51f6f97cdcfe03c5d7224
-  data.tar.gz: 751ae4a52840f96d9fd2381167e0c58479b31a777da9cb43e8f90868e13603bc
+  metadata.gz: fe1409d374421a05f03e3a685f540ce5dc28d1861aa8037594efbe1210fdc527
+  data.tar.gz: 5e9cc70b508fe1829130471dbc78a06a4058f1c930d17d59007ef9d4c88078cc
 SHA512:
-  metadata.gz: 4064061867621b97b8ae7551a3d56f4a11bfa237378957e4f4b2f8239a86efa78a3f2c688489280c441a25fe41b4d6a296fef0d66129f07eb10d7e0fa11853ed
-  data.tar.gz: 1356a54ea61aebcef5bee3b1bb20a52a30bec03fc003bb2ba6194ab917a0c7e6b0ef053d90028ecf58b06dd9f8f7c0179cd4fecf7b8c13ea812869b905d3a47b
+  metadata.gz: 22c6d0f8f599ac0419a29fb6fd92bb7722b6981780552e3d55a84d88982687365cb5c815ee18accc7b6ba4e2679b539b9e09c18c186600af5052a97c3efea8d3
+  data.tar.gz: c8dce7b4508b7c003a3f6aeb67f7dd76b877836d14242293116b23873da5731f3a775bd6d516b7f8ba1b8e1e12acba9f60dba0e71e379e3a8118b48262410c0b

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.7.16"
+    VERSION = "1.7.17"
   end
 end

data/lib/scaffolding/attribute.rb

@@ -96,6 +96,22 @@ class Scaffolding::Attribute
     original_type == "boolean"
   end
 
+  def file_field?
+    type == "file_field"
+  end
+
+  def image?
+    type == "image"
+  end
+
+  def cloudinary_image?
+    image? && cloudinary_enabled?
+  end
+
+  def active_storage_image?
+    image? && !cloudinary_enabled?
+  end
+
   # Sometimes we need all the magic of a `*_id` field, but without the scoping stuff.
   # Possibly only ever used internally by `join-model`.
   def is_unscoped?

data/lib/scaffolding/transformer.rb

@@ -969,7 +969,7 @@ class Scaffolding::Transformer
         ].each do |file|
           if attribute.is_ids? || attribute.is_multiple?
             scaffold_add_line_to_file(file, "#{attribute.name}: [],", RUBY_NEW_ARRAYS_HOOK, prepend: true)
-            if attribute.type == "file_field"
+            if attribute.file_field? || attribute.active_storage_image?
               scaffold_add_line_to_file(file, "#{attribute.name}_removal: [],", RUBY_NEW_ARRAYS_HOOK, prepend: true)
             end
           elsif attribute.type == "address_field"
@@ -988,7 +988,7 @@ class Scaffolding::Transformer
             scaffold_add_line_to_file(file, address_strong_params, RUBY_NEW_ARRAYS_HOOK, prepend: true)
           else
             scaffold_add_line_to_file(file, ":#{attribute.name},", RUBY_NEW_FIELDS_HOOK, prepend: true)
-            if attribute.type == "file_field"
+            if attribute.file_field? || attribute.active_storage_image?
               scaffold_add_line_to_file(file, ":#{attribute.name}_removal,", RUBY_NEW_FIELDS_HOOK, prepend: true)
             end
           end
@@ -1234,7 +1234,7 @@ class Scaffolding::Transformer
         end
 
         case attribute.type
-        when "file_field"
+        when "file_field", "image"
           remove_file_methods = if attribute.is_multiple?
             <<~RUBY
               def #{attribute.name}_removal?
@@ -1247,7 +1247,7 @@ class Scaffolding::Transformer
 
               def #{attribute.name}=(attachables)
                 attachables = Array(attachables).compact_blank
-            
+
                 if attachables.any?
                   attachment_changes["#{attribute.name}"] =
                     ActiveStorage::Attached::Changes::CreateMany.new("#{attribute.name}", self, #{attribute.name}.blobs + attachables)
@@ -1264,6 +1264,7 @@ class Scaffolding::Transformer
               def remove_#{attribute.name}
                 #{attribute.name}.purge
               end
+
             RUBY
           end
 
@@ -1280,13 +1281,16 @@ class Scaffolding::Transformer
             model_without_attached_hook.each { |line| f.write(line) }
           end
 
-          hook_type = attribute.is_multiple? ? HAS_MANY_HOOK : HAS_ONE_HOOK
-          scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", reflection_declaration, hook_type, prepend: true)
+          # Cloudinary images don't need all of the removal boilerplate since that's handled by the cloudinary JS
+          unless attribute.cloudinary_image?
+            hook_type = attribute.is_multiple? ? HAS_MANY_HOOK : HAS_ONE_HOOK
+            scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", reflection_declaration, hook_type, prepend: true)
 
-          # TODO: We may need to edit these depending on how we save multiple files.
-          scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "attr_accessor :#{attribute.name}_removal", ATTR_ACCESSORS_HOOK, prepend: true)
-          scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", remove_file_methods, METHODS_HOOK, prepend: true)
-          scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "after_validation :remove_#{attribute.name}, if: :#{attribute.name}_removal?", CALLBACKS_HOOK, prepend: true)
+            # TODO: We may need to edit these depending on how we save multiple files.
+            scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "attr_accessor :#{attribute.name}_removal", ATTR_ACCESSORS_HOOK, prepend: true)
+            scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", remove_file_methods, METHODS_HOOK, prepend: true)
+            scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "after_validation :remove_#{attribute.name}, if: :#{attribute.name}_removal?", CALLBACKS_HOOK, prepend: true)
+          end
         when "trix_editor"
           scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "has_rich_text :#{attribute.name}", HAS_ONE_HOOK, prepend: true)
         when "address_field"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.7.16
+  version: 1.7.17
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-09 00:00:00.000000000 Z
+date: 2024-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard