i18n-tasks 1.0.14 → 1.1.0

data/lib/i18n/tasks/data/router/isolating_router.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'i18n/tasks/key_pattern_matching'
-require 'i18n/tasks/data/tree/node'
+require "i18n/tasks/key_pattern_matching"
+require "i18n/tasks/data/tree/node"
 
 module I18n::Tasks
   module Data::Router
@@ -52,11 +52,11 @@ module I18n::Tasks
         source_path = source_path.dup
 
         config_read_patterns.each do |pattern|
-          regexp = Glob.new(format(pattern, locale: '(*)')).to_regexp
+          regexp = Glob.new(format(pattern, locale: "(*)")).to_regexp
           next unless source_path.match?(regexp)
 
           source_path.match(regexp) do |match_data|
-            (1..match_data.size - 1).reverse_each do |capture_index|
+            (1..(match_data.size - 1)).reverse_each do |capture_index|
               capture_begin, capture_end = match_data.offset(capture_index)
               source_path.slice!(Range.new(capture_begin, capture_end, true))
               source_path.insert(capture_begin, locale.to_s)
@@ -92,29 +92,29 @@ module I18n::Tasks
             end
 
             case char
-            when '**' then '(?:[^/]+/)*'
-            when '*' then '.*'
-            when '?' then '.'
-            when '.' then '\.'
-            when '{'
+            when "**" then "(?:[^/]+/)*"
+            when "*" then ".*"
+            when "?" then "."
+            when "." then '\.'
+            when "{"
               curlies += 1
-              '('
-            when '}'
+              "("
+            when "}"
               if curlies.positive?
                 curlies -= 1
-                ')'
+                ")"
               else
                 char
               end
-            when ','
+            when ","
               if curlies.positive?
-                '|'
+                "|"
               else
                 char
               end
-            when '\\'
+            when "\\"
               escaping = true
-              '\\'
+              "\\"
             else char
             end
           end.join
@@ -130,10 +130,10 @@ module I18n::Tasks
           out = []
           until chars.empty?
             char = chars.shift
-            if char == '*' && chars.first == '*'
+            if char == "*" && chars.first == "*"
               chars.shift
-              chars.shift if chars.first == '/'
-              out.push('**')
+              chars.shift if chars.first == "/"
+              out.push("**")
             else
               out.push(char)
             end

data/lib/i18n/tasks/data/router/pattern_router.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'i18n/tasks/key_pattern_matching'
-require 'i18n/tasks/data/tree/node'
+require "i18n/tasks/key_pattern_matching"
+require "i18n/tasks/data/tree/node"
 
 module I18n::Tasks
   module Data::Router
@@ -37,7 +37,7 @@ module I18n::Tasks
           pattern, path = routes.detect { |route| route[0] =~ key }
           if pattern
             key_match = $~
-            path      = format(path, locale: locale)
+            path = format(path, locale: locale)
             path.gsub!(/\\\d+/) { |m| key_match[m[1..].to_i] }
             (out[path] ||= Set.new) << "#{locale}.#{key}"
           else
@@ -46,14 +46,14 @@ module I18n::Tasks
         end
         out.each do |dest, keys|
           block.yield dest,
-                      forest.select_keys(root: true) { |key, _| keys.include?(key) }
+            forest.select_keys(root: true) { |key, _| keys.include?(key) }
         end
       end
 
       private
 
       def compile_routes(routes)
-        routes.map { |x| x.is_a?(String) ? ['*', x] : x }.map do |x|
+        routes.map { |x| x.is_a?(String) ? ["*", x] : x }.map do |x|
           [compile_key_pattern(x[0]), x[1]]
         end
       end

data/lib/i18n/tasks/data/tree/node.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'i18n/tasks/data/tree/traversal'
-require 'i18n/tasks/data/tree/siblings'
+require "i18n/tasks/data/tree/traversal"
+require "i18n/tasks/data/tree/siblings"
 module I18n::Tasks::Data::Tree
   class Node # rubocop:disable Metrics/ClassLength
     include Enumerable
@@ -23,26 +23,26 @@ module I18n::Tasks::Data::Tree
     # rubocop:enable Metrics/ParameterLists
 
     def attributes
-      { key: @key, value: @value, data: @data.try(:clone), parent: @parent, children: @children }
+      {key: @key, value: @value, data: @data.try(:clone), parent: @parent, children: @children}
     end
 
     def derive(new_attr = {})
-      self.class.new(**attributes.merge(new_attr))
+      self.class.new(**attributes, **new_attr)
     end
 
     def children=(children)
       @children = case children
-                  when Siblings
-                    children.parent == self ? children : children.derive(parent: self)
-                  when NilClass
-                    nil
-                  else
-                    Siblings.new(
-                      nodes: children,
-                      parent: self,
-                      warn_about_add_children_to_leaf: @warn_about_add_children_to_leaf
-                    )
-                  end
+      when Siblings
+        (children.parent == self) ? children : children.derive(parent: self)
+      when NilClass
+        nil
+      else
+        Siblings.new(
+          nodes: children,
+          parent: self,
+          warn_about_add_children_to_leaf: @warn_about_add_children_to_leaf
+        )
+      end
       dirty!
     end
 
@@ -90,7 +90,7 @@ module I18n::Tasks::Data::Tree
       children.get(key)
     end
 
-    alias [] get
+    alias_method :[], :get
 
     # append and reparent nodes
     def append!(nodes)
@@ -138,7 +138,7 @@ module I18n::Tasks::Data::Tree
       node
     end
 
-    alias []= set
+    alias_method :[]=, :set
 
     def to_nodes
       Nodes.new([self])
@@ -154,9 +154,9 @@ module I18n::Tasks::Data::Tree
         if key.nil?
           children_hash
         elsif leaf?
-          { key => value }
+          {key => value}
         else
-          { key => children_hash }
+          {key => children_hash}
         end
       end
     end
@@ -166,18 +166,18 @@ module I18n::Tasks::Data::Tree
 
     def inspect(level = 0)
       label = if key.nil?
-                Rainbow('∅').faint
-              else
-                [Rainbow(key).color(1 + (level % 15)),
-                 (": #{format_value_for_inspect(value)}" if leaf?),
-                 (" #{data}" if data?)].compact.join
-              end
-      ['  ' * level, label, ("\n#{children.map { |c| c.inspect(level + 1) }.join("\n")}" if children?)].compact.join
+        Rainbow("∅").faint
+      else
+        [Rainbow(key).color(1 + (level % 15)),
+          (": #{format_value_for_inspect(value)}" if leaf?),
+          (" #{data}" if data?)].compact.join
+      end
+      ["  " * level, label, ("\n#{children.map { |c| c.inspect(level + 1) }.join("\n")}" if children?)].compact.join
     end
 
     def format_value_for_inspect(value)
       if value.is_a?(Symbol)
-        "#{Rainbow('⮕ ').bright.yellow}#{Rainbow(value).yellow}"
+        "#{Rainbow("⮕ ").bright.yellow}#{Rainbow(value).yellow}"
       else
         Rainbow(value).cyan
       end

data/lib/i18n/tasks/data/tree/nodes.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'i18n/tasks/data/tree/traversal'
+require "i18n/tasks/data/tree/traversal"
 module I18n::Tasks::Data::Tree
   # A list of nodes
   class Nodes
@@ -20,7 +20,7 @@ module I18n::Tasks::Data::Tree
     end
 
     def attributes
-      { nodes: @list }
+      {nodes: @list}
     end
 
     def derive(new_attr = {})
@@ -32,10 +32,10 @@ module I18n::Tasks::Data::Tree
 
     def to_hash(sort = false)
       (@hash ||= {})[sort] ||= if sort
-                                 sort_by(&:key)
-                               else
-                                 self
-                               end.map { |node| node.to_hash(sort) }.reduce({}, :deep_merge!)
+        sort_by(&:key)
+      else
+        self
+      end.map { |node| node.to_hash(sort) }.reduce({}, :deep_merge!)
     end
 
     delegate :to_json, to: :to_hash
@@ -45,7 +45,7 @@ module I18n::Tasks::Data::Tree
       if present?
         map(&:inspect) * "\n"
       else
-        Rainbow('{∅}').faint
+        Rainbow("{∅}").faint
       end
     end
 
@@ -67,14 +67,14 @@ module I18n::Tasks::Data::Tree
       derive.append!(other)
     end
 
-    alias << append
+    alias_method :<<, :append
 
     def merge!(nodes)
       @list += nodes.to_a
       dirty!
       self
     end
-    alias + merge!
+    alias_method :+, :merge!
 
     def children(&block)
       return to_enum(:children) { map { |c| c.children ? c.children.size : 0 }.reduce(:+) } unless block
@@ -84,7 +84,7 @@ module I18n::Tasks::Data::Tree
       end
     end
 
-    alias children? any?
+    alias_method :children?, :any?
 
     protected
 

data/lib/i18n/tasks/data/tree/siblings.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'set'
-require 'i18n/tasks/split_key'
-require 'i18n/tasks/data/tree/nodes'
+require "set"
+require "i18n/tasks/split_key"
+require "i18n/tasks/data/tree/nodes"
 
 module I18n::Tasks::Data::Tree
   # Siblings represents a subtree sharing a common parent
@@ -17,7 +17,7 @@ module I18n::Tasks::Data::Tree
     def initialize(opts = {})
       super(nodes: opts[:nodes])
       @parent = opts[:parent] || first.try(:parent)
-      @list.map! { |node| node.parent == @parent ? node : node.derive(parent: @parent) }
+      @list.map! { |node| (node.parent == @parent) ? node : node.derive(parent: @parent) }
       @key_to_node = @list.each_with_object({}) { |node, h| h[node.key] = node }
       @warn_about_add_children_to_leaf = opts.fetch(:warn_about_add_children_to_leaf, true)
     end
@@ -52,7 +52,7 @@ module I18n::Tasks::Data::Tree
           new_key = to_pattern.gsub(/\\\d+/) { |m| match[m[1..].to_i] }
           old_key_to_new_key[full_key] = new_key
           moved_forest.merge!(Siblings.new.tap do |forest|
-            forest[[(node.root.try(:key) unless root), new_key].compact.join('.')] =
+            forest[[(node.root.try(:key) unless root), new_key].compact.join(".")] =
               node.derive(key: split_key(new_key).last)
           end)
         end
@@ -62,10 +62,10 @@ module I18n::Tasks::Data::Tree
       nodes do |node|
         next unless node.reference?
 
-        old_target = [(node.root.key if root), node.value.to_s].compact.join('.')
+        old_target = [(node.root.key if root), node.value.to_s].compact.join(".")
         new_target = old_key_to_new_key[old_target]
         if new_target
-          new_target = new_target.sub(/\A[^.]*\./, '') if root
+          new_target = new_target.sub(/\A[^.]*\./, "") if root
           node.value = new_target.to_sym
         end
       end
@@ -75,26 +75,26 @@ module I18n::Tasks::Data::Tree
     end
 
     def replace_node!(node, new_node)
-      @list[@list.index(node)]  = new_node
+      @list[@list.index(node)] = new_node
       key_to_node[new_node.key] = new_node
     end
 
     # @return [Node] by full key
     def get(full_key)
       first_key, rest = split_key(full_key.to_s, 2)
-      node            = key_to_node[first_key]
+      node = key_to_node[first_key]
       node = node.children.try(:get, rest) if rest && node
       node
     end
 
-    alias [] get
+    alias_method :[], :get
 
     # add or replace node by full key
     def set(full_key, node)
-      fail 'value should be a I18n::Tasks::Data::Tree::Node' unless node.is_a?(Node)
+      fail "value should be a I18n::Tasks::Data::Tree::Node" unless node.is_a?(Node)
 
       key_part, rest = split_key(full_key, 2)
-      child          = key_to_node[key_part]
+      child = key_to_node[key_part]
 
       if rest
         unless child
@@ -119,7 +119,7 @@ module I18n::Tasks::Data::Tree
       node
     end
 
-    alias []= set
+    alias_method :[]=, :set
 
     # methods below change state
 
@@ -133,9 +133,9 @@ module I18n::Tasks::Data::Tree
       nodes = nodes.map do |node|
         fail "already has a child with key '#{node.key}'" if key_to_node.key?(node.key)
 
-        key_to_node[node.key] = (node.parent == parent ? node : node.derive(parent: parent))
+        key_to_node[node.key] = ((node.parent == parent) ? node : node.derive(parent: parent))
       end
-      super(nodes)
+      super
       self
     end
 
@@ -267,7 +267,7 @@ module I18n::Tasks::Data::Tree
           key_occurrences.each do |key_occurrence|
             forest[key_occurrence.key] = ::I18n::Tasks::Data::Tree::Node.new(
               key: split_key(key_occurrence.key).last,
-              data: { occurrences: key_occurrence.occurrences }
+              data: {occurrences: key_occurrence.occurrences}
             )
           end
         end
@@ -276,9 +276,9 @@ module I18n::Tasks::Data::Tree
       def from_key_attr(key_attrs, opts = {}, &block)
         build_forest(opts) do |forest|
           key_attrs.each do |(full_key, attr)|
-            fail "Invalid key #{full_key.inspect}" if full_key.end_with?('.')
+            fail "Invalid key #{full_key.inspect}" if full_key.end_with?(".")
 
-            node = ::I18n::Tasks::Data::Tree::Node.new(**attr.merge(key: split_key(full_key).last))
+            node = ::I18n::Tasks::Data::Tree::Node.new(**attr, key: split_key(full_key).last)
             yield(full_key, node) if block
             forest[full_key] = node
           end
@@ -305,7 +305,7 @@ module I18n::Tasks::Data::Tree
         Siblings.new(opts)
       end
 
-      alias [] from_nested_hash
+      alias_method :[], :from_nested_hash
 
       # build forest from [[Full Key, Value]]
       def from_flat_pairs(pairs)
@@ -323,7 +323,7 @@ module I18n::Tasks::Data::Tree
         opts[:parent] = ::I18n::Tasks::Data::Tree::Node.new(opts[:parent_attr]) if opts[:parent_attr]
         if opts[:parent_locale]
           opts[:parent] = ::I18n::Tasks::Data::Tree::Node.new(
-            key: opts[:parent_locale], data: { locale: opts[:parent_locale] }
+            key: opts[:parent_locale], data: {locale: opts[:parent_locale]}
           )
         end
       end

data/lib/i18n/tasks/data/tree/traversal.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'set'
+require "set"
 
 module I18n::Tasks
   module Data::Tree
     # Any Enumerable that yields nodes can mix in this module
     module Traversal # rubocop:disable Metrics/ModuleLength
-      def nodes(&block)
-        depth_first(&block)
+      def nodes(&)
+        depth_first(&)
       end
 
       def leaves(&visitor)
@@ -76,13 +76,13 @@ module I18n::Tasks
 
       def root_key_values(sort = false)
         result = keys(root: false).map { |key, node| [node.root.key, key, node.value] }
-        result.sort! { |a, b| a[0] == b[0] ? a[1] <=> b[1] : a[0] <=> b[0] } if sort
+        result.sort! { |a, b| (a[0] == b[0]) ? a[1] <=> b[1] : a[0] <=> b[0] } if sort
         result
       end
 
       def root_key_value_data(sort = false)
         result = keys(root: false).map { |key, node| [node.root.key, key, node.value, node.data] }
-        result.sort! { |a, b| a[0] == b[0] ? a[1] <=> b[1] : a[0] <=> b[0] } if sort
+        result.sort! { |a, b| (a[0] == b[0]) ? a[1] <=> b[1] : a[0] <=> b[0] } if sort
         result
       end
 

data/lib/i18n/tasks/data.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'i18n/tasks/data/file_system'
+require "i18n/tasks/data/file_system"
 
 module I18n::Tasks
   module Data
     DATA_DEFAULTS = {
-      adapter: 'I18n::Tasks::Data::FileSystem'
+      adapter: "I18n::Tasks::Data::FileSystem"
     }.freeze
 
     # I18n data provider
@@ -17,7 +17,7 @@ module I18n::Tasks
         data_config[:locales] = config[:locales]
         adapter_class = data_config[:adapter].presence || data_config[:class].presence || DATA_DEFAULTS[:adapter]
         adapter_class = adapter_class.to_s
-        adapter_class = 'I18n::Tasks::Data::FileSystem' if adapter_class == 'file_system'
+        adapter_class = "I18n::Tasks::Data::FileSystem" if adapter_class == "file_system"
         data_config.except!(:adapter, :class)
         ActiveSupport::Inflector.constantize(adapter_class).new data_config
       end
@@ -50,7 +50,7 @@ module I18n::Tasks
     end
 
     def t_proc(locale = base_locale)
-      @t_proc         ||= {}
+      @t_proc ||= {}
       @t_proc[locale] ||= proc { |key| t(key, locale) }
     end
 

data/lib/i18n/tasks/html_keys.rb

@@ -2,8 +2,8 @@
 
 module I18n::Tasks
   module HtmlKeys
-    HTML_KEY_PATTERN = /[.\-_]html\z/.freeze
-    MAYBE_PLURAL_HTML_KEY_PATTERN = /[.\-_]html\.[^.]+\z/.freeze
+    HTML_KEY_PATTERN = /[.\-_]html\z/
+    MAYBE_PLURAL_HTML_KEY_PATTERN = /[.\-_]html\.[^.]+\z/
 
     def html_key?(full_key, locale)
       !!(full_key =~ HTML_KEY_PATTERN ||

data/lib/i18n/tasks/ignore_keys.rb

@@ -12,19 +12,19 @@ module I18n::Tasks::IgnoreKeys
   # @param locale [String] only when type is :eq_base
   # @return [Regexp] a regexp that matches all the keys ignored for the type (and locale)
   def ignore_pattern(type, locale = nil)
-    @ignore_patterns              ||= HashWithIndifferentAccess.new
-    @ignore_patterns[type]        ||= {}
+    @ignore_patterns ||= HashWithIndifferentAccess.new
+    @ignore_patterns[type] ||= {}
     @ignore_patterns[type][locale] ||= begin
       global = ignore_config.presence || []
       type_ignore = ignore_config(type).presence || []
       patterns = case type_ignore
-                 when Array
-                   global + type_ignore
-                 when Hash
-                   # ignore per locale
-                   global + (type_ignore['all'] || []) +
-                   type_ignore.select { |k, _v| k.to_s =~ /\b#{locale}\b/ }.values.flatten(1).compact
-                 end
+      when Array
+        global + type_ignore
+      when Hash
+        # ignore per locale
+        global + (type_ignore["all"] || []) +
+          type_ignore.select { |k, _v| k.to_s =~ /\b#{locale}\b/ }.values.flatten(1).compact
+      end
       compile_patterns_re patterns
     end
   end

data/lib/i18n/tasks/interpolations.rb

@@ -5,7 +5,7 @@ module I18n::Tasks
     class << self
       attr_accessor :variable_regex
     end
-    @variable_regex = /(?<!%)%{[^}]+}/.freeze
+    @variable_regex = /(?<!%)%{[^}]+}/
 
     def inconsistent_interpolations(locales: nil, base_locale: nil) # rubocop:disable Metrics/AbcSize
       locales ||= self.locales
@@ -30,5 +30,25 @@ module I18n::Tasks
       result.each { |root| root.data[:type] = :inconsistent_interpolations }
       result
     end
+
+    def reserved_interpolations(locales: nil)
+      locales ||= self.locales
+      result = empty_forest
+
+      locales.each do |current_locale|
+        data[current_locale].key_values.each do |key, value|
+          next unless value.is_a?(String)
+
+          reserved_variables = value.scan(::I18n.reserved_keys_pattern).flatten
+          next if reserved_variables.empty?
+
+          result.merge!(data[current_locale].first.children[key].walk_to_root.reduce(nil) do |c, p|
+            [p.derive(children: c, value: reserved_variables)]
+          end)
+        end
+      end
+      result.each { |root| root.data[:type] = :inconsistent_interpolations }
+      result
+    end
   end
 end

data/lib/i18n/tasks/key_pattern_matching.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'strscan'
+require "strscan"
 
 module I18n::Tasks::KeyPatternMatching
   extend self # rubocop:disable Style/ModuleFunction
 
-  MATCH_NOTHING = /\z\A/.freeze
+  MATCH_NOTHING = /\z\A/
 
   # one regex to match any
   def compile_patterns_re(key_patterns)
@@ -13,7 +13,7 @@ module I18n::Tasks::KeyPatternMatching
       # match nothing
       MATCH_NOTHING
     else
-      /(?:#{key_patterns.map { |p| compile_key_pattern p } * '|'})/m
+      /(?:#{key_patterns.map { |p| compile_key_pattern p } * "|"})/m
     end
   end
 
@@ -31,10 +31,10 @@ module I18n::Tasks::KeyPatternMatching
 
   def key_pattern_re_body(key_pattern)
     key_pattern
-      .gsub('.', '\.')
-      .gsub('*:', '[^.]+?')
-      .gsub('*', '.*')
-      .gsub(':', '(?<=^|\.)[^.]+?(?=\.|$)')
-      .gsub(/\{(.*?)}/) { "(#{Regexp.last_match(1).strip.gsub(/\s*,\s*/, '|')})" }
+      .gsub(".", '\.')
+      .gsub("*:", "[^.]+?")
+      .gsub("*", ".*")
+      .gsub(":", '(?<=^|\.)[^.]+?(?=\.|$)')
+      .gsub(/\{(.*?)}/) { "(#{Regexp.last_match(1).strip.gsub(/\s*,\s*/, "|")})" }
   end
 end

data/lib/i18n/tasks/logging.rb

@@ -25,7 +25,8 @@ module I18n::Tasks::Logging
   def log_stderr(*args)
     # We don't want output from different threads to get intermixed.
     MUTEX.synchronize do
-      $stderr.puts(*args)
+      # Use $stderr directly to avoid issues with JRuby and thread safety
+      $stderr.puts(*args) # rubocop:disable Style/StderrPuts
     end
   end