i18n-tasks 0.9.6 → 0.9.7

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

@@ -5,21 +5,22 @@ module I18n::Tasks
   module Data
     module Adapter
       module JsonAdapter
-        extend self
+        class << self
+          # @return [Hash] locale tree
+          def parse(str, opts)
+            JSON.parse(str, parse_opts(opts))
+          end
 
-        # @return [Hash] locale tree
-        def parse(str, opts)
-          JSON.parse(str, parse_opts(opts))
-        end
+          # @return [String]
+          def dump(tree, opts)
+            JSON.generate(tree, parse_opts(opts))
+          end
 
-        # @return [String]
-        def dump(tree, opts)
-          JSON.generate(tree, parse_opts(opts))
-        end
+          private
 
-        private
-        def parse_opts(opts)
-          opts.try(:symbolize_keys) || {}
+          def parse_opts(opts)
+            opts.try(:symbolize_keys) || {}
+          end
         end
       end
     end

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

@@ -4,23 +4,22 @@ module I18n::Tasks
   module Data
     module Adapter
       module YamlAdapter
-        extend self
-
-        # @return [Hash] locale tree
-        def parse(str, options)
-          if YAML.method(:load).arity.abs == 2
-            YAML.load(str, options || {})
-          else
-            # older jruby and rbx 2.2.7 do not accept options
-            YAML.load(str)
+        class << self
+          # @return [Hash] locale tree
+          def parse(str, options)
+            if YAML.method(:load).arity.abs == 2
+              YAML.load(str, options || {})
+            else
+              # older jruby and rbx 2.2.7 do not accept options
+              YAML.load(str)
+            end
           end
-        end
 
-        # @return [String]
-        def dump(tree, options)
-          tree.to_yaml(options || {})
+          # @return [String]
+          def dump(tree, options)
+            tree.to_yaml(options || {})
+          end
         end
-
       end
     end
   end

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

@@ -19,8 +19,8 @@ module I18n
 
         def adapter_op(op, format, tree, config)
           self.class.adapter_by_name(format).send(op, tree, config)
-        rescue Exception => e
-          raise CommandError.new("#{format} #{op} error: #{e.message}")
+        rescue Exception => e # rubocop:disable Lint/RescueException
+          raise CommandError, "#{format} #{op} error: #{e.message}"
         end
 
         protected
@@ -43,10 +43,10 @@ module I18n
           content = adapter_dump(hash, adapter)
           # Ignore unchanged data
           return if File.file?(path) &&
-              # Comparing hashes for equality directly would ignore key order.
-              # Round-trip through the adapter and compare the strings instead:
-              content == adapter_dump(load_file(path), adapter)
-          ::FileUtils.mkpath(File.dirname path)
+                    # Comparing hashes for equality directly would ignore key order.
+                    # Round-trip through the adapter and compare the strings instead:
+                    content == adapter_dump(load_file(path), adapter)
+          ::FileUtils.mkpath(File.dirname(path))
           ::File.open(path, 'w') { |f| f.write content }
         end
 
@@ -58,9 +58,11 @@ module I18n
           end
 
           def adapter_name_for_path(path)
-            @fn_patterns.detect { |(_name, pattern, _adapter)|
+            @fn_patterns.detect do |(_name, pattern, _adapter)|
               ::File.fnmatch(pattern, path)
-            }.try(:first) or raise CommandError.new("Adapter not found for #{path}. Registered adapters: #{@fn_patterns.inspect}")
+            end.try(:first) || fail(
+              CommandError, "Adapter not found for #{path}. Registered adapters: #{@fn_patterns.inspect}"
+            )
           end
 
           def adapter_names
@@ -69,9 +71,12 @@ module I18n
 
           def adapter_by_name(name)
             name = name.to_s
-            @fn_patterns.detect { |(adapter_name, _pattern, _adapter)|
+            @fn_patterns.detect do |(adapter_name, _pattern, _adapter)|
               adapter_name.to_s == name
-            }.try(:last) or raise CommandError.new("Adapter with name #{name.inspect} not found. Registered adapters: #{@fn_patterns.inspect}")
+            end.try(:last) || fail(
+              CommandError,
+              "Adapter with name #{name.inspect} not found. Registered adapters: #{@fn_patterns.inspect}"
+            )
           end
         end
       end

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

@@ -15,9 +15,9 @@ module I18n::Tasks
       attr_writer :locales
 
       DEFAULTS = {
-          read:  ['config/locales/%{locale}.yml'],
-          write: ['config/locales/%{locale}.yml']
-      }
+        read:  ['config/locales/%{locale}.yml'],
+        write: ['config/locales/%{locale}.yml']
+      }.freeze
 
       def initialize(config = {})
         self.config  = config.except(:base_locale, :locales)
@@ -33,10 +33,10 @@ module I18n::Tasks
 
       # get locale tree
       def get(locale)
-        locale         = locale.to_s
+        locale = locale.to_s
         @trees         ||= {}
         @trees[locale] ||= Tree::Siblings[locale => {}].merge!(
-            read_locale locale
+          read_locale(locale)
         )
       end
 
@@ -57,12 +57,12 @@ module I18n::Tasks
       end
 
       def merge!(forest)
-        forest.inject(Tree::Siblings.new) { |result, root|
+        forest.inject(Tree::Siblings.new) do |result, root|
           locale = root.key
           merged = get(locale).merge(root)
           set locale, merged
           result.merge! merged
-        }
+        end
       end
 
       def remove_by_key!(forest)
@@ -88,17 +88,13 @@ module I18n::Tasks
         @available_locales ||= begin
           locales = Set.new
           Array(config[:read]).map do |pattern|
-            [pattern, Dir.glob(pattern % {locale: '*'})] if pattern.include?('%{locale}'.freeze)
+            [pattern, Dir.glob(pattern % { locale: '*' })] if pattern.include?('%{locale}')
           end.compact.each do |pattern, paths|
-            p  = pattern.gsub('\\'.freeze, '\\\\'.freeze).gsub('/'.freeze, '\/'.freeze).gsub('.'.freeze, '\.'.freeze)
-            p  = p.gsub(/(\*+)/) {
-              $1 == '**'.freeze ? '.*'.freeze : '[^/]*?'.freeze
-            }.gsub('%{locale}'.freeze, '([^/.]+)'.freeze)
+            p  = pattern.gsub('\\', '\\\\').gsub('/', '\/').gsub('.', '\.')
+            p  = p.gsub(/(\*+)/) { Regexp.last_match(1) == '**' ? '.*' : '[^/]*?' }.gsub('%{locale}', '([^/.]+)')
             re = /\A#{p}\z/
             paths.each do |path|
-              if re =~ path
-                locales << $1
-              end
+              locales << Regexp.last_match(1) if re =~ path
             end
           end
           locales
@@ -112,7 +108,7 @@ module I18n::Tasks
       end
 
       def config=(config)
-        @config = DEFAULTS.deep_merge((config || {}).reject { |k, v| v.nil? })
+        @config = DEFAULTS.deep_merge((config || {}).reject { |_k, v| v.nil? })
         reload
       end
 
@@ -124,16 +120,16 @@ module I18n::Tasks
         self.router = router_was
       end
 
-
       ROUTER_NAME_ALIASES = {
-          'conservative_router' => 'I18n::Tasks::Data::Router::ConservativeRouter',
-          'pattern_router' => 'I18n::Tasks::Data::Router::PatternRouter'
-      }
+        'conservative_router' => 'I18n::Tasks::Data::Router::ConservativeRouter',
+        'pattern_router' => 'I18n::Tasks::Data::Router::PatternRouter'
+      }.freeze
       def router
         @router ||= begin
           name = @config[:router].presence || 'conservative_router'
           name = ROUTER_NAME_ALIASES[name] || name
-          ActiveSupport::Inflector.constantize(name).new(self, @config.merge(base_locale: base_locale, locales: locales))
+          router_class = ActiveSupport::Inflector.constantize(name)
+          router_class.new(self, @config.merge(base_locale: base_locale, locales: locales))
         end
       end
       attr_writer :router
@@ -142,7 +138,7 @@ module I18n::Tasks
 
       def read_locale(locale)
         Array(config[:read]).map do |path|
-          Dir.glob path % {locale: locale}
+          Dir.glob path % { locale: locale }
         end.reduce(:+).map do |path|
           [path.freeze, load_file(path) || {}]
         end.map do |path, data|

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

@@ -20,9 +20,7 @@ module I18n::Tasks
           path = key_path(locale, key)
           # infer from another locale
           unless path
-            inferred_from = (locales - [locale]).detect { |loc|
-              path = key_path(loc, key)
-            }
+            inferred_from = (locales - [locale]).detect { |loc| path = key_path(loc, key) }
             path = LocalePathname.replace_locale(path, inferred_from, locale) if inferred_from
           end
           key_with_locale = "#{locale}.#{key}"
@@ -36,9 +34,9 @@ module I18n::Tasks
         if not_found.present?
           # fall back to pattern router
           not_found_tree = forest.select_keys(root: true) { |key, _| not_found.include?(key) }
-          super(locale, not_found_tree) { |path, tree|
+          super(locale, not_found_tree) do |path, tree|
             out[path] += tree.key_names(root: true)
-          }
+          end
         end
 
         out.each do |dest, keys|
@@ -60,4 +58,3 @@ module I18n::Tasks
     end
   end
 end
-

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

@@ -32,11 +32,11 @@ module I18n::Tasks
           pattern, path = routes.detect { |route| route[0] =~ key }
           if pattern
             key_match = $~
-            path      = path % {locale: locale}
+            path      = path % { locale: locale }
             path.gsub!(/\\\d+/) { |m| key_match[m[1..-1].to_i] }
             (out[path] ||= Set.new) << "#{locale}.#{key}"
           else
-            raise CommandError.new("Cannot route key #{key}. Routes are #{@routes_config.inspect}")
+            fail CommandError, "Cannot route key #{key}. Routes are #{@routes_config.inspect}"
           end
         end
         out.each do |dest, keys|
@@ -48,11 +48,10 @@ module I18n::Tasks
       private
 
       def compile_routes(routes)
-        routes.map { |x| x.is_a?(String) ? ['*', x] : x }.map { |x|
+        routes.map { |x| x.is_a?(String) ? ['*', x] : x }.map do |x|
           [compile_key_pattern(x[0]), x[1]]
-        }
+        end
       end
     end
   end
 end
-

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

@@ -3,7 +3,7 @@
 require 'i18n/tasks/data/tree/traversal'
 require 'i18n/tasks/data/tree/siblings'
 module I18n::Tasks::Data::Tree
-  class Node
+  class Node # rubocop:disable Metrics/ClassLength
     include Enumerable
     include Traversal
 
@@ -11,16 +11,16 @@ module I18n::Tasks::Data::Tree
     attr_reader :key, :children, :parent
 
     def initialize(key:, value: nil, data: nil, parent: nil, children: nil)
-      @key          = key
+      @key = key
       @key = @key.to_s.freeze if @key
-      @value        = value
-      @data         = data
-      @parent       = parent
+      @value = value
+      @data = data
+      @parent = parent
       self.children = (children if children)
     end
 
     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 = {})
@@ -29,12 +29,12 @@ module I18n::Tasks::Data::Tree
 
     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)
+                  when Siblings
+                    children.parent == self ? children : children.derive(parent: self)
+                  when NilClass
+                    nil
+                  else
+                    Siblings.new(nodes: children, parent: self)
                   end
       dirty!
     end
@@ -59,7 +59,7 @@ module I18n::Tasks::Data::Tree
     end
 
     def parent?
-      !!parent
+      !parent.nil?
     end
 
     def children?
@@ -99,8 +99,8 @@ module I18n::Tasks::Data::Tree
     end
 
     def full_key(opts = {})
-      root            = opts.key?(:root) ? opts[:root] : true
-      @full_key       ||= {}
+      root = opts.key?(:root) ? opts[:root] : true
+      @full_key ||= {}
       @full_key[root] ||= "#{"#{parent.full_key(root: root)}." if parent? && (root || parent.parent?)}#{key}"
     end
 
@@ -128,6 +128,7 @@ module I18n::Tasks::Data::Tree
       dirty!
       node
     end
+
     alias []= set
 
     def to_nodes
@@ -144,9 +145,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
@@ -167,7 +168,7 @@ module I18n::Tasks::Data::Tree
 
     def format_value_for_inspect(value)
       if value.is_a?(Symbol)
-        "#{Term::ANSIColor.bold(Term::ANSIColor.yellow '⮕ ')}#{Term::ANSIColor.yellow value.to_s}"
+        "#{Term::ANSIColor.bold(Term::ANSIColor.yellow('⮕ '))}#{Term::ANSIColor.yellow value.to_s}"
       else
         Term::ANSIColor.cyan(value.to_s)
       end
@@ -176,7 +177,7 @@ module I18n::Tasks::Data::Tree
     protected
 
     def dirty!
-      @hash     = nil
+      @hash = nil
       @full_key = nil
     end
 

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

@@ -20,7 +20,7 @@ module I18n::Tasks::Data::Tree
     end
 
     def attributes
-      {nodes: @list}
+      { nodes: @list }
     end
 
     def derive(new_attr = {})
@@ -33,7 +33,7 @@ module I18n::Tasks::Data::Tree
     def to_hash(sort = false)
       (@hash ||= {})[sort] ||= begin
         if sort
-          self.sort { |a, b| a.key <=> b.key }
+          sort_by(&:key)
         else
           self
         end.map { |node| node.to_hash(sort) }.reduce({}, :deep_merge!)
@@ -54,7 +54,7 @@ module I18n::Tasks::Data::Tree
     # methods below change state
 
     def remove!(node)
-      @list.delete(node) or raise "#{node.full_key} not found in #{self.inspect}"
+      @list.delete(node) || fail("#{node.full_key} not found in #{inspect}")
       dirty!
       self
     end
@@ -88,6 +88,7 @@ module I18n::Tasks::Data::Tree
     alias children? any?
 
     protected
+
     def dirty!
       @hash = nil
     end

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

@@ -8,7 +8,7 @@ module I18n::Tasks::Data::Tree
   # Siblings represents a subtree sharing a common parent
   # in case of an empty parent (nil) it represents a forest
   # siblings' keys are unique
-  class Siblings < Nodes
+  class Siblings < Nodes # rubocop:disable Metrics/ClassLength
     include ::I18n::Tasks::SplitKey
 
     attr_reader :parent, :key_to_node
@@ -17,7 +17,7 @@ module I18n::Tasks::Data::Tree
       super(nodes: opts[:nodes])
       @parent = opts[:parent] || first.try(:parent)
       @list.map! { |node| node.parent == @parent ? node : node.derive(parent: @parent) }
-      @key_to_node = @list.inject({}) { |h, node| h[node.key] = node; h }
+      @key_to_node = @list.each_with_object({}) { |node, h| h[node.key] = node }
     end
 
     def attributes
@@ -53,9 +53,7 @@ module I18n::Tasks::Data::Tree
     def get(full_key)
       first_key, rest = split_key(full_key.to_s, 2)
       node            = key_to_node[first_key]
-      if rest && node
-        node = node.children.try(:get, rest)
-      end
+      node = node.children.try(:get, rest) if rest && node
       node
     end
 
@@ -63,7 +61,7 @@ module I18n::Tasks::Data::Tree
 
     # add or replace node by full key
     def set(full_key, node)
-      raise '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]
 
@@ -87,7 +85,6 @@ module I18n::Tasks::Data::Tree
 
     alias []= set
 
-
     # methods below change state
 
     def remove!(node)
@@ -98,7 +95,7 @@ module I18n::Tasks::Data::Tree
 
     def append!(nodes)
       nodes = nodes.map do |node|
-        raise "already has a child with key '#{node.key}'" if key_to_node.key?(node.key)
+        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)
@@ -123,11 +120,11 @@ module I18n::Tasks::Data::Tree
     end
 
     def subtract_keys(keys)
-      remove_nodes_and_emptied_ancestors(keys.inject(Set.new) { |set, key| (node = get(key)) ? set << node : set })
+      remove_nodes_and_emptied_ancestors(find_nodes(keys))
     end
 
     def subtract_keys!(keys)
-      remove_nodes_and_emptied_ancestors!(keys.inject(Set.new) { |set, key| (node = get(key)) ? set << node : set })
+      remove_nodes_and_emptied_ancestors!(find_nodes(keys))
     end
 
     def subtract_by_key(other)
@@ -146,7 +143,7 @@ module I18n::Tasks::Data::Tree
     end
 
     # @param on_leaves_merge [Proc] invoked when a leaf is merged with another leaf
-    def merge_node!(node, on_leaves_merge: nil)
+    def merge_node!(node, on_leaves_merge: nil) # rubocop:disable Metrics/AbcSize,Metrics/PerceivedComplexity
       if key_to_node.key?(node.key)
         our = key_to_node[node.key]
         return if our == node
@@ -182,6 +179,13 @@ module I18n::Tasks::Data::Tree
 
     private
 
+    def find_nodes(keys)
+      keys.each_with_object(Set.new) do |key, set|
+        node = get(key)
+        set << node if node
+      end
+    end
+
     # Adds all the ancestors that only contain the given nodes as descendants to the given nodes.
     # @param nodes [Set] Modified in-place.
     def add_ancestors_that_only_contain_nodes!(nodes)
@@ -205,7 +209,7 @@ module I18n::Tasks::Data::Tree
         opts[:nodes] ||= []
         parse_parent_opt!(opts)
         forest = Siblings.new(opts)
-        block.call(forest) if block
+        yield(forest) if block
         # forest.parent.children = forest
         forest
       end
@@ -216,38 +220,39 @@ module I18n::Tasks::Data::Tree
         build_forest 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,
-                data: {occurrences: key_occurrence.occurrences})
+              key:  split_key(key_occurrence.key).last,
+              data: { occurrences: key_occurrence.occurrences }
+            )
           end
         end
       end
 
       def from_key_attr(key_attrs, opts = {}, &block)
-        build_forest(opts) { |forest|
-          key_attrs.each { |(full_key, attr)|
-            raise "Invalid key #{full_key.inspect}" if full_key.end_with?('.')
+        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))
-            block.call(full_key, node) if block
+            yield(full_key, node) if block
             forest[full_key] = node
-          }
-        }
+          end
+        end
       end
 
       def from_key_names(keys, opts = {}, &block)
-        build_forest(opts) { |forest|
-          keys.each { |full_key|
+        build_forest(opts) do |forest|
+          keys.each do |full_key|
             node = ::I18n::Tasks::Data::Tree::Node.new(key: split_key(full_key).last)
-            block.call(full_key, node) if block
+            yield(full_key, node) if block
             forest[full_key] = node
-          }
-        }
+          end
+        end
       end
 
       # build forest from nested hash, e.g. {'es' => { 'common' => { name => 'Nombre', 'age' => 'Edad' } } }
       # this is the native i18n gem format
       def from_nested_hash(hash, opts = {})
         parse_parent_opt!(opts)
-        raise ::I18n::Tasks::CommandError.new("invalid tree #{hash.inspect}") unless hash.respond_to?(:map)
+        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
@@ -257,13 +262,14 @@ module I18n::Tasks::Data::Tree
       # build forest from [[Full Key, Value]]
       def from_flat_pairs(pairs)
         Siblings.new.tap do |siblings|
-          pairs.each { |full_key, value|
+          pairs.each do |full_key, value|
             siblings[full_key] = ::I18n::Tasks::Data::Tree::Node.new(key: split_key(full_key).last, value: value)
-          }
+          end
         end
       end
 
       private
+
       def parse_parent_opt!(opts)
         if opts[:parent_key]
           opts[:parent] = ::I18n::Tasks::Data::Tree::Node.new(key: opts[:parent_key])
@@ -273,7 +279,8 @@ module I18n::Tasks::Data::Tree
         end
         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
     end