i18n-tasks 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3231dd8c4f3772a49ed9db6862f6d34c9fabed656a1ba3588f2a0d24be158d50
-  data.tar.gz: b5db9e81af6eff9256acf3b84bbbcea4a738c987f0485e04e127eba0236f01fd
+  metadata.gz: 71571170117cb1d0576fb7cbbe9ff289e5726a05366f1470b1fd3cc8442fd49c
+  data.tar.gz: a3d3f5468a9a93543538f6022e41bcaa4bafc65a52a84d6f425dfbbae25d6603
 SHA512:
-  metadata.gz: 601af6d9cf98382b36cb7eebec4672c8918440f63899ef8e91cda798de0685971e331e352420c0f7d3c2f4a5dc056d80f7b0feb1b04e7aa847c69ebd273ff214
-  data.tar.gz: d8e0c5b7bb14a6ab061f60360e869f293b2c608fde5a02f7ebb90495f8c0d0adec69d4665818bd96b2fe6f3c590434aa94ad35462e2777bd9925ac3150aa4273
+  metadata.gz: 40583950dc98e2ef6f7cb3d7af909984d97b68e036b1a6ebcbab51f6dcb627e9d7cf7a42a6feff8be1417b0e4663984311e3b3156c16091747f7857f0e68c8b4
+  data.tar.gz: 025ada2029c316a7ce2a9286ae7dd28a971e628a6adbca6f22aa119579104710cd705ab2b303964997cabfe538b142fb62342a2e18807670f56b02841d792582

data/README.md

@@ -24,7 +24,7 @@ i18n-tasks can be used with any project using the ruby [i18n gem][i18n-gem] (def
 Add i18n-tasks to the Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 1.1.0', group: :development
+gem 'i18n-tasks', '~> 1.1.1', group: :development
 ```
 
 Copy the default [configuration file](#configuration):

data/lib/i18n/tasks/scanners/erb_ast_scanner.rb

@@ -3,7 +3,6 @@
 require "i18n/tasks/scanners/ruby_scanner"
 require "i18n/tasks/scanners/local_ruby_parser"
 require "i18n/tasks/scanners/occurrence_from_position"
-require "prism"
 
 module I18n::Tasks::Scanners
   # Scan for I18n.translate calls in ERB-file using regexp and Parser/Prism
@@ -111,7 +110,8 @@ module I18n::Tasks::Scanners
             path,
             content,
             start + occurrence.pos,
-            raw_key: occurrence.raw_key
+            raw_key: occurrence.raw_key,
+            candidate_keys: occurrence.candidate_keys
           )
         ]
       end
@@ -128,7 +128,8 @@ module I18n::Tasks::Scanners
             path,
             content,
             start + (code.index(key) || occurrence.pos),
-            raw_key: occurrence.raw_key
+            raw_key: occurrence.raw_key,
+            candidate_keys: occurrence.candidate_keys
           )
         ]
       end

data/lib/i18n/tasks/scanners/occurrence_from_position.rb

@@ -11,7 +11,7 @@ module I18n
         # @param contents [String] contents of the file at the path.
         # @param position [Integer] position just before the beginning of the match.
         # @return [Results::Occurrence]
-        def occurrence_from_position(path, contents, position, raw_key: nil)
+        def occurrence_from_position(path, contents, position, raw_key: nil, candidate_keys: nil)
           line_begin = contents.rindex(/^/, position - 1)
           line_end = contents.index(/.(?=\r?\n|$)/, position)
           Results::Occurrence.new(
@@ -20,7 +20,8 @@ module I18n
             line_num: contents[0..position].count("\n") + 1,
             line_pos: position - line_begin + 1,
             line: contents[line_begin..line_end],
-            raw_key: raw_key
+            raw_key: raw_key,
+            candidate_keys: candidate_keys
           )
         end
       end

data/lib/i18n/tasks/scanners/prism_scanners/nodes.rb

@@ -41,6 +41,10 @@ module I18n::Tasks::Scanners::PrismScanners
       rails_view? && !partial_view?
     end
 
+    def support_candidate_keys?
+      false
+    end
+
     def path
       if rails_view?
         folder_path = file_path.sub(%r{app/views/}, "").split("/")
@@ -66,12 +70,13 @@ module I18n::Tasks::Scanners::PrismScanners
     class ScopeError < StandardError; end
     attr_reader(:node, :key, :receiver, :options, :parent)
 
-    def initialize(node:, key:, receiver:, options:, parent:)
+    def initialize(node:, key:, receiver:, options:, parent:, candidate_keys: nil)
       @node = node
       @key = key
       @receiver = receiver
       @options = options
       @parent = parent
+      @candidate_keys = candidate_keys || []
     end
 
     def relative_key?
@@ -110,7 +115,7 @@ module I18n::Tasks::Scanners::PrismScanners
 
       base_parts = [scope].compact
 
-      if relative_key?
+      if relative_key? && support_candidate_keys?
         # For relative keys in controllers/methods, generate candidate keys by
         # progressively stripping trailing path segments from the parent path.
         # Example: parent.path = ["events", "create"], key = ".success"
@@ -127,8 +132,15 @@ module I18n::Tasks::Scanners::PrismScanners
         end
 
         candidates.map { |c| c.gsub("..", ".") }
+      elsif relative_key?
+        # For relative keys in views, just append to the full path
+        [base_parts + parent.path + [key[1..]]].flatten.compact.join(".").gsub("..", ".") # rubocop:disable Performance/ChainArrayAllocation
       elsif key.start_with?(".")
         [base_parts + [key[1..]]].flatten.compact.join(".").gsub("..", ".") # rubocop:disable Performance/ArraySemiInfiniteRangeSlice,Performance/ChainArrayAllocation
+      elsif @candidate_keys.present?
+        ([key] + @candidate_keys).map do |c|
+          [base_parts + [c]].flatten.compact.join(".").gsub("..", ".") # rubocop:disable Performance/ChainArrayAllocation
+        end
       else
         [base_parts + [key]].flatten.compact.join(".").gsub("..", ".") # rubocop:disable Performance/ChainArrayAllocation
       end
@@ -159,16 +171,14 @@ module I18n::Tasks::Scanners::PrismScanners
         pos: location.start_offset,
         line_pos: location.start_column,
         line_num: location.start_line,
-        raw_key: key
+        raw_key: key,
+        candidate_keys: Array(final)
       )
 
       # full_key may be a single String or an Array of candidate strings
       if final.is_a?(Array)
-        # record candidate keys on the occurrence (first candidate is the primary)
-        occurrence.instance_variable_set(:@candidate_keys, final)
         [final.first, occurrence]
       else
-        occurrence.instance_variable_set(:@candidate_keys, [final])
         [final, occurrence]
       end
     rescue ScopeError
@@ -180,6 +190,11 @@ module I18n::Tasks::Scanners::PrismScanners
     def support_relative_keys?
       (parent.is_a?(ParsedMethod) || parent.is_a?(Root)) && parent.support_relative_keys?
     end
+
+    # Not supported for Rails views
+    def support_candidate_keys?
+      support_relative_keys? && parent.support_candidate_keys?
+    end
   end
 
   class ParsedModule < Root
@@ -292,6 +307,10 @@ module I18n::Tasks::Scanners::PrismScanners
       controller? || mailer?
     end
 
+    def support_candidate_keys?
+      controller?
+    end
+
     def path
       (@parent&.path || []) + [path_name]
     end
@@ -323,6 +342,8 @@ module I18n::Tasks::Scanners::PrismScanners
       !@private_method && @parent&.support_relative_keys?
     end
 
+    delegate(:support_candidate_keys?, to: :parent)
+
     def path
       (@parent&.path || []) + [@node.name]
     end

data/lib/i18n/tasks/scanners/prism_scanners/visitor.rb

@@ -95,6 +95,8 @@ module I18n::Tasks::Scanners::PrismScanners
         @current_class&.private_methods!
       when :t, :t!, :translate, :translate!
         args, kwargs = process_arguments(node)
+        # Do not process other receivers than I18n, e.g. Service.translate(:key)
+        return if node.receiver.present? && !i18n_receiver?(node.receiver)
         parent.add_translation_call(
           TranslationCall.new(
             node: node,
@@ -160,6 +162,17 @@ module I18n::Tasks::Scanners::PrismScanners
       end
     end
 
+    def i18n_receiver?(receiver)
+      case receiver.type
+      when :constant_read_node
+        receiver.name == :I18n
+      when :constant_path_node
+        receiver.parent.nil? && receiver.child&.name == :I18n
+      else
+        false
+      end
+    end
+
     # ---- Rails specific methods ----
     # Returns true if the node was handled
     def handle_rails_call_node(node, &)
@@ -268,7 +281,7 @@ module I18n::Tasks::Scanners::PrismScanners
       # We need to check for `node.receiver` since node is the `human` call
       model_name = if current_class.present? && rails_model_method_called_on_current_class?(node.receiver)
         current_class.path.flatten.map!(&:underscore).join(".")
-      elsif node.receiver.present?
+      elsif node.receiver&.receiver&.type == :constant_read_node
         node.receiver&.receiver&.name&.to_s&.underscore
       end
 
@@ -289,6 +302,9 @@ module I18n::Tasks::Scanners::PrismScanners
           node: node,
           receiver: nil,
           key: [:activerecord, :models, model_name, count_key].join("."),
+          candidate_keys: [
+            [:activerecord, :models, model_name].join(".")
+          ],
           parent: parent,
           options: kwargs
         )
@@ -327,6 +343,7 @@ module I18n::Tasks::Scanners::PrismScanners
         TranslationCall.new(
           node: node,
           key: key,
+          candidate_keys: Array([:attributes, array_args.first].join(".")),
           receiver: nil,
           parent: parent,
           options: {}

data/lib/i18n/tasks/scanners/ruby_scanner.rb

@@ -167,7 +167,8 @@ module I18n::Tasks::Scanners
     # Extract all occurrences of translate calls from the file at the given path.
     # @return [Array<[key, Results::KeyOccurrence]>] each occurrence found in the file
     def prism_parse_file(path)
-      process_prism_results(path, Prism.parse_file(path))
+      # Need File.expand_path for JRuby
+      process_prism_results(path, Prism.parse_file(File.expand_path(path)))
     end
 
     # This method handles only parsing to be able to test it properly.

data/lib/i18n/tasks/scanners/scanner_multiplexer.rb

@@ -4,8 +4,6 @@ require "i18n/tasks/scanners/scanner"
 
 module I18n::Tasks::Scanners
   # Run multiple {Scanner Scanners} and merge their results.
-  # @note The scanners are run concurrently. A thread is spawned per each scanner.
-  # @since 0.9.0
   class ScannerMultiplexer < Scanner
     # @param scanners [Array<Scanner>]
     def initialize(scanners:)
@@ -15,29 +13,10 @@ module I18n::Tasks::Scanners
 
     # Collect the results of all the scanners. Occurrences of a key from multiple scanners are merged.
     #
-    # @note The scanners are run concurrently. A thread is spawned per each scanner.
     # @return (see Scanner#keys)
     def keys
-      Results::KeyOccurrences.merge_keys collect_results.flatten(1)
-    end
-
-    private
-
-    # @return [Array<Array<Results::KeyOccurrences>>]
-    def collect_results
-      return [@scanners[0].keys] if @scanners.length == 1
-
-      Array.new(@scanners.length).tap do |results|
-        results_mutex = Mutex.new
-        @scanners.map.with_index do |scanner, i|
-          Thread.start do
-            scanner_results = scanner.keys
-            results_mutex.synchronize do
-              results[i] = scanner_results
-            end
-          end
-        end.each(&:join)
-      end
+      results = @scanners.map(&:keys)
+      Results::KeyOccurrences.merge_keys results.flatten(1)
     end
   end
 end

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - glebm
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-14 00:00:00.000000000 Z
+date: 2025-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport