bullet_train-super_scaffolding 1.7.9 → 1.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c00c62e56f391f71ca5c5810b241411d314aae77a1197556214d57ee3ba67b72
-  data.tar.gz: 72b87b899231851824b77399fb2e3ac90be33592914f0e5510045ae340379489
+  metadata.gz: 16465881966c5cc7bfb8056943d036dea6ee5e2284a4000a2f6182c41c1eb22d
+  data.tar.gz: aa40db2f84412ec08860dd6387f096c5e53622526ab17700bb66be85e8f0dd6b
 SHA512:
-  metadata.gz: 28838a058935c9e621ed012b1ed60bdeb1aeb52b352c27ce7701e641ca50422a0aaf6578d352253a1db24d89a51d596c8c7c6902efda2ae87e7abb7ff3285303
-  data.tar.gz: 4888c911c70833c745a1f659471537cca5c9ec18605dd23d0818e2b7172da5b89f1aeb084ea73b31aa5b7b84f8c045ab49303da0d6423de1c21f261bb7c8c0ae
+  metadata.gz: 4c78f397e90c8c4175ab3b5c02fbd841ab8a6f1f6c6f2929bdf4d850f88822ac6ce50f0359b51a88ee2ffde1f2a445b3084d1d23433122fd454e65e361795e43
+  data.tar.gz: 033dd98dd593f934b77f39214f35876da85ae9a9716c7e11d4b7ca93e2ba169d5e217e63326551f941a77a69277cf7a8598d140babd2c60d001186791a48f2e6

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

@@ -28,6 +28,8 @@ module BulletTrain
           end
 
           child = argv[0]
+          check_class_name_for_namespace_conflict(child)
+
           parents = argv[1] ? argv[1].split(",") : []
 
           # Raise an error if the developer skipped adding the parent and went straight to the attributes.

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

@@ -30,6 +30,8 @@ module BulletTrain
           end
 
           child = argv[0]
+          check_class_name_for_namespace_conflict(child)
+
           primary_parent = argv[1].split("class_name=").last.split(",").first.split("}").first
           secondary_parent = argv[2].split("class_name=").last.split(",").first.split("}").first
 

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.7.9"
+    VERSION = "1.7.11"
   end
 end

data/lib/scaffolding/attribute.rb

@@ -51,6 +51,13 @@ class Scaffolding::Attribute
     options[:required] || is_first_attribute?
   end
 
+  def association_class_name
+    if options[:class_name].present?
+      return options[:class_name].underscore.split("/").last
+    end
+    name.split("_id").first
+  end
+
   def is_association?
     is_belongs_to? || is_has_many?
   end

data/lib/scaffolding/script.rb

@@ -49,6 +49,39 @@ def get_untracked_files
   `git ls-files --other --exclude-standard`.split("\n")
 end
 
+# class_name is a potentially namespaced class like
+# "Tasks::Widget" or "Task::Widget". Here we ensure that
+# the namespace doesn't clobber an existing model. If it does
+# we suggest that the namespace could be pluralized.
+def check_class_name_for_namespace_conflict(class_name)
+  if class_name.include?("::")
+    parts = class_name.split("::") # ["Task", "Widget"]
+    # We drop the last segment because that's tne new model we're trying to create
+    parts.pop # ["Task"]
+    possible_conflicted_class_name = ""
+    parts.each do |part|
+      possible_conflicted_class_name += "::#{part}"
+      begin
+        klass = possible_conflicted_class_name.constantize
+        is_active_record_class = klass&.ancestors&.include?(ActiveRecord::Base)
+        is_aactive_hash_class = klass&.ancestors&.include?(ActiveHash::Base)
+        if klass && (is_active_record_class || is_aactive_hash_class)
+          problematic_namespace = possible_conflicted_class_name[2..]
+          puts "It looks like the namespace you gave for this model conflicts with an existing class: #{klass.name}".red
+          puts "You should use a namespace that doesn't clobber an existing class.".red
+          puts ""
+          puts "We reccomend using the pluralized version of the existing class.".red
+          puts ""
+          puts "For instance instead of #{problematic_namespace} use #{problematic_namespace.pluralize}".red
+          exit
+        end
+      rescue NameError
+        # this is good actually, it means we don't already have a class that will be clobbered
+      end
+    end
+  end
+end
+
 def check_required_options_for_attributes(scaffolding_type, attributes, child, parent = nil)
   tableized_parent = nil
 
@@ -139,14 +172,37 @@ def check_required_options_for_attributes(scaffolding_type, attributes, child, p
 
         file_name = Dir.glob("app/models/**/*.rb").find { |model| model.match?(/#{attribute_options[:class_name].underscore}\.rb/) } || ""
 
+        begin
+          class_name_constant = attribute_options[:class_name].constantize
+        rescue NameError
+          if attribute_options[:class_name] == child
+            puts ""
+            puts "You appear to be tryingo scaffold a model that references itself. Unfotunately this needs to be a two-step process.".red
+            puts "First you should generate the model without the reference, and then add the reference as a new field. For instance:".red
+            puts ""
+            puts "  rails generate super_scaffold #{child}#{" " + parent if parent.present?}".red
+            puts "  rails generate super_scaffold:field #{child} #{name}:#{type}".red
+            puts ""
+            puts "If `#{name}` is just a regular field and isn't backed by an ActiveRecord association, you can skip all this with the `{vanilla}` option, e.g.:".red
+            puts ""
+            puts "  rails generate super_scaffold #{child}#{" " + parent if parent.present?} #{name}:#{type}{vanilla}".red
+            puts ""
+            exit
+          else
+            # We don't do anything special here because we'll end up triggering the error message below. A self-referential model
+            # is kind of a special case that's worth calling out specifically. If we just can't find the model the messaging below
+            # should be sufficient to get folks on the right track.
+          end
+        end
+
         # If a model is namespaced, the parent's model file might exist under
         # `app/models/`, but sometimes these files are modules that resolve
         # table names by providing a prefix as opposed to an actual ApplicationRecord.
         # This check ensures that the _id attribute really is a model.
-        is_active_record_class = attribute_options[:class_name].constantize.ancestors.include?(ActiveRecord::Base)
+        is_active_record_class = class_name_constant&.ancestors&.include?(ActiveRecord::Base)
         unless File.exist?(file_name) && is_active_record_class
           puts ""
-          puts "Attributes that end with `_id` or `_ids` trigger awesome, powerful magic in Super Scaffolding. However, because no `#{attribute_options[:class_name]}` class was found defined in `#{file_name}`, you'll need to specify a `class_name` that exists to let us know what model class is on the other side of the association, like so:".red
+          puts "Attributes that end with `_id` or `_ids` trigger awesome, powerful magic in Super Scaffolding. However, because no `#{attribute_options[:class_name]}` class was found defined in your app, you'll need to specify a `class_name` that exists to let us know what model class is on the other side of the association, like so:".red
           puts ""
           puts "  bin/super-scaffold #{scaffolding_type} #{child}#{" " + parent if parent.present?} #{name}:#{type}{class_name=#{name.gsub(/_ids?$/, "").classify}}".red
           puts ""

data/lib/scaffolding/transformer.rb

@@ -758,7 +758,7 @@ class Scaffolding::Transformer
         end
 
         if attribute.is_association?
-          short = attribute.options[:class_name].underscore.split("/").last
+          short = attribute.association_class_name
           case attribute.type
           when "buttons", "options"
             field_attributes["\n  options"] = "@tangible_thing.#{valid_values}.map { |#{short}| [#{short}.id, #{short}.#{attribute.options[:label]}] }"
@@ -1362,12 +1362,12 @@ class Scaffolding::Transformer
 
       # update the factory generated by `rails g`.
       content = if transform_string(":absolutely_abstract_creative_concept") == transform_string(":scaffolding_absolutely_abstract_creative_concept")
-        transform_string("association :absolutely_abstract_creative_concept")
+        transform_string("    association :absolutely_abstract_creative_concept")
       else
-        transform_string("association :absolutely_abstract_creative_concept, factory: :scaffolding_absolutely_abstract_creative_concept")
+        transform_string("    association :absolutely_abstract_creative_concept, factory: :scaffolding_absolutely_abstract_creative_concept")
       end
 
-      scaffold_replace_line_in_file("./test/factories/scaffolding/completely_concrete/tangible_things.rb", content, "absolutely_abstract_creative_concept { nil }")
+      scaffold_replace_line_in_file("./test/factories/scaffolding/completely_concrete/tangible_things.rb", content, "    absolutely_abstract_creative_concept { nil }")
 
       add_has_many_association
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.7.9
+  version: 1.7.11
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2024-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard