bullet_train-super_scaffolding 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52bd806e1278e3ac3365aa11d8b5d8dc723daa05342e6aba8661dd05522672bd
-  data.tar.gz: b0a9c6b29e04b3bf5683db9cdb9df7d851f3601422083246a1f76e41e8896c34
+  metadata.gz: 2a205bbac5111136b98f7af3d1a87f76a1fbd20449e8c8c2329caeed751df896
+  data.tar.gz: 4707519e317c5b3a605010d528485cd90e44c54566aa201bd35848b0cc6d47ff
 SHA512:
-  metadata.gz: d421e343cecfe142599857aeeb89d13b69699c6e4ac3bf03391575ab8f664e7641072c9235f299aae5c15bc65181d2165f535ca699e60b51e5cc0800ed1051d5
-  data.tar.gz: 46b0ea1b3621ddaddc77ca8f5aa08777434f796b54f7648dab73ef69860c845e253ec789b0a95721c6f12adb10876885d06d11a59f19ab8d3c2188581734c41b
+  metadata.gz: f0cd1a2f64f9e7c96f81b950e44089885446f3988cc1e8552b392785464f2a034010c5117e5c26343d5c275143d49eea10756ae266d6cb043c29c7b237af1f3f
+  data.tar.gz: f7909f319a4ffc2563d5a66cb5ed35c0ee769eb639c671356b34fdd796700ccb34fdfe448aa1b051c6b01f6d1682f450bc18b2ba933e658c96b083d9fd20c479

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.8.2"
+    VERSION = "1.8.3"
   end
 end

data/lib/scaffolding/routes_file_manipulator.rb

@@ -158,6 +158,33 @@ class Scaffolding::RoutesFileManipulator
     namespace_block_start.present? ? {namespace => namespace_block_start} : {}
   end
 
+  def find_last_in_namespace(needle, namespaces, within = nil, ignore = nil)
+    if namespaces.any?
+      namespace_lines = find_namespaces(namespaces, within)
+      within = namespace_lines[namespaces.last]
+    end
+
+    lines_within = Scaffolding::FileManipulator.lines_within(lines, within)
+    lines_within.reverse.each_with_index do |line, line_number|
+      reversed_line_number = lines_within.count - line_number - 1
+      # + 2 because line_number starts from 0, and within starts one line after
+      actual_line_number = (within + reversed_line_number + 2)
+
+      # The lines we want to ignore may be a a series of blocks, so we check each Range here.
+      ignore_line = false
+      if ignore.present?
+        ignore.each do |lines_to_ignore|
+          ignore_line = true if lines_to_ignore.include?(actual_line_number)
+        end
+      end
+
+      next if ignore_line
+      return (within + (within ? 1 : 0) + reversed_line_number) if line.match?(needle)
+    end
+
+    nil
+  end
+
   def find_in_namespace(needle, namespaces, within = nil, ignore = nil)
     if namespaces.any?
       namespace_lines = find_namespaces(namespaces, within)
@@ -187,15 +214,26 @@ class Scaffolding::RoutesFileManipulator
     within = options[:within]
     parts = parts.dup
     resource = parts.pop
+    needle = /resources :#{resource}#{options[:options] ? ", #{options[:options].gsub(/({)(.*)(})/, '{\2}')}" : ""}(,?\s.*)? do(\s.*)?$/
+
     # TODO this doesn't take into account any options like we do in `find_resource`.
-    find_in_namespace(/resources :#{resource}#{options[:options] ? ", #{options[:options].gsub(/({)(.*)(})/, '{\2}')}" : ""}(,?\s.*)? do(\s.*)?$/, parts, within)
+    if options[:find_last]
+      find_last_in_namespace(needle, parts, within)
+    else
+      find_in_namespace(needle, parts, within)
+    end
   end
 
   def find_resource(parts, options = {})
     parts = parts.dup
     resource = parts.pop
     needle = /resources :#{resource}#{options[:options] ? ", #{options[:options].gsub(/({)(.*)(})/, '{\2}')}" : ""}(,?\s.*)?$/
-    find_in_namespace(needle, parts, options[:within], options[:ignore])
+
+    if options[:find_last]
+      find_last_in_namespace(needle, parts, options[:within], options[:ignore])
+    else
+      find_in_namespace(needle, parts, options[:within], options[:ignore])
+    end
   end
 
   def find_or_create_resource(parts, options = {})
@@ -278,17 +316,18 @@ class Scaffolding::RoutesFileManipulator
   end
 
   def find_or_convert_resource_block(parent_resource, options = {})
-    unless find_resource_block([parent_resource], options)
-      if (resource_line_number = find_resource([parent_resource], options))
-        # convert it.
-        lines[resource_line_number].gsub!("\n", " do\n")
-        insert_after(["end"], resource_line_number)
-      else
-        raise BulletTrain::SuperScaffolding::CannotFindParentResourceException.new("the parent resource (`#{parent_resource}`) doesn't appear to exist in `#{@filename}`.")
+    resource_statement_line = find_resource([parent_resource], options)
+    if resource_statement_line
+      resource_statement = lines[resource_statement_line]
+      if !resource_statement.match?(/ do(\s.*)?$/)
+        lines[resource_statement_line].gsub!("\n", " do\n")
+        insert_after(["end"], resource_statement_line)
       end
+    else
+      raise BulletTrain::SuperScaffolding::CannotFindParentResourceException.new("the parent resource (`#{parent_resource}`) doesn't appear to exist in `#{@filename}`.")
     end
 
-    # update the block of code we're working within.
+    # capture the line number of the block of code we're working within.
     unless (within = find_resource_block([parent_resource], options))
       raise "tried to convert the parent resource to a block, but failed?"
     end
@@ -328,13 +367,18 @@ class Scaffolding::RoutesFileManipulator
       #   end
       # end
 
-      parent_within = find_or_convert_resource_block(parent_resource, within: within)
+      parent_within = find_resource([parent_resource], within: within)
+
+      # With deeply nested namespaces we end up with mutliple resource blocks and some things need
+      # to go into the last block. See this issue for details:
+      # https://github.com/bullet-train-co/bullet_train/issues/1655
+      last_parent_within = find_or_convert_resource_block(parent_resource, within: within, find_last: true)
 
       # add the new resource within that namespace.
       line = "scope module: '#{parent_resource}' do"
       # TODO you haven't tested this yet.
-      unless (scope_within = Scaffolding::FileManipulator.find(lines, /#{line}/, parent_within))
-        scope_within = insert([line, "end"], parent_within)
+      unless (scope_within = Scaffolding::FileManipulator.find(lines, /#{line}/, last_parent_within))
+        scope_within = insert([line, "end"], last_parent_within)
       end
 
       if child_namespaces.size > 1
@@ -361,7 +405,9 @@ class Scaffolding::RoutesFileManipulator
       else
         routing_options = "only: collection_actions"
         routing_options += ", #{formatted_concerns}" if formatted_concerns
-        find_or_create_resource([child_resource], options: routing_options, within: scope_within)
+        # We find last here for this reason:
+        # https://github.com/bullet-train-co/bullet_train/issues/1655
+        find_or_create_resource([child_resource], options: routing_options, within: scope_within, find_last: true)
 
         # namespace :projects do
         #   resources :deliverables, except: collection_actions

metadata

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