bullet_train-super_scaffolding 1.3.11 → 1.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c18ddfb99ec853190950e2e80f6f3f00658fd565c2b3a092bc6d001bfc2da535
-  data.tar.gz: 00274d04c09b7c9866bd73099d832e94a44bf033929da3a7e1ad5779647cae3b
+  metadata.gz: c5750822ea3890089ff110d3632abb49b78254db7f43980caa77eea770991828
+  data.tar.gz: dfb19446a59d8665205ec89fbeacf49d12c5f695ac30e878c3776da8fca86aea
 SHA512:
-  metadata.gz: a823e9d63e599106ec58ff0290cc79e37e1c55e65149724105c81497e0d30190823be8280a11cc787b61cf574ba2664697d1fd93f14d19f77f302b82564fda59
-  data.tar.gz: abdd3895111e87a081a2d3d9dd8cc887386c8a6c7f4784a9c7b8319036025806b99694a448cbd72787728ed139b78ad26f8e80bf81aca110cfb88a7be22d2d23
+  metadata.gz: d0fd7cd95ad4b491f8d23daa2c6fd9b901f70b2745aebd56a64c6555e31ce33667117a98cacad94239e860077495b148fa090ff71e40280f3cb322423b14ecb4
+  data.tar.gz: 2dc5dbf921246e3e5f972f64cf271178f2c5d2a0854d39b59dbd7b66dcbbc77f5e84b27d01fb3767ff2ce42a97951824ad06542c4f48d46ff3985c0c455c04d9

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.3.11"
+    VERSION = "1.3.13"
   end
 end

data/lib/scaffolding/transformer.rb

@@ -722,7 +722,7 @@ class Scaffolding::Transformer
       when "number_field"
         "number"
       when "file_field"
-        "file"
+        "file#{"s" if is_multiple}"
       when "password_field"
         "text"
       else
@@ -1065,6 +1065,9 @@ class Scaffolding::Transformer
         ].each do |file|
           if is_ids || is_multiple
             scaffold_add_line_to_file(file, "#{name}: [],", RUBY_NEW_ARRAYS_HOOK, prepend: true)
+            if type == "file_field"
+              scaffold_add_line_to_file(file, "#{name}_removal: [],", RUBY_NEW_ARRAYS_HOOK, prepend: true)
+            end
           else
             scaffold_add_line_to_file(file, ":#{name},", RUBY_NEW_FIELDS_HOOK, prepend: true)
             if type == "file_field"
@@ -1113,7 +1116,11 @@ class Scaffolding::Transformer
           when "date_and_time_field"
             "assert_equal_or_nil DateTime.parse(tangible_thing_data['#{name}']), tangible_thing.#{name}"
           when "file_field"
-            "assert_equal tangible_thing_data['#{name}'], rails_blob_path(@tangible_thing.#{name}) unless controller.action_name == 'create'"
+            if is_multiple
+              "assert_equal tangible_thing_data['#{name}'], @tangible_thing.#{name}.map{|file| rails_blob_path(file)} unless controller.action_name == 'create'"
+            else
+              "assert_equal tangible_thing_data['#{name}'], rails_blob_path(@tangible_thing.#{name}) unless controller.action_name == 'create'"
+            end
           else
             "assert_equal_or_nil tangible_thing_data['#{name}'], tangible_thing.#{name}"
           end
@@ -1122,13 +1129,30 @@ class Scaffolding::Transformer
 
         # File fields are handled in a specific way when using the jsonapi-serializer.
         if type == "file_field"
-          scaffold_add_line_to_file("./app/views/api/v1/scaffolding/completely_concrete/tangible_things/_tangible_thing.json.jbuilder", "json.#{name} url_for(tangible_thing.#{name}) if tangible_thing.#{name}.attached?", RUBY_FILES_HOOK, prepend: true, suppress_could_not_find: true)
+          jbuilder_content = if is_multiple
+            <<~RUBY
+              json.#{name} do 
+                json.array! tangible_thing.#{name}.map { |file| url_for(file)  }
+              end if tangible_thing.#{name}.attached?
+            RUBY
+          else
+            "json.#{name} url_for(tangible_thing.#{name}) if tangible_thing.#{name}.attached?"
+          end
+
+          scaffold_add_line_to_file("./app/views/api/v1/scaffolding/completely_concrete/tangible_things/_tangible_thing.json.jbuilder", jbuilder_content, RUBY_FILES_HOOK, prepend: true, suppress_could_not_find: true)
           # We also want to make sure we attach the dummy file in the API test on setup
           file_name = "./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_controller_test.rb"
-          content = <<~RUBY
-            @#{child.underscore}.#{name} = Rack::Test::UploadedFile.new("test/support/foo.txt")
-            @another_#{child.underscore}.#{name} = Rack::Test::UploadedFile.new("test/support/foo.txt")
-          RUBY
+          content = if is_multiple
+            <<~RUBY
+              @#{child.underscore}.#{name} = [Rack::Test::UploadedFile.new("test/support/foo.txt")]
+              @another_#{child.underscore}.#{name} = [Rack::Test::UploadedFile.new("test/support/foo.txt")]
+            RUBY
+          else
+            <<~RUBY
+              @#{child.underscore}.#{name} = Rack::Test::UploadedFile.new("test/support/foo.txt")
+              @another_#{child.underscore}.#{name} = Rack::Test::UploadedFile.new("test/support/foo.txt")
+            RUBY
+          end
           scaffold_add_line_to_file(file_name, content, RUBY_FILES_HOOK, prepend: true)
         end
 
@@ -1297,7 +1321,27 @@ class Scaffolding::Transformer
 
         case type
         when "file_field"
-          remove_file_methods =
+          remove_file_methods = if is_multiple
+            <<~RUBY
+              def #{name}_removal?
+                #{name}_removal&.any?
+              end
+
+              def remove_#{name}
+                #{name}_attachments.where(id: #{name}_removal).map(&:purge)
+              end
+
+              def #{name}=(attachables)
+                attachables = Array(attachables).compact_blank
+            
+                if attachables.any?
+                  attachment_changes["#{name}"] =
+                    ActiveStorage::Attached::Changes::CreateMany.new("#{name}", self, #{name}.blobs + attachables)
+                end
+              end
+
+            RUBY
+          else
             <<~RUBY
               def #{name}_removal?
                 #{name}_removal.present?
@@ -1307,6 +1351,7 @@ class Scaffolding::Transformer
                 #{name}.purge
               end
             RUBY
+          end
 
           # Generating a model with an `attachment(s)` data type (i.e. - `rails g ModelName file:attachment`)
           # adds `has_one_attached` or `has_many_attached` to our model, just not directly above the

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.3.11
+  version: 1.3.13
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard