bullet_train-super_scaffolding 1.6.18 → 1.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71ecc941a9a4ee421299d14d35a6ef5a437214882dc364eb820c64ce8f35da7b
-  data.tar.gz: 4fbaaa2c7b7adb9a6e2df372e31f4310cacfdbbff72aa0eebba9b5148be33059
+  metadata.gz: eafd70da2079b3901c1d863670e76da7058d10eec9aa25158b7b60bfb6599b98
+  data.tar.gz: 5ee1b5f7fcadae48a99923d5228408cee0d80ce69990907e5882ba234e71505d
 SHA512:
-  metadata.gz: 8f2dfc1a15b9fe1c40553a36675f3969577c614673f0c7191eb7524322b94295806432155df2f25c1926744479df9a69925d6f54852452db8bf602c727d493e5
-  data.tar.gz: 26cc15d1982e7ee5443794502f21ee55a6a45bf85c6c8a0f2e3913bdc3299586d346d836649cad0d9c9da2c8e2bba1ccb01dbb93b67975bd09cb0f6c3f953e74
+  metadata.gz: e38a7f78a0e925e3cc7250a8f16ae583315902347f61d9ea2c36d8db88634e60b500f3702c2c2ce5ae23f6df5d3c20c56fd7e1c15f4ec6b33f1eda4a15503892
+  data.tar.gz: 5cb14fe691394c3656e29e604f09ba1f2e80a7de36efdb717abdf01fb5dee610628feb54b73d4f8d2a18aecfde3f095c8c68e44dd4290a6913acfc54f9abe275

data/lib/bullet_train/super_scaffolding/version.rb

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

data/lib/scaffolding/routes_file_manipulator.rb

@@ -52,28 +52,19 @@ 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
+    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?
     end
-
-    # `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 }
-    end
-
     results
   end
 
@@ -427,10 +418,4 @@ class Scaffolding::RoutesFileManipulator
       lines[line_number].gsub!(/resources :(.*)$/, "resources :\\1, concerns: [#{existing_concerns.map { |e| ":#{e}" }.join(", ")}]")
     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
 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.19
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard