bullet_train-super_scaffolding 1.6.16 → 1.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 756d0f0f80e99c6dae67cd43a18cb2c759b0aa8255d4671f25b3cdb415a3c318
-  data.tar.gz: 764cb6047ffcda07aebd78cc05e525ae4e658ff5fc866c428f9a3962308326eb
+  metadata.gz: 71ecc941a9a4ee421299d14d35a6ef5a437214882dc364eb820c64ce8f35da7b
+  data.tar.gz: 4fbaaa2c7b7adb9a6e2df372e31f4310cacfdbbff72aa0eebba9b5148be33059
 SHA512:
-  metadata.gz: 56deea3c0cfb883f813acec3d63f92c6b56e9f51c539f03d93b177a1eff67b85a9504d1b61086e474689827f03db0f70c9e0185745b1ec206ad0e2b9bf62b82d
-  data.tar.gz: a20d36c4ffca88890982c106c23f31973968296f07da056248331384593bb0d64160527ec3fac1ad9150c7710f93a1618d86c1eb862006b5afb0f600ea7a7ac8
+  metadata.gz: 8f2dfc1a15b9fe1c40553a36675f3969577c614673f0c7191eb7524322b94295806432155df2f25c1926744479df9a69925d6f54852452db8bf602c727d493e5
+  data.tar.gz: 26cc15d1982e7ee5443794502f21ee55a6a45bf85c6c8a0f2e3913bdc3299586d346d836649cad0d9c9da2c8e2bba1ccb01dbb93b67975bd09cb0f6c3f953e74

data/lib/bullet_train/super_scaffolding/version.rb

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

data/lib/scaffolding/routes_file_manipulator.rb

@@ -52,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
 
@@ -418,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

data/lib/scaffolding/script.rb

@@ -50,16 +50,7 @@ def standard_protip
   puts "If you do that, you can reset to your last commit state by using `git checkout .` and `git clean -d -f` ."
 end
 
-def git_status
-  `git status`.split("\n")
-end
-
-def has_untracked_files?(status_lines)
-  status_lines.include?("Untracked files:")
-end
-
-# All untracked files begin with a tab (i.e. - "\tapp/models/model.rb").
-def get_untracked_files(status_lines)
+def get_untracked_files
   `git ls-files --other --exclude-standard`.split("\n")
 end
 
@@ -198,11 +189,11 @@ def check_required_options_for_attributes(scaffolding_type, attributes, child, p
     puts ""
 
     unless @options["skip-migration-generation"]
-      untracked_files = has_untracked_files?(git_status) ? get_untracked_files(git_status) : []
+      untracked_files = get_untracked_files
       generation_thread = Thread.new { `#{generation_command}` }
       generation_thread.join # Wait for the process to finish.
 
-      newly_untracked_files = has_untracked_files?(git_status) ? get_untracked_files(git_status) : []
+      newly_untracked_files = get_untracked_files
       if (newly_untracked_files - untracked_files).size.zero?
         error_message = <<~MESSAGE
           Since you have already created the #{child} model, Super Scaffolding won't allow you to re-create it.

metadata

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