bullet_train-super_scaffolding 1.0.5 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 718da72ec75872187974897a5213689485797049c7ebdf1ddb564a30163cc3b1
-  data.tar.gz: 0d19c7282a403fee1baa0fb1c3c8e45cc72defe674ce58243099ea00aa245fff
+  metadata.gz: f2cb314ed84525cc6dafce8c9c1ddeec7b51486c8e759b1ab32b176791730e4f
+  data.tar.gz: 3d72bc268faeb84f61bec331bc5fda61e2d298e539ed184ce273d614d18303eb
 SHA512:
-  metadata.gz: b5034959fedec36b6c8312e64ed757f25834399744d69f95a5dfb84f5f88b01b1e7bff080a0161048ae4ab8140147c4c818edd7e49356b424cbc2326940ad970
-  data.tar.gz: d1ddfc16f3035831d95531bb2ca8fa62b88d413c4aba4f181703f2e6d1c0d02fe37edf48c6313da8d5e35525a20b1d236d48cd69f774e12bd9507e7f9507b971
+  metadata.gz: 12fc83283e2bd199994e47457e09ad18f097cc61c80d10ec67b55e72971e198f76616fad859539ad2be547683a77b3a7abcbd725bb69cdc005566c679cb80324
+  data.tar.gz: 4e3ae7e9b86a6ae8341384081ca05b87aa71e0c0de4d4af9277c554a05d6ac5765064e840fa274ae428c9e016ada8d1e3e180f3f048f363c0d5eb2d06cbc17cb

data/lib/bullet_train/super_scaffolding/engine.rb

@@ -1,6 +1,14 @@
 module BulletTrain
   module SuperScaffolding
     class Engine < ::Rails::Engine
+      initializer "bullet_train.super_scaffolding.register_template_path" do |app|
+        # Templates from the application itself should always be highest priority.
+        # This allows application developers to locally overload any template from any package.
+        BulletTrain::SuperScaffolding.template_paths << Rails.root.to_s
+
+        # Register the base path of this package with the Super Scaffolding engine.
+        BulletTrain::SuperScaffolding.template_paths << File.expand_path("../../../..", __FILE__)
+      end
     end
   end
 end

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

@@ -26,7 +26,7 @@ module BulletTrain
           # get all the attributes.
           attributes = argv[1..-1]
 
-          check_required_options_for_attributes('crud-field', attributes, child)
+          check_required_options_for_attributes("crud-field", attributes, child)
 
           transformer = Scaffolding::Transformer.new(child, parents, @options)
           transformer.add_attributes_to_various_views(attributes, type: :crud_field)

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

@@ -45,9 +45,7 @@ module BulletTrain
           # get all the attributes.
           attributes = argv[2..-1]
 
-          check_required_options_for_attributes('crud', attributes, child, parent)
-
-          binding.pry
+          check_required_options_for_attributes("crud", attributes, child, parent)
 
           transformer = Scaffolding::Transformer.new(child, parents, @options)
           transformer.scaffold_crud(attributes)

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.0.5"
+    VERSION = "1.0.9"
   end
 end

data/lib/bullet_train/super_scaffolding.rb

@@ -13,7 +13,7 @@ module BulletTrain
       "crud" => "BulletTrain::SuperScaffolding::Scaffolders::CrudScaffolder",
       "crud-field" => "BulletTrain::SuperScaffolding::Scaffolders::CrudFieldScaffolder",
       "join-model" => "BulletTrain::SuperScaffolding::Scaffolders::JoinModelScaffolder",
-      "oauth-provider" => "BulletTrain::SuperScaffolding::Scaffolders::OauthProviderScaffolder",
+      "oauth-provider" => "BulletTrain::SuperScaffolding::Scaffolders::OauthProviderScaffolder"
     }
 
     class Runner

data/lib/scaffolding/block_manipulator.rb

@@ -0,0 +1,140 @@
+class Scaffolding::BlockManipulator
+  attr_accessor :lines
+
+  def initialize(filepath)
+    @filepath = filepath
+    @lines = File.readlines(filepath)
+  end
+
+  #
+  # Wrap a block of ruby code inside another block
+  #
+  # @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:)
+    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)
+
+    final = []
+    block_indent = ""
+    spacer = "  "
+    @lines.each_with_index do |line, index|
+      line += "\n" unless line.match?(/\n$/)
+      if index < starting_line
+        final << line
+      elsif index == starting_line
+        block_indent = line.match(/^\s*/).to_s
+        final << block_indent + with[0]
+        final << (line.blank? ? "\n" : "#{spacer}#{line}")
+      elsif index > starting_line && index < end_line
+        final << (line.blank? ? "\n" : "#{spacer}#{line}")
+      elsif index == end_line
+        final << (line.blank? ? "\n" : "#{spacer}#{line}")
+        final << block_indent + with[1]
+      else
+        final << line
+      end
+    end
+
+    @lines = final
+    unless @lines.last.match?(/\n$/)
+      @lines.last += "\n"
+    end
+  end
+
+  def insert(content, 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
+    if within.present?
+      start_line = find_block_start(within)
+      end_line = find_block_end(starting_from: start_line)
+      # 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)
+      start_line = block_end
+      end_line = @lines.count - 1
+    end
+    index = start_line
+    match = false
+    while index < end_line && !match
+      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))
+        end
+      end
+      index += 1
+    end
+
+    return if match
+
+    # Match should always be false here.
+    if append && !match
+      insert_line(content, index - 1)
+    end
+  end
+
+  def insert_line(content, insert_at_index)
+    content += "\n" unless content.match?(/\n$/)
+    final = []
+    @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)
+    insert_line(block_content[0], block_end)
+    insert_line(block_content[1], block_end + 1)
+  end
+
+  def write
+    File.write(@filepath, @lines.join)
+  end
+
+  def find_block_start(starting_string)
+    matcher = Regexp.escape(starting_string)
+    starting_line = 0
+
+    @lines.each_with_index do |line, index|
+      if line.match?(matcher)
+        starting_line = index
+        break
+      end
+    end
+    starting_line
+  end
+
+  def find_block_end(starting_from:)
+    depth = 0
+    current_line = starting_from
+    @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 .*%>/)
+      depth += 1 if line.match?(/\s*<% unless .*%>/)
+      depth -= 1 if line.match?(/\s*<%.* end .*%>/)
+      break current_line if depth == 0
+    end
+    current_line
+  end
+end

data/lib/scaffolding/script.rb

@@ -3,6 +3,7 @@
 
 require "scaffolding"
 require "scaffolding/transformer"
+require "scaffolding/block_manipulator"
 require "scaffolding/class_names_transformer"
 require "scaffolding/oauth_providers"
 require "scaffolding/routes_file_manipulator"

data/lib/scaffolding/transformer.rb

@@ -1,5 +1,6 @@
 require "indefinite_article"
 require "yaml"
+require "scaffolding/class_names_transformer"
 
 class Scaffolding::Transformer
   attr_accessor :child, :parent, :parents, :class_names_transformer, :cli_options, :additional_steps, :namespace, :suppress_could_not_find
@@ -111,11 +112,11 @@ class Scaffolding::Transformer
     # 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.reverse.map do |base_path|
+    BulletTrain::SuperScaffolding.template_paths.map do |base_path|
       base_path = Pathname.new(base_path)
       resolved_path = base_path.join(file).to_s
-      File.exists?(resolved_path) ? resolved_path : file
-    end.compact.first
+      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 get_transformed_file_content(file)
@@ -275,7 +276,7 @@ class Scaffolding::Transformer
     begin
       target_file_content = File.read(transformed_file_name)
     rescue Errno::ENOENT => _
-      puts "Couldn't find '#{transformed_file_name}'".red unless suppress_could_not_find
+      puts "Couldn't find '#{transformed_file_name}'".red unless (suppress_could_not_find || options[:suppress_could_not_find])
       return false
     end
 
@@ -755,7 +756,6 @@ class Scaffolding::Transformer
         end
 
         # field on the form.
-        file_name = "./app/views/account/scaffolding/completely_concrete/tangible_things/_form.html.erb"
         field_attributes = {method: ":#{name}"}
         field_options = {}
 
@@ -799,7 +799,12 @@ class Scaffolding::Transformer
         end
 
         field_content = "<%= render 'shared/fields/#{type}'#{", " if field_attributes.any?}#{field_attributes.map { |key, value| "#{key}: #{value}" }.join(", ")} %>"
-        scaffold_add_line_to_file(file_name, field_content, ERB_NEW_FIELDS_HOOK, prepend: true)
+
+        # TODO Add more of these from other packages?
+        is_core_model = ["Team", "User", "Membership"].include?(child)
+
+        scaffold_add_line_to_file("./app/views/account/scaffolding/completely_concrete/tangible_things/_form.html.erb", field_content, ERB_NEW_FIELDS_HOOK, prepend: true, suppress_could_not_find: is_core_model)
+        scaffold_add_line_to_file("./app/views/account/scaffolding/completely_concrete/tangible_things/_fields.html.erb", field_content, ERB_NEW_FIELDS_HOOK, prepend: true, suppress_could_not_find: !is_core_model)
       end
 
       #
@@ -1000,12 +1005,8 @@ class Scaffolding::Transformer
 
         # TODO The serializers can't handle these `has_rich_text` attributes.
         unless type == "trix_editor"
-          [
-            "./app/views/account/scaffolding/completely_concrete/tangible_things/_tangible_thing.json.jbuilder",
-            "./app/serializers/api/v1/scaffolding/completely_concrete/tangible_thing_serializer.rb"
-          ].each do |file|
-            scaffold_add_line_to_file(file, ":#{name},", RUBY_NEW_FIELDS_HOOK, prepend: true)
-          end
+          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)
 
           assertion = if type == "date_field"
             "assert_equal Date.parse(tangible_thing_data['#{name}']), tangible_thing.#{name}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.9
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,6 +45,7 @@ files:
 - lib/bullet_train/super_scaffolding/scaffolders/oauth_provider_scaffolder.rb
 - lib/bullet_train/super_scaffolding/version.rb
 - lib/scaffolding.rb
+- lib/scaffolding/block_manipulator.rb
 - lib/scaffolding/class_names_transformer.rb
 - lib/scaffolding/oauth_providers.rb
 - lib/scaffolding/routes_file_manipulator.rb