bullet_train-super_scaffolding 1.0.40 → 1.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87a39d71d1f67a3d605d8c4ae07f4bc943c960b2b53462b50849e69d6432c833
-  data.tar.gz: 9df95982f857ed3078a3e102289922de88923ff691850659c51f9597a51f5350
+  metadata.gz: 695ce6d408d1cb821d6fd5672b9877f5387ee1dbd4baaeac04c6f51933fd3ad4
+  data.tar.gz: 22fc5ed6ec8df0617560da233a492835354faf636ac010f007116728bd3a36ed
 SHA512:
-  metadata.gz: 4b6039c8d90f382b04b7bc1e6214cbb03ab42c9ce1d9cf7ae9f6581524e3557174c3e9f7c06382ecc16b389570f431965618b4df6f58104e52c0018ca67f4847
-  data.tar.gz: 0fc1286f8a5fa5aec8505922c3a2cf73d2d48551c77141c8c8b0534a4f95b0f4d6ef0d1cef952c1014dfae565808807100a816d43b5584e00fd65eac0b4b2db5
+  metadata.gz: e4c8d5afb02e06b48107ef53bd95bdf42632587f45a886c89ed3f3ad938f6db80294e4025a896dac89c7e5ece79aa527ea67514fe8b3bbff3446f6e1acb99c1e
+  data.tar.gz: e7a5bfdbda2bccab756affe5b27f82eb94c5d419127be93e6bca0e8dc3f94f9556e6ae8c1bcebf0801e462d4b57c214a7c0d1527b6d9df90f07aa90ec49643ff

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

@@ -24,7 +24,7 @@ module BulletTrain
           child = argv[0]
 
           # get all the attributes.
-          attributes = argv[1..-1]
+          attributes = argv[1..]
 
           check_required_options_for_attributes("crud-field", attributes, child)
 

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

@@ -36,14 +36,14 @@ module BulletTrain
           parent = parents.first
 
           unless parents.include?("Team")
-            raise "Parents for #{child} should trace back to the Team model, but Team wasn't provided. Please confirm that all of the parents tracing back to the Team model are present and try again.\n" +
-              "E.g.:\n" +
-              "rails g model Section page:references title:text body:text\n" +
+            raise "Parents for #{child} should trace back to the Team model, but Team wasn't provided. Please confirm that all of the parents tracing back to the Team model are present and try again.\n" \
+              "E.g.:\n" \
+              "rails g model Section page:references title:text body:text\n" \
               "bin/super-scaffold crud Section Page,Site,Team title:text body:text\n"
           end
 
           # get all the attributes.
-          attributes = argv[2..-1]
+          attributes = argv[2..]
 
           check_required_options_for_attributes("crud", attributes, child, parent)
 

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.0.40"
+    VERSION = "1.0.43"
   end
 end

data/lib/scaffolding/block_manipulator.rb

@@ -1,27 +1,22 @@
-class Scaffolding::BlockManipulator
-  attr_accessor :lines
-
-  def initialize(filepath)
-    @filepath = filepath
-    @lines = File.readlines(filepath)
-  end
+require "scaffolding/file_manipulator"
 
+module Scaffolding::BlockManipulator
   #
   # 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 [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:)
+  def self.wrap_block(starting:, with:, lines:)
     with[0] += "\n" unless with[0].match?(/\n$/)
     with[1] += "\n" unless with[1].match?(/\n$/)
-    starting_line = find_block_start(starting)
-    end_line = find_block_end(starting_from: starting_line, lines: @lines)
+    starting_line = find_block_start(starting_from: starting, lines: lines)
+    end_line = find_block_end(starting_from: starting_line, lines: lines)
 
     final = []
     block_indent = ""
     spacer = "  "
-    @lines.each_with_index do |line, index|
+    lines.each_with_index do |line, index|
       line += "\n" unless line.match?(/\n$/)
       if index < starting_line
         final << line
@@ -39,80 +34,77 @@ class Scaffolding::BlockManipulator
       end
     end
 
-    @lines = final
-    unless @lines.last.match?(/\n$/)
-      @lines.last += "\n"
+    lines = final
+    unless lines.last.match?(/\n$/)
+      lines[-1] += "\n"
     end
+    lines
   end
 
-  def insert(content, within: nil, after: nil, before: nil, after_block: nil, append: false)
+  def self.insert(content, lines:, within: nil, after: nil, before: nil, after_block: nil, append: false)
     # Search for before like we do after, we'll just inject before it.
     after ||= before
 
     # If within is given, find the start and end lines of the block
     content += "\n" unless content.match?(/\n$/)
     start_line = 0
-    end_line = @lines.count - 1
+    end_line = lines.count - 1
     if within.present?
-      start_line = find_block_start(within)
-      end_line = find_block_end(starting_from: start_line, lines: @lines)
+      start_line = find_block_start(starting_from: within, lines: lines)
+      end_line = find_block_end(starting_from: start_line, lines: lines)
       # start_line += 1 # ensure we actually insert the content _within_ the given block
       # end_line += 1 if end_line == start_line
     end
     if after_block.present?
-      block_start = find_block_start(after_block)
-      block_end = find_block_end(starting_from: block_start, lines: @lines)
+      block_start = find_block_start(starting_from: after_block, lines: lines)
+      block_end = find_block_end(starting_from: block_start, lines: lines)
       start_line = block_end
-      end_line = @lines.count - 1
+      end_line = lines.count - 1
     end
     index = start_line
     match = false
     while index < end_line && !match
-      line = @lines[index]
+      line = lines[index]
       if after.nil? || line.match?(after)
         unless append
           match = true
           # We adjust the injection point if we really wanted to insert before.
-          insert_line(content, index - (before ? 1 : 0))
+          lines = insert_line(content, index - (before ? 1 : 0), lines)
         end
       end
       index += 1
     end
 
-    return if match
+    return lines if match
 
     # Match should always be false here.
     if append && !match
-      insert_line(content, index - 1)
+      lines = insert_line(content, index - 1, lines)
     end
+    lines
   end
 
-  def insert_line(content, insert_at_index)
+  def self.insert_line(content, insert_at_index, lines)
     content += "\n" unless content.match?(/\n$/)
     final = []
-    @lines.each_with_index do |line, index|
+    lines.each_with_index do |line, index|
       indent = line.match(/^\s*/).to_s
       final << line
       if index == insert_at_index
         final << indent + content
       end
     end
-    @lines = final
-  end
-
-  def insert_block(block_content, after_block:)
-    block_start = find_block_start(after_block)
-    block_end = find_block_end(starting_from: block_start, lines: @lines)
-    insert_line(block_content[0], block_end)
-    insert_line(block_content[1], block_end + 1)
+    final
   end
 
-  # TODO: Delete this because it only really needs to be in the FileManipulator
-  def write
-    File.write(@filepath, @lines.join)
+  def self.insert_block(block_content, after_block:, lines:)
+    block_start = find_block_start(starting_from: after_block, lines: lines)
+    block_end = find_block_end(starting_from: block_start, lines: lines)
+    lines = insert_line(block_content[0], block_end, lines)
+    insert_line(block_content[1], block_end + 1, lines)
   end
 
-  def find_block_parent(starting_line_number, lines)
+  def self.find_block_parent(starting_line_number, lines)
     return nil unless indentation_of(starting_line_number, lines)
     cursor = starting_line_number
     while cursor >= 0
@@ -124,11 +116,11 @@ class Scaffolding::BlockManipulator
     nil
   end
 
-  def find_block_start(starting_string)
-    matcher = Regexp.escape(starting_string)
+  def self.find_block_start(starting_from:, lines:)
+    matcher = Regexp.escape(starting_from)
     starting_line = 0
 
-    @lines.each_with_index do |line, index|
+    lines.each_with_index do |line, index|
       if line.match?(matcher)
         starting_line = index
         break
@@ -137,7 +129,7 @@ class Scaffolding::BlockManipulator
     starting_line
   end
 
-  def find_block_end(starting_from:, lines:)
+  def self.find_block_end(starting_from:, lines:)
     # This loop was previously in the RoutesFileManipulator.
     lines.each_with_index do |line, line_number|
       next unless line_number > starting_from
@@ -148,7 +140,7 @@ class Scaffolding::BlockManipulator
 
     depth = 0
     current_line = starting_from
-    @lines[starting_from..@lines.count].each_with_index do |line, index|
+    lines[starting_from..lines.count].each_with_index do |line, index|
       current_line = starting_from + index
       depth += 1 if line.match?(/\s*<%.+ do .*%>/)
       depth += 1 if line.match?(/\s*<% if .*%>/)
@@ -162,7 +154,7 @@ class Scaffolding::BlockManipulator
   # TODO: We shouldn't need this second argument, but since
   # we have `lines` here and in the RoutesFileManipulator,
   # the lines diverge from one another when we edit them individually.
-  def indentation_of(line_number, lines)
+  def self.indentation_of(line_number, lines)
     lines[line_number].match(/^( +)/)[1]
   rescue
     nil

data/lib/scaffolding/file_manipulator.rb

@@ -3,27 +3,35 @@ require "scaffolding/block_manipulator"
 # TODO: If we move this and the BlockManipulator into their own gems,
 # we can probably call these methods with something shorter without `Scaffolding::`.
 module Scaffolding::FileManipulator
-  # TODO: The block_manipulator shouldn't be an instance variable.
-  def self.find(lines, needle, within = nil, block_manipulator)
-    lines_within(lines, within, block_manipulator).each_with_index do |line, line_number|
+  def self.find(lines, needle, within = nil)
+    lines_within(lines, within).each_with_index do |line, line_number|
       return (within + (within ? 1 : 0) + line_number) if line.match?(needle)
     end
     nil
   end
 
-  # TODO: The block_manipulator shouldn't be an instance variable.
-  def self.lines_within(lines, within, block_manipulator)
+  def self.lines_within(lines, within)
     return lines unless within
-    lines[(within + 1)..(block_manipulator.find_block_end(starting_from: within, lines: lines) + 1)]
+    lines[(within + 1)..(Scaffolding::BlockManipulator.find_block_end(starting_from: within, lines: lines) + 1)]
   end
 
-  def self.replace_line_in_file(file, content, in_place_of)
-    target_file_content = File.read(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 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)
+    rescue Errno::ENOENT => _
+      puts "Couldn't find '#{file}'".red unless options[:suppress_could_not_find]
+      return false
+    end
 
     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
@@ -62,10 +70,14 @@ module Scaffolding::FileManipulator
     File.write(file, new_lines.join)
   end
 
-  def self.write(file_name, lines)
-    puts "Updating '#{file_name}'."
-    File.open(file_name, "w+") do |file|
-      file.puts(lines.join.strip + "\n")
+  def self.write(file_name, lines, strip: true)
+    puts "Updating '#{file_name}'." unless silence_logs?
+    if strip
+      File.open(file_name, "w+") do |file|
+        file.puts(lines.join.strip + "\n")
+      end
+    else
+      File.write(file_name, lines.join)
     end
   end
 end

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/routes_file_manipulator.rb

@@ -1,7 +1,7 @@
 require "scaffolding/block_manipulator"
 
 class Scaffolding::RoutesFileManipulator
-  attr_accessor :child, :parent, :lines, :transformer_options, :block_manipulator
+  attr_accessor :child, :parent, :lines, :transformer_options
 
   def initialize(filename, child, parent, transformer_options = {})
     self.child = child
@@ -9,7 +9,6 @@ class Scaffolding::RoutesFileManipulator
     @filename = filename
     self.lines = File.readlines(@filename)
     self.transformer_options = transformer_options
-    self.block_manipulator = Scaffolding::BlockManipulator.new(@filename)
   end
 
   def child_parts
@@ -68,7 +67,7 @@ class Scaffolding::RoutesFileManipulator
   def find_namespaces(namespaces, within = nil)
     namespaces = namespaces.dup
     results = {}
-    block_end = block_manipulator.find_block_end(starting_from: within, lines: lines) if within
+    block_end = Scaffolding::BlockManipulator.find_block_end(starting_from: within, lines: lines) if within
     lines.each_with_index do |line, line_number|
       if within
         next unless line_number > within
@@ -86,7 +85,7 @@ class Scaffolding::RoutesFileManipulator
   def insert_before(new_lines, line_number, options = {})
     options[:indent] ||= false
     before = lines[0..(line_number - 1)]
-    new_lines = new_lines.map { |line| (block_manipulator.indentation_of(line_number, lines) + (options[:indent] ? "  " : "") + line).gsub(/\s+$/, "") + "\n" }
+    new_lines = new_lines.map { |line| (Scaffolding::BlockManipulator.indentation_of(line_number, lines) + (options[:indent] ? "  " : "") + line).gsub(/\s+$/, "") + "\n" }
     after = lines[line_number..]
     self.lines = before + (options[:prepend_newline] ? ["\n"] : []) + new_lines + after
   end
@@ -95,7 +94,7 @@ class Scaffolding::RoutesFileManipulator
   def insert_after(new_lines, line_number, options = {})
     options[:indent] ||= false
     before = lines[0..line_number]
-    new_lines = new_lines.map { |line| (block_manipulator.indentation_of(line_number, lines) + (options[:indent] ? "  " : "") + line).gsub(/\s+$/, "") + "\n" }
+    new_lines = new_lines.map { |line| (Scaffolding::BlockManipulator.indentation_of(line_number, lines) + (options[:indent] ? "  " : "") + line).gsub(/\s+$/, "") + "\n" }
     after = lines[(line_number + 1)..]
     self.lines = before + new_lines + (options[:append_newline] ? ["\n"] : []) + after
   end
@@ -104,7 +103,7 @@ class Scaffolding::RoutesFileManipulator
     namespace_lines = find_namespaces(namespaces, within)
     if namespace_lines[namespaces.last]
       block_start = namespace_lines[namespaces.last]
-      insertion_point = block_manipulator.find_block_end(starting_from: block_start, lines: lines)
+      insertion_point = Scaffolding::BlockManipulator.find_block_end(starting_from: block_start, lines: lines)
       insert_before(new_lines, insertion_point, indent: true, prepend_newline: (insertion_point > block_start + 1))
     else
       raise "we weren't able to insert the following lines into the namespace block for #{namespaces.join(" -> ")}:\n\n#{new_lines.join("\n")}"
@@ -172,7 +171,7 @@ class Scaffolding::RoutesFileManipulator
       within = namespace_lines[namespaces.last]
     end
 
-    Scaffolding::FileManipulator.lines_within(lines, within, block_manipulator).each_with_index do |line, line_number|
+    Scaffolding::FileManipulator.lines_within(lines, within).each_with_index do |line, line_number|
       # + 2 because line_number starts from 0, and within starts one line after
       actual_line_number = (within + line_number + 2)
 
@@ -226,7 +225,7 @@ class Scaffolding::RoutesFileManipulator
   # However, will not find namespace blocks inside namespace blocks.
   def top_level_namespace_block_lines(within)
     local_namespace_blocks = []
-    Scaffolding::FileManipulator.lines_within(lines, within, block_manipulator).each do |line|
+    Scaffolding::FileManipulator.lines_within(lines, within).each do |line|
       # i.e. - Retrieve "foo" from "namespace :foo do"
       match_data = line.match(/(\s*namespace\s:)(.*)(\sdo$)/)
 
@@ -236,7 +235,7 @@ class Scaffolding::RoutesFileManipulator
         namespace_name = match_data[2]
         local_namespace = find_namespaces([namespace_name], within)
         starting_line_number = local_namespace[namespace_name]
-        local_namespace_block = ((starting_line_number + 1)..(block_manipulator.find_block_end(starting_from: starting_line_number, lines: lines) + 1))
+        local_namespace_block = ((starting_line_number + 1)..(Scaffolding::BlockManipulator.find_block_end(starting_from: starting_line_number, lines: lines) + 1))
 
         if local_namespace_blocks.empty?
           local_namespace_blocks << local_namespace_block
@@ -263,11 +262,11 @@ class Scaffolding::RoutesFileManipulator
   def namespace_blocks_directly_under_parent(within)
     blocks = []
     if lines[within].match?(/do$/)
-      parent_indentation_size = block_manipulator.indentation_of(within, lines).length
-      within_block_end = block_manipulator.find_block_end(starting_from: within, lines: lines)
+      parent_indentation_size = Scaffolding::BlockManipulator.indentation_of(within, lines).length
+      within_block_end = Scaffolding::BlockManipulator.find_block_end(starting_from: within, lines: lines)
       within.upto(within_block_end) do |line_number|
         if lines[line_number].match?(/^#{" " * (parent_indentation_size + 2)}namespace/)
-          namespace_block_lines = line_number..block_manipulator.find_block_end(starting_from: line_number, lines: lines)
+          namespace_block_lines = line_number..Scaffolding::BlockManipulator.find_block_end(starting_from: line_number, lines: lines)
           blocks << namespace_block_lines
         end
       end
@@ -301,7 +300,7 @@ class Scaffolding::RoutesFileManipulator
 
   # TODO: Remove this and use the BlockManipulator
   def insert(lines_to_add, within)
-    insertion_line = block_manipulator.find_block_end(starting_from: within, lines: lines)
+    insertion_line = Scaffolding::BlockManipulator.find_block_end(starting_from: within, lines: lines)
     result_line = insertion_line
     unless insertion_line == within + 1
       # only put the extra space if we're adding this line after a block
@@ -333,7 +332,7 @@ class Scaffolding::RoutesFileManipulator
       # add the new resource within that namespace.
       line = "scope module: '#{parent_resource}' do"
       # TODO you haven't tested this yet.
-      unless (scope_within = Scaffolding::FileManipulator.find(lines, /#{line}/, parent_within, block_manipulator))
+      unless (scope_within = Scaffolding::FileManipulator.find(lines, /#{line}/, parent_within))
         scope_within = insert([line, "end"], parent_within)
       end
 
@@ -345,7 +344,7 @@ class Scaffolding::RoutesFileManipulator
 
       # We want to see if there are any namespaces one level above the parent itself,
       # because namespaces with the same name as the resource can exist on the same level.
-      parent_block_start = block_manipulator.find_block_parent(parent_within, lines)
+      parent_block_start = Scaffolding::BlockManipulator.find_block_parent(parent_within, lines)
       namespace_line_within = find_or_create_namespaces(child_namespaces, parent_block_start)
       find_or_create_resource([child_resource], options: "except: collection_actions", within: namespace_line_within)
       unless find_namespaces(child_namespaces, within)[child_namespaces.last]
@@ -364,7 +363,7 @@ class Scaffolding::RoutesFileManipulator
       # resources :projects_deliverables, path: 'projects/deliverables' do
       #   resources :objectives
       # end
-      block_parent_within = block_manipulator.find_block_parent(top_parent_namespace, lines)
+      block_parent_within = Scaffolding::BlockManipulator.find_block_parent(top_parent_namespace, lines)
       parent_namespaces_and_resource = (parent_namespaces + [parent_resource]).join("_")
       parent_within = find_or_create_resource_block([parent_namespaces_and_resource], options: "path: '#{parent_namespaces_and_resource.tr("_", "/")}'", within: block_parent_within)
       find_or_create_resource(child_namespaces + [child_resource], within: parent_within)

data/lib/scaffolding/script.rb

@@ -15,7 +15,7 @@ argv = []
 @options = {}
 ARGV.each do |arg|
   if arg[0..1] == "--"
-    arg = arg[2..-1]
+    arg = arg[2..]
     if arg.split("=").count > 1
       @options[arg.split("=")[0]] = arg.split("=")[1]
     else
@@ -38,9 +38,9 @@ def check_required_options_for_attributes(scaffolding_type, attributes, child, p
     type = parts.join(":")
 
     unless Scaffolding.valid_attribute_type?(type)
-      raise "You have entered an invalid attribute type: #{type}. General data types are used when creating new models, but Bullet Train " +
-            "uses field partials when Super Scaffolding, i.e. - `name:text_field` as opposed to `name:string`. " +
-            "Please refer to the Field Partial documentation to view which attribute types are available."
+      raise "You have entered an invalid attribute type: #{type}. General data types are used when creating new models, but Bullet Train " \
+        "uses field partials when Super Scaffolding, i.e. - `name:text_field` as opposed to `name:string`. " \
+        "Please refer to the Field Partial documentation to view which attribute types are available."
     end
 
     # extract any options they passed in with the field.

data/lib/scaffolding/transformer.rb

@@ -231,21 +231,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 +274,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 +309,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 +359,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")
 
@@ -353,7 +377,7 @@ class Scaffolding::Transformer
     file = transform_string(file)
     # we specifically don't transform the content, we assume a builder function created this content.
     in_place_of = transform_string(in_place_of)
-    Scaffolding::FileManipulator.replace_line_in_file(file, content, in_place_of)
+    Scaffolding::FileManipulator.replace_line_in_file(file, content, in_place_of, suppress_could_not_find: suppress_could_not_find)
   end
 
   # if class_name isn't specified, we use `child`.
@@ -477,7 +501,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|
@@ -1047,14 +1071,14 @@ class Scaffolding::Transformer
 
           assertion = case type
           when "date_field"
-            "assert_equal Date.parse(tangible_thing_data['#{name}']), tangible_thing.#{name}"
+            "assert_equal_or_nil Date.parse(tangible_thing_data['#{name}']), tangible_thing.#{name}"
           when "date_and_time_field"
-            "assert_equal DateTime.parse(tangible_thing_data['#{name}']), tangible_thing.#{name}"
+            "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"
           else
-            "assert_equal tangible_thing_data['#{name}'], tangible_thing.#{name}"
+            "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)
         end
@@ -1085,6 +1109,20 @@ class Scaffolding::Transformer
             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)
+          end
+        end
       end
 
       #
@@ -1422,8 +1460,9 @@ class Scaffolding::Transformer
 
       begin
         routes_manipulator.apply([routes_namespace])
-      rescue
-        add_additional_step :yellow, "We weren't able to automatically add your `#{routes_namespace}` 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/ ."
+      rescue => e
+        puts "We weren't able to automatically add your `#{routes_namespace}` 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.rb", routes_manipulator.lines)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.0.40
+  version: 1.0.43
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-21 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard