bullet_train-super_scaffolding 1.3.20 → 1.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e630cb440a6fca50b4cdf0b905cddd1732fe1966c9c79a6b6a55d28095936c21
-  data.tar.gz: c080a11f2b8452ef7864fb8f573a0b93482fe30660503e386815d73f9de5e622
+  metadata.gz: e9210f83ebe43b35a2f22c251699259b4c019dda13edfd97ee8b86a36b1c4076
+  data.tar.gz: 377c1286afbd0dc549bd606abaf4f4c5eca77461c80586344ebf0cb7905db1fd
 SHA512:
-  metadata.gz: 24e161b7f3a2ce0be67fbf4c58327990d7b29d57bee0036da2324bff3017aa398438758c9b6894628e680e56e69eb73400b4288756a03b2129ed7d4faacb5e9a
-  data.tar.gz: c728ddd209bb35a33ea30bdad45363e9e20223564fca6f6b9812025696ecf4cba41e55550c77ba29b8e153b7533f4604b4d32c9dab8c593f3738163afced6a70
+  metadata.gz: df76ecad025409b2d23c5140f5d7b05710bcfd8ac8723c2f6dab2055d83d37f301a17224a9280313829f517a514004b5ecb78837474642365dde18da9f293494
+  data.tar.gz: 135cb316d50b1d502e2d8803e33de8181252efb6672778107f00e066807e2324668e4f0e1c2f35a1ccdbbb32f3fa23289203ec3cb0098abe6c4593f2db434bca

data/app/controllers/account/scaffolding/completely_concrete/tangible_things_controller.rb

@@ -15,10 +15,16 @@ class Account::Scaffolding::CompletelyConcrete::TangibleThingsController < Accou
 
   # GET /account/scaffolding/absolutely_abstract/creative_concepts/:absolutely_abstract_creative_concept_id/completely_concrete/tangible_things/new
   def new
+    # 🚅 skip this section when scaffolding.
+    @tangible_thing.address_value = Address.new
+    # 🚅 stop any skipping we're doing now.
   end
 
   # GET /account/scaffolding/completely_concrete/tangible_things/:id/edit
   def edit
+    # 🚅 skip this section when scaffolding.
+    @tangible_thing.address_value ||= Address.new
+    # 🚅 stop any skipping we're doing now.
   end
 
   # POST /account/scaffolding/absolutely_abstract/creative_concepts/:absolutely_abstract_creative_concept_id/completely_concrete/tangible_things

data/app/controllers/api/v1/scaffolding/completely_concrete/tangible_things_controller.rb

@@ -67,6 +67,16 @@ if defined?(Api::V1::ApplicationController)
           # 🚅 skip this section when scaffolding.
           multiple_button_values: [],
           multiple_option_values: [],
+          address_value_attributes: [
+            :id,
+            :address_one,
+            :address_two,
+            :city,
+            :region_id,
+            :region_name,
+            :country_id,
+            :postal_code
+          ],
           multiple_super_select_values: []
           # 🚅 stop any skipping we're doing now.
           # 🚅 super scaffolding will insert new arrays above this line.

data/app/models/scaffolding/completely_concrete/tangible_thing.rb

@@ -13,7 +13,10 @@ class Scaffolding::CompletelyConcrete::TangibleThing < ApplicationRecord
   # 🚅 add oauth providers above.
 
   has_one_attached :file_field_value
+
   has_one :team, through: :absolutely_abstract_creative_concept
+  has_one :address_value, class_name: "Address", as: :addressable
+  accepts_nested_attributes_for :address_value
   # 🚅 add has_one associations above.
 
   # 🚅 add scopes above.

data/app/views/account/scaffolding/completely_concrete/tangible_things/_form.html.erb

@@ -49,6 +49,8 @@
           <%= render 'shared/fields/super_select', method: :multiple_super_select_values, other_options: {search: true}, html_options: {multiple: true}  %>
         </div>
       </div>
+      
+      <%= render 'shared/fields/address_field', method: :address_value %>
 
       <%= render 'shared/fields/text_area', method: :text_area_value %>
       <%= render 'shared/fields/trix_editor', method: :action_text_value %>

data/app/views/account/scaffolding/completely_concrete/tangible_things/show.html.erb

@@ -23,6 +23,7 @@
             <%= render 'shared/attributes/email', attribute: :email_field_value %>
             <%= render 'shared/attributes/text', attribute: :password_field_value %>
             <%= render 'shared/attributes/phone_number', attribute: :phone_field_value %>
+            <%= render 'shared/attributes/address', attribute: :address_value %>
             <%= render 'shared/attributes/option', attribute: :option_value %>
             <%= render 'shared/attributes/options', attribute: :multiple_option_values %>
             <%= render 'shared/attributes/option', attribute: :super_select_value %>

data/config/locales/en/scaffolding/completely_concrete/tangible_things.en.yml

@@ -95,6 +95,10 @@ en:
         _: &phone_field_value Phone Field Value
         label: *phone_field_value
         heading: *phone_field_value
+      address_value:
+        _: &address_value Address Value
+        label: *address_value
+        heading: *address_value
       option_value:
         _: &option_value Option Value
         label: *option_value
@@ -215,6 +219,7 @@ en:
         file_field_value: *file_field_value
         password_field_value: *password_field_value
         phone_field_value: *phone_field_value
+        address_value: *address_value
         option_value: *option_value
         multiple_option_values: *multiple_option_values
         super_select_value: *super_select_value

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.3.20"
+    VERSION = "1.3.22"
   end
 end

data/lib/scaffolding/attribute.rb

@@ -0,0 +1,214 @@
+# This class provides helpful methods for determining when and how we
+# should apply logic for each attribute when Super Scaffolding a new model.
+#
+# For example, we determine which association to use based off of the
+# attribute passed to `bin/super-scaffold` as opposed to the models (classes) themselves.
+# Rails has ActiveRecord::Reflection::AssociationReflection, but this is only useful
+# after we've declared the associations. Since we haven't declared the associations in
+# the models yet, we determine the association for the attribute based on its suffix.
+#
+# i.e. - bin/super-scaffold crud Project tag_ids:super_select{class_name=Projects::Tag}
+# Here, we determine the association for the `tag_ids` attribute by its suffix, `_ids`.
+
+class Scaffolding::Attribute
+  attr_accessor :name, :type, :options, :scaffolding_type, :attribute_index, :original_type
+
+  # @attribute_definition [String]: The raw attribute name, type, and options that are passed to bin/super-scaffold.
+  # @scaffoldng_type [Key]: The type of scaffolder we're using to Super Scaffold the model as a whole.
+  # @attribute_index [Integer]: The index taken from the Array of all the attributes of the model.
+  def initialize(attribute_definition, scaffolding_type, attribute_index)
+    parts = attribute_definition.split(":")
+    self.name = parts.shift
+    self.type, self.options = get_type_and_options_from(parts)
+    self.scaffolding_type = scaffolding_type
+    self.attribute_index = attribute_index
+
+    # We mutate `type` within the transformer, so `original_type` allows us
+    # to access what the developer originally passed to bin/super-scaffold.
+    # (Refer to sql_type_to_field_type_mapping in the transformer)
+    self.original_type = type
+
+    # Ensure `options` is a hash.
+    self.options = if options
+      options.split(",").map { |s|
+        option_name, option_value = s.split("=")
+        [option_name.to_sym, option_value || true]
+      }.to_h
+    else
+      {}
+    end
+
+    options[:label] ||= "label_string"
+  end
+
+  def is_first_attribute?
+    attribute_index == 0 && scaffolding_type == :crud
+  end
+
+  # if this is the first attribute of a newly scaffolded model, that field is required.
+  def is_required?
+    return false if type == "file_field"
+    options[:required] || is_first_attribute?
+  end
+
+  def is_association?
+    is_belongs_to? || is_has_many?
+  end
+
+  def is_belongs_to?
+    is_id? && !is_vanilla?
+  end
+
+  def is_has_many?
+    is_ids? && !is_vanilla?
+  end
+
+  def is_vanilla?
+    options&.key?(:vanilla)
+  end
+
+  def is_multiple?
+    options&.key?(:multiple) || is_has_many?
+  end
+
+  def is_boolean?
+    original_type == "boolean"
+  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?
+    options[:unscoped]
+  end
+
+  def is_id?
+    name.match?(/_id$/)
+  end
+
+  def is_ids?
+    name.match?(/_ids$/)
+  end
+
+  def name_without_id
+    name.gsub(/_id$/, "")
+  end
+
+  def name_without_ids
+    name.gsub(/_ids$/, "").pluralize
+  end
+
+  def name_without_id_suffix
+    if is_ids?
+      name_without_ids
+    elsif is_id?
+      name_without_id
+    else
+      name
+    end
+  end
+
+  def title_case
+    if is_ids?
+      # user_ids should be 'Users'
+      name_without_ids.humanize.titlecase
+    elsif is_id?
+      name_without_id.humanize.titlecase
+    else
+      name.humanize.titlecase
+    end
+  end
+
+  def collection_name
+    is_ids? ? name_without_ids : name_without_id.pluralize
+  end
+
+  # Field on the show view.
+  def partial_name
+    return options[:attribute] if options[:attribute]
+
+    case type
+    when "trix_editor", "ckeditor"
+      "html"
+    when "buttons", "super_select", "options", "boolean"
+      if is_ids?
+        "has_many"
+      elsif is_id?
+        "belongs_to"
+      else
+        "option#{"s" if is_multiple?}"
+      end
+    when "cloudinary_image"
+      options[:height] = 200
+      "image"
+    when "phone_field"
+      "phone_number"
+    when "date_field"
+      "date"
+    when "date_and_time_field"
+      "date_and_time"
+    when "email_field"
+      "email"
+    when "emoji_field"
+      "text"
+    when "color_picker"
+      "code"
+    when "text_field"
+      "text"
+    when "text_area"
+      "text"
+    when "file_field"
+      "file#{"s" if is_multiple?}"
+    when "password_field"
+      "text"
+    when "number_field"
+      "number"
+    else
+      raise "Invalid field type: #{type}."
+    end
+  end
+
+  def default_value
+    case type
+    when "text_field", "password_field", "text_area"
+      "'Alternative String Value'"
+    when "email_field"
+      "'another.email@test.com'"
+    when "phone_field"
+      "'+19053871234'"
+    when "color_picker"
+      "'#47E37F'"
+    end
+  end
+
+  def special_processing
+    case type
+    when "date_field"
+      "assign_date(strong_params, :#{name})"
+    when "date_and_time_field"
+      "assign_date_and_time(strong_params, :#{name})"
+    when "buttons"
+      if is_boolean?
+        "assign_boolean(strong_params, :#{name})"
+      elsif is_multiple?
+        "assign_checkboxes(strong_params, :#{name})"
+      end
+    when "options"
+      if is_multiple?
+        "assign_checkboxes(strong_params, :#{name})"
+      end
+    when "super_select"
+      if is_boolean?
+        "assign_boolean(strong_params, :#{name})"
+      elsif is_multiple?
+        "assign_select_options(strong_params, :#{name})"
+      end
+    end
+  end
+
+  private
+
+  # i.e. - multiple_buttons:buttons{multiple}
+  def get_type_and_options_from(parts)
+    parts.join(":").scan(/^(.*){(.*)}/).first || parts.join(":")
+  end
+end

data/lib/scaffolding/transformer.rb

@@ -2,6 +2,7 @@ require "indefinite_article"
 require "yaml"
 require "scaffolding/file_manipulator"
 require "scaffolding/class_names_transformer"
+require "scaffolding/attribute"
 
 class Scaffolding::Transformer
   attr_accessor :child, :parent, :parents, :class_names_transformer, :cli_options, :additional_steps, :namespace, :suppress_could_not_find
@@ -628,15 +629,10 @@ class Scaffolding::Transformer
     }
 
     # add attributes to various views.
-    attributes.each_with_index do |attribute, index|
-      first_table_cell = index == 0 && scaffolding_options[:type] == :crud
+    attributes.each_with_index do |attribute_definition, index|
+      attribute = Scaffolding::Attribute.new(attribute_definition, scaffolding_options[:type], index)
 
-      parts = attribute.split(":")
-      name = parts.shift
-      type = parts.join(":")
-      boolean_buttons = type == "boolean"
-
-      if first_table_cell && ["trix_editor", "ckeditor", "text_area"].include?(type)
+      if attribute.is_first_attribute? && ["trix_editor", "ckeditor", "text_area"].include?(attribute.type)
         puts ""
         puts "The first attribute of your model cannot be any of the following types:".red
         puts "1. trix_editor"
@@ -648,130 +644,24 @@ class Scaffolding::Transformer
         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
-
-      # create a hash of the options.
-      attribute_options = if attribute_options
-        attribute_options.split(",").map { |s|
-          option_name, option_value = s.split("=")
-          [option_name.to_sym, option_value || true]
-        }.to_h
-      else
-        {}
+      if sql_type_to_field_type_mapping[attribute.type]
+        attribute.type = sql_type_to_field_type_mapping[attribute.type]
       end
 
-      attribute_options[:label] ||= "label_string"
-
-      if sql_type_to_field_type_mapping[type]
-        type = sql_type_to_field_type_mapping[type]
-      end
-
-      is_id = name.match?(/_id$/)
-      is_ids = name.match?(/_ids$/)
-      # if this is the first attribute of a newly scaffolded model, that field is required.
-      unless type == "file_field"
-        is_required = attribute_options[:required] || (scaffolding_options[:type] == :crud && index == 0)
-      end
-      is_vanilla = attribute_options&.key?(:vanilla)
-      is_belongs_to = is_id && !is_vanilla
-      is_has_many = is_ids && !is_vanilla
-      is_multiple = attribute_options&.key?(:multiple) || is_has_many
-      is_association = is_belongs_to || is_has_many
-
-      # Sometimes we need all the magic of a `*_id` field, but without the scoping stuff.
-      # Possibly only ever used internally by `join-model`.
-      is_unscoped = attribute_options[:unscoped]
-
-      name_without_id = name.gsub(/_id$/, "")
-      name_without_ids = name.gsub(/_ids$/, "").pluralize
-      collection_name = is_ids ? name_without_ids : name_without_id.pluralize
-
-      # field on the show view.
-      attribute_partial ||= attribute_options[:attribute] || case type
-      when "trix_editor", "ckeditor"
-        "html"
-      when "buttons", "super_select", "options", "boolean"
-        if is_ids
-          "has_many"
-        elsif is_id
-          "belongs_to"
-        else
-          "option#{"s" if is_multiple}"
-        end
-      when "cloudinary_image"
-        attribute_options[:height] = 200
-        "image"
-      when "phone_field"
-        "phone_number"
-      when "date_field"
-        "date"
-      when "date_and_time_field"
-        "date_and_time"
-      when "email_field"
-        "email"
-      when "emoji_field"
-        "text"
-      when "color_picker"
-        "code"
-      when "text_field"
-        "text"
-      when "text_area"
-        "text"
-      when "number_field"
-        "number"
-      when "file_field"
-        "file#{"s" if is_multiple}"
-      when "password_field"
-        "text"
-      else
-        raise "Invalid field type: #{type}."
-      end
-
-      cell_attributes = if boolean_buttons
+      cell_attributes = if attribute.is_boolean?
         ' class="text-center"'
       end
 
-      # e.g. from `person_id` to `person` or `person_ids` to `people`.
-      attribute_name = if is_ids
-        name_without_ids
-      elsif is_id
-        name_without_id
-      else
-        name
-      end
-
-      title_case = if is_ids
-        # user_ids should be 'Users'
-        name_without_ids.humanize.titlecase
-      elsif is_id
-        name_without_id.humanize.titlecase
-      else
-        name.humanize.titlecase
-      end
-
-      attribute_assignment = case type
-      when "text_field", "password_field", "text_area"
-        "'Alternative String Value'"
-      when "email_field"
-        "'another.email@test.com'"
-      when "phone_field"
-        "'+19053871234'"
-      when "color_picker"
-        "'#47E37F'"
-      end
-
       # don't do table columns for certain types of fields and attribute partials
-      if ["trix_editor", "ckeditor", "text_area"].include?(type) || ["html", "has_many"].include?(attribute_partial)
+      if ["trix_editor", "ckeditor", "text_area"].include?(attribute.type) || ["html", "has_many"].include?(attribute.partial_name)
         cli_options["skip-table"] = true
       end
 
-      if type == "none"
+      if attribute.type == "none"
         cli_options["skip-form"] = true
       end
 
-      if attribute_partial == "none"
+      if attribute.partial_name == "none"
         cli_options["skip-show"] = true
         cli_options["skip-table"] = true
       end
@@ -780,26 +670,26 @@ class Scaffolding::Transformer
       # MODEL VALIDATIONS
       #
 
-      unless cli_options["skip-form"] || is_unscoped
+      unless cli_options["skip-form"] || attribute.is_unscoped?
 
         file_name = "./app/models/scaffolding/completely_concrete/tangible_thing.rb"
 
-        if is_association
-          field_content = if attribute_options[:source]
+        if attribute.is_association?
+          field_content = if attribute.options[:source]
             <<~RUBY
-              def valid_#{collection_name}
-                #{attribute_options[:source]}
+              def valid_#{attribute.collection_name}
+                #{attribute.options[:source]}
               end
 
             RUBY
           else
-            add_additional_step :yellow, transform_string("You'll need to implement the `valid_#{collection_name}` method of `Scaffolding::CompletelyConcrete::TangibleThing` in `./app/models/scaffolding/completely_concrete/tangible_thing.rb`. This is the method that will be used to populate the `#{type}` field and also validate that users aren't trying to exploit multitenancy.")
+            add_additional_step :yellow, transform_string("You'll need to implement the `valid_#{attribute.collection_name}` method of `Scaffolding::CompletelyConcrete::TangibleThing` in `./app/models/scaffolding/completely_concrete/tangible_thing.rb`. This is the method that will be used to populate the `#{attribute.type}` field and also validate that users aren't trying to exploit multitenancy.")
 
             <<~RUBY
-              def valid_#{collection_name}
-                raise "please review and implement `valid_#{collection_name}` in `app/models/scaffolding/completely_concrete/tangible_thing.rb`."
-                # please specify what objects should be considered valid for assigning to `#{name_without_id}`.
-                # the resulting code should probably look something like `team.#{collection_name}`.
+              def valid_#{attribute.collection_name}
+                raise "please review and implement `valid_#{attribute.collection_name}` in `app/models/scaffolding/completely_concrete/tangible_thing.rb`."
+                # please specify what objects should be considered valid for assigning to `#{attribute.name_without_id}`.
+                # the resulting code should probably look something like `team.#{attribute.collection_name}`.
               end
 
             RUBY
@@ -807,8 +697,8 @@ class Scaffolding::Transformer
 
           scaffold_add_line_to_file(file_name, field_content, METHODS_HOOK, prepend: true)
 
-          if is_belongs_to
-            scaffold_add_line_to_file(file_name, "validates :#{name_without_id}, scope: true", VALIDATIONS_HOOK, prepend: true)
+          if attribute.is_belongs_to?
+            scaffold_add_line_to_file(file_name, "validates :#{attribute.name_without_id}, scope: true", VALIDATIONS_HOOK, prepend: true)
           end
 
           # TODO we need to add a multitenancy check for has many associations.
@@ -820,51 +710,51 @@ class Scaffolding::Transformer
       # FORM FIELD
       #
 
-      unless cli_options["skip-form"] || attribute_options[:readonly]
+      unless cli_options["skip-form"] || attribute.options[:readonly]
 
         # add `has_rich_text` for trix editor fields.
-        if type == "trix_editor"
+        if attribute.type == "trix_editor"
           file_name = "./app/models/scaffolding/completely_concrete/tangible_thing.rb"
-          scaffold_add_line_to_file(file_name, "has_rich_text :#{name}", HAS_ONE_HOOK, prepend: true)
+          scaffold_add_line_to_file(file_name, "has_rich_text :#{attribute.name}", HAS_ONE_HOOK, prepend: true)
         end
 
         # field on the form.
-        field_attributes = {method: ":#{name}"}
+        field_attributes = {method: ":#{attribute.name}"}
         field_options = {}
         options = {}
 
-        if scaffolding_options[:type] == :crud && index == 0
+        if attribute.is_first_attribute?
           field_options[:autofocus] = "true"
         end
 
-        if is_id && type == "super_select"
-          options[:include_blank] = "t('.fields.#{name}.placeholder')"
+        if attribute.is_id? && attribute.type == "super_select"
+          options[:include_blank] = "t('.fields.#{attribute.name}.placeholder')"
           # add_additional_step :yellow, transform_string("We've added a reference to a `placeholder` to the form for the select or super_select field, but unfortunately earlier versions of the scaffolded locales Yaml don't include a reference to `fields: *fields` under `form`. Please add it, otherwise your form won't be able to locate the appropriate placeholder label.")
         end
 
-        if type == "color_picker"
-          field_options[:color_picker_options] = "t('#{child.pluralize.underscore}.fields.#{name}.options')"
+        if attribute.type == "color_picker"
+          field_options[:color_picker_options] = "t('#{child.pluralize.underscore}.fields.#{attribute.name}.options')"
         end
 
         # When rendering a super_select element we need to use `html_options: {multiple: true}`,
         # but all other fields simply use `multiple: true` to work.
-        if is_multiple
-          if type == "super_select"
+        if attribute.is_multiple?
+          if attribute.type == "super_select"
             field_options[:multiple] = "true"
           else
             field_attributes[:multiple] = "true"
           end
         end
 
-        valid_values = if is_id
-          "valid_#{name_without_id.pluralize}"
-        elsif is_ids
-          "valid_#{collection_name}"
+        valid_values = if attribute.is_id?
+          "valid_#{attribute.name_without_id.pluralize}"
+        elsif attribute.is_ids?
+          "valid_#{attribute.collection_name}"
         end
 
         # https://stackoverflow.com/questions/21582464/is-there-a-ruby-hashto-s-equivalent-for-the-new-hash-syntax
         if field_options.any? || options.any?
-          field_options_key = if ["buttons", "super_select", "options"].include?(type)
+          field_options_key = if ["buttons", "super_select", "options"].include?(attribute.type)
             if options.any?
               field_attributes[:options] = "{" + field_options.map { |key, value| "#{key}: #{value}" }.join(", ") + "}"
             end
@@ -879,17 +769,17 @@ class Scaffolding::Transformer
           field_attributes[field_options_key] = "{" + field_options.map { |key, value| "#{key}: #{value}" }.join(", ") + "}"
         end
 
-        if is_association
-          short = attribute_options[:class_name].underscore.split("/").last
-          case type
+        if attribute.is_association?
+          short = attribute.options[:class_name].underscore.split("/").last
+          case attribute.type
           when "buttons", "options"
-            field_attributes["\n  options"] = "@tangible_thing.#{valid_values}.map { |#{short}| [#{short}.id, #{short}.#{attribute_options[:label]}] }"
+            field_attributes["\n  options"] = "@tangible_thing.#{valid_values}.map { |#{short}| [#{short}.id, #{short}.#{attribute.options[:label]}] }"
           when "super_select"
-            field_attributes["\n  choices"] = "@tangible_thing.#{valid_values}.map { |#{short}| [#{short}.#{attribute_options[:label]}, #{short}.id] }"
+            field_attributes["\n  choices"] = "@tangible_thing.#{valid_values}.map { |#{short}| [#{short}.#{attribute.options[:label]}, #{short}.id] }"
           end
         end
 
-        field_content = "<%= render 'shared/fields/#{type}'#{", " if field_attributes.any?}#{field_attributes.map { |key, value| "#{key}: #{value}" }.join(", ")} %>"
+        field_content = "<%= render 'shared/fields/#{attribute.type}'#{", " if field_attributes.any?}#{field_attributes.map { |key, value| "#{key}: #{value}" }.join(", ")} %>"
 
         # TODO Add more of these from other packages?
         is_core_model = ["Team", "User", "Membership"].include?(child)
@@ -904,24 +794,24 @@ class Scaffolding::Transformer
 
       unless cli_options["skip-show"]
 
-        if is_id
+        if attribute.is_id?
           <<~ERB
-            <% if @tangible_thing.#{name_without_id} %>
+            <% if @tangible_thing.#{attribute.name_without_id} %>
               <div class="form-group">
-                <label class="col-form-label"><%= t('.fields.#{name}.heading') %></label>
+                <label class="col-form-label"><%= t('.fields.#{attribute.name}.heading') %></label>
                 <div>
-                  <%= link_to @tangible_thing.#{name_without_id}.#{attribute_options[:label]}, [:account, @tangible_thing.#{name_without_id}] %>
+                  <%= link_to @tangible_thing.#{attribute.name_without_id}.#{attribute.options[:label]}, [:account, @tangible_thing.#{attribute.name_without_id}] %>
                 </div>
               </div>
             <% end %>
           ERB
-        elsif is_ids
+        elsif attribute.is_ids?
           <<~ERB
-            <% if @tangible_thing.#{collection_name}.any? %>
+            <% if @tangible_thing.#{attribute.collection_name}.any? %>
               <div class="form-group">
-                <label class="col-form-label"><%= t('.fields.#{name}.heading') %></label>
+                <label class="col-form-label"><%= t('.fields.#{attribute.name}.heading') %></label>
                 <div>
-                  <%= @tangible_thing.#{collection_name}.map { |#{name_without_ids}| link_to #{name_without_ids}.#{attribute_options[:label]}, [:account, #{name_without_ids}] }.to_sentence.html_safe %>
+                  <%= @tangible_thing.#{attribute.collection_name}.map { |#{attribute.name_without_ids}| link_to #{attribute.name_without_ids}.#{attribute.options[:label]}, [:account, #{attribute.name_without_ids}] }.to_sentence.html_safe %>
                 </div>
               </div>
             <% end %>
@@ -930,10 +820,10 @@ class Scaffolding::Transformer
 
         # this gets stripped and is one line, so indentation isn't a problem.
         field_content = <<-ERB
-          <%= render 'shared/attributes/#{attribute_partial}', attribute: :#{attribute_name} %>
+          <%= render 'shared/attributes/#{attribute.partial_name}', attribute: :#{attribute.name_without_id_suffix} %>
         ERB
 
-        if type == "password_field"
+        if attribute.type == "password_field"
           field_content.gsub!(/\s%>/, ", options: { password: true } %>")
         end
 
@@ -949,7 +839,7 @@ class Scaffolding::Transformer
       unless cli_options["skip-table"]
 
         # table header.
-        field_content = "<th#{cell_attributes.present? ? " " + cell_attributes : ""}><%= t('.fields.#{attribute_name}.heading') %></th>"
+        field_content = "<th#{cell_attributes.present? ? " " + cell_attributes : ""}><%= t('.fields.#{attribute.name_without_id_suffix}.heading') %></th>"
 
         unless ["Team", "User"].include?(child)
           scaffold_add_line_to_file("./app/views/account/scaffolding/completely_concrete/tangible_things/_index.html.erb", field_content, "<%# 🚅 super scaffolding will insert new field headers above this line. %>", prepend: true)
@@ -971,16 +861,16 @@ class Scaffolding::Transformer
 
         table_cell_options = []
 
-        if first_table_cell
+        if attribute.is_first_attribute?
           table_cell_options << "url: [:account, tangible_thing]"
         end
 
         # this gets stripped and is one line, so indentation isn't a problem.
         field_content = <<-ERB
-          <td#{cell_attributes}><%= render 'shared/attributes/#{attribute_partial}', attribute: :#{attribute_name}#{", #{table_cell_options.join(", ")}" if table_cell_options.any?} %></td>
+          <td#{cell_attributes}><%= render 'shared/attributes/#{attribute.partial_name}', attribute: :#{attribute.name_without_id_suffix}#{", #{table_cell_options.join(", ")}" if table_cell_options.any?} %></td>
         ERB
 
-        if type == "password_field"
+        if attribute.type == "password_field"
           field_content.gsub!(/\s%>/, ", options: { password: true } %>")
         end
 
@@ -998,26 +888,26 @@ class Scaffolding::Transformer
 
         yaml_template = <<~YAML
 
-          <%= name %>: <% if is_association %>&<%= attribute_name %><% end %>
-            _: &#{name} #{title_case}
-            label: *#{name}
-            heading: *#{name}
+          <%= attribute.name %>: <% if attribute.is_association? %>&<%= attribute.name_without_id_suffix %><% end %>
+            _: &#{attribute.name} #{attribute.title_case}
+            label: *#{attribute.name}
+            heading: *#{attribute.name}
 
-            <% if type == "super_select" %>
-            <% if is_required %>
-            placeholder: Select <% title_case.with_indefinite_article %>
+            <% if attribute.type == "super_select" %>
+            <% if attribute.is_required? %>
+            placeholder: Select <% attribute.title_case.with_indefinite_article %>
             <% else %>
             placeholder: None
             <% end %>
             <% end %>
 
-            <% if boolean_buttons %>
+            <% if attribute.is_boolean? %>
 
             options:
               yes: "Yes"
               no: "No"
 
-            <% elsif ["buttons", "super_select", "options"].include?(type) && !is_association %>
+            <% elsif ["buttons", "super_select", "options"].include?(attribute.type) && !attribute.is_association? %>
 
             options:
               one: One
@@ -1026,7 +916,7 @@ class Scaffolding::Transformer
 
             <% end %>
 
-            <% if type == "color_picker" %>
+            <% if attribute.type == "color_picker" %>
             options:
               - '#9C73D2'
               - '#48CDFE'
@@ -1038,8 +928,8 @@ class Scaffolding::Transformer
               - '#929292'
             <% end %>
 
-          <% if is_association %>
-          <%= attribute_name %>: *<%= attribute_name %>
+          <% if attribute.is_association? %>
+          <%= attribute.name_without_id_suffix %>: *<%= attribute.name_without_id_suffix %>
           <% end %>
         YAML
 
@@ -1048,7 +938,7 @@ class Scaffolding::Transformer
         scaffold_add_line_to_file("./config/locales/en/scaffolding/completely_concrete/tangible_things.en.yml", field_content, RUBY_NEW_FIELDS_HOOK, prepend: true)
 
         # active record's field label.
-        scaffold_add_line_to_file("./config/locales/en/scaffolding/completely_concrete/tangible_things.en.yml", "#{name}: *#{name}", "# 🚅 super scaffolding will insert new activerecord attributes above this line.", prepend: true)
+        scaffold_add_line_to_file("./config/locales/en/scaffolding/completely_concrete/tangible_things.en.yml", "#{attribute.name}: *#{attribute.name}", "# 🚅 super scaffolding will insert new activerecord attributes above this line.", prepend: true)
 
       end
 
@@ -1056,46 +946,27 @@ class Scaffolding::Transformer
       # STRONG PARAMETERS
       #
 
-      unless cli_options["skip-form"] || attribute_options[:readonly]
+      unless cli_options["skip-form"] || attribute.options[:readonly]
 
         # add attributes to strong params.
         [
           "./app/controllers/account/scaffolding/completely_concrete/tangible_things_controller.rb",
           "./app/controllers/api/v1/scaffolding/completely_concrete/tangible_things_controller.rb"
         ].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)
+          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"
+              scaffold_add_line_to_file(file, "#{attribute.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"
-              scaffold_add_line_to_file(file, ":#{name}_removal,", RUBY_NEW_FIELDS_HOOK, prepend: true)
+            scaffold_add_line_to_file(file, ":#{attribute.name},", RUBY_NEW_FIELDS_HOOK, prepend: true)
+            if attribute.type == "file_field"
+              scaffold_add_line_to_file(file, ":#{attribute.name}_removal,", RUBY_NEW_FIELDS_HOOK, prepend: true)
             end
           end
         end
 
-        special_processing = case type
-        when "buttons"
-          if boolean_buttons
-            "assign_boolean(strong_params, :#{name})"
-          elsif is_multiple
-            "assign_checkboxes(strong_params, :#{name})"
-          end
-        when "options"
-          if is_multiple
-            "assign_checkboxes(strong_params, :#{name})"
-          end
-        when "super_select"
-          if boolean_buttons
-            "assign_boolean(strong_params, :#{name})"
-          elsif is_multiple
-            "assign_select_options(strong_params, :#{name})"
-          end
-        end
-
-        scaffold_add_line_to_file("./app/controllers/account/scaffolding/completely_concrete/tangible_things_controller.rb", special_processing, RUBY_NEW_FIELDS_PROCESSING_HOOK, prepend: true) if special_processing
+        scaffold_add_line_to_file("./app/controllers/account/scaffolding/completely_concrete/tangible_things_controller.rb", attribute.special_processing, RUBY_NEW_FIELDS_PROCESSING_HOOK, prepend: true) if attribute.special_processing
       end
 
       #
@@ -1105,61 +976,61 @@ class Scaffolding::Transformer
       unless cli_options["skip-api"]
 
         # TODO The serializers can't handle these `has_rich_text` attributes.
-        unless type == "trix_editor"
-          unless type == "file_field"
-            scaffold_add_line_to_file("./app/views/api/v1/scaffolding/completely_concrete/tangible_things/_tangible_thing.json.jbuilder", ":#{name},", RUBY_NEW_FIELDS_HOOK, prepend: true, suppress_could_not_find: true)
+        unless attribute.type == "trix_editor"
+          unless attribute.type == "file_field"
+            scaffold_add_line_to_file("./app/views/api/v1/scaffolding/completely_concrete/tangible_things/_tangible_thing.json.jbuilder", ":#{attribute.name},", RUBY_NEW_FIELDS_HOOK, prepend: true, suppress_could_not_find: true)
           end
 
-          assertion = case type
+          assertion = case attribute.type
           when "date_field"
-            "assert_equal_or_nil Date.parse(tangible_thing_data['#{name}']), tangible_thing.#{name}"
+            "assert_equal_or_nil Date.parse(tangible_thing_data['#{attribute.name}']), tangible_thing.#{attribute.name}"
           when "date_and_time_field"
-            "assert_equal_or_nil DateTime.parse(tangible_thing_data['#{name}']), tangible_thing.#{name}"
+            "assert_equal_or_nil DateTime.parse(tangible_thing_data['#{attribute.name}']), tangible_thing.#{attribute.name}"
           when "file_field"
-            if is_multiple
-              "assert_equal tangible_thing_data['#{name}'], @tangible_thing.#{name}.map{|file| rails_blob_path(file)} unless controller.action_name == 'create'"
+            if attribute.is_multiple?
+              "assert_equal tangible_thing_data['#{attribute.name}'], @tangible_thing.#{attribute.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'"
+              "assert_equal tangible_thing_data['#{attribute.name}'], rails_blob_path(@tangible_thing.#{attribute.name}) unless controller.action_name == 'create'"
             end
           else
-            "assert_equal_or_nil tangible_thing_data['#{name}'], tangible_thing.#{name}"
+            "assert_equal_or_nil tangible_thing_data['#{attribute.name}'], tangible_thing.#{attribute.name}"
           end
           scaffold_add_line_to_file("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_controller_test.rb", assertion, RUBY_NEW_FIELDS_HOOK, prepend: true)
         end
 
         # File fields are handled in a specific way when using the jsonapi-serializer.
-        if type == "file_field"
-          jbuilder_content = if is_multiple
+        if attribute.type == "file_field"
+          jbuilder_content = if attribute.is_multiple?
             <<~RUBY
-              json.#{name} do 
-                json.array! tangible_thing.#{name}.map { |file| url_for(file)  }
-              end if tangible_thing.#{name}.attached?
+              json.#{attribute.name} do 
+                json.array! tangible_thing.#{attribute.name}.map { |file| url_for(file)  }
+              end if tangible_thing.#{attribute.name}.attached?
             RUBY
           else
-            "json.#{name} url_for(tangible_thing.#{name}) if tangible_thing.#{name}.attached?"
+            "json.#{attribute.name} url_for(tangible_thing.#{attribute.name}) if tangible_thing.#{attribute.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 = if is_multiple
+          content = if attribute.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")]
+              @#{child.underscore}.#{attribute.name} = [Rack::Test::UploadedFile.new("test/support/foo.txt")]
+              @another_#{child.underscore}.#{attribute.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")
+              @#{child.underscore}.#{attribute.name} = Rack::Test::UploadedFile.new("test/support/foo.txt")
+              @another_#{child.underscore}.#{attribute.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
 
-        if attribute_assignment
-          unless attribute_options[:readonly]
-            scaffold_add_line_to_file("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_controller_test.rb", "#{name}: #{attribute_assignment},", RUBY_ADDITIONAL_NEW_FIELDS_HOOK, prepend: true)
-            scaffold_add_line_to_file("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_controller_test.rb", "assert_equal @tangible_thing.#{name}, #{attribute_assignment}", RUBY_EVEN_MORE_NEW_FIELDS_HOOK, prepend: true)
+        if attribute.default_value
+          unless attribute.options[:readonly]
+            scaffold_add_line_to_file("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_controller_test.rb", "#{attribute.name}: #{attribute.default_value},", RUBY_ADDITIONAL_NEW_FIELDS_HOOK, prepend: true)
+            scaffold_add_line_to_file("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_controller_test.rb", "assert_equal @tangible_thing.#{attribute.name}, #{attribute.default_value}", RUBY_EVEN_MORE_NEW_FIELDS_HOOK, prepend: true)
           end
         end
       end
@@ -1176,7 +1047,7 @@ class Scaffolding::Transformer
         # It's OK that this won't be found most of the time.
         scaffold_add_line_to_file(
           "./app/views/api/v1/open_api/scaffolding/completely_concrete/tangible_things/_components.yaml.erb",
-          "<%= attribute :#{name} %>",
+          "<%= attribute :#{attribute.name} %>",
           "<%# 🚅 super scaffolding will insert new attributes above this line. %>",
           prepend: true
         )
@@ -1184,7 +1055,7 @@ class Scaffolding::Transformer
         # It's OK that this won't be found most of the time.
         scaffold_add_line_to_file(
           "./app/views/api/v1/open_api/scaffolding/completely_concrete/tangible_things/_components.yaml.erb",
-          "<%= parameter :#{name} %>",
+          "<%= parameter :#{attribute.name} %>",
           "<%# 🚅 super scaffolding will insert new parameter above this line. %>",
           prepend: true
         )
@@ -1198,20 +1069,20 @@ class Scaffolding::Transformer
 
       unless cli_options["skip-model"]
 
-        if is_belongs_to
-          unless attribute_options[:class_name]
-            attribute_options[:class_name] = name_without_id.classify
+        if attribute.is_belongs_to?
+          unless attribute.options[:class_name]
+            attribute.options[:class_name] = attribute.name_without_id.classify
           end
 
-          file_name = "app/models/#{attribute_options[:class_name].underscore}.rb"
+          file_name = "app/models/#{attribute.options[:class_name].underscore}.rb"
           unless File.exist?(file_name)
-            raise "You'll need to specify a `class_name` option for `#{name}` because there is no `#{attribute_options[:class_name].classify}` model defined in `#{file_name}`. Try again with `#{name}:#{type}[class_name=SomeClassName]`."
+            raise "You'll need to specify a `class_name` option for `#{attribute.name}` because there is no `#{attribute.options[:class_name].classify}` model defined in `#{file_name}`. Try again with `#{attribute.name}:#{attribute.type}[class_name=SomeClassName]`."
           end
 
           modified_migration = false
 
           # find the database migration that defines this relationship.
-          expected_reference = "add_reference :#{class_names_transformer.table_name}, :#{name_without_id}"
+          expected_reference = "add_reference :#{class_names_transformer.table_name}, :#{attribute.name_without_id}"
           migration_file_name = `grep "#{expected_reference}" db/migrate/*`.split(":").first
 
           # if that didn't work, see if we can find a creation of the reference when the table was created.
@@ -1219,7 +1090,7 @@ class Scaffolding::Transformer
             confirmation_reference = "create_table :#{class_names_transformer.table_name}"
             confirmation_migration_file_name = `grep "#{confirmation_reference}" db/migrate/*`.split(":").first
 
-            fallback_reference = "t.references :#{name_without_id}"
+            fallback_reference = "t.references :#{attribute.name_without_id}"
             fallback_migration_file_name = `grep "#{fallback_reference}" db/migrate/* | grep #{confirmation_migration_file_name}`.split(":").first
 
             if fallback_migration_file_name == confirmation_migration_file_name
@@ -1227,10 +1098,10 @@ class Scaffolding::Transformer
             end
           end
 
-          unless is_required
+          unless attribute.is_required?
 
             if migration_file_name
-              replace_in_file(migration_file_name, ":#{name_without_id}, null: false", ":#{name_without_id}, null: true")
+              replace_in_file(migration_file_name, ":#{attribute.name_without_id}, null: false", ":#{attribute.name_without_id}, null: true")
               modified_migration = true
             else
               add_additional_step :yellow, "We would have expected there to be a migration that defined `#{expected_reference}`, but we didn't find one. Where was the reference added to this model? It's _probably_ the original creation of the table, but we couldn't find that either. Either way, you need to rollback, change 'null: false' to 'null: true' for this column, and re-run the migration (unless, of course, that attribute _is_ required, then you need to add a validation on the model)."
@@ -1238,10 +1109,10 @@ class Scaffolding::Transformer
 
           end
 
-          class_name_matches = name_without_id.tableize == attribute_options[:class_name].tableize.tr("/", "_")
+          class_name_matches = attribute.name_without_id.tableize == attribute.options[:class_name].tableize.tr("/", "_")
 
           # but also, if namespaces are involved, just don't...
-          if attribute_options[:class_name].include?("::")
+          if attribute.options[:class_name].include?("::")
             class_name_matches = false
           end
 
@@ -1249,24 +1120,24 @@ class Scaffolding::Transformer
           unless class_name_matches
             if migration_file_name
               # There are two forms this association creation can take.
-              replace_in_file(migration_file_name, "foreign_key: true", "foreign_key: {to_table: \"#{attribute_options[:class_name].tableize.tr("/", "_")}\"}", /t\.references :#{name_without_id}/)
-              replace_in_file(migration_file_name, "foreign_key: true", "foreign_key: {to_table: \"#{attribute_options[:class_name].tableize.tr("/", "_")}\"}", /add_reference :#{child.underscore.pluralize.tr("/", "_")}, :#{name_without_id}/)
+              replace_in_file(migration_file_name, "foreign_key: true", "foreign_key: {to_table: \"#{attribute.options[:class_name].tableize.tr("/", "_")}\"}", /t\.references :#{attribute.name_without_id}/)
+              replace_in_file(migration_file_name, "foreign_key: true", "foreign_key: {to_table: \"#{attribute.options[:class_name].tableize.tr("/", "_")}\"}", /add_reference :#{child.underscore.pluralize.tr("/", "_")}, :#{attribute.name_without_id}/)
 
               modified_migration = true
             else
-              add_additional_step :yellow, "We would have expected there to be a migration that defined `#{expected_reference}`, but we didn't find one. Where was the reference added to this model? It's _probably_ the original creation of the table. Either way, you need to rollback, change \"foreign_key: true\" to \"foreign_key: {to_table: '#{attribute_options[:class_name].tableize.tr("/", "_")}'}\" for this column, and re-run the migration."
+              add_additional_step :yellow, "We would have expected there to be a migration that defined `#{expected_reference}`, but we didn't find one. Where was the reference added to this model? It's _probably_ the original creation of the table. Either way, you need to rollback, change \"foreign_key: true\" to \"foreign_key: {to_table: '#{attribute.options[:class_name].tableize.tr("/", "_")}'}\" for this column, and re-run the migration."
             end
           end
 
-          optional_line = ", optional: true" unless is_required
+          optional_line = ", optional: true" unless attribute.is_required?
 
           # if the `belongs_to` is already there from `rails g model`..
           scaffold_replace_line_in_file(
             "./app/models/scaffolding/completely_concrete/tangible_thing.rb",
             class_name_matches ?
-              "belongs_to :#{name_without_id}#{optional_line}" :
-              "belongs_to :#{name_without_id}, class_name: \"#{attribute_options[:class_name]}\"#{optional_line}",
-            "belongs_to :#{name_without_id}"
+              "belongs_to :#{attribute.name_without_id}#{optional_line}" :
+              "belongs_to :#{attribute.name_without_id}, class_name: \"#{attribute.options[:class_name]}\"#{optional_line}",
+            "belongs_to :#{attribute.name_without_id}"
           )
 
           # if it wasn't there, the replace will not have done anything, so we insert it entirely.
@@ -1274,8 +1145,8 @@ class Scaffolding::Transformer
           scaffold_add_line_to_file(
             "./app/models/scaffolding/completely_concrete/tangible_thing.rb",
             class_name_matches ?
-              "belongs_to :#{name_without_id}#{optional_line}" :
-              "belongs_to :#{name_without_id}, class_name: \"#{attribute_options[:class_name]}\"#{optional_line}",
+              "belongs_to :#{attribute.name_without_id}#{optional_line}" :
+              "belongs_to :#{attribute.name_without_id}, class_name: \"#{attribute.options[:class_name]}\"#{optional_line}",
             BELONGS_TO_HOOK,
             prepend: true
           )
@@ -1286,9 +1157,9 @@ class Scaffolding::Transformer
         end
 
         # Add `default: false` to boolean migrations.
-        if boolean_buttons
+        if attribute.is_boolean?
           # Give priority to crud-field migrations if they exist.
-          add_column_reference = "add_column :#{class_names_transformer.table_name}, :#{name}"
+          add_column_reference = "add_column :#{class_names_transformer.table_name}, :#{attribute.name}"
           create_table_reference = "create_table :#{class_names_transformer.table_name}"
           confirmation_migration_file_name = `grep "#{add_column_reference}" db/migrate/*`.split(":").first
           confirmation_migration_file_name ||= `grep "#{create_table_reference}" db/migrate/*`.split(":").first
@@ -1297,7 +1168,7 @@ class Scaffolding::Transformer
           File.open(confirmation_migration_file_name) do |migration_file|
             old_lines = migration_file.readlines
             old_lines.each do |line|
-              target_attribute = line.match?(/:#{class_names_transformer.table_name}, :#{name}, :boolean/) || line.match?(/\s*t\.boolean :#{name}/)
+              target_attribute = line.match?(/:#{class_names_transformer.table_name}, :#{attribute.name}, :boolean/) || line.match?(/\s*t\.boolean :#{attribute.name}/)
               if target_attribute
                 old_line = line
                 new_line = "#{old_line.chomp}, default: false\n"
@@ -1315,40 +1186,40 @@ class Scaffolding::Transformer
 
       unless cli_options["skip-model"]
 
-        if is_required && !is_belongs_to
-          scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "validates :#{name}, presence: true", VALIDATIONS_HOOK, prepend: true)
+        if attribute.is_required? && !attribute.is_belongs_to?
+          scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "validates :#{attribute.name}, presence: true", VALIDATIONS_HOOK, prepend: true)
         end
 
-        case type
+        case attribute.type
         when "file_field"
-          remove_file_methods = if is_multiple
+          remove_file_methods = if attribute.is_multiple?
             <<~RUBY
-              def #{name}_removal?
-                #{name}_removal&.any?
+              def #{attribute.name}_removal?
+                #{attribute.name}_removal&.any?
               end
 
-              def remove_#{name}
-                #{name}_attachments.where(id: #{name}_removal).map(&:purge)
+              def remove_#{attribute.name}
+                #{attribute.name}_attachments.where(id: #{attribute.name}_removal).map(&:purge)
               end
 
-              def #{name}=(attachables)
+              def #{attribute.name}=(attachables)
                 attachables = Array(attachables).compact_blank
             
                 if attachables.any?
-                  attachment_changes["#{name}"] =
-                    ActiveStorage::Attached::Changes::CreateMany.new("#{name}", self, #{name}.blobs + attachables)
+                  attachment_changes["#{attribute.name}"] =
+                    ActiveStorage::Attached::Changes::CreateMany.new("#{attribute.name}", self, #{attribute.name}.blobs + attachables)
                 end
               end
 
             RUBY
           else
             <<~RUBY
-              def #{name}_removal?
-                #{name}_removal.present?
+              def #{attribute.name}_removal?
+                #{attribute.name}_removal.present?
               end
 
-              def remove_#{name}
-                #{name}.purge
+              def remove_#{attribute.name}
+                #{attribute.name}.purge
               end
             RUBY
           end
@@ -1358,7 +1229,7 @@ class Scaffolding::Transformer
           # HAS_ONE_HOOK or the HAS_MANY_HOOK. We move the string here so it's scaffolded above the proper hook.
           model_file_path = transform_string("./app/models/scaffolding/completely_concrete/tangible_thing.rb")
           model_contents = File.readlines(model_file_path)
-          reflection_declaration = is_multiple ? "has_many_attached :#{name}" : "has_one_attached :#{name}"
+          reflection_declaration = attribute.is_multiple? ? "has_many_attached :#{attribute.name}" : "has_one_attached :#{attribute.name}"
 
           # Save the file without the hook so we can write it via the `scaffold_add_line_to_file` method below.
           model_without_attached_hook = model_contents.reject.each { |line| line.include?(reflection_declaration) }
@@ -1366,18 +1237,18 @@ class Scaffolding::Transformer
             model_without_attached_hook.each { |line| f.write(line) }
           end
 
-          hook_type = is_multiple ? HAS_MANY_HOOK : HAS_ONE_HOOK
+          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 :#{name}_removal", ATTR_ACCESSORS_HOOK, prepend: true)
+          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_#{name}, if: :#{name}_removal?", CALLBACKS_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)
         when "trix_editor"
-          scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "has_rich_text :#{name}", HAS_ONE_HOOK, prepend: true)
+          scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "has_rich_text :#{attribute.name}", HAS_ONE_HOOK, prepend: true)
         when "buttons"
-          if boolean_buttons
-            scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "validates :#{name}, inclusion: [true, false]", VALIDATIONS_HOOK, prepend: true)
+          if attribute.is_boolean?
+            scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "validates :#{attribute.name}, inclusion: [true, false]", VALIDATIONS_HOOK, prepend: true)
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.3.20
+  version: 1.3.22
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-31 00:00:00.000000000 Z
+date: 2023-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -162,6 +162,7 @@ files:
 - lib/bullet_train/super_scaffolding/version.rb
 - lib/bullet_train/terminal_commands.rb
 - lib/scaffolding.rb
+- lib/scaffolding/attribute.rb
 - lib/scaffolding/block_manipulator.rb
 - lib/scaffolding/class_names_transformer.rb
 - lib/scaffolding/file_manipulator.rb