bullet_train-super_scaffolding 1.0.41 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5b3c39c20e852d11ae216cb1bb8e8686e935345954b5bb89fa4662e931aa9f0
-  data.tar.gz: c5c7884aacf4fad0073b2802913b2521c985d4059648e5036cef76dec826ba86
+  metadata.gz: 32224b242dd25356684b3c9610d35b34cb3bb1b8066370a7f2c17e79a26bc1fb
+  data.tar.gz: d95d63eff9edb73aec111c413122b1eff2469e47cf12a69bd4a901f204c8a7f9
 SHA512:
-  metadata.gz: 5c67a6fc6aa0325cded01535276152126a8339ce2ea321b6e3e31eecb0a969dccbe6b69077b239941239720ce7cc616dd28272c17d6aa6dd1048984d5464aeba
-  data.tar.gz: 5591f573ad8cea3aed70e079bf6293f8764de12dbbf333f17e4c0f67ec295812ab986fe6fd04e1e9a64066125be944508bea381c2a2d145e1a9a52be6017efc8
+  metadata.gz: 71f3a470afb3905bc70a33e9a7b54bf97d740ded06bd64abcfd1a78396484de7aad0df07ebff2403a3d3aa5f89098fae3411c4864fe096722d3b7a0c1b38246b
+  data.tar.gz: 5ed09d089a092bc7355af52becf880f30ec54a12047ff38a8fdf6e27cc71b86c8a93fdf768355b593b26b578bf541d8d950f8037a7cdcbdde56664116011d9bf

data/app/controllers/account/scaffolding/absolutely_abstract/creative_concepts/collaborators_controller.rb

@@ -61,7 +61,7 @@ class Account::Scaffolding::AbsolutelyAbstract::CreativeConcepts::CollaboratorsC
 
   private
 
-  # Never trust parameters from the scary internet, only allow the white list through.
+  # Only allow a list of trusted parameters through.
   def collaborator_params
     role_ids = params.dig(:scaffolding_absolutely_abstract_creative_concepts_collaborator, :role_ids)
     role_ids = [role_ids] unless role_ids.is_a?(Array)

data/app/controllers/account/scaffolding/absolutely_abstract/creative_concepts_controller.rb

@@ -68,7 +68,7 @@ class Account::Scaffolding::AbsolutelyAbstract::CreativeConceptsController < Acc
 
   private
 
-  # Never trust parameters from the scary internet, only allow the white list through.
+  # Only allow a list of trusted parameters through.
   def creative_concept_params
     params.require(:scaffolding_absolutely_abstract_creative_concept).permit(
       :name,

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

@@ -4,13 +4,13 @@ class Account::Scaffolding::CompletelyConcrete::TangibleThingsController < Accou
   # GET /account/scaffolding/absolutely_abstract/creative_concepts/:absolutely_abstract_creative_concept_id/completely_concrete/tangible_things
   # GET /account/scaffolding/absolutely_abstract/creative_concepts/:absolutely_abstract_creative_concept_id/completely_concrete/tangible_things.json
   def index
-    # if you only want these objects shown on their parent's show page, uncomment this:
-    # redirect_to [:account, @absolutely_abstract_creative_concept]
+    delegate_json_to_api
   end
 
   # GET /account/scaffolding/completely_concrete/tangible_things/:id
   # GET /account/scaffolding/completely_concrete/tangible_things/:id.json
   def show
+    delegate_json_to_api
   end
 
   # GET /account/scaffolding/absolutely_abstract/creative_concepts/:absolutely_abstract_creative_concept_id/completely_concrete/tangible_things/new
@@ -61,37 +61,9 @@ class Account::Scaffolding::CompletelyConcrete::TangibleThingsController < Accou
 
   private
 
-  # Never trust parameters from the scary internet, only allow the white list through.
-  def tangible_thing_params
-    strong_params = params.require(:scaffolding_completely_concrete_tangible_thing).permit(
-      # 🚅 skip this section when scaffolding.
-      :text_field_value,
-      :action_text_value,
-      :boolean_button_value,
-      :button_value,
-      :color_picker_value,
-      :cloudinary_image_value,
-      :date_field_value,
-      :date_and_time_field_value,
-      :date_and_time_field_value_time_zone,
-      :email_field_value,
-      :file_field_value,
-      :file_field_value_removal,
-      :option_value,
-      :password_field_value,
-      :phone_field_value,
-      :super_select_value,
-      :text_area_value,
-      # 🚅 stop any skipping we're doing now.
-      # 🚅 super scaffolding will insert new fields above this line.
-      # 🚅 skip this section when scaffolding.
-      multiple_button_values: [],
-      multiple_option_values: [],
-      multiple_super_select_values: []
-      # 🚅 stop any skipping we're doing now.
-      # 🚅 super scaffolding will insert new arrays above this line.
-    )
+  include strong_parameters_from_api
 
+  def process_params(strong_params)
     # 🚅 skip this section when scaffolding.
     assign_boolean(strong_params, :boolean_button_value)
     assign_date_and_time(strong_params, :date_and_time_field_value)
@@ -100,7 +72,5 @@ class Account::Scaffolding::CompletelyConcrete::TangibleThingsController < Accou
     assign_select_options(strong_params, :multiple_super_select_values)
     # 🚅 stop any skipping we're doing now.
     # 🚅 super scaffolding will insert processing for new fields above this line.
-
-    strong_params
   end
 end

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

@@ -0,0 +1,78 @@
+class Api::V1::Scaffolding::CompletelyConcrete::TangibleThingsController < Api::V1::ApplicationController
+  account_load_and_authorize_resource :tangible_thing, through: :absolutely_abstract_creative_concept, through_association: :completely_concrete_tangible_things
+
+  # GET /api/v1/scaffolding/absolutely_abstract/creative_concepts/:absolutely_abstract_creative_concept_id/completely_concrete/tangible_things
+  def index
+  end
+
+  # GET /api/v1/scaffolding/completely_concrete/tangible_things/:id
+  def show
+  end
+
+  # POST /api/v1/scaffolding/absolutely_abstract/creative_concepts/:absolutely_abstract_creative_concept_id/completely_concrete/tangible_things
+  def create
+    if @tangible_thing.save
+      render :show, status: :created, location: [:api, :v1, @tangible_thing]
+    else
+      render json: @tangible_thing.errors, status: :unprocessable_entity
+    end
+  end
+
+  # PATCH/PUT /api/v1/scaffolding/completely_concrete/tangible_things/:id
+  def update
+    if @tangible_thing.update(tangible_thing_params)
+      render :show
+    else
+      render json: @tangible_thing.errors, status: :unprocessable_entity
+    end
+  end
+
+  # DELETE /api/v1/scaffolding/completely_concrete/tangible_things/:id
+  def destroy
+    @tangible_thing.destroy
+  end
+
+  private
+
+  module StrongParameters
+    # Only allow a list of trusted parameters through.
+    def tangible_thing_params
+      strong_params = params.require(:scaffolding_completely_concrete_tangible_thing).permit(
+        *permitted_fields,
+        # 🚅 skip this section when scaffolding.
+        :text_field_value,
+        :action_text_value,
+        :boolean_button_value,
+        :button_value,
+        :color_picker_value,
+        :cloudinary_image_value,
+        :date_field_value,
+        :date_and_time_field_value,
+        :date_and_time_field_value_time_zone,
+        :email_field_value,
+        :file_field_value,
+        :file_field_value_removal,
+        :option_value,
+        :password_field_value,
+        :phone_field_value,
+        :super_select_value,
+        :text_area_value,
+        # 🚅 stop any skipping we're doing now.
+        # 🚅 super scaffolding will insert new fields above this line.
+        *permitted_arrays,
+        # 🚅 skip this section when scaffolding.
+        multiple_button_values: [],
+        multiple_option_values: [],
+        multiple_super_select_values: []
+        # 🚅 stop any skipping we're doing now.
+        # 🚅 super scaffolding will insert new arrays above this line.
+      )
+
+      process_params(strong_params)
+
+      strong_params
+    end
+  end
+
+  include StrongParameters
+end

data/app/views/{account → api/v1}/scaffolding/completely_concrete/tangible_things/_tangible_thing.json.jbuilder

@@ -7,6 +7,7 @@ json.extract! tangible_thing,
   :color_picker_value,
   :cloudinary_image_value,
   :date_field_value,
+  :date_and_time_field_value,
   :email_field_value,
   :password_field_value,
   :phone_field_value,
@@ -19,4 +20,7 @@ json.extract! tangible_thing,
   # 🚅 super scaffolding will insert new fields above this line.
   :created_at,
   :updated_at
-json.url account_scaffolding_completely_concrete_tangible_thing_url(tangible_thing, format: :json)
+
+# if tangible_thing.persisted?
+#   json.url api_v1_scaffolding_completely_concrete_tangible_thing_url(tangible_thing, format: :json)
+# end

data/app/views/api/v1/scaffolding/completely_concrete/tangible_things/index.json.jbuilder

@@ -0,0 +1,5 @@
+json.data do
+  json.array! @tangible_things, partial: "api/v1/scaffolding/completely_concrete/tangible_things/tangible_thing", as: :tangible_thing
+end
+
+render_pagination(json)

data/app/views/api/v1/scaffolding/completely_concrete/tangible_things/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "api/v1/scaffolding/completely_concrete/tangible_things/tangible_thing", tangible_thing: @tangible_thing

data/config/routes.rb

@@ -1,6 +1,35 @@
 Rails.application.routes.draw do
   collection_actions = [:index, :new, :create]
 
+  namespace :api do
+    namespace :v1 do
+      shallow do
+        resources :teams do
+          unless scaffolding_things_disabled?
+            namespace :scaffolding do
+              namespace :absolutely_abstract do
+                resources :creative_concepts do
+                  scope module: "creative_concepts" do
+                    resources :collaborators, only: collection_actions
+                  end
+
+                  namespace :creative_concepts do
+                    resources :collaborators, except: collection_actions
+                  end
+                end
+              end
+              resources :absolutely_abstract_creative_concepts, path: "absolutely_abstract/creative_concepts" do
+                namespace :completely_concrete do
+                  resources :tangible_things
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
   namespace :account do
     shallow do
       resources :teams do

data/lib/bullet_train/super_scaffolding/engine.rb

@@ -10,13 +10,6 @@ module BulletTrain
         BulletTrain::SuperScaffolding.template_paths << File.expand_path("../../../..", __FILE__)
       end
 
-      initializer "bullet_train.super_scaffolding.templates.register_api_endpoints" do |app|
-        if defined?(BulletTrain::Api)
-          BulletTrain::Api.endpoints << "Api::V1::Scaffolding::AbsolutelyAbstract::CreativeConceptsEndpoint"
-          BulletTrain::Api.endpoints << "Api::V1::Scaffolding::CompletelyConcrete::TangibleThingsEndpoint"
-        end
-      end
-
       initializer "bullet_train.super_scaffolding.register" do |app|
         # Older versions of Bullet Train have a `BulletTrain` module, but it doesn't have `linked_gems`.
         if BulletTrain.respond_to?(:linked_gems)

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.0.41"
+    VERSION = "1.1.0"
   end
 end

data/lib/scaffolding/file_manipulator.rb

@@ -15,6 +15,11 @@ module Scaffolding::FileManipulator
     lines[(within + 1)..(Scaffolding::BlockManipulator.find_block_end(starting_from: within, lines: lines) + 1)]
   end
 
+  # TODO I was running into an error in a downstream application where it couldn't find silence_logs? We should implement it in this package.
+  def self.silence_logs?
+    ENV["SILENCE_LOGS"].present?
+  end
+
   def self.replace_line_in_file(file, content, in_place_of, options = {})
     begin
       target_file_content = File.read(file)
@@ -26,7 +31,7 @@ module Scaffolding::FileManipulator
     if target_file_content.include?(content)
       puts "No need to update '#{file}'. It already has '#{content}'."
     else
-      puts "Updating '#{file}'."
+      puts "Updating '#{file}'." unless silence_logs?
       target_file_content.gsub!(in_place_of, content)
       File.write(file, target_file_content)
     end
@@ -66,7 +71,7 @@ module Scaffolding::FileManipulator
   end
 
   def self.write(file_name, lines, strip: true)
-    puts "Updating '#{file_name}'."
+    puts "Updating '#{file_name}'." unless silence_logs?
     if strip
       File.open(file_name, "w+") do |file|
         file.puts(lines.join.strip + "\n")

data/lib/scaffolding/oauth_providers.rb

@@ -10,8 +10,13 @@ def legacy_resolve_template_path(file)
   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
 
+# TODO I was running into an error in a downstream application where it couldn't find silence_logs? We should implement it in this package.
+def silence_logs?
+  ENV["SILENCE_LOGS"].present?
+end
+
 def legacy_replace_in_file(file, before, after)
-  puts "Replacing in '#{file}'."
+  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)
@@ -58,7 +63,7 @@ def legacy_add_line_to_file(file, content, hook, child, parent, options = {})
       end
     end
 
-    puts "Updating '#{transformed_file_name}'."
+    puts "Updating '#{transformed_file_name}'." unless silence_logs?
 
     File.write(transformed_file_name, new_target_file_content.join("\n") + "\n")
   end
@@ -137,7 +142,7 @@ def oauth_scaffold_file(file, options)
     FileUtils.mkdir_p(transformed_directory_name)
   end
 
-  puts "Writing '#{transformed_file_name}'."
+  puts "Writing '#{transformed_file_name}'." unless silence_logs?
 
   File.write(transformed_file_name, transformed_file_content)
 end

data/lib/scaffolding/transformer.rb

@@ -45,7 +45,6 @@ class Scaffolding::Transformer
   RUBY_ADDITIONAL_NEW_FIELDS_HOOK = "# 🚅 super scaffolding will also insert new fields above this line."
   RUBY_EVEN_MORE_NEW_FIELDS_HOOK = "# 🚅 super scaffolding will additionally insert new fields above this line."
   RUBY_FILES_HOOK = "# 🚅 super scaffolding will insert file-related logic above this line."
-  ENDPOINTS_HOOK = "# 🚅 super scaffolding will mount new endpoints above this line."
   ERB_NEW_FIELDS_HOOK = "<%#{RUBY_NEW_FIELDS_HOOK} %>"
   CONCERNS_HOOK = "# 🚅 add concerns above."
   ATTR_ACCESSORS_HOOK = "# 🚅 add attribute accessors above."
@@ -231,21 +230,29 @@ class Scaffolding::Transformer
     transformed_file_content.join
   end
 
-  def scaffold_file(file)
+  # TODO I was running into an error in a downstream application where it couldn't find silence_logs? We should implement it in this package.
+  def silence_logs?
+    ENV["SILENCE_LOGS"].present?
+  end
+
+  def scaffold_file(file, overrides: false)
     transformed_file_content = get_transformed_file_content(file)
     transformed_file_name = transform_string(file)
 
+    # Remove `_overrides` from the file name if we're sourcing from a local override folder.
+    transformed_file_name.gsub!("_overrides", "") if overrides
+
     transformed_directory_name = File.dirname(transformed_file_name)
     unless File.directory?(transformed_directory_name)
       FileUtils.mkdir_p(transformed_directory_name)
     end
 
-    puts "Writing '#{transformed_file_name}'."
+    puts "Writing '#{transformed_file_name}'." unless silence_logs?
 
     File.write(transformed_file_name, transformed_file_content.strip + "\n")
 
     if transformed_file_name.split(".").last == "rb"
-      puts "Fixing Standard Ruby on '#{transformed_file_name}'."
+      puts "Fixing Standard Ruby on '#{transformed_file_name}'." unless silence_logs?
       # `standardrb --fix #{transformed_file_name} 2> /dev/null`
     end
   end
@@ -266,6 +273,22 @@ class Scaffolding::Transformer
         scaffold_file(file)
       end
     end
+
+    # Allow local developers to override just certain files of a directory.
+    override_path = begin
+      resolve_template_path(directory + "_overrides")
+    rescue RuntimeError
+      nil
+    end
+
+    if override_path
+      Dir.foreach(override_path) do |file|
+        file = "#{directory}_overrides/#{file}"
+        unless File.directory?(resolve_template_path(file))
+          scaffold_file(file, overrides: true)
+        end
+      end
+    end
   end
 
   def add_line_to_file(file, content, hook, options = {})
@@ -285,7 +308,7 @@ class Scaffolding::Transformer
     end
 
     if target_file_content.include?(transformed_content)
-      puts "No need to update '#{transformed_file_name}'. It already has '#{transformed_content}'."
+      puts "No need to update '#{transformed_file_name}'. It already has '#{transformed_content}'." unless silence_logs?
 
     else
 
@@ -335,7 +358,7 @@ class Scaffolding::Transformer
         end
       end
 
-      puts "Updating '#{transformed_file_name}'."
+      puts "Updating '#{transformed_file_name}'." unless silence_logs?
 
       File.write(transformed_file_name, new_target_file_content.join("\n").strip + "\n")
 
@@ -477,7 +500,7 @@ class Scaffolding::Transformer
   end
 
   def replace_in_file(file, before, after, target_regexp = nil)
-    puts "Replacing in '#{file}'."
+    puts "Replacing in '#{file}'." unless silence_logs?
     if target_regexp.present?
       target_file_content = ""
       File.open(file).each_line do |l|
@@ -691,6 +714,8 @@ class Scaffolding::Transformer
         "'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
@@ -968,7 +993,8 @@ class Scaffolding::Transformer
 
         # add attributes to strong params.
         [
-          "./app/controllers/account/scaffolding/completely_concrete/tangible_things_controller.rb"
+          "./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)
@@ -1002,38 +1028,6 @@ class Scaffolding::Transformer
         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
       end
 
-      #
-      # API ENDPOINT
-      #
-
-      unless cli_options["skip-api"]
-
-        # add attributes to endpoint.
-        if name.match?(/_ids$/)
-          scaffold_add_line_to_file("./app/controllers/api/v1/scaffolding/completely_concrete/tangible_things_endpoint.rb", "optional :#{name}, type: Array, desc: Api.heading(:#{name})", RUBY_NEW_ARRAYS_HOOK, prepend: true)
-        else
-          api_type = case type
-          when "date_field"
-            "Date"
-          when "date_and_time_field"
-            "DateTime"
-          when "buttons"
-            if boolean_buttons
-              "Boolean"
-            else
-              "String"
-            end
-          when "file_field"
-            "File"
-          else
-            "String"
-          end
-
-          scaffold_add_line_to_file("./app/controllers/api/v1/scaffolding/completely_concrete/tangible_things_endpoint.rb", "optional :#{name}, type: #{api_type}, desc: Api.heading(:#{name})", RUBY_NEW_FIELDS_HOOK, prepend: true)
-        end
-
-      end
-
       #
       # API SERIALIZER
       #
@@ -1042,8 +1036,7 @@ class Scaffolding::Transformer
 
         # TODO The serializers can't handle these `has_rich_text` attributes.
         unless type == "trix_editor"
-          scaffold_add_line_to_file("./app/views/account/scaffolding/completely_concrete/tangible_things/_tangible_thing.json.jbuilder", ":#{name},", RUBY_NEW_FIELDS_HOOK, prepend: true, suppress_could_not_find: true)
-          scaffold_add_line_to_file("./app/serializers/api/v1/scaffolding/completely_concrete/tangible_thing_serializer.rb", ":#{name},", RUBY_NEW_FIELDS_HOOK, prepend: true) 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)
 
           assertion = case type
           when "date_field"
@@ -1051,52 +1044,27 @@ class Scaffolding::Transformer
           when "date_and_time_field"
             "assert_equal_or_nil DateTime.parse(tangible_thing_data['#{name}']), tangible_thing.#{name}"
           when "file_field"
-            # TODO: If we want to use Cloudinary to handle our files, we should make sure we're getting a URL.
-            "assert tangible_thing_data['#{name}'].match?('foo.txt') unless response.status == 201"
+            # TODO Get this working again.
+            "# assert tangible_thing_data['#{name}'].match?('foo.txt') unless response.status == 201"
           else
             "assert_equal_or_nil tangible_thing_data['#{name}'], tangible_thing.#{name}"
           end
-          scaffold_add_line_to_file("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_endpoint_test.rb", assertion, RUBY_NEW_FIELDS_HOOK, prepend: true)
+          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"
-          file_name = "./app/serializers/api/v1/scaffolding/completely_concrete/tangible_thing_serializer.rb"
-          content = <<~RUBY
-            attribute :#{name} do |object|
-              rails_blob_path(object.#{name}, disposition: "attachment", only_path: true) if object.#{name}.attached?
-            end
-
-          RUBY
-          hook = RUBY_FILES_HOOK
-          scaffold_add_line_to_file(file_name, content, hook, prepend: true)
-
-          # We also want to make sure we attach the dummy file in the endpoint test on setup
-          file_name = "./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_endpoint_test.rb"
-          content = "@#{child.underscore}.#{name} = Rack::Test::UploadedFile.new(\"test/support/foo.txt\")"
-          scaffold_add_line_to_file(file_name, content, hook, prepend: true)
+          # TODO Get this working again.
+          # 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 = "# @#{child.underscore}.#{name} = Rack::Test::UploadedFile.new(\"test/support/foo.txt\")"
+          scaffold_add_line_to_file(file_name, content, RUBY_FILES_HOOK, prepend: true)
         end
 
-        # scaffold_add_line_to_file("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_controller_test.rb", "assert_equal tangible_thing_attributes['#{name.gsub('_', '-')}'], tangible_thing.#{name}", RUBY_NEW_FIELDS_HOOK, prepend: true)
-
         if attribute_assignment
           unless attribute_options[:readonly]
-            scaffold_add_line_to_file("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_endpoint_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_endpoint_test.rb", "assert_equal @tangible_thing.#{name}, #{attribute_assignment}", RUBY_EVEN_MORE_NEW_FIELDS_HOOK, prepend: true)
-          end
-        end
-
-        # We need to update our new Tangible Thing's
-        # jbuilder files if it's scoped under "account".
-        # TODO: Should we run this if `namespace.present?` instead?
-        if namespace == "account"
-          target_string = "#{transform_string("scaffolding/completely_concrete/tangible_things")}/#{transform_string("tangible_thing")}"
-          replacement_string = "#{namespace}/#{target_string}"
-          [
-            "app/views/account/completely_concrete/tangible_things/index.json.jbuilder",
-            "app/views/account/completely_concrete/tangible_things/show.json.jbuilder"
-          ].each do |path|
-            scaffold_replace_line_in_file(path, replacement_string, target_string)
+            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)
           end
         end
       end
@@ -1283,10 +1251,10 @@ class Scaffolding::Transformer
       [
         "./app/controllers/account/scaffolding/completely_concrete/tangible_things_controller.rb",
         "./app/views/account/scaffolding/completely_concrete/tangible_things",
+        "./app/views/api/v1/scaffolding/completely_concrete/tangible_things",
         ("./config/locales/en/scaffolding/completely_concrete/tangible_things.en.yml" unless cli_options["skip-locales"]),
-        ("./app/controllers/api/v1/scaffolding/completely_concrete/tangible_things_endpoint.rb" unless cli_options["skip-api"]),
-        ("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_endpoint_test.rb" unless cli_options["skip-api"]),
-        ("./app/serializers/api/v1/scaffolding/completely_concrete/tangible_thing_serializer.rb" unless cli_options["skip-api"])
+        ("./app/controllers/api/v1/scaffolding/completely_concrete/tangible_things_controller.rb" unless cli_options["skip-api"]),
+        ("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_controller_test.rb" unless cli_options["skip-api"])
         # "./app/filters/scaffolding/completely_concrete/tangible_things_filter.rb"
       ].compact
     end
@@ -1299,13 +1267,6 @@ class Scaffolding::Transformer
       end
     end
 
-    unless cli_options["skip-api"]
-
-      # add endpoint to the api.
-      scaffold_add_line_to_file("./app/controllers/api/v1/root.rb", "mount Api::V1::Scaffolding::CompletelyConcrete::TangibleThingsEndpoint", ENDPOINTS_HOOK, prepend: true)
-
-    end
-
     unless cli_options["skip-model"]
       # find the database migration that defines this relationship.
       migration_file_name = `grep "create_table :#{class_names_transformer.table_name} do |t|" db/migrate/*`.split(":").first
@@ -1343,7 +1304,7 @@ class Scaffolding::Transformer
     end
 
     unless cli_options["skip-api"]
-      scaffold_replace_line_in_file("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_endpoint_test.rb", build_factory_setup.join("\n"), "# 🚅 super scaffolding will insert factory setup in place of this line.")
+      scaffold_replace_line_in_file("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_controller_test.rb", build_factory_setup.join("\n"), "# 🚅 super scaffolding will insert factory setup in place of this line.")
     end
 
     # add children to the show page of their parent.
@@ -1442,6 +1403,18 @@ class Scaffolding::Transformer
       end
 
       Scaffolding::FileManipulator.write("config/routes.rb", routes_manipulator.lines)
+
+      unless cli_options["skip-api"]
+        begin
+          api_routes_manipulator = Scaffolding::RoutesFileManipulator.new("config/routes/api/#{BulletTrain::Api.current_version}.rb", child, parent, cli_options)
+          api_routes_manipulator.apply([BulletTrain::Api.current_version.to_sym])
+        rescue => e
+          puts "We weren't able to automatically add your `api/#{BulletTrain::Api.current_version}` routes for you. In theory this should be very rare, so if you could reach out on Slack, you could probably provide context that will help us fix whatever the problem was. In the meantime, to add the routes manually, we've got a guide at https://blog.bullettrain.co/nested-namespaced-rails-routing-examples/ .".send(:yellow)
+          raise e
+        end
+
+        Scaffolding::FileManipulator.write("config/routes/api/#{BulletTrain::Api.current_version}.rb", api_routes_manipulator.lines)
+      end
     end
 
     unless cli_options["skip-parent"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.0.41
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -85,9 +85,8 @@ files:
 - app/controllers/api/v1.rb
 - app/controllers/api/v1/scaffolding.rb
 - app/controllers/api/v1/scaffolding/absolutely_abstract.rb
-- app/controllers/api/v1/scaffolding/absolutely_abstract/creative_concepts_endpoint.rb
 - app/controllers/api/v1/scaffolding/completely_concrete.rb
-- app/controllers/api/v1/scaffolding/completely_concrete/tangible_things_endpoint.rb
+- app/controllers/api/v1/scaffolding/completely_concrete/tangible_things_controller.rb
 - app/controllers/concerns/scaffolding/absolutely_abstract/creative_concepts/controller_support.rb
 - app/helpers/super_scaffolding_helper.rb
 - app/models/scaffolding.rb
@@ -99,8 +98,6 @@ files:
 - app/models/scaffolding/completely_concrete/tangible_thing.rb
 - app/models/scaffolding/completely_concrete/tangible_things.rb
 - app/models/scaffolding/completely_concrete/tangible_things/assignment.rb
-- app/serializers/api/v1/scaffolding/absolutely_abstract/creative_concept_serializer.rb
-- app/serializers/api/v1/scaffolding/completely_concrete/tangible_thing_serializer.rb
 - app/views/account/scaffolding/absolutely_abstract/creative_concepts/_breadcrumbs.html.erb
 - app/views/account/scaffolding/absolutely_abstract/creative_concepts/_creative_concept.json.jbuilder
 - app/views/account/scaffolding/absolutely_abstract/creative_concepts/_form.html.erb
@@ -127,13 +124,13 @@ files:
 - app/views/account/scaffolding/completely_concrete/tangible_things/_form.html.erb
 - app/views/account/scaffolding/completely_concrete/tangible_things/_index.html.erb
 - app/views/account/scaffolding/completely_concrete/tangible_things/_menu_item.html.erb
-- app/views/account/scaffolding/completely_concrete/tangible_things/_tangible_thing.json.jbuilder
 - app/views/account/scaffolding/completely_concrete/tangible_things/edit.html.erb
 - app/views/account/scaffolding/completely_concrete/tangible_things/index.html.erb
-- app/views/account/scaffolding/completely_concrete/tangible_things/index.json.jbuilder
 - app/views/account/scaffolding/completely_concrete/tangible_things/new.html.erb
 - app/views/account/scaffolding/completely_concrete/tangible_things/show.html.erb
-- app/views/account/scaffolding/completely_concrete/tangible_things/show.json.jbuilder
+- app/views/api/v1/scaffolding/completely_concrete/tangible_things/_tangible_thing.json.jbuilder
+- app/views/api/v1/scaffolding/completely_concrete/tangible_things/index.json.jbuilder
+- app/views/api/v1/scaffolding/completely_concrete/tangible_things/show.json.jbuilder
 - app/views/shared/_bulk_action_select.html.erb
 - app/views/shared/tables/_checkbox.html.erb
 - app/views/shared/tables/_select_all.html.erb

data/app/controllers/api/v1/scaffolding/absolutely_abstract/creative_concepts_endpoint.rb

@@ -1,103 +0,0 @@
-class Api::V1::Scaffolding::AbsolutelyAbstract::CreativeConceptsEndpoint < Api::V1::Root
-  helpers do
-    include Scaffolding::AbsolutelyAbstract::CreativeConcepts::ControllerSupport
-
-    params :team_id do
-      requires :team_id, type: Integer, allow_blank: false, desc: Api.heading(:team_id)
-    end
-
-    params :id do
-      requires :id, type: Integer, allow_blank: false, desc: Api.heading(:id)
-    end
-
-    params :creative_concept do
-      optional :name, type: String, allow_blank: false, desc: Api.heading(:name)
-      optional :description, type: String, allow_blank: true, desc: Api.heading(:description)
-      # 🚅 super scaffolding will insert new fields above this line.
-      # 🚅 super scaffolding will insert new arrays above this line.
-
-      # 🚅 super scaffolding will insert processing for new fields above this line.
-    end
-  end
-
-  # uses shallow routing to support teams
-  resource :teams, desc: Api.title(:collection_actions) do
-    after_validation do
-      load_and_authorize_api_resource Scaffolding::AbsolutelyAbstract::CreativeConcept
-    end
-
-    desc Api.title(:index), &Api.index_desc
-    params do
-      use :team_id
-    end
-    oauth2
-    paginate per_page: 100
-    get "/:team_id/scaffolding/absolutely_abstract/creative_concepts" do
-      @paginated_creative_concepts = paginate @creative_concepts
-      render @paginated_creative_concepts, serializer: Api.serializer, adapter: :attributes
-    end
-
-    desc Api.title(:create), &Api.create_desc
-    params do
-      use :team_id
-      use :creative_concept
-    end
-    route_setting :api_resource_options, permission: :create
-    oauth2 "write"
-    post "/:team_id/scaffolding/absolutely_abstract/creative_concepts" do
-      ensure_current_user_can_manage_creative_concept @creative_concept
-
-      if @creative_concept.save
-        render @creative_concept, serializer: Api.serializer
-      else
-        record_not_saved @creative_concept
-      end
-    end
-  end
-
-  resource "scaffolding/absolutely_abstract/creative_concepts", desc: Api.title(:member_actions) do
-    after_validation do
-      load_and_authorize_api_resource Scaffolding::AbsolutelyAbstract::CreativeConcept
-    end
-
-    desc Api.title(:show), &Api.show_desc
-    params do
-      use :id
-    end
-    oauth2
-    route_param :id do
-      get do
-        render @creative_concept, serializer: Api.serializer
-      end
-    end
-
-    desc Api.title(:update), &Api.update_desc
-    params do
-      use :id
-      use :creative_concept
-    end
-    route_setting :api_resource_options, permission: :update
-    oauth2 "write"
-    route_param :id do
-      put do
-        if @creative_concept.update(declared(params, include_missing: false))
-          render @creative_concept, serializer: Api.serializer
-        else
-          record_not_saved @creative_concept
-        end
-      end
-    end
-
-    desc Api.title(:destroy), &Api.destroy_desc
-    params do
-      use :id
-    end
-    route_setting :api_resource_options, permission: :destroy
-    oauth2 "delete"
-    route_param :id do
-      delete do
-        render @creative_concept.destroy, serializer: Api.serializer
-      end
-    end
-  end
-end

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

@@ -1,136 +0,0 @@
-class Api::V1::Scaffolding::CompletelyConcrete::TangibleThingsEndpoint < Api::V1::Root
-  helpers do
-    params :absolutely_abstract_creative_concept_id do
-      requires :absolutely_abstract_creative_concept_id, type: Integer, allow_blank: false, desc: "Creative Concept ID"
-    end
-
-    params :id do
-      requires :id, type: Integer, allow_blank: false, desc: "Tangible Thing ID"
-    end
-
-    params :tangible_thing do
-      # 🚅 skip this section when scaffolding.
-      optional :text_field_value, type: String, allow_blank: true, desc: Api.heading(:text_field_value)
-      optional :button_value, type: String, allow_blank: true, desc: Api.heading(:button_value)
-      optional :cloudinary_image_value, type: String, allow_blank: true, desc: Api.heading(:cloudinary_image_value)
-      optional :date_field_value, type: Date, allow_blank: true, desc: Api.heading(:date_field_value)
-      optional :date_and_time_field_value, type: DateTime, allow_blank: true, desc: Api.heading(:date_and_time_field_value)
-      optional :email_field_value, type: String, allow_blank: true, desc: Api.heading(:email_field_value)
-      optional :file_field_value, type: String, allow_blank: true, desc: Api.heading(:file_field_value)
-      optional :password_field_value, type: String, allow_blank: true, desc: Api.heading(:password_field_value)
-      optional :phone_field_value, type: String, allow_blank: true, desc: Api.heading(:phone_field_value)
-      optional :option_value, type: String, allow_blank: true, desc: Api.heading(:option_value)
-      optional :super_select_value, type: String, allow_blank: true, desc: Api.heading(:super_select_value)
-      optional :text_area_value, type: String, allow_blank: true, desc: Api.heading(:text_area_value)
-      optional :action_text_value, type: String, allow_blank: true, desc: Api.heading(:action_text_value)
-      # 🚅 stop any skipping we're doing now.
-      # 🚅 super scaffolding will insert new fields above this line.
-      # 🚅 skip this section when scaffolding.
-      optional :multiple_button_values, type: Array, default: [], desc: Api.heading(:multiple_button_values)
-      optional :multiple_option_values, type: Array, default: [], desc: Api.heading(:multiple_option_values)
-      optional :multiple_super_select_values, type: Array, default: [], desc: Api.heading(:multiple_super_select_values)
-      # 🚅 stop any skipping we're doing now.
-      # 🚅 super scaffolding will insert new arrays above this line.
-
-      # 🚅 super scaffolding will insert processing for new fields above this line.
-    end
-  end
-
-  resource "scaffolding/absolutely_abstract/creative_concepts", desc: Api.title(:collection_actions) do
-    after_validation do
-      load_and_authorize_api_resource Scaffolding::CompletelyConcrete::TangibleThing
-    end
-
-    #
-    # INDEX
-    #
-
-    desc Api.title(:index), &Api.index_desc
-    params do
-      use :absolutely_abstract_creative_concept_id
-    end
-    oauth2
-    paginate per_page: 100
-    get "/:absolutely_abstract_creative_concept_id/completely_concrete/tangible_things" do
-      @paginated_tangible_things = paginate @tangible_things
-      render @paginated_tangible_things, serializer: Api.serializer
-    end
-
-    #
-    # CREATE
-    #
-
-    desc Api.title(:create), &Api.create_desc
-    params do
-      use :absolutely_abstract_creative_concept_id
-      use :tangible_thing
-    end
-    route_setting :api_resource_options, permission: :create
-    oauth2 "write"
-    post "/:absolutely_abstract_creative_concept_id/completely_concrete/tangible_things" do
-      if @tangible_thing.save
-        render @tangible_thing, serializer: Api.serializer
-      else
-        record_not_saved @tangible_thing
-      end
-    end
-  end
-
-  resource "scaffolding/completely_concrete/tangible_things", desc: Api.title(:member_actions) do
-    after_validation do
-      load_and_authorize_api_resource Scaffolding::CompletelyConcrete::TangibleThing
-    end
-
-    #
-    # SHOW
-    #
-
-    desc Api.title(:show), &Api.show_desc
-    params do
-      use :id
-    end
-    oauth2
-    route_param :id do
-      get do
-        render @tangible_thing, serializer: Api.serializer
-      end
-    end
-
-    #
-    # UPDATE
-    #
-
-    desc Api.title(:update), &Api.update_desc
-    params do
-      use :id
-      use :tangible_thing
-    end
-    route_setting :api_resource_options, permission: :update
-    oauth2 "write"
-    route_param :id do
-      put do
-        if @tangible_thing.update(declared(params, include_missing: false))
-          render @tangible_thing, serializer: Api.serializer
-        else
-          record_not_saved @tangible_thing
-        end
-      end
-    end
-
-    #
-    # DESTROY
-    #
-
-    desc Api.title(:destroy), &Api.destroy_desc
-    params do
-      use :id
-    end
-    route_setting :api_resource_options, permission: :destroy
-    oauth2 "delete"
-    route_param :id do
-      delete do
-        render @tangible_thing.destroy, serializer: Api.serializer
-      end
-    end
-  end
-end

data/app/serializers/api/v1/scaffolding/absolutely_abstract/creative_concept_serializer.rb

@@ -1,14 +0,0 @@
-class Api::V1::Scaffolding::AbsolutelyAbstract::CreativeConceptSerializer < Api::V1::ApplicationSerializer
-  set_type "scaffolding/absolutely_abstract/creative_concept"
-
-  attributes :id,
-    :team_id,
-    :name,
-    :description,
-    # 🚅 super scaffolding will insert new fields above this line.
-    :created_at,
-    :updated_at
-
-  belongs_to :team, serializer: Api::V1::TeamSerializer
-  has_many :completely_concrete_tangible_things, serializer: Api::V1::Scaffolding::CompletelyConcrete::TangibleThingSerializer
-end

data/app/serializers/api/v1/scaffolding/completely_concrete/tangible_thing_serializer.rb

@@ -1,37 +0,0 @@
-class Api::V1::Scaffolding::CompletelyConcrete::TangibleThingSerializer < Api::V1::ApplicationSerializer
-  set_type "scaffolding/completely_concrete/tangible_thing"
-  singleton_class.include Rails.application.routes.url_helpers
-
-  attributes :id,
-    :absolutely_abstract_creative_concept_id,
-    # 🚅 skip this section when scaffolding.
-    :text_field_value,
-    :button_value,
-    :multiple_button_values,
-    :color_picker_value,
-    :cloudinary_image_value,
-    :date_field_value,
-    :date_and_time_field_value,
-    :email_field_value,
-    :password_field_value,
-    :phone_field_value,
-    :option_value,
-    # :multiple_option_values,
-    :super_select_value,
-    # :multiple_super_select_values,
-    # :text_area_value,
-    # :action_text_value,
-    # 🚅 stop any skipping we're doing now.
-    # 🚅 super scaffolding will insert new fields above this line.
-    :created_at,
-    :updated_at
-
-  # 🚅 skip this section when scaffolding.
-  attribute :file_field_value do |object|
-    rails_blob_path(object.file_field_value, disposition: "attachment", only_path: true) if object.file_field_value.attached?
-  end
-  # 🚅 stop any skipping we're doing now.
-  # 🚅 super scaffolding will insert file-related logic above this line.
-
-  belongs_to :absolutely_abstract_creative_concept, serializer: Api::V1::Scaffolding::AbsolutelyAbstract::CreativeConceptSerializer
-end

data/app/views/account/scaffolding/completely_concrete/tangible_things/index.json.jbuilder

@@ -1 +0,0 @@
-json.array! @tangible_things, partial: "scaffolding/completely_concrete/tangible_things/tangible_thing", as: :tangible_thing

data/app/views/account/scaffolding/completely_concrete/tangible_things/show.json.jbuilder

@@ -1 +0,0 @@
-json.partial! "scaffolding/completely_concrete/tangible_things/tangible_thing", tangible_thing: @tangible_thing