i18n-tasks 1.1.2 → 1.2.0

data/lib/i18n/tasks/translators/google_translator.rb

@@ -60,6 +60,36 @@ module I18n::Tasks::Translators
       {format: "text"}
     end
 
+    # Batches pairs by the request limits so a failed request only skips its own keys.
+    # A single pair can exceed the limits (e.g. a large array value), see #batch_texts.
+    def translation_batches(list, options)
+      batches = []
+      current_batch = []
+      current_text_count = 0
+      current_chars = 0
+
+      list.each do |pair|
+        pair_values = replace_newlines_with_placeholder(to_values([pair], options))
+        pair_text_count = pair_values.size
+        pair_chars = pair_values.sum(&:length)
+
+        if (current_text_count + pair_text_count > MAX_TEXTS_PER_REQUEST ||
+            current_chars + pair_chars > MAX_CHARS_PER_REQUEST) && current_batch.any?
+          batches << current_batch
+          current_batch = []
+          current_text_count = 0
+          current_chars = 0
+        end
+
+        current_batch << pair
+        current_text_count += pair_text_count
+        current_chars += pair_chars
+      end
+
+      batches << current_batch if current_batch.any?
+      batches
+    end
+
     def no_results_error_message
       I18n.t("i18n_tasks.google_translate.errors.no_results")
     end
@@ -116,25 +146,23 @@ module I18n::Tasks::Translators
 
       raise ArgumentError, "target language (:to) is required" if to.nil? || to.empty?
 
-      # Split into batches if needed
-      batches = batch_texts(texts)
-
-      batches.flat_map do |batch|
+      batch_texts(texts).flat_map do |batch|
         translate_batch(texts: batch, api_key:, to:, from:, html:)
       end
     end
 
+    # Splits texts to stay within the request limits. Needed because #translation_batches
+    # cannot split a single pair, as its translated values are mapped back to it.
     def batch_texts(texts)
       batches = []
       current_batch = []
       current_chars = 0
 
       texts.each do |text|
-        text_length = text.to_s.length
+        text_length = text.length
 
-        # If adding this text would exceed limits, start new batch
-        if current_batch.size >= MAX_TEXTS_PER_REQUEST ||
-            (current_chars + text_length > MAX_CHARS_PER_REQUEST && current_batch.any?)
+        if (current_batch.size >= MAX_TEXTS_PER_REQUEST ||
+            current_chars + text_length > MAX_CHARS_PER_REQUEST) && current_batch.any?
           batches << current_batch
           current_batch = []
           current_chars = 0
@@ -169,18 +197,17 @@ module I18n::Tasks::Translators
     end
 
     def make_request(uri, body)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      http.read_timeout = 60
-      http.open_timeout = 30
-
       request = Net::HTTP::Post.new(uri.request_uri)
       request["Content-Type"] = "application/json"
       request["Accept"] = "application/json"
       request["User-Agent"] = "i18n-tasks/GoogleTranslateApi"
       request.body = JSON.generate(body)
 
-      response = http.request(request)
+      # An explicit `start` block is required: on JRuby, implicit connections intermittently fail with
+      # "closing inbound before receiving peer's close_notify" when reading Google's response.
+      response = Net::HTTP.start(uri.host, uri.port, use_ssl: true, read_timeout: 60, open_timeout: 30) do |http|
+        http.request(request)
+      end
 
       handle_error_response(response) unless response.is_a?(Net::HTTPSuccess)
       response

data/lib/i18n/tasks/translators/openai_translator.rb

@@ -50,6 +50,10 @@ module I18n::Tasks::Translators
       {}
     end
 
+    def translation_batches(list, _options)
+      list.each_slice(BATCH_SIZE).to_a
+    end
+
     def no_results_error_message
       I18n.t("i18n_tasks.openai_translate.errors.no_results")
     end
@@ -77,6 +81,10 @@ module I18n::Tasks::Translators
       @temperature ||= @i18n_tasks.translation_config[:openai_temperature].presence || 0.0
     end
 
+    def reasoning_effort
+      @i18n_tasks.translation_config[:openai_reasoning_effort].presence
+    end
+
     def system_prompt(to_locale)
       prompt = if locale_prompts[to_locale].present?
         locale_prompts[to_locale]
@@ -92,27 +100,33 @@ module I18n::Tasks::Translators
     end
 
     def translate_values(list, from:, to:)
-      results = []
-
-      list.each_slice(BATCH_SIZE) do |batch|
-        result = translate(batch, from, to)
-        results << result
-
-        @progress_bar.progress += result.size
-      end
+      return [] if list.empty?
 
-      results.flatten
+      result = translate(list, from, to)
+      @progress_bar.progress += result.size
+      result
     end
 
     def translate(values, from, to)
-      response = translator.chat(
-        parameters: {
-          model: model,
-          messages: build_messages(values, from, to),
-          temperature: temperature,
-          response_format: {type: "json_object"}
-        }
-      )
+      effort = reasoning_effort
+      parameters = {
+        model: model,
+        messages: build_messages(values, from, to),
+        response_format: {type: "json_object"}
+      }
+
+      parameters[:reasoning_effort] = effort if effort
+
+      if effort && effort != "none"
+        if @i18n_tasks.translation_config[:openai_temperature].present?
+          fail ::I18n::Tasks::CommandError,
+            "openai_temperature is not supported when openai_reasoning_effort is #{effort}"
+        end
+      else
+        parameters[:temperature] = temperature
+      end
+
+      response = translator.chat(parameters: parameters)
 
       translations = response.dig("choices", 0, "message", "content")
       error = response["error"]

data/lib/i18n/tasks/translators/watsonx_translator.rb

@@ -39,6 +39,10 @@ module I18n::Tasks::Translators
       {}
     end
 
+    def translation_batches(list, _options)
+      list.each_slice(BATCH_SIZE).to_a
+    end
+
     def no_results_error_message
       I18n.t("i18n_tasks.watsonx_translate.errors.no_results")
     end
@@ -79,17 +83,11 @@ module I18n::Tasks::Translators
     end
 
     def translate_values(list, from:, to:)
-      results = []
-
-      list.each_slice(BATCH_SIZE) do |batch|
-        translations = translate(batch, from, to)
-        result = JSON.parse(translations)
-        results << result
-
-        @progress_bar.progress += results.size
-      end
+      return [] if list.empty?
 
-      results.flatten
+      result = JSON.parse(translate(list, from, to))
+      @progress_bar.progress += result.size
+      result
     end
 
     def translate(values, from, to)

data/lib/i18n/tasks/translators/yandex_translator.rb

@@ -38,6 +38,10 @@ module I18n::Tasks::Translators
       {format: "plain"}
     end
 
+    def translation_batches(list, _options)
+      list.each_slice(1).to_a
+    end
+
     def no_results_error_message
       I18n.t("i18n_tasks.yandex_translate.errors.no_results")
     end

data/lib/i18n/tasks/unused_keys.rb

@@ -7,19 +7,49 @@ module I18n
     module UnusedKeys
       def unused_keys(locales: nil, strict: nil)
         locales = Array(locales).presence || self.locales
-        locales.map { |locale| unused_tree(locale: locale, strict: strict) }.compact.reduce(:merge!)
+        strict = strict?(strict)
+        return unused_forest(locales, strict: strict) if strict
+
+        # `used_in_expr?` scans the source again, non-strictly
+        parse_cache.retain { unused_forest(locales, strict: strict) }
       end
 
       # @param [String] locale
-      # @param [Boolean] strict if true, do not match dynamic keys
-      def unused_tree(locale: base_locale, strict: nil)
-        used_key_names = used_tree(strict: true).key_names
+      # @param [Boolean, nil] strict if true, do not match dynamic keys. Defaults to `search.strict`.
+      def unused_tree(locale: base_locale, strict: nil, used_key_names: nil)
+        strict = strict?(strict)
+        used_key_names ||= used_tree(strict: true).key_names.to_set
         collapse_plural_nodes!(data[locale].select_keys do |key, _node|
           !ignore_key?(key, :unused) &&
             (strict || !used_in_expr?(key)) &&
-            !used_key_names.include?(depluralize_key(key, locale))
+            !key_used?(depluralize_key(key, locale), used_key_names)
         end)
       end
+
+      private
+
+      def unused_forest(locales, strict:)
+        used_key_names = used_tree(strict: true).key_names.to_set
+        locales.map { |locale| unused_tree(locale: locale, strict: strict, used_key_names: used_key_names) }.compact.reduce(:merge!)
+      end
+
+      # A key is considered used if it is directly used, or if one of its ancestors is used
+      # (e.g. `t(:section)` covers `section.item.title`).
+      def key_used?(key, used_key_names)
+        return true if used_key_names.include?(key)
+
+        ancestor = key
+        loop do
+          next_ancestor = ancestor.sub(/\.[^.]+\z/, "")
+          break if next_ancestor == ancestor
+
+          return true if used_key_names.include?(next_ancestor)
+
+          ancestor = next_ancestor
+        end
+
+        false
+      end
     end
   end
 end

data/lib/i18n/tasks/used_keys.rb

@@ -81,7 +81,8 @@ module I18n::Tasks
             ActiveSupport::Inflector.constantize(class_name).new(
               config: merge_scanner_configs(shared_options, args || {}),
               file_finder_provider: caching_file_finder_provider,
-              file_reader: caching_file_reader
+              file_reader: caching_file_reader,
+              parse_cache: parse_cache
             )
           end.tap { |scanners| log_verbose { scanners.map { |s| "  #{s.class.name} #{s.config.inspect}" } * "\n" } }
         )
@@ -123,6 +124,10 @@ module I18n::Tasks
       @caching_file_finder_provider ||= Scanners::Files::CachingFileFinderProvider.new(exclude: ALWAYS_EXCLUDE)
     end
 
+    def parse_cache
+      @parse_cache ||= Scanners::Files::ParseCache.new
+    end
+
     def caching_file_reader
       @caching_file_reader ||= Scanners::Files::CachingFileReader.new
     end

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = "1.1.2"
+    VERSION = "1.2.0"
   end
 end

data/script/report_test_results.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require "rexml/document"
+
+def escape_property(value)
+  value.gsub("%", "%25").gsub("\r", "%0D").gsub("\n", "%0A").gsub(":", "%3A").gsub(",", "%2C")
+end
+
+def escape_data(value)
+  value.gsub("%", "%25").gsub("\r", "%0D").gsub("\n", "%0A")
+end
+
+reports = Dir.glob(File.join(ARGV.fetch(0, "test-results"), "**", "*.xml")).sort
+summary = ["## RSpec results", ""]
+
+if reports.empty?
+  summary << "No JUnit reports were uploaded."
+  puts "::warning::No JUnit reports were uploaded."
+else
+  summary << "| Ruby | Tests | Failures | Errors | Skipped |"
+  summary << "| --- | ---: | ---: | ---: | ---: |"
+
+  reports.each do |report|
+    ruby_version = File.basename(File.dirname(report)).delete_prefix("test-results-")
+    document = REXML::Document.new(File.read(report))
+    cases = []
+    document.elements.each("//testcase") { |test_case| cases << test_case }
+
+    failed = cases.count { |test_case| test_case.elements["failure"] }
+    errors = cases.count { |test_case| test_case.elements["error"] }
+    skipped = cases.count { |test_case| test_case.elements["skipped"] }
+    summary << "| #{ruby_version} | #{cases.size} | #{failed} | #{errors} | #{skipped} |"
+
+    cases.each do |test_case|
+      %w[failure error].each do |result|
+        issue = test_case.elements[result]
+        next unless issue
+
+        name = [test_case.attributes["classname"], test_case.attributes["name"]].compact.join(" ")
+        message = [issue.attributes["message"], issue.text].compact.reject(&:empty?).join(": ")
+        location = test_case.attributes["file"]
+        details = "#{ruby_version}: #{name} - #{message}"
+        summary << "- **#{ruby_version}** `#{name}`: #{message.to_s.gsub("\n", " ")}"
+
+        properties = ["title=RSpec #{result}"]
+        properties << "file=#{location}" if location
+        escaped_properties = properties.map { |property| escape_property(property) }.join(",")
+        puts "::error #{escaped_properties}::#{escape_data(details)}"
+      end
+    end
+  end
+end
+
+if (summary_path = ENV["GITHUB_STEP_SUMMARY"])
+  File.open(summary_path, "a") { |file| file.puts(summary.join("\n")) }
+else
+  puts summary.join("\n")
+end

data/templates/config/i18n-tasks.yml

@@ -13,7 +13,9 @@ data:
   ## Provide a custom adapter:
   # adapter: I18n::Tasks::Data::FileSystem
 
-  # Locale files or `Dir.glob` patterns where translations are read from:
+  # Locale files or `Dir.glob` patterns where translations are read from.
+  # When a key is defined in several files, the file read last wins: patterns are read in order,
+  # and the files matching a pattern in the order `Dir.glob` returns them.
   read:
     ## Default:
     # - config/locales/%{locale}.yml
@@ -115,8 +117,7 @@ search:
 #   # deepl_host: "https://api.deepl.com"
 #   # deepl_version: "v2"
 #   # deepl_glossary_ids:
-#   #   - f28106eb-0e06-489e-82c6-8215d6f95089
-#   #   - 2c6415be-1852-4f54-9e1b-d800463496b4
+#   #   - uuid
 #   # add additional options to the DeepL.translate call: https://www.deepl.com/docs-api/translate-text/translate-text/
 #   deepl_options:
 #     formality: prefer_less
@@ -153,6 +154,13 @@ search:
 # - 'errors.messages.{accepted,blank,invalid,too_short,too_long}'
 # - '{devise,simple_form}.*'
 
+## Alternatively, ignore missing keys per locale (just like ignore_eq_base):
+# ignore_missing:
+#   all:
+#     - 'errors.messages.{accepted,blank,invalid,too_short,too_long}'
+#   fr,es:
+#     - '{devise,simple_form}.*'
+
 ## Consider these keys used:
 # ignore_unused:
 # - 'activerecord.attributes.*'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - glebm
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,14 +99,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.28'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +190,14 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmarks/bench_helper.rb
+- benchmarks/data_bench.rb
+- benchmarks/end_to_end_bench.rb
+- benchmarks/fixtures/generator.rb
+- benchmarks/results/baseline.json
+- benchmarks/run_all.rb
+- benchmarks/scanning_bench.rb
+- benchmarks/tree_bench.rb
 - bin/i18n-tasks
 - bin/i18n-tasks.cmd
 - config/locales/en.yml
@@ -208,6 +215,7 @@ files:
 - lib/i18n/tasks/command/commands/interpolations.rb
 - lib/i18n/tasks/command/commands/meta.rb
 - lib/i18n/tasks/command/commands/missing.rb
+- lib/i18n/tasks/command/commands/prune.rb
 - lib/i18n/tasks/command/commands/tree.rb
 - lib/i18n/tasks/command/commands/usages.rb
 - lib/i18n/tasks/command/dsl.rb
@@ -245,6 +253,7 @@ files:
 - lib/i18n/tasks/logging.rb
 - lib/i18n/tasks/missing_keys.rb
 - lib/i18n/tasks/plural_keys.rb
+- lib/i18n/tasks/prune.rb
 - lib/i18n/tasks/references.rb
 - lib/i18n/tasks/reports/base.rb
 - lib/i18n/tasks/reports/terminal.rb
@@ -259,6 +268,7 @@ files:
 - lib/i18n/tasks/scanners/files/caching_file_reader.rb
 - lib/i18n/tasks/scanners/files/file_finder.rb
 - lib/i18n/tasks/scanners/files/file_reader.rb
+- lib/i18n/tasks/scanners/files/parse_cache.rb
 - lib/i18n/tasks/scanners/local_ruby_parser.rb
 - lib/i18n/tasks/scanners/occurrence_from_position.rb
 - lib/i18n/tasks/scanners/pattern_mapper.rb
@@ -289,6 +299,7 @@ files:
 - lib/i18n/tasks/unused_keys.rb
 - lib/i18n/tasks/used_keys.rb
 - lib/i18n/tasks/version.rb
+- script/report_test_results.rb
 - templates/config/i18n-tasks.yml
 - templates/minitest/i18n_test.rb
 - templates/rspec/i18n_spec.rb
@@ -321,8 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 4.0.22
 specification_version: 4
 summary: Manage localization and translation with the awesome power of static analysis
 test_files: []