bullet_train-super_scaffolding 1.5.2 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69058843f0779cdd62cd70d3c1a628efc280339ec7f8056c9e1ee4a0cf3eeac0
-  data.tar.gz: d8b6eba75ba033cdfed28dfac6541c4708195d2fbdcb06fa3fe9c1f4c86d4149
+  metadata.gz: 9b7efadfb9aedfb0c4f903bd3a3d3cfb4434049c028f36ceba9e431bb9b7fe49
+  data.tar.gz: 1ed8a32334f0f72d859abfdea2ab689a5e7222f452344254a5bc46ebda8069c1
 SHA512:
-  metadata.gz: 6f3beaf757781c0522f677b6d40a27bf8cd5804e8079cd4b6e13bf10e3ad7e1119c022fd5ad1a7aa7b58625feee6bd00e079e7bf25b336f2171e1c140acadc3f
-  data.tar.gz: d57c47406f32696055be9834fd388de04ac2df32d3a0f86fd162ce91dce0cb7c684c7cc089625126fc2aa613874f849208d164f365b80d5ee84bbafae49de65a
+  metadata.gz: 1f68150179ed016be2eb00f51500eaaedae7b5f84dd851118422c4fe78024e4506f83ce47aa35d9526b7a6cb2f1a1e3d3692c694d124551436bd9498a1dd531c
+  data.tar.gz: 6934fcc20f30bf18d9a29c3d5b878a83612b01697af0226defa7c94bf7543c5423534f6397bd6bef472d2f63578d5558059df9ebb73ca8f7894aae0063bddc7b

data/lib/bullet_train/super_scaffolding/scaffolders/crud_scaffolder.rb

@@ -51,6 +51,11 @@ module BulletTrain
             end
           end
 
+          # get all the attributes.
+          attributes = argv[2..]
+
+          check_required_options_for_attributes("crud", attributes, child, parent)
+
           # `tr` here compensates for namespaced models (i.e. - `Projects::Deliverable` to `projects/deliverable`).
           parent_reference = parent_without_namespace.tableize.singularize.tr("/", "_")
           tableized_child = child.tableize.tr("/", "_")
@@ -82,11 +87,6 @@ module BulletTrain
               "bin/super-scaffold crud Section Page,Site,Team title:text body:text\n"
           end
 
-          # get all the attributes.
-          attributes = argv[2..]
-
-          check_required_options_for_attributes("crud", attributes, child, parent)
-
           transformer = Scaffolding::Transformer.new(child, parents, @options)
           transformer.scaffold_crud(attributes)
 

data/lib/bullet_train/super_scaffolding/scaffolders/join_model_scaffolder.rb

@@ -44,6 +44,16 @@ module BulletTrain
           # There should only be two attributes.
           attributes = [argv[1], argv[2]]
 
+          unless @options["skip-migration-generation"]
+            attributes_without_options = attributes.map { |attribute| attribute.gsub(/{.*}$/, "") }
+            attributes_without_id = attributes_without_options.map { |attribute| attribute.gsub(/_id$/, "") }
+            attributes_with_references = attributes_without_id.map { |attribute| attribute + ":references" }
+
+            generation_command = "bin/rails generate model #{child} #{attributes_with_references.join(" ")}"
+            puts "Generating model with '#{generation_command}'".green
+            `#{generation_command}`
+          end
+
           # Pretend we're doing a `super_select` scaffolding because it will do the correct thing.
           attributes = attributes.map { |attribute| attribute.gsub("{", ":super_select{") }
           attributes = attributes.map { |attribute| attribute.gsub("}", ",required}") }

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.5.2"
+    VERSION = "1.6.1"
   end
 end

data/lib/scaffolding/script.rb

@@ -7,6 +7,28 @@ require "scaffolding/routes_file_manipulator"
 
 require_relative "../bullet_train/terminal_commands"
 
+FIELD_PARTIALS = {
+  address_field: nil,
+  boolean: "boolean",
+  buttons: "string",
+  cloudinary_image: "string",
+  color_picker: "string",
+  date_and_time_field: "datetime",
+  date_field: "date",
+  email_field: "string",
+  emoji_field: "string",
+  file_field: "attachment",
+  image: "attachment",
+  options: "string",
+  password_field: "string",
+  phone_field: "string",
+  super_select: "string",
+  text_area: "text",
+  text_field: "string",
+  number_field: "integer",
+  trix_editor: "text"
+}
+
 # filter out options.
 argv = []
 @options = {}
@@ -28,11 +50,63 @@ def standard_protip
   puts "If you do that, you can reset to your last commit state by using `git checkout .` and `git clean -d -f` ."
 end
 
+def git_status
+  `git status`.split("\n")
+end
+
+def has_untracked_files?(status_lines)
+  status_lines.include?("Untracked files:")
+end
+
+# All untracked files begin with a tab (i.e. - "\tapp/models/model.rb").
+def get_untracked_files(status_lines)
+  `git ls-files --other --exclude-standard`.split("\n")
+end
+
 def check_required_options_for_attributes(scaffolding_type, attributes, child, parent = nil)
+  tableized_parent = nil
+
+  # Ensure the parent attribute name has the proper namespacing for adding as a foreign key.
+  if parent.present?
+    if child.include?("::") && parent.include?("::")
+      child_parts = child.split("::")
+      parent_parts = parent.split("::")
+      child_parts_dup = child_parts.dup
+      parent_parts_dup = parent_parts.dup
+
+      # Pop off however many spaces match.
+      child_parts_dup.each.with_index do |child_part, idx|
+        if child_part == parent_parts_dup[idx]
+          child_parts.shift
+          parent_parts.shift
+        else
+          tableized_parent = parent_parts.map(&:downcase).join("_")
+          break
+        end
+      end
+    end
+    # In case we're not working with namespaces, just tableize the parent as is.
+    tableized_parent ||= parent.tableize.singularize.tr("/", "_") if parent.present?
+  end
+
+  generation_command = case scaffolding_type
+  when "crud"
+    "bin/rails generate model #{child} #{tableized_parent}:references"
+  when "crud-field"
+    "" # This is blank so we can create the proper migration name first after we get the attributes.
+  end
+
+  # Even if there are attributes passed to the scaffolder,
+  # They may already exist in previous migrations, so we
+  # only register ones that need to be generated.
+  # i.e. - *_ids attributes in the join-model scaffolder.
+  attributes_to_generate = []
+
   attributes.each do |attribute|
     parts = attribute.split(":")
     name = parts.shift
     type = parts.join(":")
+    type_without_option = type.gsub(/{.*}/, "")
 
     unless Scaffolding.valid_attribute_type?(type)
       raise "You have entered an invalid attribute type: #{type}. General data types are used when creating new models, but Bullet Train " \
@@ -53,6 +127,19 @@ def check_required_options_for_attributes(scaffolding_type, attributes, child, p
       {}
     end
 
+    data_type = if type == "image" && cloudinary_enabled?
+      "string"
+    elsif attribute_options[:multiple]
+      case type
+      when "file"
+        "attachments"
+      else
+        "jsonb"
+      end
+    else
+      FIELD_PARTIALS[type_without_option.to_sym]
+    end
+
     if name.match?(/_id$/) || name.match?(/_ids$/)
       attribute_options ||= {}
       unless attribute_options[:vanilla]
@@ -85,6 +172,48 @@ def check_required_options_for_attributes(scaffolding_type, attributes, child, p
         end
       end
     end
+
+    # TODO: Is there ever a case that we want this to be a string?
+    data_type = "references" if name.match?(/_id$/)
+
+    # For join models, we don't want to generate a migration when
+    # running the crud-field scaffolder in the last step, so we skip *_ids.
+    # Addresses belong_to :addressable, so they don't hae to be represented in a migration.
+    unless name.match?(/_ids$/) || data_type.nil?
+      generation_command += " #{name_without_id || name}:#{data_type}"
+      attributes_to_generate << name
+    end
+  end
+
+  # Generate the models/migrations with the attributes passed.
+  if attributes_to_generate.any?
+    case scaffolding_type
+    # "join-model" is not here because the `rails g` command is written inline in its own scaffolder.
+    when "crud"
+      puts "Generating #{child} model with '#{generation_command}'".green
+    when "crud-field"
+      generation_command = "bin/rails generate migration add_#{attributes_to_generate.join("_and_")}_to_#{child.tableize.tr("/", "_")}#{generation_command}"
+      puts "Adding new fields to #{child} with '#{generation_command}'".green
+    end
+    puts ""
+
+    unless @options["skip-migration-generation"]
+      untracked_files = has_untracked_files?(git_status) ? get_untracked_files(git_status) : []
+      generation_thread = Thread.new { `#{generation_command}` }
+      generation_thread.join # Wait for the process to finish.
+
+      newly_untracked_files = has_untracked_files?(git_status) ? get_untracked_files(git_status) : []
+      if (newly_untracked_files - untracked_files).size.zero?
+        error_message = <<~MESSAGE
+          Since you have already created the #{child} model, Super Scaffolding won't allow you to re-create it.
+          You can either delete the model and try Super Scaffolding again, or add the `--skip-migration-generation`
+          flag to Super Scaffold the classic Bullet Train way.
+        MESSAGE
+        puts ""
+        puts error_message.red
+        exit 1
+      end
+    end
   end
 end
 
@@ -120,36 +249,16 @@ elsif ARGV.first.present?
   when "--field-partials"
     puts "Bullet Train uses the following field partials for Super Scaffolding".blue
     puts ""
-    field_partials = {
-      address_field: "string",
-      boolean: "boolean",
-      buttons: "string",
-      cloudinary_image: "string",
-      color_picker: "string",
-      date_and_time_field: "datetime",
-      date_field: "date_field",
-      email_field: "string",
-      emoji_field: "string",
-      file_field: "attachment",
-      options: "string",
-      password_field: "string",
-      phone_field: "string",
-      super_select: "string",
-      text_area: "text",
-      text_field: "string",
-      number_field: "integer",
-      trix_editor: "text"
-    }
 
     max_name_length = 0
-    field_partials.each do |key, value|
+    FIELD_PARTIALS.each do |key, value|
       if key.to_s.length > max_name_length
         max_name_length = key.to_s.length
       end
     end
 
     printf "\t%#{max_name_length}s:Data Type\n".bold, "Field Partial Name"
-    field_partials.each { |key, value| printf "\t%#{max_name_length}s:#{value}\n", key }
+    FIELD_PARTIALS.each { |key, value| printf "\t%#{max_name_length}s:#{value}\n", key }
 
     puts ""
     puts "For more details, check out the documentation:"

data/lib/scaffolding/transformer.rb

@@ -102,7 +102,7 @@ class Scaffolding::Transformer
       "absolutely_abstract/creative_concepts",
       "completely_concrete/tangible_things",
       "absolutely-abstract-creative-concepts",
-      "completely-concrete-tangible-things",
+      "completely-concrete-tangible-things"
     ]
 
     class_name = [
@@ -115,7 +115,7 @@ class Scaffolding::Transformer
       "Creative concepts",
       "Tangible things",
       "creative concepts",
-      "tangible things",
+      "tangible things"
     ]
 
     (

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.1
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-03 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: masamune-ast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: indefinite_article
   requirement: !ruby/object:Gem::Requirement