i18n-tasks 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 414af08a4707037cdb353bba1ed426fd44852906
-  data.tar.gz: 986fd27c576e0763f1980ba70fa45e7cad81ce95
+  metadata.gz: 4f6dc7facc584ec90bee3fd89b5222c645c0207d
+  data.tar.gz: 0c09aea76d0b9c8494f6544c99e7b698374887dc
 SHA512:
-  metadata.gz: 9cd51331aa6e088f79d0d06d28c88b1b32b5321c25af2821c638639ebf40ea28b121ad1ac056f37d1ace4e702589282df29957d9e0be9877fc444b97e31daa39
-  data.tar.gz: 46339dd43fcb62d8630bb348df8ceee774d90ced3eab072f0565e66df1ae426228ad81e5584b28e3d346e5bac81f2f4988c04879ca594d63c74175d3e8b59e38
+  metadata.gz: b1f5f755ef3f26541331ecf6aaee38bf68958018b28bd22d94b8aa2b6e930277789d36186debb785fb7a139ec68fdf1024df8e18d5145a263a99d8c4d91f8237
+  data.tar.gz: 976c51c8ad42d3c538713d353172b7db8bc0b519fc50cf37e613b03e665b9a19d535352138fd484aa9534a9c51e65a1a18091440b32fbc03cf21f1cbbe053553

data/README.md

@@ -24,7 +24,7 @@ i18n-tasks can be used with any project using the ruby [i18n gem][i18n-gem] (def
 Add i18n-tasks to the Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.9.13'
+gem 'i18n-tasks', '~> 0.9.14'
 ```
 
 Copy the default [configuration file](#configuration):

data/i18n-tasks.gemspec

@@ -30,8 +30,8 @@ TEXT
   s.required_ruby_version = '~> 2.1' if s.respond_to?(:required_ruby_version=)
 
   s.files = `git ls-files`.split($/)
-  s.files -= s.files.grep(%r{^(doc/|\.|spec/)}) + %w(CHANGES.md config/i18n-tasks.yml Gemfile)
-  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) } - %w(i18n-tasks.cmd)
+  s.files -= s.files.grep(%r{^(doc/|\.|spec/)}) + %w[CHANGES.md config/i18n-tasks.yml Gemfile]
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) } - %w[i18n-tasks.cmd]
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 

data/lib/i18n/tasks/cli.rb

@@ -101,7 +101,7 @@ class I18n::Tasks::CLI
 
   def allow_help_arg_first!(argv)
     # allow `i18n-tasks --help command` in addition to `i18n-tasks command --help`
-    if %w(-h --help).include?(argv[0]) && argv[1] && !argv[1].start_with?('-')
+    if %w[-h --help].include?(argv[0]) && argv[1] && !argv[1].start_with?('-')
       argv[0], argv[1] = argv[1], argv[0]
     end
   end

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

@@ -14,7 +14,7 @@ module I18n::Tasks
         cmd :normalize,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.normalize'),
-            args: %i(locales pattern_router)
+            args: %i[locales pattern_router]
 
         def normalize(opt = {})
           i18n.normalize_store! opt[:locales], opt[:pattern_router]
@@ -49,7 +49,7 @@ module I18n::Tasks
         cmd :data,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.data'),
-            args: %i(locales out_format)
+            args: %i[locales out_format]
 
         def data(opt = {})
           print_forest i18n.data_forest(opt[:locales]), opt
@@ -58,7 +58,7 @@ module I18n::Tasks
         cmd :data_merge,
             pos:  '[tree ...]',
             desc: t('i18n_tasks.cmd.desc.data_merge'),
-            args: %i(data_format nostdin)
+            args: %i[data_format nostdin]
 
         def data_merge(opt = {})
           forest = merge_forests_stdin_and_pos!(opt)
@@ -69,7 +69,7 @@ module I18n::Tasks
         cmd :data_write,
             pos:  '[tree]',
             desc: t('i18n_tasks.cmd.desc.data_write'),
-            args: %i(data_format nostdin)
+            args: %i[data_format nostdin]
 
         def data_write(opt = {})
           forest = forest_pos_or_stdin!(opt)
@@ -80,7 +80,7 @@ module I18n::Tasks
         cmd :data_remove,
             pos:  '[tree]',
             desc: t('i18n_tasks.cmd.desc.data_remove'),
-            args: %i(data_format nostdin)
+            args: %i[data_format nostdin]
 
         def data_remove(opt = {})
           removed = i18n.data.remove_by_key!(forest_pos_or_stdin!(opt))

data/lib/i18n/tasks/command/commands/eq_base.rb

@@ -9,7 +9,7 @@ module I18n::Tasks
         cmd :eq_base,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.eq_base'),
-            args: %i(locales out_format)
+            args: %i[locales out_format]
 
         def eq_base(opt = {})
           print_forest i18n.eq_base_keys(opt), opt, :eq_base_keys

data/lib/i18n/tasks/command/commands/health.rb

@@ -9,7 +9,7 @@ module I18n::Tasks
         cmd :health,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.health'),
-            args: %i(locales out_format)
+            args: %i[locales out_format]
 
         def health(opt = {})
           forest = i18n.data_forest(opt[:locales])

data/lib/i18n/tasks/command/commands/missing.rb

@@ -25,7 +25,7 @@ module I18n::Tasks
         cmd :missing,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.missing'),
-            args: %i(locales out_format missing_types)
+            args: %i[locales out_format missing_types]
 
         def missing(opt = {})
           forest = i18n.missing_keys(opt.slice(:locales, :base_locale, :missing_types))

data/lib/i18n/tasks/command/commands/tree.rb

@@ -20,7 +20,7 @@ module I18n::Tasks
         cmd :tree_merge,
             pos:  '[[tree] [tree] ... (or stdin)]',
             desc: t('i18n_tasks.cmd.desc.tree_merge'),
-            args: %i(data_format nostdin)
+            args: %i[data_format nostdin]
 
         def tree_merge(opts = {})
           print_forest merge_forests_stdin_and_pos!(opts), opts
@@ -29,7 +29,7 @@ module I18n::Tasks
         cmd :tree_filter,
             pos:  '[pattern] [tree (or stdin)]',
             desc: t('i18n_tasks.cmd.desc.tree_filter'),
-            args: %i(data_format pattern)
+            args: %i[data_format pattern]
 
         def tree_filter(opts = {})
           pattern = arg_or_pos! :pattern, opts
@@ -75,7 +75,7 @@ module I18n::Tasks
         cmd :tree_subtract,
             pos:  '[[tree] [tree] ... (or stdin)]',
             desc: t('i18n_tasks.cmd.desc.tree_subtract'),
-            args: %i(data_format nostdin)
+            args: %i[data_format nostdin]
 
         def tree_subtract(opt = {})
           forests = forests_stdin_and_pos! opt, 2
@@ -86,7 +86,7 @@ module I18n::Tasks
         cmd :tree_set_value,
             pos:  '[VALUE] [tree (or stdin)]',
             desc: t('i18n_tasks.cmd.desc.tree_set_value'),
-            args: %i(value data_format nostdin pattern)
+            args: %i[value data_format nostdin pattern]
 
         def tree_set_value(opt = {})
           value       = arg_or_pos! :value, opt

data/lib/i18n/tasks/command/commands/usages.rb

@@ -13,7 +13,7 @@ module I18n::Tasks
         cmd :find,
             pos:  '[pattern]',
             desc: t('i18n_tasks.cmd.desc.find'),
-            args: %i(out_format pattern strict)
+            args: %i[out_format pattern strict]
 
         def find(opt = {})
           opt[:filter] ||= opt.delete(:pattern) || opt[:arguments].try(:first)
@@ -24,7 +24,7 @@ module I18n::Tasks
         cmd :unused,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.unused'),
-            args: %i(locales out_format strict)
+            args: %i[locales out_format strict]
 
         def unused(opt = {})
           forest = i18n.unused_keys(opt.slice(:locales, :strict))
@@ -35,7 +35,7 @@ module I18n::Tasks
         cmd :remove_unused,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.remove_unused'),
-            args: %i(locales out_format strict confirm)
+            args: %i[locales out_format strict confirm]
 
         def remove_unused(opt = {})
           unused_keys = i18n.unused_keys(opt.slice(:locales, :strict))

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

@@ -36,7 +36,7 @@ module I18n::Tasks
 
           def call(values, *)
             values = Array(values)
-            return @valid if values == %w(all)
+            return @valid if values == %w[all]
             invalid = values - @valid
             if invalid.empty?
               if values.empty?

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

@@ -37,7 +37,7 @@ module I18n::Tasks
 
           # @param [#base_locale,#locales] context
           def call(vals, context)
-            if vals == %w(all) || vals.blank?
+            if vals == %w[all] || vals.blank?
               context.locales
             else
               move_base_locale_to_front!(vals.map { |v| v == 'base' ? context.base_locale : v }, context.base_locale)

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

@@ -8,7 +8,7 @@ module I18n::Tasks
       module Data
         include Command::DSL
 
-        DATA_FORMATS = %w(yaml json keys).freeze
+        DATA_FORMATS = %w[yaml json keys].freeze
         OUT_FORMATS  = ['terminal-table', *DATA_FORMATS, 'inspect'].freeze
 
         format_arg = proc do |type, values|

data/lib/i18n/tasks/configuration.rb

@@ -14,10 +14,10 @@ module I18n::Tasks::Configuration # rubocop:disable Metrics/ModuleLength
     @config || (self.config = {})
   end
 
-  CONFIG_FILES = %w(
+  CONFIG_FILES = %w[
     config/i18n-tasks.yml config/i18n-tasks.yml.erb
     i18n-tasks.yml i18n-tasks.yml.erb
-  ).freeze
+  ].freeze
 
   def file_config
     file   = CONFIG_FILES.detect { |f| File.exist?(f) }

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

@@ -160,7 +160,7 @@ Skipping a nil key found in #{path.inspect}:
   value: #{value.inspect}
 Nil keys are not supported by i18n.
 The following unquoted YAML keys result in a nil key:
-  #{%w(null Null NULL ~).join(', ')}
+  #{%w[null Null NULL ~].join(', ')}
 See http://yaml.org/type/null.html
 TEXT
           elsif value.is_a?(Hash)

data/lib/i18n/tasks/plural_keys.rb

@@ -2,7 +2,7 @@
 
 require 'set'
 module I18n::Tasks::PluralKeys
-  PLURAL_KEY_SUFFIXES = Set.new %w(zero one two few many other)
+  PLURAL_KEY_SUFFIXES = Set.new %w[zero one two few many other]
   PLURAL_KEY_RE = /\.(?:#{PLURAL_KEY_SUFFIXES.to_a * '|'})$/
 
   def collapse_plural_nodes!(tree)

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

@@ -36,7 +36,7 @@ module I18n::Tasks::Scanners::Files
       log_warn "None of the search.paths exist #{@paths.inspect}" if paths.empty?
       Find.find(*paths) do |path|
         is_dir   = File.directory?(path)
-        hidden   = File.basename(path).start_with?('.') && !%w(. ./).include?(path)
+        hidden   = File.basename(path).start_with?('.') && !%w[. ./].include?(path)
         not_incl = @include && !path_fnmatch_any?(path, @include)
         excl     = path_fnmatch_any?(path, @exclude)
         if is_dir || hidden || not_incl || excl

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

@@ -6,12 +6,12 @@ module I18n::Tasks::Scanners
   class RubyAstCallFinder
     include AST::Processor::Mixin
 
-    # @param messages [Array<Symbol>] method names to intercept.
-    # @param receivers [Array<nil, AST::Node>] receivers of the `messages` to intercept.
-    def initialize(messages:, receivers:)
+    # @param receiver_messages [Set<Pair<[nil, AST::Node>, Symbol>>] The receiver-message pairs to look for.
+    def initialize(receiver_messages:)
       super()
-      @messages  = Set.new(messages).freeze
-      @receivers = Set.new(receivers).freeze
+      @message_receivers = receiver_messages.each_with_object({}) do |(receiver, message), t|
+        (t[message] ||= []) << receiver
+      end
     end
 
     # @param root_node [Parser::AST:Node]
@@ -46,13 +46,13 @@ module I18n::Tasks::Scanners
     def on_send(send_node)
       receiver = send_node.children[0]
       message  = send_node.children[1]
-      if @messages.include?(message) &&
-         # use `any?` because `include?` checks type equality, but the receiver is a Parser::AST::Node != AST::Node.
-         @receivers.any? { |r| r == receiver }
+      valid_receivers = @message_receivers[message]
+      # use `any?` because `include?` checks type equality, but the receiver is a Parser::AST::Node != AST::Node.
+      if valid_receivers && valid_receivers.any? { |r| r == receiver }
         @callback.call(send_node, @method_name)
-      else
-        handler_missing send_node
       end
+      # always invoke handler_missing to get nested translations in children
+      handler_missing send_node
       nil
     end
 

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

@@ -15,12 +15,13 @@ module I18n::Tasks::Scanners
     include AST::Sexp
 
     MAGIC_COMMENT_PREFIX = /\A.\s*i18n-tasks-use\s+/
+    RECEIVER_MESSAGES = [nil, AST::Node.new(:const, [nil, :I18n])].product(%i[t translate])
 
-    def initialize(messages: %i(t translate), receivers: [nil, s(:const, nil, :I18n)], **args)
+    def initialize(receiver_messages: RECEIVER_MESSAGES, **args)
       super(args)
       @parser               = ::Parser::CurrentRuby.new
       @magic_comment_parser = ::Parser::CurrentRuby.new
-      @call_finder          = RubyAstCallFinder.new(messages: messages, receivers: receivers)
+      @call_finder          = RubyAstCallFinder.new(receiver_messages: receiver_messages)
     end
 
     protected
@@ -93,7 +94,7 @@ module I18n::Tasks::Scanners
       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
+        %i[sym str].include?(key_node.type) && key_node.children[0].to_s == key
       end
     end
 
@@ -110,9 +111,9 @@ module I18n::Tasks::Scanners
     # @return [String, nil] `nil` is returned only when a dynamic value is encountered in strict mode
     #     or the node type is not supported.
     def extract_string(node, array_join_with: nil, array_flatten: false, array_reject_blank: false)
-      if %i(sym str int).include?(node.type)
+      if %i[sym str int].include?(node.type)
         node.children[0].to_s
-      elsif %i(true false).include?(node.type)
+      elsif %i[true false].include?(node.type)
         node.type.to_s
       elsif :nil == node.type
         ''
@@ -126,9 +127,9 @@ module I18n::Tasks::Scanners
           # `nil` is returned when a dynamic value is encountered in strict mode. Propagate:
           return nil if str.nil?
         end
-      elsif !config[:strict] && %i(dsym dstr).include?(node.type)
+      elsif !config[:strict] && %i[dsym dstr].include?(node.type)
         node.children.map do |child|
-          if %i(sym str).include?(child.type)
+          if %i[sym str].include?(child.type)
             child.children[0].to_s
           else
             child.loc.expression.source
@@ -146,12 +147,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)
+        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) || (:array == child.type && array_flatten)
+          if %i[dsym dstr].include?(child.type) || (:array == child.type && array_flatten)
             extract_string(child, array_join_with: array_join_with)
           else
             "\#{#{child.loc.expression.source}}"

data/lib/i18n/tasks/used_keys.rb

@@ -15,9 +15,9 @@ require 'i18n/tasks/scanners/pattern_mapper'
 module I18n::Tasks
   module UsedKeys # rubocop:disable Metrics/ModuleLength
     SEARCH_DEFAULTS = {
-      paths:          %w(app/).freeze,
-      relative_roots: %w(app/controllers app/helpers app/mailers app/presenters app/views).freeze,
-      scanners:       [['::I18n::Tasks::Scanners::RubyAstScanner', only: %w(*.rb)]],
+      paths:          %w[app/].freeze,
+      relative_roots: %w[app/controllers app/helpers app/mailers app/presenters app/views].freeze,
+      scanners:       [['::I18n::Tasks::Scanners::RubyAstScanner', only: %w[*.rb]]],
       strict:         true
     }.tap do |defaults|
       defaults[:scanners] << ['::I18n::Tasks::Scanners::PatternWithScopeScanner',
@@ -29,8 +29,8 @@ module I18n::Tasks
                                               'erb'    => %q(^\s*<%\s*#(?!\si18n-tasks-use)) }.freeze]
     end
 
-    ALWAYS_EXCLUDE = %w(*.jpg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less
-                        *.yml *.json *.zip *.tar.gz).freeze
+    ALWAYS_EXCLUDE = %w[*.jpg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less
+                        *.yml *.json *.zip *.tar.gz *.swf *.flv].freeze
 
     # Find all keys in the source and return a forest with the keys in absolute form and their occurrences.
     #
@@ -109,10 +109,10 @@ module I18n::Tasks
 
     def merge_scanner_configs(a, b)
       a.deep_merge(b).tap do |c|
-        %i(scanners paths relative_roots).each do |key|
+        %i[scanners paths relative_roots].each do |key|
           c[key] = a[key] if b[key].blank?
         end
-        %i(exclude).each do |key|
+        %i[exclude].each do |key|
           merged = Array(a[key]) + Array(b[key])
           c[key] = merged unless merged.empty?
         end

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = '0.9.13'
+    VERSION = '0.9.14'
   end
 end

data/templates/config/i18n-tasks.yml

@@ -31,7 +31,7 @@ data:
     # - config/locales/%{locale}.yml
 
   ## Specify the router (see Readme for details). Valid values: conservative_router, pattern_router, or a custom class.
-  # router: convervative_router
+  # router: conservative_router
 
   yaml:
     write:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport