bullet_train-super_scaffolding 1.6.35 → 1.6.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 044dbfb0828cf00ca12e975d7b49769c555636666e64a16ac4d0fc05db19c4d7
-  data.tar.gz: e77bce7fdde5eb6fd3e5a3598bab8520bcf8c37b21a78de734aed69692d7f132
+  metadata.gz: a7d33a69bc377b790693e058b4d06a16026a2ecf5f1bbba4ce901062fbedf6ea
+  data.tar.gz: 75848676aa75f7e19fb8d52d6310ea7570ea7aa60ae488efab004fb72dfa1870
 SHA512:
-  metadata.gz: 5aa17cc571a64107afc56007743dc5c14b5192dc021dee371684fcd21fcd50a3b302fef4e73261979769df0bb652a2fb0b9a9750adc21e219330483e7161b4d1
-  data.tar.gz: 9b4e70dcb0af3243235372a36cd42acd9ea655246829fd927af7ecad450fbd195a64a1b453724d08464e65ec251c694fcf09371f0545e66f27c4bc308c5a873b
+  metadata.gz: cd629420914dfa91d04f4b7c244a6c37f615c1135c19233743a174ec51e01107806ba2b7eed3b085f5ac32003b11b55fb4d377e256314dcbfd40723362d36609
+  data.tar.gz: 96f3b2a3e70ddf0700d87da31f0098531845ef941260ce8866ec44dd3620e6fb6b3a677baad8e8c2575ff9bf9db73b4b00898cd529cf9ce40343ca3dde5858d3

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

@@ -38,7 +38,7 @@ module BulletTrain
 
           unless @options["skip-migration-generation"]
             attributes_without_options = attributes.map { |attribute| attribute.gsub(/{.*}$/, "") }
-            attributes_without_id = attributes_without_options.map { |attribute| attribute.gsub(/_id$/, "") }
+            attributes_without_id = attributes_without_options.map { |attribute| attribute.delete_suffix("_id") }
             attributes_with_references = attributes_without_id.map { |attribute| attribute + ":references" }
 
             generation_command = "bin/rails generate model #{child} #{attributes_with_references.join(" ")}"

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.6.35"
+    VERSION = "1.6.37"
   end
 end

data/lib/scaffolding/attribute.rb

@@ -90,11 +90,11 @@ class Scaffolding::Attribute
   end
 
   def name_without_id
-    name.gsub(/_id$/, "")
+    name.delete_suffix("_id")
   end
 
   def name_without_ids
-    name.gsub(/_ids$/, "").pluralize
+    name.delete_suffix("_ids").pluralize
   end
 
   def name_without_id_suffix

data/lib/scaffolding/routes_file_manipulator.rb

@@ -316,6 +316,9 @@ class Scaffolding::RoutesFileManipulator
 
     within = find_or_create_namespaces(base_namespaces)
 
+    # Add any concerns passed as options.
+    add_concern(:sortable) if transformer_options["sortable"]
+
     # e.g. Project and Projects::Deliverable
     if parent_namespaces.empty? && child_namespaces.any? && parent_resource == child_namespaces.first
 
@@ -352,9 +355,13 @@ class Scaffolding::RoutesFileManipulator
         child_namespaces_without_parent = child_namespaces.dup
         child_namespaces_without_parent.shift
         deeply_nested_within = find_or_create_namespaces(child_namespaces_without_parent, scope_within)
-        find_or_create_resource([child_resource], options: "shallow: false", within: deeply_nested_within)
+        routing_options = "shallow: false"
+        routing_options += ", #{formatted_concerns}" if formatted_concerns
+        find_or_create_resource([child_resource], options: routing_options, within: deeply_nested_within)
       else
-        find_or_create_resource([child_resource], options: "only: collection_actions", within: scope_within)
+        routing_options = "only: collection_actions"
+        routing_options += ", #{formatted_concerns}" if formatted_concerns
+        find_or_create_resource([child_resource], options: routing_options, within: scope_within)
 
         # namespace :projects do
         #   resources :deliverables, except: collection_actions
@@ -364,7 +371,9 @@ class Scaffolding::RoutesFileManipulator
         # because namespaces with the same name as the resource can exist on the same level.
         parent_block_start = Scaffolding::BlockManipulator.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)
+        routing_options = "except: collection_actions"
+        routing_options += ", #{formatted_concerns}" if formatted_concerns
+        find_or_create_resource([child_resource], options: routing_options, within: namespace_line_within)
         unless find_namespaces(child_namespaces, within)[child_namespaces.last]
           raise "tried to insert `namespace :#{child_namespaces.last}` but it seems we failed"
         end
@@ -377,7 +386,7 @@ class Scaffolding::RoutesFileManipulator
       #   resources :deliverables
       # end
       top_parent_namespace = find_namespaces(parent_namespaces, within)[parent_namespaces.first]
-      find_or_create_resource(child_namespaces + [child_resource], within: top_parent_namespace)
+      find_or_create_resource(child_namespaces + [child_resource], options: formatted_concerns, within: top_parent_namespace)
 
       # resources :projects_deliverables, path: 'projects/deliverables' do
       #   resources :objectives
@@ -394,7 +403,6 @@ class Scaffolding::RoutesFileManipulator
         within = find_or_convert_resource_block(parent_resource, options: "except: collection_actions", within: within)
       end
 
-      add_concern(:sortable) if transformer_options["sortable"]
       find_or_create_resource(child_namespaces + [child_resource], options: formatted_concerns, within: within)
 
     end

data/lib/scaffolding/script.rb

@@ -130,9 +130,9 @@ def check_required_options_for_attributes(scaffolding_type, attributes, child, p
       attribute_options ||= {}
       unless attribute_options[:vanilla]
         name_without_id = if name.match?(/_id$/)
-          name.gsub(/_id$/, "")
+          name.delete_suffix("_id")
         elsif name.match?(/_ids$/)
-          name.gsub(/_ids$/, "")
+          name.delete_suffix("_ids")
         end
 
         attribute_options[:class_name] ||= name_without_id.classify

data/lib/tasks/bullet_train/super_scaffolding_tasks.rake

@@ -1,12 +1,2 @@
 namespace :bullet_train do
-  desc "Next-level code generation"
-  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.6.35
+  version: 1.6.37
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2024-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard