i18n-tasks 0.9.31 → 0.9.34

data/lib/i18n/tasks/missing_keys.rb

@@ -60,11 +60,13 @@ module I18n::Tasks
       locales.each_with_object(empty_forest) do |locale, forest|
         required_keys = required_plural_keys_for_locale(locale)
         next if required_keys.empty?
+
         tree = empty_forest
         plural_nodes data[locale] do |node|
           children = node.children
           present_keys = Set.new(children.map { |c| c.key.to_sym })
           next if present_keys.superset?(required_keys)
+
           tree[node.full_key] = node.derive(
             value: children.to_hash,
             children: nil,
@@ -79,12 +81,8 @@ module I18n::Tasks
     def required_plural_keys_for_locale(locale)
       @plural_keys_for_locale ||= {}
       return @plural_keys_for_locale[locale] if @plural_keys_for_locale.key?(locale)
-      @plural_keys_for_locale[locale] =
-        begin
-          Set.new(load_rails_i18n_pluralization!(locale)[locale.to_sym][:i18n][:plural][:keys])
-        rescue SystemCallError, IOError
-          Set.new
-        end
+
+      @plural_keys_for_locale[locale] = plural_keys_for_locale(locale)
     end
 
     # Loads rails-i18n pluralization config for the given locale.
@@ -123,7 +121,7 @@ module I18n::Tasks
     end
 
     def locale_key_missing?(locale, key)
-      !key_value?(key, locale) && !external_key?(key) && !ignore_key?(key, :missing)
+      !key_value?(key, locale) && !external_key?(key, locale) && !ignore_key?(key, :missing)
     end
 
     # @param [::I18n::Tasks::Data::Tree::Siblings] forest
@@ -136,6 +134,7 @@ module I18n::Tasks
         locale = root.key
         root.keys do |key, node|
           next unless yield node
+
           if locales_and_node_by_key.key?(key)
             locales_and_node_by_key[key][0] << locale
           else
@@ -154,5 +153,32 @@ module I18n::Tasks
       end
       forest
     end
+
+    private
+
+    def plural_keys_for_locale(locale)
+      configuration = load_rails_i18n_pluralization!(locale)
+      if configuration[locale.to_sym].nil?
+        alternate_locale = alternate_locale_from(locale)
+        return Set.new if configuration[alternate_locale.to_sym].nil?
+
+        return set_from_rails_i18n_pluralization(configuration, alternate_locale)
+      end
+      set_from_rails_i18n_pluralization(configuration, locale)
+    rescue SystemCallError, IOError
+      Set.new
+    end
+
+    def alternate_locale_from(locale)
+      re = /(\w{2})-*(\w{2,3})*/
+      match = locale.match(re)
+      language_code = match[1]
+      country_code = match[2]
+      "#{language_code}-#{country_code.upcase}"
+    end
+
+    def set_from_rails_i18n_pluralization(configuration, locale)
+      Set.new(configuration[locale.to_sym][:i18n][:plural][:keys])
+    end
   end
 end

data/lib/i18n/tasks/plural_keys.rb

@@ -5,12 +5,13 @@ module I18n::Tasks::PluralKeys
   # Ref: http://cldr.unicode.org/index/cldr-spec/plural-rules
   CLDR_CATEGORY_KEYS = %w[zero one two few many other].freeze
   PLURAL_KEY_SUFFIXES = Set.new CLDR_CATEGORY_KEYS
-  PLURAL_KEY_RE = /\.(?:#{CLDR_CATEGORY_KEYS * '|'})$/
+  PLURAL_KEY_RE = /\.(?:#{CLDR_CATEGORY_KEYS * '|'})$/.freeze
 
   def collapse_plural_nodes!(tree)
     tree.leaves.map(&:parent).compact.uniq.each do |node|
       children = node.children
       next unless plural_forms?(children)
+
       node.value    = children.to_hash
       node.children = nil
       node.data.merge! children.first.data
@@ -23,6 +24,7 @@ module I18n::Tasks::PluralKeys
   # @return [String] the base form if the key is a specific plural form (e.g. apple for apple.many), the key otherwise.
   def depluralize_key(key, locale = base_locale)
     return key if key !~ PLURAL_KEY_RE
+
     key_name = last_key_part(key)
     parent_key = key[0..- (key_name.length + 2)]
     nodes = tree("#{locale}.#{parent_key}").presence || (locale != base_locale && tree("#{base_locale}.#{parent_key}"))
@@ -37,10 +39,12 @@ module I18n::Tasks::PluralKeys
   # @yieldparam node [::I18n::Tasks::Data::Tree::Node] plural node
   def plural_nodes(tree)
     return to_enum(:plural_nodes, tree) unless block_given?
+
     visited = Set.new
     tree.leaves do |node|
       parent = node.parent
       next if !parent || visited.include?(parent)
+
       yield parent if plural_forms?(parent.children)
       visited.add(parent)
     end
@@ -49,6 +53,7 @@ module I18n::Tasks::PluralKeys
 
   def plural_forms?(s)
     return false if non_plural_other?(s)
+
     s.present? && s.all? { |node| node.leaf? && plural_suffix?(node.key) }
   end
 

data/lib/i18n/tasks/references.rb

@@ -10,12 +10,14 @@ module I18n::Tasks
                            data_refs = merge_reference_trees(data_forest.select_keys { |_, node| node.reference? }))
       fail ArgumentError, 'usages must be a Data::Tree::Instance' unless usages.is_a?(Data::Tree::Siblings)
       fail ArgumentError, 'all_references must be a Data::Tree::Instance' unless data_refs.is_a?(Data::Tree::Siblings)
+
       raw_refs = empty_forest
       resolved_refs = empty_forest
       refs = empty_forest
       data_refs.key_to_node.each do |ref_key_part, ref_node|
         usages.each do |usage_node|
           next unless usage_node.key == ref_key_part
+
           if ref_node.leaf?
             process_leaf!(ref_node, usage_node, raw_refs, resolved_refs, refs)
           else

data/lib/i18n/tasks/reports/base.rb

@@ -9,6 +9,7 @@ module I18n::Tasks::Reports
     end
 
     attr_reader :task
+
     delegate :base_locale, :locales, to: :task
 
     protected
@@ -58,6 +59,7 @@ module I18n::Tasks::Reports
 
     def format_locale(locale)
       return '' unless locale
+
       if locale.split('+') == task.locales.sort
         'all'
       else
@@ -67,8 +69,7 @@ module I18n::Tasks::Reports
 
     def collapse_missing_tree!(forest)
       forest = task.collapse_plural_nodes!(forest)
-      forest = task.collapse_same_key_in_locales!(forest) { |node| node.data[:type] == :missing_used }
-      forest
+      task.collapse_same_key_in_locales!(forest) { |node| node.data[:type] == :missing_used }
     end
   end
 end

data/lib/i18n/tasks/reports/terminal.rb

@@ -106,9 +106,10 @@ module I18n
         private
 
         def missing_key_info(leaf)
-          if leaf[:type] == :missing_used
+          case leaf[:type]
+          when :missing_used
             first_occurrence leaf
-          elsif leaf[:type] == :missing_plural
+          when :missing_plural
             leaf[:data][:missing_keys].join(', ')
           else
             "#{Rainbow(leaf[:data][:missing_diff_locale]).cyan} "\
@@ -134,6 +135,7 @@ module I18n
 
         def format_reference_desc(node_data)
           return nil unless node_data
+
           case node_data[:ref_type]
           when :reference_usage
             Rainbow('(ref)').yellow.bright
@@ -159,9 +161,9 @@ module I18n
             print_table headings: [Rainbow(I18n.t('i18n_tasks.common.locale')).cyan.bright,
                                    Rainbow(I18n.t('i18n_tasks.common.key')).cyan.bright,
                                    I18n.t('i18n_tasks.common.value')] do |t|
-              t.rows = locale_key_value_datas.map { |(locale, k, v, data)|
+              t.rows = locale_key_value_datas.map do |(locale, k, v, data)|
                 [{ value: Rainbow(locale).cyan, alignment: :center }, format_key(k, data), format_value(v)]
-              }
+              end
             end
           else
             puts 'ø'

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

@@ -11,10 +11,11 @@ module I18n::Tasks::Scanners
     attr_reader :config
 
     def initialize(
-        config: {},
-        file_finder_provider: Files::CachingFileFinderProvider.new,
-        file_reader: Files::CachingFileReader.new
+      config: {},
+      file_finder_provider: Files::CachingFileFinderProvider.new,
+      file_reader: Files::CachingFileReader.new
     )
+      super()
       @config      = config
       @file_reader = file_reader
       @file_finder = file_finder_provider.get(**config.slice(:paths, :only, :exclude))

data/lib/i18n/tasks/scanners/files/caching_file_finder.rb

@@ -22,9 +22,6 @@ module I18n::Tasks::Scanners::Files
     # @param (see FileFinder#traverse_files)
     # @yieldparam (see FileFinder#traverse_files)
     # @return (see FileFinder#traverse_files)
-    def traverse_files
-      super
-    end
 
     alias uncached_find_files find_files
     private :uncached_find_files

data/lib/i18n/tasks/scanners/files/file_finder.rb

@@ -15,6 +15,7 @@ module I18n::Tasks::Scanners::Files
     #     Files matching any of the exclusion patterns will be excluded even if they match an inclusion pattern.
     def initialize(paths: ['.'], only: nil, exclude: [])
       fail 'paths argument is required' if paths.nil?
+
       @paths   = paths
       @include = only
       @exclude = exclude || []
@@ -25,8 +26,8 @@ module I18n::Tasks::Scanners::Files
     # @yield [path]
     # @yieldparam path [String] the path of the found file.
     # @return [Array<of block results>]
-    def traverse_files
-      find_files.map { |path| yield path }
+    def traverse_files(&block)
+      find_files.map(&block)
     end
 
     # @return [Array<String>] found files

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

@@ -15,11 +15,11 @@ module I18n
           line_begin = contents.rindex(/^/, position - 1)
           line_end   = contents.index(/.(?=\r?\n|$)/, position)
           Results::Occurrence.new(
-            path:     path,
-            pos:      position,
+            path: path,
+            pos: position,
             line_num: contents[0..position].count("\n") + 1,
             line_pos: position - line_begin + 1,
-            line:     contents[line_begin..line_end],
+            line: contents[line_begin..line_end],
             raw_key: raw_key
           )
         end

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

@@ -12,7 +12,7 @@ module I18n::Tasks::Scanners
     include OccurrenceFromPosition
     include RubyKeyLiterals
 
-    TRANSLATE_CALL_RE = /(?<=^|[^\w'\-.]|[^\w'\-]I18n\.|I18n\.)t(?:!|ranslate!?)?/
+    TRANSLATE_CALL_RE = /(?<=^|[^\w'\-.]|[^\w'\-]I18n\.|I18n\.)t(?:!|ranslate!?)?/.freeze
     IGNORE_LINES = {
       'coffee' => /^\s*#(?!\si18n-tasks-use)/,
       'erb' => /^\s*<%\s*#(?!\si18n-tasks-use)/,
@@ -43,10 +43,13 @@ module I18n::Tasks::Scanners
         src_pos = Regexp.last_match.offset(0).first
         location = occurrence_from_position(path, text, src_pos, raw_key: strip_literal(match[0]))
         next if exclude_line?(location.line, path)
+
         key = match_to_key(match, path, location)
         next unless key
+
         key += ':' if key.end_with?('.')
         next unless valid_key?(key)
+
         keys << [key, location]
       end
       keys
@@ -67,7 +70,7 @@ module I18n::Tasks::Scanners
       re && re =~ line
     end
 
-    VALID_KEY_RE_DYNAMIC = /^(#{VALID_KEY_CHARS}|[:\#{@}\[\]])+$/
+    VALID_KEY_RE_DYNAMIC = /^(#{VALID_KEY_CHARS}|[:\#{@}\[\]])+$/.freeze
 
     def valid_key?(key)
       if @config[:strict]
@@ -84,7 +87,7 @@ module I18n::Tasks::Scanners
     def closest_method(occurrence)
       method = File.readlines(occurrence.path, encoding: 'UTF-8')
                    .first(occurrence.line_num - 1).reverse_each.find { |x| x =~ /\bdef\b/ }
-      method && method.strip.sub(/^def\s*/, '').sub(/[\(\s;].*$/, '')
+      method && method.strip.sub(/^def\s*/, '').sub(/[(\s;].*$/, '')
     end
 
     # This method only exists for backwards compatibility with monkey-patches and plugins
@@ -93,7 +96,7 @@ module I18n::Tasks::Scanners
     def default_pattern
       # capture only the first argument
       /
-      #{translate_call_re} [\( ] \s* (?# fn call begin )
+      #{translate_call_re} [( ] \s* (?# fn call begin )
       (#{first_argument_re})         (?# capture the first argument)
       /x
     end

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

@@ -26,6 +26,7 @@ module I18n::Tasks::Scanners
       if scope
         scope_parts = extract_literal_or_array_of_literals(scope)
         return nil if scope_parts.nil? || scope_parts.empty?
+
         "#{scope_parts.join('.')}.#{key}"
       else
         key unless match[0] =~ /\A\w/
@@ -61,7 +62,7 @@ module I18n::Tasks::Scanners
 
     # extract literal or array of literals
     # returns nil on any other input
-    # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+    # rubocop:disable Metrics/MethodLength,Metrics/PerceivedComplexity
     def extract_literal_or_array_of_literals(s)
       literals = []
       braces_stack = []
@@ -78,6 +79,7 @@ module I18n::Tasks::Scanners
       s.each_char.with_index do |c, i|
         if c == '['
           return nil unless braces_stack.empty?
+
           braces_stack.push(i)
         elsif c == ']'
           break
@@ -93,6 +95,6 @@ module I18n::Tasks::Scanners
       consume_literal.call unless acc.empty?
       literals
     end
-    # rubocop:enable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/MethodLength,Metrics/PerceivedComplexity
   end
 end

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

@@ -12,6 +12,7 @@ module I18n
         def absolute_key(key, path, roots: config[:relative_roots], calling_method: nil)
           return key unless key.start_with?(DOT)
           fail 'roots argument is required' unless roots.present?
+
           normalized_path = File.expand_path(path)
           (root = path_root(normalized_path, roots)) ||
             fail(CommandError, "Cannot resolve relative key \"#{key}\".\n" \

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

@@ -5,7 +5,7 @@ require 'i18n/tasks/scanners/relative_keys'
 require 'i18n/tasks/scanners/ruby_ast_call_finder'
 require 'parser/current'
 
-# rubocop:disable Metrics/AbcSize,Metrics/BlockNesting,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+# rubocop:disable Metrics/AbcSize,Metrics/BlockNesting,Metrics/PerceivedComplexity
 # TODO: make this class more readable.
 
 module I18n::Tasks::Scanners
@@ -14,7 +14,7 @@ module I18n::Tasks::Scanners
     include RelativeKeys
     include AST::Sexp
 
-    MAGIC_COMMENT_PREFIX = /\A.\s*i18n-tasks-use\s+/
+    MAGIC_COMMENT_PREFIX = /\A.\s*i18n-tasks-use\s+/.freeze
     RECEIVER_MESSAGES = [nil, AST::Node.new(:const, [nil, :I18n])].product(%i[t t! translate translate!])
 
     def initialize(**args)
@@ -71,6 +71,7 @@ module I18n::Tasks::Scanners
             scope = extract_string(scope_node.children[1],
                                    array_join_with: '.', array_flatten: true, array_reject_blank: true)
             return nil if scope.nil? && scope_node.type != :nil
+
             key = [scope, key].join('.') unless scope == ''
           end
           default_arg = if (default_arg_node = extract_hash_pair(second_arg_node, 'default'))
@@ -95,6 +96,7 @@ module I18n::Tasks::Scanners
     def extract_hash_pair(node, key)
       node.children.detect do |child|
         next unless child.type == :pair
+
         key_node = child.children[0]
         %i[sym str].include?(key_node.type) && key_node.children[0].to_s == key
       end
@@ -115,15 +117,15 @@ module I18n::Tasks::Scanners
     def extract_string(node, array_join_with: nil, array_flatten: false, array_reject_blank: false)
       if %i[sym str int].include?(node.type)
         node.children[0].to_s
-      elsif %i[true false].include?(node.type) # rubocop:disable Lint/BooleanSymbol
+      elsif %i[true false].include?(node.type)
         node.type.to_s
       elsif node.type == :nil
         ''
       elsif node.type == :array && array_join_with
         extract_array_as_string(
           node,
-          array_join_with:    array_join_with,
-          array_flatten:      array_flatten,
+          array_join_with: array_join_with,
+          array_flatten: array_flatten,
           array_reject_blank: array_reject_blank
         ).tap do |str|
           # `nil` is returned when a dynamic value is encountered in strict mode. Propagate:
@@ -149,11 +151,12 @@ module I18n::Tasks::Scanners
     # @return [String, nil] `nil` is returned only when a dynamic value is encountered in strict mode.
     def extract_array_as_string(node, array_join_with:, array_flatten: false, array_reject_blank: false)
       children_strings = node.children.map do |child|
-        if %i[sym str int true false].include?(child.type) # rubocop:disable Lint/BooleanSymbol
+        if %i[sym str int true false].include?(child.type)
           extract_string child
         else
           # ignore dynamic argument in strict mode
           return nil if config[:strict]
+
           if %i[dsym dstr].include?(child.type) || (child.type == :array && array_flatten)
             extract_string(child, array_join_with: array_join_with)
           else
@@ -180,12 +183,12 @@ module I18n::Tasks::Scanners
     # @return [Results::Occurrence]
     def range_to_occurrence(raw_key, range, default_arg: nil)
       Results::Occurrence.new(
-        path:        range.source_buffer.name,
-        pos:         range.begin_pos,
-        line_num:    range.line,
-        line_pos:    range.column,
-        line:        range.source_line,
-        raw_key:     raw_key,
+        path: range.source_buffer.name,
+        pos: range.begin_pos,
+        line_num: range.line,
+        line_pos: range.column,
+        line: range.source_line,
+        raw_key: raw_key,
         default_arg: default_arg
       )
     end
@@ -203,4 +206,4 @@ module I18n::Tasks::Scanners
     end
   end
 end
-# rubocop:enable Metrics/AbcSize,Metrics/BlockNesting,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+# rubocop:enable Metrics/AbcSize,Metrics/BlockNesting,Metrics/PerceivedComplexity

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

@@ -2,7 +2,7 @@
 
 module I18n::Tasks::Scanners
   module RubyKeyLiterals
-    LITERAL_RE = /:?".+?"|:?'.+?'|:\w+/
+    LITERAL_RE = /:?".+?"|:?'.+?'|:\w+/.freeze
 
     # Match literals:
     # * String: '', "#{}"
@@ -20,8 +20,8 @@ module I18n::Tasks::Scanners
       literal
     end
 
-    VALID_KEY_CHARS = /(?:[[:word:]]|[-.?!:;À-ž])/
-    VALID_KEY_RE    = /^#{VALID_KEY_CHARS}+$/
+    VALID_KEY_CHARS = /(?:[[:word:]]|[-.?!:;À-ž])/.freeze
+    VALID_KEY_RE    = /^#{VALID_KEY_CHARS}+$/.freeze
 
     def valid_key?(key)
       key =~ VALID_KEY_RE && !key.end_with?('.')