bullet_train-super_scaffolding 1.6.35 → 1.6.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 044dbfb0828cf00ca12e975d7b49769c555636666e64a16ac4d0fc05db19c4d7
-  data.tar.gz: e77bce7fdde5eb6fd3e5a3598bab8520bcf8c37b21a78de734aed69692d7f132
+  metadata.gz: 78fc168b87086abdff9a77f6fca18414f48ecfa480b96675e5d57d5b15461834
+  data.tar.gz: 3a219e7452a7d1cee87498fff9626636758efbd9c6276b38fc8071689271299c
 SHA512:
-  metadata.gz: 5aa17cc571a64107afc56007743dc5c14b5192dc021dee371684fcd21fcd50a3b302fef4e73261979769df0bb652a2fb0b9a9750adc21e219330483e7161b4d1
-  data.tar.gz: 9b4e70dcb0af3243235372a36cd42acd9ea655246829fd927af7ecad450fbd195a64a1b453724d08464e65ec251c694fcf09371f0545e66f27c4bc308c5a873b
+  metadata.gz: 86f8893e04227ba822300e981e1a606ccb8242d22c6e3c628fa226b044f50c060dc1a4401b9ae1150bfc9be67718d349d3a8ab23e6c0b12a4d682a8babcd9c00
+  data.tar.gz: 89ea52f90b89ffde18b3458ccbb20df62848be892c823feb8fe69508b09a46dd451b376e9ec6e298f98dfe6bcfa0d78ff365e292000e470ae1750cd74b684097

data/lib/bullet_train/super_scaffolding/version.rb

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

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

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.36
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2024-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard