bullet_train-super_scaffolding 1.6.15 → 1.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d15de6e89509669065c9701bfe3fb3f7b3360d933c1bc7f5d0bb23d2caa9332
-  data.tar.gz: d68001e7b68cb2b19a975ac7d34bc4ac6fe79a0c67c814fccdcb2b4f0933c43b
+  metadata.gz: ab9f39b31aacb0b95619b04fb4b3a32fef367608f8eb4115588dbaf596711c60
+  data.tar.gz: a1be9b35f77dfc9871e3909c653d59806519fcc08de8b6a9904a1721348b5b99
 SHA512:
-  metadata.gz: 9f4886c91bd90f8cb0345511a6cd3b962f7e53a788f28e94ea1ef52bf95e3cce93c76e52ac8f67c7a8cab7b6516f03f42c9f92950b9b3ba153a875295133a97d
-  data.tar.gz: 3ee073e9d3116b1aa80298d7d4b1e7c706946af827bee05b2a0e81eb5ed639b7940be52d8ccbf2856b22f502fc92654e25cb27bcbfa978833d1b748df2053293
+  metadata.gz: 5e8cdceb4b5c68cd44d3425fa499f3f132eb51da96c867dd828c6374f8743e6fc3e1b4ccb78cba391fa8d197fd3bf87bcea87d8209976c1f8d7898dcd69f94af
+  data.tar.gz: '099142a8e33347d3c506c40780a65f376295d92ba58231beea2b63fe3a4da71766d44fe894002ecb55e941ebaef769818b56ca2ad07183f35ac17d052f8a99a3'

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.6.15"
+    VERSION = "1.6.17"
   end
 end

data/lib/scaffolding/routes_file_manipulator.rb

@@ -35,22 +35,6 @@ class Scaffolding::RoutesFileManipulator
     @common_namespaces
   end
 
-  # def divergent_namespaces
-  #   unless @divergent_namespaces
-  #     @divergent_namespaces ||= []
-  #     child_parts_copy = child_parts.dup
-  #     parent_parts_copy = parent_parts.dup
-  #     while child_parts_copy.first == parent_parts_copy.first
-  #       child_parts_copy.shift
-  #       parent_parts_copy.shift
-  #     end
-  #     child_parts_copy.pop
-  #     parent_parts_copy.pop
-  #     @divergent_namespaces = [child_parts_copy, parent_parts_copy]
-  #   end
-  #   @divergent_namespaces
-  # end
-
   def divergent_parts
     unless @divergent_namespaces
       @divergent_namespaces ||= []
@@ -68,19 +52,28 @@ class Scaffolding::RoutesFileManipulator
   end
 
   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
+    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
-      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
 
@@ -434,4 +427,10 @@ 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.15
+  version: 1.6.17
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-16 00:00:00.000000000 Z
+date: 2023-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
-- !ruby/object:Gem::Dependency
-  name: bullet_train
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: masamune-ast
   requirement: !ruby/object:Gem::Requirement