i18n-tasks 0.9.29 → 0.9.34

data/lib/i18n/tasks/command/dsl.rb

@@ -10,8 +10,8 @@ module I18n::Tasks
         end
       end
 
-      def t(*args)
-        I18n.t(*args)
+      def t(*args, **kwargs)
+        I18n.t(*args, **kwargs)
       end
 
       module ClassMethods
@@ -42,8 +42,8 @@ module I18n::Tasks
         end
 
         # late-bound I18n.t for module bodies
-        def t(*args)
-          proc { I18n.t(*args) }
+        def t(*args, **kwargs)
+          proc { I18n.t(*args, **kwargs) }
         end
 
         # if class is a module, merge DSL definitions when it is included

data/lib/i18n/tasks/command/option_parsers/enum.rb

@@ -16,6 +16,7 @@ module I18n::Tasks
 
           def call(value, *)
             return @valid.first unless value.present?
+
             if @valid.include?(value)
               value
             else
@@ -37,6 +38,7 @@ module I18n::Tasks
           def call(values, *)
             values = Array(values)
             return @valid if values == %w[all]
+
             invalid = values - @valid
             if invalid.empty?
               if values.empty?

data/lib/i18n/tasks/command/option_parsers/locale.rb

@@ -5,12 +5,13 @@ module I18n::Tasks
     module OptionParsers
       module Locale
         module Validator
-          VALID_LOCALE_RE = /\A\w[\w\-\.]*\z/i
+          VALID_LOCALE_RE = /\A\w[\w\-.]*\z/i.freeze
 
           def validate!(locale)
             if VALID_LOCALE_RE !~ locale
               fail CommandError, I18n.t('i18n_tasks.cmd.errors.invalid_locale', invalid: locale)
             end
+
             locale
           end
         end

data/lib/i18n/tasks/command/options/data.rb

@@ -64,6 +64,7 @@ module I18n::Tasks
         # @return [I18n::Tasks::Data::Tree::Siblings]
         def parse_forest(src, format)
           fail CommandError, I18n.t('i18n_tasks.cmd.errors.pass_forest') unless src
+
           if format == 'keys'
             ::I18n::Tasks::Data::Tree::Siblings.from_key_names parse_keys(src)
           else

data/lib/i18n/tasks/command/options/locales.rb

@@ -13,22 +13,22 @@ module I18n::Tasks
             '--locales en,es,ru',
             Array,
             t('i18n_tasks.cmd.args.desc.locales_filter'),
-            parser:             OptionParsers::Locale::ListParser,
-            default:            'all',
+            parser: OptionParsers::Locale::ListParser,
+            default: 'all',
             consume_positional: true
 
         arg :locale,
             '-l',
             '--locale en',
             t('i18n_tasks.cmd.args.desc.locale'),
-            parser:  OptionParsers::Locale::Parser,
+            parser: OptionParsers::Locale::Parser,
             default: 'base'
 
         arg :locale_to_translate_from,
             '-f',
             '--from en',
             t('i18n_tasks.cmd.args.desc.locale_to_translate_from'),
-            parser:  OptionParsers::Locale::Parser,
+            parser: OptionParsers::Locale::Parser,
             default: 'base'
 
         TRANSLATION_BACKENDS = %w[google deepl].freeze
@@ -36,7 +36,7 @@ module I18n::Tasks
             '-b',
             '--backend BACKEND',
             t('i18n_tasks.cmd.args.desc.translation_backend'),
-            parser:  OptionParsers::Locale::Parser,
+            parser: OptionParsers::Locale::Parser,
             default: TRANSLATION_BACKENDS[0]
       end
     end

data/lib/i18n/tasks/concurrent/cached_value.rb

@@ -19,8 +19,10 @@ module I18n::Tasks::Concurrent
     # @return [Object] Result of the computation.
     def get
       return get_result_volatile unless get_result_volatile == NULL
+
       @mutex.synchronize do
         next unless get_result_volatile == NULL
+
         set_result_volatile @computation.call
         @computation = nil
       end

data/lib/i18n/tasks/configuration.rb

@@ -2,10 +2,10 @@
 
 module I18n::Tasks::Configuration # rubocop:disable Metrics/ModuleLength
   DEFAULTS = {
-    base_locale:     'en',
+    base_locale: 'en',
     internal_locale: 'en',
-    search:          ::I18n::Tasks::UsedKeys::SEARCH_DEFAULTS,
-    data:            ::I18n::Tasks::Data::DATA_DEFAULTS
+    search: ::I18n::Tasks::UsedKeys::SEARCH_DEFAULTS,
+    data: ::I18n::Tasks::Data::DATA_DEFAULTS
   }.freeze
 
   # i18n-tasks config (defaults + config/i18n-tasks.yml)
@@ -47,7 +47,7 @@ module I18n::Tasks::Configuration # rubocop:disable Metrics/ModuleLength
     @config_sections[:data] ||= begin
       {
         adapter: data.class.name,
-        config:  data.config
+        config: data.config
       }
     end
   end
@@ -59,6 +59,7 @@ module I18n::Tasks::Configuration # rubocop:disable Metrics/ModuleLength
       conf = (config[:translation] || {}).with_indifferent_access
       conf[:google_translate_api_key] = ENV['GOOGLE_TRANSLATE_API_KEY'] if ENV.key?('GOOGLE_TRANSLATE_API_KEY')
       conf[:deepl_api_key] = ENV['DEEPL_AUTH_KEY'] if ENV.key?('DEEPL_AUTH_KEY')
+      conf[:yandex_api_key] = ENV['YANDEX_API_KEY'] if ENV.key?('YANDEX_API_KEY')
       conf
     end
   end

data/lib/i18n/tasks/console_context.rb

@@ -34,7 +34,7 @@ module I18n::Tasks
       end
 
       def guide
-        Rainbow('i18n-tasks IRB Quick Start guide').green.bright + "\n" + <<~TEXT
+        "#{Rainbow('i18n-tasks IRB Quick Start guide').green.bright}\n#{<<~TEXT}"
           #{Rainbow('Data as trees').yellow}
             tree(locale)
             used_tree(key_filter: nil, strict: nil)

data/lib/i18n/tasks/data/adapter/yaml_adapter.rb

@@ -9,7 +9,7 @@ module I18n::Tasks
           # @return [Hash] locale tree
           def parse(str, options)
             if YAML.method(:load).arity.abs == 2
-              YAML.load(str, options || {})
+              YAML.load(str, **(options || {}))
             else
               # older jruby and rbx 2.2.7 do not accept options
               YAML.load(str)

data/lib/i18n/tasks/data/file_formats.rb

@@ -53,12 +53,14 @@ module I18n
           content = adapter_dump(hash, adapter)
           # Ignore unchanged data
           return if File.file?(path) && content == read_file(path)
+
           ::FileUtils.mkpath(File.dirname(path))
           ::File.open(path, 'w') { |f| f.write content }
         end
 
         def normalized?(path, tree)
           return false unless File.file?(path)
+
           read_file(path) == adapter_dump(tree.to_hash(true), self.class.adapter_name_for_path(path))
         end
 

data/lib/i18n/tasks/data/file_system_base.rb

@@ -12,11 +12,12 @@ module I18n::Tasks
       include ::I18n::Tasks::Data::FileFormats
       include ::I18n::Tasks::Logging
 
-      attr_reader :config, :base_locale, :locales
-      attr_writer :locales
+      attr_accessor :locales
+      attr_reader :config, :base_locale
+      attr_writer :router
 
       DEFAULTS = {
-        read:  ['config/locales/%{locale}.yml'],
+        read: ['config/locales/%{locale}.yml'],
         write: ['config/locales/%{locale}.yml']
       }.freeze
 
@@ -131,11 +132,12 @@ module I18n::Tasks
       def t(key, locale)
         tree = self[locale.to_s]
         return unless tree
+
         tree[locale][key].try(:value_or_children_hash)
       end
 
       def config=(config)
-        @config = DEFAULTS.deep_merge((config || {}).reject { |_k, v| v.nil? })
+        @config = DEFAULTS.deep_merge((config || {}).compact)
         reload
       end
 
@@ -159,7 +161,6 @@ module I18n::Tasks
           router_class.new(self, @config.merge(base_locale: base_locale, locales: locales))
         end
       end
-      attr_writer :router
 
       protected
 
@@ -188,7 +189,7 @@ module I18n::Tasks
               The following unquoted YAML keys result in a nil key:
                 #{%w[null Null NULL ~].join(', ')}
               See http://yaml.org/type/null.html
-TEXT
+            TEXT
           elsif value.is_a?(Hash)
             filter_nil_keys! path, value, suffix + [key]
           end

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

@@ -13,8 +13,9 @@ module I18n::Tasks
         super
       end
 
-      def route(locale, forest, &block)
+      def route(locale, forest, &block) # rubocop:disable Metrics/AbcSize
         return to_enum(:route, locale, forest) unless block
+
         out = Hash.new { |hash, key| hash[key] = Set.new }
         not_found = Set.new
         forest.keys do |key, _node|

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

@@ -10,6 +10,7 @@ module I18n::Tasks
       include ::I18n::Tasks::KeyPatternMatching
 
       attr_reader :routes
+
       # @option data_config write [Array] of routes
       # @example
       #   {write:
@@ -29,6 +30,7 @@ module I18n::Tasks
       # @return [Hash] mapping of destination => [ [key, value], ... ]
       def route(locale, forest, &block)
         return to_enum(:route, locale, forest) unless block
+
         locale = locale.to_s
         out = {}
         forest.keys do |key, _node|

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

@@ -2,7 +2,6 @@
 
 require 'i18n/tasks/data/tree/traversal'
 require 'i18n/tasks/data/tree/siblings'
-require 'i18n/tasks/rainbow_utils'
 module I18n::Tasks::Data::Tree
   class Node # rubocop:disable Metrics/ClassLength
     include Enumerable
@@ -19,7 +18,7 @@ module I18n::Tasks::Data::Tree
       @data = data
       @parent = parent
       @warn_about_add_children_to_leaf = warn_about_add_children_to_leaf
-      self.children = (children if children)
+      self.children = children if children
     end
     # rubocop:enable Metrics/ParameterLists
 
@@ -28,7 +27,7 @@ module I18n::Tasks::Data::Tree
     end
 
     def derive(new_attr = {})
-      self.class.new(attributes.merge(new_attr))
+      self.class.new(**attributes.merge(new_attr))
     end
 
     def children=(children)
@@ -49,6 +48,7 @@ module I18n::Tasks::Data::Tree
 
     def each(&block)
       return to_enum(:each) { 1 } unless block
+
       block.yield(self)
       self
     end
@@ -113,6 +113,7 @@ module I18n::Tasks::Data::Tree
 
     def walk_to_root(&visitor)
       return to_enum(:walk_to_root) unless visitor
+
       visitor.yield self
       parent.walk_to_root(&visitor) if parent?
     end
@@ -125,6 +126,7 @@ module I18n::Tasks::Data::Tree
 
     def walk_from_root(&visitor)
       return to_enum(:walk_from_root) unless visitor
+
       walk_to_root.reverse_each do |node|
         visitor.yield node
       end
@@ -164,13 +166,13 @@ module I18n::Tasks::Data::Tree
 
     def inspect(level = 0)
       label = if key.nil?
-                I18n::Tasks::RainbowUtils.faint_color('∅')
+                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
+      ['  ' * level, label, ("\n#{children.map { |c| c.inspect(level + 1) }.join("\n")}" if children?)].compact.join
     end
 
     def format_value_for_inspect(value)

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'i18n/tasks/data/tree/traversal'
-require 'i18n/tasks/rainbow_utils'
 module I18n::Tasks::Data::Tree
   # A list of nodes
   class Nodes
@@ -48,7 +47,7 @@ module I18n::Tasks::Data::Tree
       if present?
         map(&:inspect) * "\n"
       else
-        I18n::Tasks::RainbowUtils.faint_color('{∅}')
+        Rainbow('{∅}').faint
       end
     end
 
@@ -81,6 +80,7 @@ module I18n::Tasks::Data::Tree
 
     def children(&block)
       return to_enum(:children) { map { |c| c.children ? c.children.size : 0 }.reduce(:+) } unless block
+
       each do |node|
         node.children.each(&block) if node.children?
       end

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

@@ -62,6 +62,7 @@ module I18n::Tasks::Data::Tree
       # TODO: support nested references better
       nodes do |node|
         next unless node.reference?
+
         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
@@ -92,6 +93,7 @@ module I18n::Tasks::Data::Tree
     # 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)
+
       key_part, rest = split_key(full_key, 2)
       child          = key_to_node[key_part]
 
@@ -131,6 +133,7 @@ module I18n::Tasks::Data::Tree
     def append!(nodes)
       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))
       end
       super(nodes)
@@ -172,16 +175,18 @@ module I18n::Tasks::Data::Tree
 
     def set_root_key!(new_key, data = nil)
       return self if empty?
+
       rename_key first.key, new_key
       leaves { |node| node.data.merge! data } if data
       self
     end
 
     # @param on_leaves_merge [Proc] invoked when a leaf is merged with another leaf
-    def merge_node!(node, on_leaves_merge: nil) # rubocop:disable Metrics/AbcSize,Metrics/PerceivedComplexity
+    def merge_node!(node, on_leaves_merge: nil) # rubocop:disable Metrics/AbcSize
       if key_to_node.key?(node.key)
         our = key_to_node[node.key]
         return if our == node
+
         our.value = node.value if node.leaf?
         our.data.merge!(node.data) if node.data?
         if node.children?
@@ -262,7 +267,7 @@ module I18n::Tasks::Data::Tree
         build_forest(warn_about_add_children_to_leaf: false) do |forest|
           key_occurrences.each do |key_occurrence|
             forest[key_occurrence.key] = ::I18n::Tasks::Data::Tree::Node.new(
-              key:  split_key(key_occurrence.key).last,
+              key: split_key(key_occurrence.key).last,
               data: { occurrences: key_occurrence.occurrences }
             )
           end
@@ -273,7 +278,8 @@ module I18n::Tasks::Data::Tree
         build_forest(opts) do |forest|
           key_attrs.each do |(full_key, attr)|
             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.merge(key: split_key(full_key).last))
             yield(full_key, node) if block
             forest[full_key] = node
           end
@@ -295,6 +301,7 @@ module I18n::Tasks::Data::Tree
       def from_nested_hash(hash, opts = {})
         parse_parent_opt!(opts)
         fail I18n::Tasks::CommandError, "invalid tree #{hash.inspect}" unless hash.respond_to?(:map)
+
         opts[:nodes] = hash.map { |key, value| Node.from_key_value key, value }
         Siblings.new(opts)
       end

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

@@ -12,6 +12,7 @@ module I18n::Tasks
 
       def leaves(&visitor)
         return to_enum(:leaves) unless visitor
+
         nodes do |node|
           visitor.yield(node) if node.leaf?
         end
@@ -20,6 +21,7 @@ module I18n::Tasks
 
       def levels(&block)
         return to_enum(:levels) unless block
+
         nodes = to_nodes
         unless nodes.empty?
           block.yield nodes
@@ -35,6 +37,7 @@ module I18n::Tasks
 
       def breadth_first(&visitor)
         return to_enum(:breadth_first) unless visitor
+
         levels do |nodes|
           nodes.each { |node| visitor.yield(node) }
         end
@@ -43,9 +46,11 @@ module I18n::Tasks
 
       def depth_first(&visitor)
         return to_enum(:depth_first) unless visitor
+
         each do |node|
           visitor.yield node
           next unless node.children?
+
           node.children.each do |child|
             child.depth_first(&visitor)
           end
@@ -56,29 +61,28 @@ module I18n::Tasks
       # @option root include root in full key
       def keys(root: false, &visitor)
         return to_enum(:keys, root: root) unless visitor
+
         leaves { |node| visitor.yield(node.full_key(root: root), node) }
         self
       end
 
-      def key_names(opts = {})
-        opts[:root] = false unless opts.key?(:root)
-        keys(opts).map { |key, _node| key }
+      def key_names(root: false)
+        keys(root: root).map { |key, _node| key }
       end
 
-      def key_values(opts = {})
-        opts[:root] = false unless opts.key?(:root)
-        keys(opts).map { |key, node| [key, node.value] }
+      def key_values(root: false)
+        keys(root: root).map { |key, node| [key, node.value] }
       end
 
       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[0] <=> b[0] : a[1] <=> b[1] } 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[0] <=> b[0] : a[1] <=> b[1] } if sort
+        result.sort! { |a, b| a[0] == b[0] ? a[1] <=> b[1] : a[0] <=> b[0] } if sort
         result
       end
 
@@ -90,6 +94,7 @@ module I18n::Tasks
         tree = Siblings.new
         each do |node|
           next unless block.yield(node)
+
           tree.append! node.derive(
             parent: tree.parent,
             children: (node.children.select_nodes(&block).to_a if node.children)
@@ -146,12 +151,12 @@ module I18n::Tasks
       # @return [Siblings]
       def intersect_keys(other_tree, key_opts = {}, &block)
         if block
-          select_keys(key_opts) do |key, node|
+          select_keys(**key_opts.slice(:root)) do |key, node|
             other_node = other_tree[key]
             other_node && yield(key, node, other_node)
           end
         else
-          select_keys(key_opts) { |key, _node| other_tree[key] }
+          select_keys(**key_opts.slice(:root)) { |key, _node| other_tree[key] }
         end
       end
 
@@ -165,6 +170,7 @@ module I18n::Tasks
         value_proc ||= proc do |node|
           node_value = node.value
           next node_value if node.reference?
+
           human_key = ActiveSupport::Inflector.humanize(node.key.to_s)
           full_key = node.full_key
           default = (node.data[:occurrences] || []).detect { |o| o.default_arg.presence }.try(:default_arg)
@@ -181,6 +187,7 @@ module I18n::Tasks
         pattern_re = I18n::Tasks::KeyPatternMatching.compile_key_pattern(key_pattern) if key_pattern.present?
         keys.each do |key, node|
           next if pattern_re && key !~ pattern_re
+
           node.value = value_proc.call(node)
         end
         self