bullet_train-super_scaffolding 1.2.21 → 1.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 223f16f152b545b1554a030ef0f492740fa59825d34f62ffc4685aadb6b7882e
-  data.tar.gz: cda0b98a79b3d69c020e0ff61b7d4e40cb9029a382a760041cb2f3d6ec306d61
+  metadata.gz: 626091dfa183016d4944a4708cd94b6378c28be9732b8b98e8b54ad167de115c
+  data.tar.gz: 353cb3c7e7d7b601235ed0cb2762e48303037c0af10fcefb9f200347ad2acab0
 SHA512:
-  metadata.gz: 5ccd6e1495cd0f281bec5c3474694d43effb3fbad17dd438e808733526e7dcebb0f9584f4d3c375aaebbf44871cca3c2ca11b0f41ed801a9e537f30edfa7d896
-  data.tar.gz: 3949161365fc870eb977eb9962482123c8d30da896def52807ef0936dc86fd4089385a6147c94fcec71242d1fd988f60eb286f82f6e5b71bf5c0cc9bccf51dea
+  metadata.gz: ba96da3da40d384c9f36ba1f257470640ba9b2c95303536b80ef670cc1144301595e1ebfb0c6d83a4b32748e05eb361dbbb65b947ec8c8ab0316f33dfeb426be
+  data.tar.gz: 3051a564684d6a8cd46268bdeacd58bfa821d83aa462d63f1a1154b3b0fc9e7bf52cb0b590c1d3c1bc6c95638781d216240bb0058a42a748e7c4616558cf02de

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.2.21"
+    VERSION = "1.2.22"
   end
 end

data/lib/scaffolding/routes_file_manipulator.rb

@@ -398,10 +398,11 @@ class Scaffolding::RoutesFileManipulator
     existing_concerns.map! { |e| e.tr(":", "").tr("\"", "").squish&.to_sym }
     existing_concerns.filter! { |e| e.present? }
     existing_concerns << concern
+    existing_concerns.uniq!
     if line.include?("concerns:")
       lines[line_number].gsub!(/concerns: \[(.*)\]/, "concerns: [#{existing_concerns.map { |e| ":#{e}" }.join(", ")}]")
-    elsif line.ends_with?(" do")
-      lines[line_number].gsub!(/ do$/, " concerns: [#{existing_concerns.map { |e| ":#{e}" }.join(", ")}] do")
+    elsif line.squish.ends_with?(" do")
+      lines[line_number].gsub!(/ do$/, ", concerns: [#{existing_concerns.map { |e| ":#{e}" }.join(", ")}] do")
     else
       lines[line_number].gsub!(/resources :(.*)$/, "resources :\\1, concerns: [#{existing_concerns.map { |e| ":#{e}" }.join(", ")}]")
     end

data/lib/scaffolding/transformer.rb

@@ -668,6 +668,18 @@ class Scaffolding::Transformer
       type = parts.join(":")
       boolean_buttons = type == "boolean"
 
+      if first_table_cell && ["trix_editor", "ckeditor", "text_area"].include?(type)
+        puts ""
+        puts "The first attribute of your model cannot be any of the following types:".red
+        puts "1. trix_editor"
+        puts "2. ckeditor"
+        puts "3. text_area"
+        puts ""
+        puts "Please ensure you have another attribute type as the first attribute for your model and try again."
+
+        exit
+      end
+
       # extract any options they passed in with the field.
       # will extract options declared with either [] or {}.
       type, attribute_options = type.scan(/^(.*){(.*)}/).first || type
@@ -1523,6 +1535,12 @@ class Scaffolding::Transformer
       unless cli_options["skip-model"]
         scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "def collection\n  absolutely_abstract_creative_concept.completely_concrete_tangible_things\nend\n\n", METHODS_HOOK, prepend: true)
         scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "include Sortable\n", CONCERNS_HOOK, prepend: true)
+
+        migration = Dir.glob("db/migrate/*").last
+        migration_lines = File.open(migration).readlines
+        parent_line_idx = Scaffolding::FileManipulator.find(migration_lines, "t.references :#{parent.downcase}")
+        new_lines = Scaffolding::BlockManipulator.insert_line("t.integer :sort_order", parent_line_idx, migration_lines, false)
+        Scaffolding::FileManipulator.write(migration, new_lines)
       end
 
       unless cli_options["skip-table"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.2.21
+  version: 1.2.22
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-11 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Bullet Train Super Scaffolding