bullet_train-super_scaffolding 1.3.22 → 1.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9210f83ebe43b35a2f22c251699259b4c019dda13edfd97ee8b86a36b1c4076
-  data.tar.gz: 377c1286afbd0dc549bd606abaf4f4c5eca77461c80586344ebf0cb7905db1fd
+  metadata.gz: cd421ed7beb8f9570ef975c46e9f5794ed1a64253061f67b14e13bc98e677cde
+  data.tar.gz: 135079a96e577d61008e20042616ced3c9d27a85d039e61fc3665f519e4fca00
 SHA512:
-  metadata.gz: df76ecad025409b2d23c5140f5d7b05710bcfd8ac8723c2f6dab2055d83d37f301a17224a9280313829f517a514004b5ecb78837474642365dde18da9f293494
-  data.tar.gz: 135cb316d50b1d502e2d8803e33de8181252efb6672778107f00e066807e2324668e4f0e1c2f35a1ccdbbb32f3fa23289203ec3cb0098abe6c4593f2db434bca
+  metadata.gz: 33f0e7cb5d4011be403d74bd4b1ba6352fa8ef7d50ccdd7f923e0829871def6f9b2f31af93eea2b2ff2f827e68ced6f4d8084bcf4cdc9c460e04ba340b5e3128
+  data.tar.gz: 8ceb683356e4b78eacb8efe373c750c2b8916097cc3b6752e6657fa4481d494a63884460f4643726bef3ed0ef164e3c451e2fb6f8d812680e8298ef70fb2b9ad

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

@@ -34,6 +34,46 @@ module BulletTrain
           parents = argv[1] ? argv[1].split(",") : []
           parents = parents.map(&:classify).uniq
           parent = parents.first
+          child_parts = child.split("::")
+          parent_parts = parent.split("::")
+
+          # Pop off however many spaces match.
+          child_parts_dup = child_parts.dup
+          parent_parts_dup = parent_parts.dup
+          parent_without_namespace = nil
+          child_parts_dup.each.with_index do |child_part, idx|
+            if child_part == parent_parts_dup[idx]
+              child_parts.shift
+              parent_parts.shift
+            else
+              parent_without_namespace = parent_parts.join("::")
+              break
+            end
+          end
+
+          # `tr` here compensates for namespaced models (i.e. - `Projects::Deliverable` to `projects/deliverable`).
+          parent_reference = parent_without_namespace.tableize.singularize.tr("/", "_")
+          tableized_child = child.tableize.tr("/", "_")
+
+          # Pull the parent foreign key from the `create_table` call
+          # if a migration with `add_reference` hasn't been created.
+          migration_file_name = `grep "add_reference :#{tableized_child}, :#{parent_reference}" db/migrate/*`.split(":").shift
+          migration_file_name ||= `grep "create_table :#{tableized_child}" db/migrate/*`.split(":").shift
+          parent_t_references = "t.references :#{parent_reference}"
+          parent_add_reference = "add_reference :#{tableized_child}, :#{parent_reference}"
+          parent_foreign_key = nil
+          File.open(migration_file_name).readlines.each do |line|
+            parent_foreign_key = line.match?(/#{parent_add_reference}|#{parent_t_references}/)
+            break if parent_foreign_key
+          end
+
+          unless parent_foreign_key
+            puts "#{child} does not have a foreign key referencing #{parent}".red
+            puts ""
+            puts "Please re-generate your model, or execute the following to add the foreign key:"
+            puts "rails generate migration add_#{parent_reference}_to_#{tableized_child} #{parent_reference}:references\n"
+            exit 1
+          end
 
           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" \

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.3.22"
+    VERSION = "1.3.24"
   end
 end

data/lib/bullet_train/super_scaffolding.rb

@@ -8,6 +8,7 @@ require "bullet_train/super_scaffolding/scaffolders/join_model_scaffolder"
 require "bullet_train/super_scaffolding/scaffolders/oauth_provider_scaffolder"
 
 require "indefinite_article"
+require "colorizer"
 
 module BulletTrain
   module SuperScaffolding

data/lib/scaffolding/attribute.rb

@@ -111,8 +111,8 @@ class Scaffolding::Attribute
     if is_ids?
       # user_ids should be 'Users'
       name_without_ids.humanize.titlecase
-    elsif is_id?
-      name_without_id.humanize.titlecase
+    elsif is_id? && is_vanilla?
+      "#{name.humanize.titlecase} ID"
     else
       name.humanize.titlecase
     end

data/lib/scaffolding/routes_file_manipulator.rb

@@ -1,4 +1,5 @@
 require "scaffolding/block_manipulator"
+require "masamune"
 
 class Scaffolding::RoutesFileManipulator
   attr_accessor :child, :parent, :lines, :transformer_options, :concerns
@@ -10,6 +11,7 @@ class Scaffolding::RoutesFileManipulator
     @filename = filename
     self.lines = File.readlines(@filename)
     self.transformer_options = transformer_options
+    @msmn = Masamune::AbstractSyntaxTree.new(lines.join)
   end
 
   def child_parts
@@ -225,15 +227,19 @@ class Scaffolding::RoutesFileManipulator
   # Finds namespace blocks no matter how many levels deep they are nested in resource blocks, etc.
   # However, will not find namespace blocks inside namespace blocks.
   def top_level_namespace_block_lines(within)
+    namespaces = @msmn.method_calls(name: "namespace")
+    namespace_line_numbers = namespaces.map { |namespace| namespace[:line_number] }
+
     local_namespace_blocks = []
     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$)/)
+      # Masamune gets the actual line number, whereas File.readlines etc. start at 0.
+      line_index = lines.index(line) + 1
 
       # Since we only want top-level namespace blocks, we ensure that
       # all other namespace blocks INSIDE the top-level namespace blocks are skipped
-      if match_data.present?
-        namespace_name = match_data[2]
+      if namespace_line_numbers.include?(line_index)
+        # Grab the first symbol token on the same line as the namespace.
+        namespace_name = @msmn.symbols.find { |sym| sym[:line_number] == line_index }[:token]
         local_namespace = find_namespaces([namespace_name], within)
         starting_line_number = local_namespace[namespace_name]
         local_namespace_block = ((starting_line_number + 1)..(Scaffolding::BlockManipulator.find_block_end(starting_from: starting_line_number, lines: lines) + 1))

data/lib/scaffolding/transformer.rb

@@ -820,7 +820,7 @@ class Scaffolding::Transformer
 
         # this gets stripped and is one line, so indentation isn't a problem.
         field_content = <<-ERB
-          <%= render 'shared/attributes/#{attribute.partial_name}', attribute: :#{attribute.name_without_id_suffix} %>
+          <%= render 'shared/attributes/#{attribute.partial_name}', attribute: :#{attribute.is_vanilla? ? attribute.name : attribute.name_without_id_suffix} %>
         ERB
 
         if attribute.type == "password_field"
@@ -839,7 +839,7 @@ class Scaffolding::Transformer
       unless cli_options["skip-table"]
 
         # table header.
-        field_content = "<th#{cell_attributes.present? ? " " + cell_attributes : ""}><%= t('.fields.#{attribute.name_without_id_suffix}.heading') %></th>"
+        field_content = "<th#{cell_attributes.present? ? " " + cell_attributes : ""}><%= t('.fields.#{attribute.is_vanilla? ? attribute.name : attribute.name_without_id_suffix}.heading') %></th>"
 
         unless ["Team", "User"].include?(child)
           scaffold_add_line_to_file("./app/views/account/scaffolding/completely_concrete/tangible_things/_index.html.erb", field_content, "<%# 🚅 super scaffolding will insert new field headers above this line. %>", prepend: true)
@@ -867,7 +867,7 @@ class Scaffolding::Transformer
 
         # this gets stripped and is one line, so indentation isn't a problem.
         field_content = <<-ERB
-          <td#{cell_attributes}><%= render 'shared/attributes/#{attribute.partial_name}', attribute: :#{attribute.name_without_id_suffix}#{", #{table_cell_options.join(", ")}" if table_cell_options.any?} %></td>
+          <td#{cell_attributes}><%= render 'shared/attributes/#{attribute.partial_name}', attribute: :#{attribute.is_vanilla? ? attribute.name : attribute.name_without_id_suffix}#{", #{table_cell_options.join(", ")}" if table_cell_options.any?} %></td>
         ERB
 
         if attribute.type == "password_field"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.3.22
+  version: 1.3.24
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard