i18n-tasks 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0d5a6d44abbe13489dbf413f1fe2934f96ac3ec
-  data.tar.gz: b73c633dbb50493e77f248a4d019473d38920c6e
+  metadata.gz: 850032b9cd081295834563c079f301118c4adc93
+  data.tar.gz: bb430460401ab69f396b53e29337b7d12894c49a
 SHA512:
-  metadata.gz: 33f1b9a719ad5a1127be44b0513aa9e0f2cd46598c2d855c46be9fbb9e488164c4eacddbd0d7ef0da28e4db7ffd922162770d8dbe883acdb45cf5d8d44dfb28b
-  data.tar.gz: 625b026add3aa686380a485df1f1db04ab450092eac690d793eb0293f237752c823702164ec13e662a3d7e4d5717a0dd840bfebe41d65f796f97abacd58bef12
+  metadata.gz: 2f28025277307b4c42facd0f94691100f73680a27eaf135945484e5711e66db865a094269f895c3f6e7cdb767c021a50df51fb50d77377eccbfa7e8955359e18
+  data.tar.gz: 6abfa104439e6592d7a40934fa8e7c70707094be19faad49ce5ca4fbb9a04774613662f0076ff2fa436cd62001a242ad0dea35dcddbcdab7b3e0c49b11f17304

data/CHANGES.md

@@ -1,7 +1,15 @@
+## 0.7.5
+
+Dynamic key usage inference fixes by [Mikko Koski](https://github.com/rap1ds):
+
+* Append `:` to keys ending with dot '.' (to scan `t('category.' + cat)` as `t('category.:')`)
+* Consider keys ending with `:` as match expressions
+* Make `@` a valid character for keys (to allow `t("category.#{@cat}"`)
+
 ## 0.7.4
 
 * Fix `add-missing --help`
-* Fix a minor issue with `health` #88(https://github.com/glebm/i18n-tasks/issues/88)
+* Fix a minor issue with `health` [#88](https://github.com/glebm/i18n-tasks/issues/88)
 
 ## 0.7.3
 
@@ -196,29 +204,29 @@ With these trees, information can be associated with each node, which allows for
 
 * config/i18n-tasks.yml now processed with ERB
 * can now be used with any ruby apps, not just Rails
-* more locale formats are considered valid 
+* more locale formats are considered valid
 * `i18n:missing` accepts locales
 * `i18n:missing` supports plural keys
 
 ## v0.2.4
 
-* more powerful key pattern matching with sets and backtracking 
+* more powerful key pattern matching with sets and backtracking
 
 ## v0.2.3
 
-* spreadsheet report, tests run on rbx 
+* spreadsheet report, tests run on rbx
 
 ## v0.2.2
 
-* improved output with terminal-table 
+* improved output with terminal-table
 
 ## v0.2.1
 
-* fill tasks renamed, fix symbol key search 
+* fill tasks renamed, fix symbol key search
 
 ## v0.2.0
 
-* 3 more prefill tasks, including Google Translate 
+* 3 more prefill tasks, including Google Translate
 * tasks renamed
 
 ## v0.1.8
@@ -227,16 +235,16 @@ With these trees, information can be associated with each node, which allows for
 
 ## v0.1.7
 
-* ability to route prefill output via data.write config 
-* multiple configuration variables renamed (still understands old syntax with deprecation warnings) 
+* ability to route prefill output via data.write config
+* multiple configuration variables renamed (still understands old syntax with deprecation warnings)
 
 ## v0.1.6
 
-* New key pattern syntax for i18n-tasks.yml a la globbing 
+* New key pattern syntax for i18n-tasks.yml a la globbing
 
 ## v0.1.5
 
-* Removed get_locale_data, added data configuration options 
+* Removed get_locale_data, added data configuration options
 
 ## v0.1.4
 
@@ -245,10 +253,10 @@ With these trees, information can be associated with each node, which allows for
 
 ## v0.1.3
 
-* detect countable keys as used for unused task 
+* detect countable keys as used for unused task
 * account for non-string keys coming from yaml (thanks @lichtamberg)
 
 ## v0.1.2
 
 * added grep config options (thanks @dmke)
-* improved terminal output 
+* improved terminal output

data/README.md

@@ -25,7 +25,7 @@ i18n-tasks can be used with any project using [i18n][i18n-gem] (default in Rails
 Add to Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.7.4'
+gem 'i18n-tasks', '~> 0.7.5'
 ```
 
 Copy default [configuration file](#configuration) (optional):

data/bin/i18n-tasks

@@ -35,7 +35,7 @@ begin
       exit
     }
     commander.cmds.each do |name, attr|
-      slop_dsl = slop_adapter.slop_command(name, attr) { |name, opts|
+      slop_dsl = slop_adapter.slop_command(name, attr) { |_name, opts|
         begin
           ran = true
           instance.safe_run name, opts
@@ -45,7 +45,7 @@ begin
           exit 1
         end
       }
-      instance_exec &slop_dsl
+      instance_exec(&slop_dsl)
     end
   end
 rescue Slop::Error => e

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

@@ -9,7 +9,7 @@ module I18n::Tasks
         include Options::EnumOpt
         include Options::ListOpt
 
-        VALID_LOCALE_RE = /\A\w[\w\-_\.]*\z/i
+        VALID_LOCALE_RE = /\A\w[\w\-\.]*\z/i
 
         cmd_opt :nostdin, {
             short: :S,

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

@@ -43,7 +43,7 @@ module I18n::Tasks
           opt[key]
         end
 
-        VALID_LOCALE_RE = /\A\w[\w\-_\.]*\z/i
+        VALID_LOCALE_RE = /\A\w[\w\-\.]*\z/i
 
         def validate_locale!(locale)
           raise CommandError.new(I18n.t('i18n_tasks.cmd.errors.invalid_locale', invalid: locale)) if VALID_LOCALE_RE !~ locale

data/lib/i18n/tasks/configuration.rb

@@ -12,7 +12,7 @@ module I18n::Tasks::Configuration
   )
 
   def file_config
-    file = CONFIG_FILES.detect { |f| File.exists?(f) }
+    file = CONFIG_FILES.detect { |f| File.exist?(f) }
     config = file && YAML.load(Erubis::Eruby.new(File.read(file)).result)
     if config.present?
       config.with_indifferent_access.tap do |c|

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

@@ -12,7 +12,7 @@ module I18n::Tasks
       include ::I18n::Tasks::Logging
 
       attr_reader :config, :base_locale, :locales
-      attr_accessor :locales
+      attr_writer :locales
 
       DEFAULTS = {
           read:  ['config/locales/%{locale}.yml'],

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

@@ -8,11 +8,12 @@ module I18n::Tasks::Data::Tree
     attr_reader :key, :children, :parent
 
     def initialize(opts = {})
-      @key          = opts[:key].try(:to_s)
+      @key          = opts[:key]
+      @key = @key.to_s.freeze if @key
       @value        = opts[:value]
       @data         = opts[:data]
       @parent       = opts[:parent]
-      self.children = opts[:children] if opts[:children]
+      self.children = (opts[:children] if opts[:children])
     end
 
     def attributes
@@ -102,7 +103,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?
+      parent.walk_to_root(&visitor) if parent?
     end
 
     def root
@@ -123,7 +124,7 @@ module I18n::Tasks::Data::Tree
     end
 
     def to_siblings
-      parent.try(:children) || Siblings.new(nodes: [self])
+      parent && parent.children || Siblings.new(nodes: [self])
     end
 
     def to_hash

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

@@ -49,7 +49,7 @@ module I18n::Tasks::Data::Tree
 
     # @return [Node] by full key
     def get(full_key)
-      first_key, rest = split_key(full_key, 2)
+      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)

data/lib/i18n/tasks/ignore_keys.rb

@@ -15,13 +15,13 @@ module I18n::Tasks::IgnoreKeys
     @ignore_patterns[type]        ||= {}
     @ignore_patterns[type][locale] ||= begin
       global, type_ignore = ignore_config.presence || [], ignore_config(type).presence || []
-      if type_ignore.is_a?(Array)
-        patterns = global + type_ignore
-      elsif type_ignore.is_a?(Hash)
-        # ignore per locale
-        patterns = global + (type_ignore['all'] || []) +
-            type_ignore.select { |k, v| k.to_s =~ /\b#{locale}\b/ }.values.flatten(1).compact
-      end
+      patterns = if type_ignore.is_a?(Array)
+                   global + type_ignore
+                 elsif type_ignore.is_a?(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/key_pattern_matching.rb

@@ -39,7 +39,7 @@ module I18n::Tasks::KeyPatternMatching
   end
 
   # @return true if the key looks like an expression
-  KEY_INTERPOLATION_RE = /(?:\#{.*?}|\*+)/.freeze
+  KEY_INTERPOLATION_RE = /(?:\#{.*?}|\*+|\:+)/.freeze
   def key_expression?(k)
     @key_is_expr ||= {}
     if @key_is_expr[k].nil?

data/lib/i18n/tasks/locale_pathname.rb

@@ -3,7 +3,13 @@ module I18n::Tasks
     extend self
 
     def replace_locale(path, from, to)
-      path.try :sub, /(?<=^|[\/.])#{from}(?=\.)/, "#{to}"
+      path && path.sub(path_locale_re(from), to)
+    end
+
+    private
+
+    def path_locale_re(locale)
+      (@path_locale_res ||= {})[locale] ||= /(?<=^|[\/.])#{locale}(?=\.)/.freeze
     end
   end
 end

data/lib/i18n/tasks/logging.rb

@@ -21,6 +21,6 @@ module I18n::Tasks::Logging
   end
 
   def log_stderr(*args)
-    STDERR.puts *args
+    STDERR.puts(*args)
   end
 end

data/lib/i18n/tasks/missing_keys.rb

@@ -67,7 +67,7 @@ module I18n::Tasks
     # keys present in compared_to, but not in locale
     def missing_diff_tree(locale, compared_to = base_locale)
       data[compared_to].select_keys { |key, _node|
-        locale_key_missing? locale, depluralize_key(key, locale)
+        locale_key_missing? locale, depluralize_key(key, compared_to)
       }.set_root_key!(locale, type: :missing_diff).keys { |_key, node|
         if node.data.key?(:path)
           # change path and locale to base

data/lib/i18n/tasks/plural_keys.rb

@@ -21,7 +21,8 @@ module I18n::Tasks::PluralKeys
   # @return the base form if the key is a specific plural form (e.g. apple for apple.many), and the key as passed otherwise
   def depluralize_key(key, locale = base_locale)
     return key if key !~ PLURAL_KEY_RE
-    parent_key = split_key(key)[0..-2] * '.'
+    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}"))
     if nodes && plural_forms?(nodes)
       parent_key

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

@@ -40,7 +40,7 @@ module I18n::Tasks::Reports
     def sort_by_attr!(objects, order = {locale: :asc, key: :asc})
       order_keys = order.keys
       objects.sort! { |a, b|
-        by = order_keys.detect { |by| a[by] != b[by] }
+        by = order_keys.detect { |k| a[k] != b[k] }
         order[by] == :desc ? b[by] <=> a[by] : a[by] <=> b[by]
       }
       objects

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

@@ -42,7 +42,7 @@ module I18n::Tasks::Scanners
         scan_file(path, opts)
       }.reduce(:+) || []
       keys.group_by(&:first).map { |key, key_loc|
-        [key, data: {source_occurrences: key_loc.map { |(k, attr)| attr[:data] }}]
+        [key, data: {source_occurrences: key_loc.map { |(_k, attr)| attr[:data] }}]
       }
     end
 
@@ -61,7 +61,7 @@ module I18n::Tasks::Scanners
     # @return [Array] Results of block calls
     def traverse_files
       result = []
-      paths  = config[:paths].select { |p| File.exists?(p) }
+      paths  = config[:paths].select { |p| File.exist?(p) }
       if paths.empty?
         log_warn "search.paths #{config[:paths].inspect} do not exist"
         return result
@@ -117,7 +117,7 @@ module I18n::Tasks::Scanners
 
     VALID_KEY_CHARS = /[-\w.?!;:]/
     VALID_KEY_RE_STRICT = /^#{VALID_KEY_CHARS}+$/
-    VALID_KEY_RE = /^(#{VALID_KEY_CHARS}|[\#{}])+$/
+    VALID_KEY_RE = /^(#{VALID_KEY_CHARS}|[\#{@}])+$/
 
     def valid_key?(key, strict = false)
       return false if @key_filter && @key_filter_pattern !~ key

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

@@ -15,6 +15,7 @@ module I18n::Tasks::Scanners
         src_pos = Regexp.last_match.offset(0).first
         key     = match_to_key(match, path)
         next unless valid_key?(key, strict)
+        key = key + ':' if key.end_with?('.')
         location = src_location(path, text, src_pos)
         unless exclude_line?(location[:line])
           keys << [key, data: location]
@@ -39,7 +40,6 @@ module I18n::Tasks::Scanners
     # @return [String] full absolute key name
     def match_to_key(match, path)
       key = strip_literal(match[0])
-      key = key + '*' if key.end_with?('.')
       key = absolutize_key(key, path) if path && key.start_with?('.')
       key
     end

data/lib/i18n/tasks/split_key.rb

@@ -1,39 +1,65 @@
 module SplitKey
   extend self
 
-  # split a key taking parenthesis into account
+  # split a key by dots (.)
+  # dots inside braces or parenthesis are not split on
+  #
   # split_key 'a.b'      # => ['a', 'b']
   # split_key 'a.#{b.c}' # => ['a', '#{b.c}']
   # split_key 'a.b.c', 2 # => ['a', 'b.c']
   def split_key(key, max = Float::INFINITY)
     parts = []
-    nesting = NESTING_CHARS
-    counts  = Array.new(NESTING_CHARS.size, 0)
+    pos = 0
+    return [key] if max == 1
+    key_parts(key) do |part|
+      parts << part
+      pos += part.length + 1
+      if parts.length + 1 >= max
+        parts << key.from(pos) unless pos == key.length
+        break
+      end
+    end
+    parts
+  end
+
+  def last_key_part(key)
+    last = nil
+    key_parts(key) { |part| last = part }
+    last
+  end
+
+  # yield each key part
+  # dots inside braces or parenthesis are not split on
+  def key_parts(key, &block)
+    return enum_for(:key_parts, key) unless block
+    nesting = PARENS
+    counts  = PARENS_ZEROS # dup'd later if key contains parenthesis
     delim   = '.'.freeze
-    buf = []
-    key.to_s.chars.each do |char|
-      nest_i, nest_inc = nesting[char]
-      if nest_i
-        counts[nest_i] += nest_inc
-        buf << char
-      elsif char == delim && parts.length + 1 < max && counts.all?(&:zero?)
-        part = buf.join
-        buf.clear
-        parts << part
-        yield part if block_given?
+    from = to = 0
+    key.each_char do |char|
+      if char == delim && PARENS_ZEROS == counts
+        block.yield key[from...to]
+        from = to = (to + 1)
       else
-        buf << char
+        nest_i, nest_inc = nesting[char]
+        if nest_i
+          counts = counts.dup if counts.frozen?
+          counts[nest_i] += nest_inc
+        end
+        to += 1
       end
     end
-    parts << buf.join unless buf.empty?
-    parts
+    block.yield(key[from...to]) if from < to && to <= key.length
+    true
   end
 
-  NESTING_CHARS = %w({} [] ()).inject({}) { |h, s|
-    i = h.size / 2
+  PARENS = %w({} [] ()).inject({}) { |h, s|
+    i              = h.size / 2
     h[s[0].freeze] = [i, 1].freeze
     h[s[1].freeze] = [i, -1].freeze
     h
   }.freeze
-  private_constant :NESTING_CHARS
+  PARENS_ZEROS = Array.new(PARENS.size, 0).freeze
+  private_constant :PARENS
+  private_constant :PARENS_ZEROS
 end

data/lib/i18n/tasks/version.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 module I18n
   module Tasks
-    VERSION = '0.7.4'
+    VERSION = '0.7.5'
   end
 end

data/spec/split_key_spec.rb

@@ -22,6 +22,12 @@ describe 'SplitKey' do
     expect(split_key 'a.b.c', 1).to eq(['a.b.c'])
     expect(split_key 'a.b.c', 2).to eq(['a', 'b.c'])
     expect(split_key 'a.b.c.', 2).to eq(['a', 'b.c.'])
+    expect(split_key 'a.b.c.d.e.f', 4).to eq(['a', 'b', 'c', 'd.e.f'])
   end
 
+  it 'last part' do
+    expect(last_key_part 'a.b.c').to eq('c')
+    expect(last_key_part 'a').to eq('a')
+    expect(last_key_part 'a.b.c.d').to eq('d')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis