bullet_train-super_scaffolding 1.6.17 → 1.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab9f39b31aacb0b95619b04fb4b3a32fef367608f8eb4115588dbaf596711c60
-  data.tar.gz: a1be9b35f77dfc9871e3909c653d59806519fcc08de8b6a9904a1721348b5b99
+  metadata.gz: eafd70da2079b3901c1d863670e76da7058d10eec9aa25158b7b60bfb6599b98
+  data.tar.gz: 5ee1b5f7fcadae48a99923d5228408cee0d80ce69990907e5882ba234e71505d
 SHA512:
-  metadata.gz: 5e8cdceb4b5c68cd44d3425fa499f3f132eb51da96c867dd828c6374f8743e6fc3e1b4ccb78cba391fa8d197fd3bf87bcea87d8209976c1f8d7898dcd69f94af
-  data.tar.gz: '099142a8e33347d3c506c40780a65f376295d92ba58231beea2b63fe3a4da71766d44fe894002ecb55e941ebaef769818b56ca2ad07183f35ac17d052f8a99a3'
+  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.17"
+    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

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.17
+  version: 1.6.19
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-20 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard