bullet_train-super_scaffolding 1.6.7 → 1.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4daf211d2bdfa4cdfed707713e865468f546e99e33217454a3a344623e323b24
-  data.tar.gz: 73a5b7db62adb169f77eab98ebf2480b23a38eaa26d365c98262b34501e8fff3
+  metadata.gz: bdb72d4e418e35117006cbc2bde82d94fa388771c2eec71444abcf51d793f985
+  data.tar.gz: 63d86d99b7520dfb506c2d78608fbf2bf4448ef40c89123006c5dd45c4240fcb
 SHA512:
-  metadata.gz: b1f123b55cd71806b43e84da083b8db0c86e655e26d831937651c20c3be179b0d9190fc46a9f72fcc601441b9dd1984352fc06d5e15d88830971999acdcdf6c5
-  data.tar.gz: 21f3158dbbc7af72e1d6610c93e5daeb96e1c1e9f26882dc2acb57231981e9fc8f534c35e592d502bef9306b8c618a21e8f19bc94df54e43f9a81577766c0829
+  metadata.gz: dc8a4ba76d763ad6167e20c742a357376e54a0de4a9f9e345891c29435dbac3ac506be1d7da29920d872c44a9accec0de9d76b9d50732e6f607d398b3ddb076c
+  data.tar.gz: cafb5f4eb58dc6e1f074302ef885fccb313459b56998f360621822212d48cf18c5eabd67db694baee157261d9921859a534ee372a097ee5e55da9d83ef3cf20a

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

@@ -29,6 +29,14 @@ module BulletTrain
 
           child = argv[0]
           parents = argv[1] ? argv[1].split(",") : []
+
+          # Raise an error if the developer skipped adding the parent and went straight to the attributes.
+          if FIELD_PARTIALS.keys.map(&:to_s).include?(parents.first.split(":").last)
+            puts "It looks like you forgot to add the model's parent to your scaffolding command.".red
+            puts "Add the parent name after the model and try again.".red
+            exit
+          end
+
           parents = parents.map(&:classify).uniq
           parent = parents.first
           child_parts = child.split("::")

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.6.7"
+    VERSION = "1.6.9"
   end
 end

data/lib/scaffolding/routes_file_manipulator.rb

@@ -326,7 +326,7 @@ class Scaffolding::RoutesFileManipulator
     within = find_or_create_namespaces(base_namespaces)
 
     # e.g. Project and Projects::Deliverable
-    if parent_namespaces.empty? && child_namespaces.one? && parent_resource == child_namespaces.first
+    if parent_namespaces.empty? && child_namespaces.any? && parent_resource == child_namespaces.first
 
       # resources :projects do
       #   scope module: 'projects' do
@@ -343,19 +343,40 @@ class Scaffolding::RoutesFileManipulator
         scope_within = insert([line, "end"], parent_within)
       end
 
-      find_or_create_resource([child_resource], options: "only: collection_actions", within: scope_within)
-
-      # namespace :projects do
-      #   resources :deliverables, except: collection_actions
-      # end
-
-      # 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 = 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)
-      unless find_namespaces(child_namespaces, within)[child_namespaces.last]
-        raise "tried to insert `namespace :#{child_namespaces.last}` but it seems we failed"
+      if child_namespaces.size > 1
+        # If a model has multiple namespaces, we have to account for that here.
+        # For example, this creates the :issues namespace here when `SendAction`
+        # and the `parent_resource` is `newsletters`.
+        #
+        # resources :newsletters do
+        #   scope module: 'newsletters' do
+        #     resources :issues, only: collection_actions
+        #     namespace :issues do
+        #       resources :send_actions, shallow: false
+        #     end
+        #   end
+        # end
+
+        # TODO: We should be able to just do `child_namespaces.shift`.
+        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)
+      else
+        find_or_create_resource([child_resource], options: "only: collection_actions", within: scope_within)
+
+        # namespace :projects do
+        #   resources :deliverables, except: collection_actions
+        # end
+
+        # 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 = 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)
+        unless find_namespaces(child_namespaces, within)[child_namespaces.last]
+          raise "tried to insert `namespace :#{child_namespaces.last}` but it seems we failed"
+        end
       end
 
     # e.g. Projects::Deliverable and Objective Under It, Abstract::Concept and Concrete::Thing

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.9
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2023-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard