bullet_train-super_scaffolding 1.0.3 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f88d08b31dfa9eb57adacd423ceea81e66308ab0f990ac59580c984ec0ea2af
-  data.tar.gz: 400340b2d11f3241fa2e2d760b076a7950bd1bc5564c11b9e75eb0a1f42b5fbe
+  metadata.gz: 3bcd9e0be2aa17210990067b3a2d43f624450d380d50503be510bd2744d7da11
+  data.tar.gz: 2550d7faf22d005b3997d185f05dd6a4cb7c8d26c97130497e84b5dc5b3c34ef
 SHA512:
-  metadata.gz: b404385f5b6e27002a2fb38563d38a8f993ff4a00a75097040ae23e4ec28aa393e514190598c744d711d88b5f77de73a146ae16c4ee8a00f1dc0a242897da23a
-  data.tar.gz: e7a89c613bfdae5ad447d8176506dca42ba2a9a7ebc3cb547a3d04e045fc3cee8a72f30a7a2cd9ecee692c410acd2de15645423b1591c86fcebcf21ed0e043ce
+  metadata.gz: 951c8ae79449a58036bd66b87cfba7d07b6a5e33c6b2fbac99f32cf9d81ea58bc53046a793dee952d7d1455f44f2c6e970605b0ff7c0f6a6bdf17c4c602bd347
+  data.tar.gz: 222c2cd02aa95cc849449130a1d59647d6abf3ad5ed3e4c12524f46138432388c1e33d67c57a60c10fecc0586695477eb6c710f5ed3440960974c65f7888fe38

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

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.0.3"
+    VERSION = "1.0.7"
   end
 end

data/lib/bullet_train/super_scaffolding.rb

@@ -19,8 +19,6 @@ module BulletTrain
     class Runner
       def run
         # Make `rake` invocation compatible with how this was run historically.
-        ARGV.shift
-
         require "scaffolding/script"
       end
     end

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"
@@ -23,6 +24,11 @@ ARGV.each do |arg|
   end
 end
 
+def standard_protip
+  puts "🏆 Protip: Commit your other changes before running Super Scaffolding so it's easy to undo if you (or we) make any mistakes."
+  puts "If you do that, you can reset to your last commit state by using `git checkout .` and `git clean -d -f` ."
+end
+
 def check_required_options_for_attributes(scaffolding_type, attributes, child, parent = nil)
   attributes.each do |attribute|
     parts = attribute.split(":")

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)

data/lib/tasks/bullet_train/super_scaffolding_tasks.rake

@@ -1,6 +1,12 @@
 namespace :bullet_train do
   desc "Next-level code generation"
-  task :super_scaffolding => :environment do
+  task :super_scaffolding, [:all_options] => :environment do |t, arguments|
+    ARGV.pop while ARGV.any?
+
+    arguments[:all_options]&.split&.each do |argument|
+      ARGV.push(argument)
+    end
+
     BulletTrain::SuperScaffolding::Runner.new.run
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.7
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 6.0.0
 description: Bullet Train Super Scaffolding
 email:
 - andrew.culver@gmail.com
@@ -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