bullet_train-super_scaffolding 1.6.18 → 1.6.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71ecc941a9a4ee421299d14d35a6ef5a437214882dc364eb820c64ce8f35da7b
-  data.tar.gz: 4fbaaa2c7b7adb9a6e2df372e31f4310cacfdbbff72aa0eebba9b5148be33059
+  metadata.gz: 753c1abfff3d8c420ad980d7b7346429225267918becdd9c5a91682dffc8247d
+  data.tar.gz: 157b9e1c7747cd41d59611043ad339ab0d42ef485f1b16882648a803cec2b0df
 SHA512:
-  metadata.gz: 8f2dfc1a15b9fe1c40553a36675f3969577c614673f0c7191eb7524322b94295806432155df2f25c1926744479df9a69925d6f54852452db8bf602c727d493e5
-  data.tar.gz: 26cc15d1982e7ee5443794502f21ee55a6a45bf85c6c8a0f2e3913bdc3299586d346d836649cad0d9c9da2c8e2bba1ccb01dbb93b67975bd09cb0f6c3f953e74
+  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.18"
+    VERSION = "1.6.20"
   end
 end

data/lib/scaffolding/routes_file_manipulator.rb

@@ -52,26 +52,23 @@ class Scaffolding::RoutesFileManipulator
   end
 
   def find_namespaces(namespaces, within = nil)
+    namespaces = namespaces.dup
     results = {}
     reinstantiate_masamune_object
-    namespace_nodes = @msmn.method_calls(token_value: "namespace")
-    namespace_nodes.map do |node|
-      # Get the first argument (a Symbol) without the colon from the list of arguments.
-      name = node.arguments.child_nodes.first.unescaped
 
-      # TODO: For some reason we use both strings and symbols for namespaces.
-      # i.e. - ["account"] and [:v1].
-      if namespaces.include?(name.to_sym)
-        results[name.to_sym] = node.line_number - 1
-      elsif namespaces.include?(name)
-        results[name] = node.line_number - 1
-      end
-    end
+    # `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/) }
 
-    # `within` uses an Array index whereas Masamune nodes use the actual line number, so we write `within + 1` here.
     if within
-      block_end = @msmn.method_calls.find { |node| node.line_number == within + 1 }.location.end_line
-      results.reject! { |name, line_number| line_number >= block_end }
+      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
@@ -232,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]
@@ -428,8 +426,6 @@ class Scaffolding::RoutesFileManipulator
     end
   end
 
-  # We have to do this because the `lines` object is constantly changing,
-  # so we reinstantiate this object wherever necessary.
   def reinstantiate_masamune_object
     @msmn = Masamune::AbstractSyntaxTree.new(lines.join)
   end

metadata

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