bullet_train-super_scaffolding 1.6.19 → 1.6.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eafd70da2079b3901c1d863670e76da7058d10eec9aa25158b7b60bfb6599b98
-  data.tar.gz: 5ee1b5f7fcadae48a99923d5228408cee0d80ce69990907e5882ba234e71505d
+  metadata.gz: 753c1abfff3d8c420ad980d7b7346429225267918becdd9c5a91682dffc8247d
+  data.tar.gz: 157b9e1c7747cd41d59611043ad339ab0d42ef485f1b16882648a803cec2b0df
 SHA512:
-  metadata.gz: e38a7f78a0e925e3cc7250a8f16ae583315902347f61d9ea2c36d8db88634e60b500f3702c2c2ce5ae23f6df5d3c20c56fd7e1c15f4ec6b33f1eda4a15503892
-  data.tar.gz: 5cb14fe691394c3656e29e604f09ba1f2e80a7de36efdb717abdf01fb5dee610628feb54b73d4f8d2a18aecfde3f095c8c68e44dd4290a6913acfc54f9abe275
+  metadata.gz: 5f3f9710da57086521693f17a5e9d2c5cf8f1fa55f1c2fd3b7e848c26a80ba52ed3b36d6a26ad2b0ae900efc6712896daf34a41854660917bc8140c48ef3cb99
+  data.tar.gz: c4e500fdb776490d8698863551aeeb6b23e0127dcda35e79bcc21bc28bc7f696502296d45ba3925e46a1bef6618385114c051703550e28e24011fd8c3655833b

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.6.19"
+    VERSION = "1.6.20"
   end
 end

data/lib/scaffolding/routes_file_manipulator.rb

@@ -54,17 +54,23 @@ class Scaffolding::RoutesFileManipulator
   def find_namespaces(namespaces, within = nil)
     namespaces = namespaces.dup
     results = {}
-    block_end = Scaffolding::BlockManipulator.find_block_end(starting_from: within, lines: lines) if within
-    lines.each_with_index do |line, line_number|
-      if within
-        next unless line_number > within
-        return results if line_number >= block_end
-      end
-      if line.include?("namespace :#{namespaces.first} do")
-        results[namespaces.shift] = line_number
-      end
-      return results unless namespaces.any?
+    reinstantiate_masamune_object
+
+    # `within` can refer to either a `resources`, `namespace`, `scope`, or `shallow` block.
+    blocks = @msmn.method_calls.select { |node| node.token_value.match?(/resources|namespace|scope|shallow/) }
+    namespace_nodes = blocks.select { |node| node.token_value.match?(/namespace/) }
+
+    if within
+      starting_block = blocks.find { |block| block.line_number - 1 == within }
+      block_range = (starting_block.location.start_line)..(starting_block.location.end_line)
+      namespace_nodes.select! { |node| block_range.cover?(node.line_number) }
+    end
+
+    namespace_nodes.each do |node|
+      name = node.arguments.child_nodes.first.unescaped
+      results[namespaces.shift] = node.line_number - 1 if namespaces.first.to_s == name
     end
+
     results
   end
 
@@ -223,6 +229,7 @@ class Scaffolding::RoutesFileManipulator
       # all other namespace blocks INSIDE the top-level namespace blocks are skipped
       if namespace_line_numbers.include?(line_index)
         # Grab the first symbol token on the same line as the namespace.
+        reinstantiate_masamune_object
         namespace_name = @msmn.symbols.find { |sym| sym.line_number == line_index }.token_value
         local_namespace = find_namespaces([namespace_name], within)
         starting_line_number = local_namespace[namespace_name]
@@ -418,4 +425,8 @@ class Scaffolding::RoutesFileManipulator
       lines[line_number].gsub!(/resources :(.*)$/, "resources :\\1, concerns: [#{existing_concerns.map { |e| ":#{e}" }.join(", ")}]")
     end
   end
+
+  def reinstantiate_masamune_object
+    @msmn = Masamune::AbstractSyntaxTree.new(lines.join)
+  end
 end

metadata

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