bullet_train-super_scaffolding 1.2.27 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0f6ee0594cec258ca5f2d7a47d21960521105c22430c7aa50380d91b6fba87b
-  data.tar.gz: 786ac721ca22a34281f820d1ba402a9c3d838e7c4985dbdc57e14b69ac7fac8f
+  metadata.gz: c7a6281cfc5c70efe7e5bf88b2cafc61d86908e19440ef073b30b4d2ae516d61
+  data.tar.gz: 8503ac172be486e3910f337ef5a3aca84d7f6f0d2fc793b59017d53e22c5c3fe
 SHA512:
-  metadata.gz: 6cdac3149c4e2e823adef37183bc5309453d2094a8e056060ed98c6021046fd9795f4eed3859e2f4df1947cdf4da4cfbd382f0225890e90475ea60fd0d058954
-  data.tar.gz: '0224519be5f063a48ae43e67b168656e23324d8159da296942f5722b0d64283cb6769343d9425ee0a62f85f86e93de2bf30e850b92b7fe1c91445228bcb42e69'
+  metadata.gz: f57ebe01f983789000413350a1cda805f3109e15dd21cd0d0a54c45e660082f78c5b25b727c07fc6ba75b088013ceddd7ab5d27c430650c5de44aa33c59f82a6
+  data.tar.gz: 3084ca618a27a8550a8f94402fa6b44c15c5f456414e4145a2ec9d1b43375c4b66c25b5867f79f48d3ce0ee029ce7c64318b0af4fe632a9ef2264f97e1fce44d

data/app/views/account/scaffolding/absolutely_abstract/creative_concepts/_index.html.erb

@@ -6,7 +6,7 @@
 <% pagy ||= nil %>
 <% pagy, creative_concepts = pagy(creative_concepts, page_param: :creative_concepts_page) unless pagy %>
 
-<%= updates_for context, :scaffolding_absolutely_abstract_creative_concepts do %>
+<%= cable_ready_updates_for context, :scaffolding_absolutely_abstract_creative_concepts do %>
   <%= render 'account/shared/box' do |box| %>
     <% box.title t(".contexts.#{context.class.name.underscore}.header") %>
     <% box.description do %>
@@ -27,9 +27,7 @@
             </tr>
           </thead>
           <tbody>
-            <% creative_concepts.each do |creative_concept| %>
-              <%= render 'account/scaffolding/absolutely_abstract/creative_concepts/creative_concept', creative_concept: creative_concept %>
-            <% end %>
+            <%= render partial: 'account/scaffolding/absolutely_abstract/creative_concepts/creative_concept', collection: creative_concepts %>
           </tbody>
         </table>
       <% end %>
@@ -43,7 +41,7 @@
 
         <%# 🚅 super scaffolding will insert new targets one parent action model buttons above this line. %>
         <%# 🚅 super scaffolding will insert new bulk action model buttons above this line. %>
-        <%= render "shared/bulk_action_select" %>
+        <%= render "shared/bulk_action_select" if creative_concepts.many? %>
 
         <%= link_to t('global.buttons.back'), [:account, context], class: "#{first_button_primary(:absolutely_abstract_creative_concept)} back" unless hide_back %>
       <% end %>

data/app/views/account/scaffolding/absolutely_abstract/creative_concepts/show.html.erb

@@ -1,7 +1,7 @@
 <%= render 'account/shared/page' do |page| %>
   <% page.title t('.section') %>
   <% page.body do %>
-    <%= updates_for @creative_concept do %>
+    <%= cable_ready_updates_for @creative_concept do %>
       <%= render 'account/shared/box', divider: true do |box| %>
         <% box.t :description, title: '.header' %>
         <% box.body do %>

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

@@ -9,7 +9,7 @@
 <% pagy, tangible_things = pagy(tangible_things, page_param: :tangible_things_page) unless pagy %>
 
 <%= action_model_select_controller do %>
-  <% updates_for context, collection do %>
+  <% cable_ready_updates_for context, collection do %>
     <%= render 'account/shared/box', pagy: pagy do |box| %>
       <% box.title t(".contexts.#{context.class.name.underscore}.header") %>
       <% box.description do %>
@@ -35,9 +35,7 @@
               </tr>
             </thead>
             <tbody>
-              <% tangible_things.each do |tangible_thing| %>
-                <%= render 'account/scaffolding/completely_concrete/tangible_things/tangible_thing', tangible_thing: tangible_thing %>
-              <% end %>
+              <%= render partial: 'account/scaffolding/completely_concrete/tangible_things/tangible_thing', collection: tangible_things %>
             </tbody>
           </table>
         <% end %>
@@ -53,7 +51,7 @@
 
           <%# 🚅 super scaffolding will insert new targets one parent action model buttons above this line. %>
           <%# 🚅 super scaffolding will insert new bulk action model buttons above this line. %>
-          <%= render "shared/bulk_action_select" %>
+          <%= render "shared/bulk_action_select" if tangible_things.many? %>
 
           <% unless hide_back %>
             <%= link_to t('global.buttons.back'), [:account, context], class: "#{first_button_primary(:completely_concrete_tangible_thing)} back" %>

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

@@ -1,7 +1,7 @@
 <%= render 'account/shared/page' do |page| %>
   <% page.title t('.section') %>
   <% page.body do %>
-    <%= updates_for @tangible_thing do %>
+    <%= cable_ready_updates_for @tangible_thing do %>
       <%= render 'account/shared/box', divider: true do |box| %>
         <% box.title t('.header') %>
         <% box.description do %>

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

@@ -18,6 +18,8 @@ en:
       confirmations:
         # TODO customize for your use-case.
         destroy: Are you sure you want to remove %{tangible_thing_name}? This will also remove any child resources and can't be undone.
+    tangible_thing:
+      buttons: *buttons
     fields: &fields
       id:
         heading: Tangible Thing ID

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

@@ -12,8 +12,8 @@ module BulletTrain
             puts "  bin/super-scaffold crud Site Team name:text_field url:text_area"
             puts ""
             puts "E.g. a Section belongs to a Page, which belongs to a Site, which belongs to a Team:"
-            puts "  rails g model Section page:references title:text body:text"
-            puts "  bin/super-scaffold crud Section Page,Site,Team title:text_area body:text_area"
+            puts "  rails g model Section page:references title:string body:text"
+            puts "  bin/super-scaffold crud Section Page,Site,Team title:text_field body:text_area"
             puts ""
             puts "E.g. an Image belongs to either a Page or a Site:"
             puts "  Doable! See https://bit.ly/2NvO8El for a step by step guide."

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

@@ -5,13 +5,15 @@ module BulletTrain
         def run
           unless argv.count >= 5
             puts ""
-            puts "🚅  usage: bin/super-scaffold oauth-provider <omniauth_gem> <gems_provider_name> <our_provider_name> <PROVIDER_API_KEY_IN_ENV> <PROVIDER_API_SECRET_IN_ENV> [options]"
+            puts "🚅  usage: bin/super-scaffold oauth-provider <omniauth_gem> <gems_provider_name> <our_provider_name> <PROVIDER_API_KEY_ENV_VAR_NAME> <PROVIDER_API_SECRET_ENV_VAR_NAME> [options]"
             puts ""
             puts "E.g. what we'd do to start Stripe off (if we didn't already do it):"
             puts "  bin/super-scaffold oauth-provider omniauth-stripe-connect stripe_connect Oauth::StripeAccount STRIPE_CLIENT_ID STRIPE_SECRET_KEY --icon=ti-money"
+            puts "  (Please note here that the STRIPE_CLIENT_ID and STRIPE_SECRET_KEY strings are not the actual values, just the names we give to the environment variables.)"
             puts ""
             puts "E.g. what we actually did to start Shopify off:"
             puts "  bin/super-scaffold oauth-provider omniauth-shopify-oauth2 shopify Oauth::ShopifyAccount SHOPIFY_API_KEY SHOPIFY_API_SECRET_KEY --icon=ti-shopping-cart"
+            puts "  (Please note here that the SHOPIFY_API_KEY and SHOPIFY_API_SECRET_KEY strings are not the actual values, just the names we give to the environment variables.)"
             puts ""
             puts "Options:"
             puts ""
@@ -24,7 +26,7 @@ module BulletTrain
 
           _, omniauth_gem, gems_provider_name, our_provider_name, api_key, api_secret = *ARGV
 
-          unless match = our_provider_name.match(/Oauth::(.*)Account/)
+          unless (match = our_provider_name.match(/Oauth::(.*)Account/))
             puts "\n🚨 Your provider name must match the pattern of `Oauth::{Name}Account`, e.g. `Oauth::StripeAccount`\n".red
             return
           end
@@ -60,7 +62,6 @@ module BulletTrain
             puts "but after you hit enter I'll open a page where you can view other icon options."
             puts "When you find one you like, hover your mouse over it and then come back here and"
             puts "and enter the name of the icon you want to use."
-            response = $stdin.gets.chomp
             if TerminalCommands.can_open?
               TerminalCommands.open_file_or_link("http://light.pinsupreme.com/icon_fonts_themefy.html")
             else
@@ -80,6 +81,8 @@ module BulletTrain
 
           options[:icon] = icon_name
 
+          empty_transformer = Scaffolding::Transformer.new("", "")
+
           [
 
             # User OAuth.
@@ -110,7 +113,7 @@ module BulletTrain
             "./app/controllers/webhooks/incoming/oauth/stripe_account_webhooks_controller.rb"
 
           ].each do |name|
-            if File.directory?(legacy_resolve_template_path(name))
+            if File.directory?(empty_transformer.resolve_template_path(name))
               oauth_scaffold_directory(name, options)
             else
               oauth_scaffold_file(name, options)
@@ -135,16 +138,16 @@ module BulletTrain
 
           # find the database migration that defines this relationship.
           migration_file_name = `grep "create_table #{oauth_transform_string(":oauth_stripe_accounts", options)}" db/migrate/*`.split(":").first
-          legacy_replace_in_file(migration_file_name, "null: false", "null: true")
+          empty_transformer.replace_in_file(migration_file_name, "null: false", "null: true")
 
           migration_file_name = `grep "create_table #{oauth_transform_string(":integrations_stripe_installations", options)}" db/migrate/*`.split(":").first
-          legacy_replace_in_file(migration_file_name,
+          empty_transformer.replace_in_file(migration_file_name,
             oauth_transform_string("t.references :oauth_stripe_account, null: false, foreign_key: true", options),
             oauth_transform_string('t.references :oauth_stripe_account, null: false, foreign_key: true, index: {name: "index_stripe_installations_on_oauth_stripe_account_id"}', options))
 
           migration_file_name = `grep "create_table #{oauth_transform_string(":webhooks_incoming_oauth_stripe_account_webhooks", options)}" db/migrate/*`.split(":").first
-          legacy_replace_in_file(migration_file_name, "null: false", "null: true")
-          legacy_replace_in_file(migration_file_name, "foreign_key: true", 'foreign_key: true, index: {name: "index_stripe_webhooks_on_oauth_stripe_account_id"}')
+          empty_transformer.replace_in_file(migration_file_name, "null: false", "null: true")
+          empty_transformer.replace_in_file(migration_file_name, "foreign_key: true", oauth_transform_string('foreign_key: true, index: {name: "index_stripe_webhooks_on_oauth_stripe_account_id"}'))
 
           puts ""
           puts "🎉"

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.2.27"
+    VERSION = "1.3.0"
   end
 end

data/lib/scaffolding/block_manipulator.rb

@@ -6,7 +6,7 @@ module Scaffolding
       #
       # Wrap a block of ruby code with another block on the outside.
       #
-      # @param [String] `starting` A string to search for at the start of the block. Eg "<%= updates_for context, collection do"
+      # @param [String] `starting` A string to search for at the start of the block. Eg "<%= cable_ready_updates_for context, collection do"
       # @param [Array] `with` An array with two String elements. The text that should wrap the block. Eg ["<%= action_model_select_controller do %>", "<% end %>"]
       #
       def wrap_block(starting:, with:, lines:)

data/lib/scaffolding/oauth_providers.rb

@@ -1,79 +1,6 @@
-def legacy_resolve_template_path(file)
-  # Figure out the actual location of the file.
-  # Originally all the potential source files were in the repository alongside the application.
-  # Now the files could be provided by an included Ruby gem, so we allow those Ruby gems to register their base
-  # path and then we check them in order to see which template we should use.
-  BulletTrain::SuperScaffolding.template_paths.map do |base_path|
-    base_path = Pathname.new(base_path)
-    resolved_path = base_path.join(file).to_s
-    File.exist?(resolved_path) ? resolved_path : nil
-  end.compact.first || raise("Couldn't find the Super Scaffolding template for `#{file}` in any of the following locations:\n\n#{BulletTrain::SuperScaffolding.template_paths.join("\n")}")
-end
-
-def legacy_replace_in_file(file, before, after)
-  puts "Replacing in '#{file}'." unless silence_logs?
-  target_file_content = File.read(file)
-  target_file_content.gsub!(before, after)
-  File.write(file, target_file_content)
-end
-
-def legacy_add_line_to_file(file, content, hook, child, parent, options = {})
-  increase_indent = options[:increase_indent]
-  add_before = options[:add_before]
-  add_after = options[:add_after]
-
-  transformed_file_name = file
-  transformed_content = content
-  transform_hook = hook
-
-  target_file_content = File.read(transformed_file_name)
-
-  if target_file_content.include?(transformed_content)
-    puts "No need to update '#{transformed_file_name}'. It already has '#{transformed_content}'."
-  else
-    new_target_file_content = []
-    target_file_content.split("\n").each do |line|
-      if /#{Regexp.escape(transform_hook)}\s*$/.match?(line)
-
-        if add_before
-          new_target_file_content << "#{line} #{add_before}"
-        else
-          unless options[:prepend]
-            new_target_file_content << line
-          end
-        end
-
-        # get leading whitespace.
-        line =~ /^(\s*).*#{Regexp.escape(transform_hook)}.*/
-        leading_whitespace = $1
-        new_target_file_content << "#{leading_whitespace}#{"  " if increase_indent}#{transformed_content}"
-
-        new_target_file_content << "#{leading_whitespace}#{add_after}" if add_after
-
-        if options[:prepend]
-          new_target_file_content << line
-        end
-      else
-        new_target_file_content << line
-      end
-    end
-
-    puts "Updating '#{transformed_file_name}'." unless silence_logs?
-
-    File.write(transformed_file_name, new_target_file_content.join("\n") + "\n")
-  end
-end
-
-def encode_double_replacement_fix(string)
-  string.chars.join("~!@BT@!~")
-end
-
-def decode_double_replacement_fix(string)
-  string.gsub("~!@BT@!~", "")
-end
-
 def oauth_scaffold_directory(directory, options)
   transformed_directory_name = oauth_transform_string(directory, options)
+  empty_transformer = Scaffolding::Transformer.new("", "")
   begin
     Dir.mkdir(transformed_directory_name)
   rescue Errno::EEXIST => _
@@ -82,9 +9,9 @@ def oauth_scaffold_directory(directory, options)
     puts "Proceeding to generate '#{transformed_directory_name}'."
   end
 
-  Dir.foreach(legacy_resolve_template_path(directory)) do |file|
+  Dir.foreach(empty_transformer.resolve_template_path(directory)) do |file|
     file = "#{directory}/#{file}"
-    unless File.directory?(legacy_resolve_template_path(file))
+    unless File.directory?(empty_transformer.resolve_template_path(file))
       oauth_scaffold_file(file, options)
     end
   end
@@ -94,9 +21,10 @@ end
 def oauth_scaffold_file(file, options)
   transformed_file_name = oauth_transform_string(file, options)
   transformed_file_content = []
+  empty_transformer = Scaffolding::Transformer.new("", "")
 
   skipping = false
-  File.open(legacy_resolve_template_path(file)).each_line do |line|
+  File.open(empty_transformer.resolve_template_path(file)).each_line do |line|
     if line.include?("# 🚅 skip when scaffolding.")
       next
     end
@@ -144,34 +72,36 @@ end
 
 def oauth_transform_string(string, options)
   name = options[:our_provider_name]
+  empty_transformer = Scaffolding::Transformer.new("", "")
 
   # get these out of the way first.
-  string = string.gsub("stripe_connect: Stripe", encode_double_replacement_fix(options[:gems_provider_name] + ": " + name.titleize))
-  string = string.gsub("ti-money", encode_double_replacement_fix(options[:icon])) if options[:icon]
-  string = string.gsub("omniauth-stripe-connect", encode_double_replacement_fix(options[:omniauth_gem]))
-  string = string.gsub("stripe_connect", encode_double_replacement_fix(options[:gems_provider_name]))
-  string = string.gsub("STRIPE_CLIENT_ID", encode_double_replacement_fix(options[:api_key]))
-  string = string.gsub("STRIPE_SECRET_KEY", encode_double_replacement_fix(options[:api_secret]))
+  string = string.gsub("stripe_connect: Stripe", empty_transformer.encode_double_replacement_fix(options[:gems_provider_name] + ": " + name.titleize))
+  string = string.gsub("ti-money", empty_transformer.encode_double_replacement_fix(options[:icon])) if options[:icon]
+  string = string.gsub("omniauth-stripe-connect", empty_transformer.encode_double_replacement_fix(options[:omniauth_gem]))
+  string = string.gsub("stripe_connect", empty_transformer.encode_double_replacement_fix(options[:gems_provider_name]))
+  string = string.gsub("STRIPE_CLIENT_ID", empty_transformer.encode_double_replacement_fix(options[:api_key]))
+  string = string.gsub("STRIPE_SECRET_KEY", empty_transformer.encode_double_replacement_fix(options[:api_secret]))
 
   # then try for some matches that give us a little more context on what they're looking for.
-  string = string.gsub("stripe-account", encode_double_replacement_fix(name.underscore.dasherize + "_account"))
-  string = string.gsub("stripe_account", encode_double_replacement_fix(name.underscore + "_account"))
-  string = string.gsub("StripeAccount", encode_double_replacement_fix(name + "Account"))
-  string = string.gsub("Stripe Account", encode_double_replacement_fix(name.titleize + " Account"))
-  string = string.gsub("Stripe account", encode_double_replacement_fix(name.titleize + " account"))
-  string = string.gsub("with Stripe", encode_double_replacement_fix("with " + name.titleize))
+  string = string.gsub("stripe-account", empty_transformer.encode_double_replacement_fix(name.underscore.dasherize + "_account"))
+  string = string.gsub("stripe_account", empty_transformer.encode_double_replacement_fix(name.underscore + "_account"))
+  string = string.gsub("StripeAccount", empty_transformer.encode_double_replacement_fix(name + "Account"))
+  string = string.gsub("Stripe Account", empty_transformer.encode_double_replacement_fix(name.titleize + " Account"))
+  string = string.gsub("Stripe account", empty_transformer.encode_double_replacement_fix(name.titleize + " account"))
+  string = string.gsub("with Stripe", empty_transformer.encode_double_replacement_fix("with " + name.titleize))
 
   # finally, just do the simplest string replace. it's possible this can produce weird results.
   # if they do, try adding more context aware replacements above, e.g. what i did with 'with'.
-  string = string.gsub("stripe", encode_double_replacement_fix(name.underscore))
-  string = string.gsub("Stripe", encode_double_replacement_fix(name))
+  string = string.gsub("stripe", empty_transformer.encode_double_replacement_fix(name.underscore))
+  string = string.gsub("Stripe", empty_transformer.encode_double_replacement_fix(name))
 
-  decode_double_replacement_fix(string)
+  empty_transformer.decode_double_replacement_fix(string)
 end
 
 def oauth_scaffold_add_line_to_file(file, content, after, options, additional_options = {})
+  empty_transformer = Scaffolding::Transformer.new("", "")
   file = oauth_transform_string(file, options)
   content = oauth_transform_string(content, options)
   after = oauth_transform_string(after, options)
-  legacy_add_line_to_file(file, content, after, nil, nil, additional_options)
+  empty_transformer.add_line_to_file(file, content, after, additional_options)
 end

data/lib/scaffolding/script.rb

@@ -1,6 +1,3 @@
-# TODO these methods were removed from the global scope in super scaffolding and moved to `Scaffolding::Transformer`,
-# but oauth provider scaffolding hasn't been updated yet.
-
 require "scaffolding"
 require "scaffolding/transformer"
 require "scaffolding/block_manipulator"
@@ -87,7 +84,7 @@ end
 
 def show_usage
   puts ""
-  puts "🚅  usage: bin/super-scaffold [type] (... | --help)"
+  puts "🚅  usage: bin/super-scaffold [type] (... | --help | --field-partials)"
   puts ""
   puts "Supported types of scaffolding:"
   puts ""
@@ -112,11 +109,48 @@ elsif argv.count > 1
   puts "To use the original Super Scaffolding that you know and love, use the `crud` option.".yellow
 
   show_usage
-else
-  if ARGV.first.present?
+elsif ARGV.first.present?
+  case ARGV.first
+  when "--field-partials"
+    puts "Bullet Train uses the following field partials for Super Scaffolding".blue
     puts ""
+    field_partials = {
+      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|
+      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 }
+
+    puts ""
+    puts "For more details, check out the documentation:"
+    puts "https://bullettrain.co/docs/field-partials"
+  when "--help"
+    show_usage
+  else
     puts "Invalid scaffolding type \"#{ARGV.first}\".".red
+    show_usage
   end
-
-  show_usage
 end

data/lib/scaffolding/transformer.rb

@@ -76,9 +76,7 @@ class Scaffolding::Transformer
   end
 
   def transform_string(string)
-    [
-
-      # full class name plural.
+    full_class_name = [
       "Scaffolding::AbsolutelyAbstract::CreativeConcepts",
       "Scaffolding::CompletelyConcrete::TangibleThings",
       "ScaffoldingAbsolutelyAbstractCreativeConcepts",
@@ -94,41 +92,19 @@ class Scaffolding::Transformer
       "scaffolding_completely_concrete_tangible_things",
       "scaffolding-absolutely-abstract-creative-concepts",
       "scaffolding-completely-concrete-tangible-things",
+      "scaffolding.completely_concrete.tangible_things"
+    ]
 
-      # full class name singular.
-      "Scaffolding::AbsolutelyAbstract::CreativeConcept",
-      "Scaffolding::CompletelyConcrete::TangibleThing",
-      "ScaffoldingAbsolutelyAbstractCreativeConcept",
-      "ScaffoldingCompletelyConcreteTangibleThing",
-      "Scaffolding Absolutely Abstract Creative Concept",
-      "Scaffolding Completely Concrete Tangible Thing",
-      "Scaffolding/Absolutely Abstract/Creative Concept",
-      "Scaffolding/Completely Concrete/Tangible Thing",
-      "scaffolding/absolutely_abstract/creative_concept",
-      "scaffolding/completely_concrete/tangible_thing",
-      "scaffolding_absolutely_abstract_creative_concept",
-      "scaffolding_completely_concrete_tangible_thing",
-      "scaffolding-absolutely-abstract-creative-concept",
-      "scaffolding-completely-concrete-tangible-thing",
-      "scaffolding.completely_concrete.tangible_things",
-
-      # class name in context plural.
+    class_name_with_context = [
       "absolutely_abstract_creative_concepts",
       "completely_concrete_tangible_things",
       "absolutely_abstract/creative_concepts",
       "completely_concrete/tangible_things",
       "absolutely-abstract-creative-concepts",
       "completely-concrete-tangible-things",
+    ]
 
-      # class name in context singular.
-      "absolutely_abstract_creative_concept",
-      "completely_concrete_tangible_thing",
-      "absolutely_abstract/creative_concept",
-      "completely_concrete/tangible_thing",
-      "absolutely-abstract-creative-concept",
-      "completely-concrete-tangible-thing",
-
-      # just class name singular.
+    class_name = [
       "creative_concepts",
       "tangible_things",
       "creative-concepts",
@@ -139,24 +115,14 @@ class Scaffolding::Transformer
       "Tangible things",
       "creative concepts",
       "tangible things",
+    ]
 
-      # just class name plural.
-      "creative_concept",
-      "tangible_thing",
-      "creative-concept",
-      "tangible-thing",
-      "Creative Concept",
-      "Tangible Thing",
-      "Creative concept",
-      "Tangible thing",
-      "creative concept",
-      "tangible thing",
-
-      # Account namespace vs. others.
-      ":account",
-      "/account/"
-
-    ].each do |needle|
+    (
+      full_class_name + full_class_name.map(&:singularize) +
+      class_name_with_context + class_name_with_context.map(&:singularize) +
+      class_name + class_name.map(&:singularize) +
+      [":account", "/account/"] # Account namespace vs. others.
+    ).each do |needle|
       string = string.gsub(needle, encode_double_replacement_fix(class_names_transformer.replacement_for(needle)))
     end
 
@@ -175,9 +141,6 @@ class Scaffolding::Transformer
 
   def resolve_template_path(file)
     # Figure out the actual location of the file.
-    # Originally all the potential source files were in the repository alongside the application.
-    # Now the files could be provided by an included Ruby gem, so we allow those Ruby gems to register their base
-    # path and then we check them in order to see which template we should use.
     BulletTrain::SuperScaffolding.template_paths.map do |base_path|
       base_path = Pathname.new(base_path)
       resolved_path = base_path.join(file).to_s
@@ -356,7 +319,12 @@ class Scaffolding::Transformer
       return false
     end
 
-    if target_file_content.include?(transformed_content)
+    # When Super Scaffolding strong parameters, if an attribute named :project exists for a model `Project`,
+    # the `account_load_and_authorize_resource :project,` code prevents the attribute from being scaffolded
+    # since the transformed content is `:project,`. We bypass that here with this check.
+    content_matches_model_name = transformed_content.gsub(/[:|,]/, "").capitalize == child
+
+    if target_file_content.include?(transformed_content) && !content_matches_model_name
       puts "No need to update '#{transformed_file_name}'. It already has '#{transformed_content}'." unless silence_logs?
 
     else
@@ -878,8 +846,8 @@ class Scaffolding::Transformer
           field_options[:color_picker_options] = "t('#{child.pluralize.underscore}.fields.#{name}.options')"
         end
 
-        # TODO: This feels incorrect.
-        # Should we adjust the partials to only use `{multiple: true}` or `html_options: {multiple_true}`?
+        # 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"
             field_options[:multiple] = "true"
@@ -1264,7 +1232,6 @@ class Scaffolding::Transformer
               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}/)
 
-              # TODO also solve the 60 character long index limitation.
               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."
@@ -1300,14 +1267,17 @@ class Scaffolding::Transformer
 
         # Add `default: false` to boolean migrations.
         if boolean_buttons
-          confirmation_reference = "create_table :#{class_names_transformer.table_name}"
-          confirmation_migration_file_name = `grep "#{confirmation_reference}" db/migrate/*`.split(":").first
+          # Give priority to crud-field migrations if they exist.
+          add_column_reference = "add_column :#{class_names_transformer.table_name}, :#{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
 
           old_line, new_line = nil
           File.open(confirmation_migration_file_name) do |migration_file|
             old_lines = migration_file.readlines
             old_lines.each do |line|
-              target_attribute = line.match?(/\s*t\.boolean :#{name}/)
+              target_attribute = line.match?(/:#{class_names_transformer.table_name}, :#{name}, :boolean/) || line.match?(/\s*t\.boolean :#{name}/)
               if target_attribute
                 old_line = line
                 new_line = "#{old_line.chomp}, default: false\n"
@@ -1532,6 +1502,8 @@ class Scaffolding::Transformer
 
     # add sortability.
     if cli_options["sortable"]
+      scaffold_replace_line_in_file("./app/views/account/scaffolding/completely_concrete/tangible_things/_index.html.erb", transform_string("<tbody data-controller=\"sortable\" data-sortable-reorder-path-value=\"<%= url_for [:reorder, :account, context, collection] %>\">"), "<tbody>")
+
       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)
@@ -1543,10 +1515,6 @@ class Scaffolding::Transformer
         Scaffolding::FileManipulator.write(migration, new_lines)
       end
 
-      unless cli_options["skip-table"]
-        scaffold_replace_line_in_file("./app/views/account/scaffolding/completely_concrete/tangible_things/_index.html.erb", transform_string("<tbody data-controller=\"sortable\" data-sortable-reorder-path-value=\"<%= url_for [:reorder, :account, context, collection] %>\">"), "<tbody>")
-      end
-
       unless cli_options["skip-controller"]
         scaffold_add_line_to_file("./app/controllers/account/scaffolding/completely_concrete/tangible_things_controller.rb", "include SortableActions\n", "Account::ApplicationController", increase_indent: true)
       end
@@ -1642,7 +1610,9 @@ class Scaffolding::Transformer
           icon_name = cli_options["sidebar"]
         else
           puts ""
-          puts "Hey, models that are scoped directly off of a Team (or nothing) are eligible to be added to the sidebar."
+          # TODO: Update this help text letting developers know they can Super Scaffold
+          # models without a parent after the `--skip-parent` logic is implemented.
+          puts "Hey, models that are scoped directly off of a Team are eligible to be added to the navbar."
           puts "Do you want to add this resource to the sidebar menu? (y/N)"
           response = $stdin.gets.chomp
           if response.downcase[0] == "y"
@@ -1693,7 +1663,7 @@ class Scaffolding::Transformer
       end
     end
 
-    add_additional_step :yellow, transform_string("If you would like the table view you've just generated to reactively update when a Tangible Thing is updated on the server, please edit `app/models/scaffolding/absolutely_abstract/creative_concept.rb`, locate the `has_many :completely_concrete_tangible_things`, and add `enable_updates: true` to it.")
+    add_additional_step :yellow, transform_string("If you would like the table view you've just generated to reactively update when a Tangible Thing is updated on the server, please edit `app/models/scaffolding/absolutely_abstract/creative_concept.rb`, locate the `has_many :completely_concrete_tangible_things`, and add `enable_cable_ready_updates: true` to it.")
 
     restart_server unless ENV["CI"].present?
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.2.27
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -170,12 +170,12 @@ files:
 - lib/scaffolding/script.rb
 - lib/scaffolding/transformer.rb
 - lib/tasks/bullet_train/super_scaffolding_tasks.rake
-homepage: https://github.com/bullet-train-co/bullet_train-super_scaffolding
+homepage: https://github.com/bullet-train-co/bullet_train-core/tree/main/bullet_train-super_scaffolding
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/bullet-train-co/bullet_train-super_scaffolding
-  source_code_uri: https://github.com/bullet-train-co/bullet_train-super_scaffolding
+  homepage_uri: https://github.com/bullet-train-co/bullet_train-core/tree/main/bullet_train-super_scaffolding
+  source_code_uri: https://github.com/bullet-train-co/bullet_train-core/tree/main/bullet_train-super_scaffolding
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Bullet Train Super Scaffolding