bullet_train-super_scaffolding 1.0.31 → 1.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94c38c4ead4e806119a38b9404d5018ca8337ca652ea7afc7c96dc095f3488cf
-  data.tar.gz: 52c02c34adb2e6239409ba77f13be030fdd3740c5e29878972001b3b4ecf5a1a
+  metadata.gz: e89abdab9630d8af6498af03edec21ce70c456c1579d5c35bf7e16ed3a0383c3
+  data.tar.gz: 57f3be888b988cc3d0ff747776cb319ec1bc3399f9e55209d94f132c2ef3d6f1
 SHA512:
-  metadata.gz: 969c7bd956727e3dbe93dbccb870709b3e9454801497a741f97ac9b7912e97d7ca7c1ebefd67335f4eca1b94f392c2fd9967da1b183597b0194df8247994de7b
-  data.tar.gz: ef790aee490efc3408d36da33b789dd78dadc4acb09d3578bb940275b7ad507a679008b3514391b302523773f1e9049087acfdcc58270971e12a82b60dd8796a
+  metadata.gz: cf98aac64c6ee99b4b9778b8d371a770c26d8a1d89925e8e3144aa5b6eee2180890cff7732e700b78c764ff9871a4dc1543db7b3e69e25cc763eb9a16cb34a98
+  data.tar.gz: d7d0935c5280a7b482e260fe857fba7b7a1dd99076505978ff7d47505921d61abfb041fed3737295f96fb1ffcddc1d368703acd67e2799e01538ac7798887d65

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

@@ -17,7 +17,7 @@
       </div>
     </div>
 
-    <%= render 'shared/fields/color_picker', method: :color_picker_value, options: t('scaffolding/completely_concrete/tangible_things.fields.color_picker_value.options') %>
+    <%= render 'shared/fields/color_picker', method: :color_picker_value, options: {color_picker_options: t('scaffolding/completely_concrete/tangible_things.fields.color_picker_value.options')} %>
     <%= render 'shared/fields/cloudinary_image', method: :cloudinary_image_value %>
     <%= render 'shared/fields/date_field', method: :date_field_value %>
     <%= render 'shared/fields/date_and_time_field', method: :date_and_time_field_value %>

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

@@ -72,9 +72,10 @@
             <% end %>
           <% end %>
 
-          <% unless hide_back %>
           <%# 🚅 super scaffolding will insert new bulk action model buttons above this line. %>
           <%= render "shared/bulk_action_select" %>
+
+          <% unless hide_back %>
             <%= link_to t('global.buttons.back'), [:account, context], class: "#{first_button_primary(:completely_concrete_tangible_thing)} back" %>
           <% end %>
         <% end %>

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.0.31"
+    VERSION = "1.0.34"
   end
 end

data/lib/scaffolding/block_manipulator.rb

@@ -7,16 +7,16 @@ class Scaffolding::BlockManipulator
   end
 
   #
-  # Wrap a block of ruby code inside another block
+  # 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 %>"]
+  # @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)
+    end_line = find_block_end(starting_from: starting_line, lines: @lines)
 
     final = []
     block_indent = ""
@@ -55,13 +55,13 @@ class Scaffolding::BlockManipulator
     end_line = @lines.count - 1
     if within.present?
       start_line = find_block_start(within)
-      end_line = find_block_end(starting_from: start_line)
+      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)
+      block_end = find_block_end(starting_from: block_start, lines: @lines)
       start_line = block_end
       end_line = @lines.count - 1
     end
@@ -102,7 +102,7 @@ class Scaffolding::BlockManipulator
 
   def insert_block(block_content, after_block:)
     block_start = find_block_start(after_block)
-    block_end = find_block_end(starting_from: block_start)
+    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)
   end
@@ -111,6 +111,18 @@ class Scaffolding::BlockManipulator
     File.write(@filepath, @lines.join)
   end
 
+  def find_block_parent(starting_line_number, lines)
+    return nil unless indentation_of(starting_line_number, lines)
+    cursor = starting_line_number
+    while cursor >= 0
+      unless lines[cursor].match?(/^#{indentation_of(starting_line_number, lines)}/) || !lines[cursor].present?
+        return cursor
+      end
+      cursor -= 1
+    end
+    nil
+  end
+
   def find_block_start(starting_string)
     matcher = Regexp.escape(starting_string)
     starting_line = 0
@@ -124,7 +136,15 @@ class Scaffolding::BlockManipulator
     starting_line
   end
 
-  def find_block_end(starting_from:)
+  def 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
+      if /^#{indentation_of(starting_from, lines)}end\s+/.match?(line)
+        return line_number
+      end
+    end
+
     depth = 0
     current_line = starting_from
     @lines[starting_from..@lines.count].each_with_index do |line, index|
@@ -138,7 +158,12 @@ class Scaffolding::BlockManipulator
     current_line
   end
 
-  def block_indentation_size(line_number)
-    lines[line_number].scan(/^\s+/).first.size
+  # 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)
+    lines[line_number].match(/^( +)/)[1]
+  rescue
+    nil
   end
 end

data/lib/scaffolding/routes_file_manipulator.rb

@@ -1,3 +1,5 @@
+require "scaffolding/block_manipulator"
+
 class Scaffolding::RoutesFileManipulator
   attr_accessor :child, :parent, :lines, :transformer_options, :block_manipulator
 
@@ -66,7 +68,7 @@ class Scaffolding::RoutesFileManipulator
   def find_namespaces(namespaces, within = nil)
     namespaces = namespaces.dup
     results = {}
-    block_end = find_block_end(within) if within
+    block_end = block_manipulator.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
@@ -80,39 +82,10 @@ class Scaffolding::RoutesFileManipulator
     results
   end
 
-  def indentation_of(line_number)
-    lines[line_number].match(/^( +)/)[1]
-  rescue
-    nil
-  end
-
-  def find_block_parent(starting_line_number)
-    return nil unless indentation_of(starting_line_number)
-    cursor = starting_line_number
-    while cursor >= 0
-      unless lines[cursor].match?(/^#{indentation_of(starting_line_number)}/) || !lines[cursor].present?
-        return cursor
-      end
-      cursor -= 1
-    end
-    nil
-  end
-
-  def find_block_end(starting_line_number)
-    return nil unless indentation_of(starting_line_number)
-    lines.each_with_index do |line, line_number|
-      next unless line_number > starting_line_number
-      if /^#{indentation_of(starting_line_number)}end\s+/.match?(line)
-        return line_number
-      end
-    end
-    nil
-  end
-
   def insert_before(new_lines, line_number, options = {})
     options[:indent] ||= false
     before = lines[0..(line_number - 1)]
-    new_lines = new_lines.map { |line| (indentation_of(line_number) + (options[:indent] ? "  " : "") + line).gsub(/\s+$/, "") + "\n" }
+    new_lines = new_lines.map { |line| (block_manipulator.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
@@ -120,7 +93,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| (indentation_of(line_number) + (options[:indent] ? "  " : "") + line).gsub(/\s+$/, "") + "\n" }
+    new_lines = new_lines.map { |line| (block_manipulator.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
@@ -129,7 +102,7 @@ class Scaffolding::RoutesFileManipulator
     namespace_lines = find_namespaces(namespaces, within)
     if namespace_lines[namespaces.last]
       block_start = namespace_lines[namespaces.last]
-      insertion_point = find_block_end(block_start)
+      insertion_point = block_manipulator.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")}"
@@ -269,7 +242,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)..(find_block_end(starting_line_number) + 1))
+        local_namespace_block = ((starting_line_number + 1)..(block_manipulator.find_block_end(starting_from: starting_line_number, lines: lines) + 1))
 
         if local_namespace_blocks.empty?
           local_namespace_blocks << local_namespace_block
@@ -296,11 +269,11 @@ class Scaffolding::RoutesFileManipulator
   def namespace_blocks_directly_under_parent(within)
     blocks = []
     if lines[within].match?(/do$/)
-      parent_indentation_size = block_manipulator.block_indentation_size(within)
-      within_block_end = find_block_end(within)
+      parent_indentation_size = block_manipulator.indentation_of(within, lines).length
+      within_block_end = block_manipulator.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..find_block_end(line_number)
+          namespace_block_lines = line_number..block_manipulator.find_block_end(starting_from: line_number, lines: lines)
           blocks << namespace_block_lines
         end
       end
@@ -315,7 +288,7 @@ class Scaffolding::RoutesFileManipulator
 
   def lines_within(within)
     return lines unless within
-    lines[(within + 1)..(find_block_end(within) + 1)]
+    lines[(within + 1)..(block_manipulator.find_block_end(starting_from: within, lines: lines) + 1)]
   end
 
   def find_or_convert_resource_block(parent_resource, options = {})
@@ -338,7 +311,7 @@ class Scaffolding::RoutesFileManipulator
   end
 
   def insert(lines_to_add, within)
-    insertion_line = find_block_end(within)
+    insertion_line = block_manipulator.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
@@ -382,7 +355,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 = find_block_parent(parent_within)
+      parent_block_start = block_manipulator.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]
@@ -401,7 +374,7 @@ class Scaffolding::RoutesFileManipulator
       # resources :projects_deliverables, path: 'projects/deliverables' do
       #   resources :objectives
       # end
-      block_parent_within = find_block_parent(top_parent_namespace)
+      block_parent_within = block_manipulator.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/transformer.rb

@@ -660,7 +660,7 @@ class Scaffolding::Transformer
       when "text_area"
         "text"
       when "file_field"
-        "text"
+        "file"
       else
         raise "Invalid attribute type: #{type}."
       end
@@ -775,6 +775,10 @@ class Scaffolding::Transformer
           # add_additional_step :yellow, transform_string("We've added a reference to a `placeholder` to the form for the select or super_select field, but unfortunately earlier versions of the scaffolded locales Yaml don't include a reference to `fields: *fields` under `form`. Please add it, otherwise your form won't be able to locate the appropriate placeholder label.")
         end
 
+        if type == "color_picker"
+          field_options[:color_picker_options] = "t('#{child.pluralize.underscore}.fields.color_picker_value.options')"
+        end
+
         # TODO: This feels incorrect.
         # Should we adjust the partials to only use `{multiple: true}` or `html_options: {multiple_true}`?
         if is_multiple
@@ -1347,7 +1351,7 @@ class Scaffolding::Transformer
       end
 
       unless cli_options["skip-table"]
-        scaffold_replace_line_in_file("./app/views/account/scaffolding/completely_concrete/tangible_things/_index.html.erb", transform_string("<tbody data-reorder=\"<%= url_for [:reorder, :account, context, collection] %>\">"), "<tbody>")
+        scaffold_replace_line_in_file("./app/views/account/scaffolding/completely_concrete/tangible_things/_index.html.erb", transform_string("<tbody data-controller=\"sortable\" data-sortable-reorder-path-value=\"<%= url_for [:reorder, :account, context, collection] %>\">"), "<tbody>")
       end
 
       unless cli_options["skip-controller"]

data/lib/scaffolding.rb

@@ -2,7 +2,7 @@ module Scaffolding
   def self.valid_attribute_type?(type)
     [
       "boolean",
-      "button",
+      "buttons",
       "cloudinary_image",
       "color_picker",
       "date_and_time_field",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.0.31
+  version: 1.0.34
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-01 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard