i18n-tasks 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5394593809b1be9eabef55d84ee0cf8ce692884
-  data.tar.gz: 5629b833e0ef043538a387a3eff45a1e16fdbc6f
+  metadata.gz: fba31809b28d7db5c2f2febad005236e8e4b7e1b
+  data.tar.gz: 0b3f032893745205af5368c017fe092fea521b26
 SHA512:
-  metadata.gz: 80141dbe9b294f9e83b3d1a812aa5f3381e2909ddf8175cec2df66dae8da310e6aedda8d36bb7a11c511d04e41a59972469eabe6475b88f0cfa0065034efa9b7
-  data.tar.gz: a0c620f7af53c0aa9f820afc057eb658f8c84d43caad4a9affdb1854d1b5ecacf76ceef4288b7265eaecca2382e0f3a8e6de226e7c21205c9aaf0d3a54a441a1
+  metadata.gz: ca884fd7cd3f02830003fb4fe8e13586fa162c22b328a17c39f0655e08005e03073ac193b6d57c50e3edb619b93bfc316eef873a761fb4bbdaac2d16d05c6375
+  data.tar.gz: 3ebcfa3023b2b5c6cb83181382a51253ffca5ce2ed476d9167495da31d19358ed8db3b8bd2401b522295f64312bdad9f51f5884a1de17145474eb3a45458d538

data/CHANGES.md

@@ -1,3 +1,8 @@
+## v0.1.7
+
+* ability to route prefill output via data.write config (@glebm)
+* multiple configuration variables renamed (still understands old syntax with deprecation warnings) (@glebm)
+
 ## v0.1.6
 
 * New key pattern syntax for i18n-tasks.yml a la globbing (@glebm)

data/README.md

@@ -8,8 +8,9 @@ Rails I18n tasks to find missing / unused translations and more. Works with slim
 Use `rake -T i18n` to get the list of tasks with descriptions. There are 3 tasks available at the moment:
 
 * `i18n:missing` task shows all the keys that have not been translated yet *([source](/lib/i18n/tasks/missing.rb))*
-* `i18n:prefill` task normalizes locale files, and adds missing keys from base locale to others *([source](/lib/i18n/tasks/prefill.rb))*
 * `i18n:unused` task shows potentially unused translations *([source](/lib/i18n/tasks/unused.rb))*
+* `i18n:prefill` task normalizes locale files, and adds missing keys from base locale to others *([source](/lib/i18n/tasks/prefill.rb))*
+
 
 The `i18n:unused` task will detect pattern translations and not report them, e.g.:
 
@@ -18,7 +19,7 @@ t 'category.' + category.key # 'category.arts_and_crafts' considered used
 t "category.#{category.key}" # also works
 ```
 
-Relative keys (`t '.title'`) are supported. Plural keys (key.one/many/other/etc) are supported.
+Relative keys (`t '.title'`) and plural keys (key.one/many/other/etc) are fully supported.
 
 For more examples see [the tests](/spec/i18n_tasks_spec.rb).
 
@@ -36,9 +37,58 @@ gem 'i18n-tasks', '~> 0.1.0'
 
 ## Configuration
 
-Tasks may incorrectly report framework i18n keys as missing. You can add `config/i18n-tasks.yml` to work around this:
+Configuration is read from `i18n-tasks/config.yml`.
+
+### Storage
+
+```yaml
+# i18n data storage
+data:
+  # The default YAML adapter supports reading from and writing to YAML files
+  adapter: yaml
+  # yaml adapter read option is a list of glob patterns of files to read from per-locale
+  read: 
+    # this one is default:
+    - 'config/locales/%{locale}.yml'
+    # this one would add some more files:
+    - 'config/locales/*.%{locale}.yml'
+  # yaml adapter write option a list of key pattern => output filename "routes" per-locale
+  write:
+    # keys matched top to bottom
+    - ['devise.*', 'config/locales/devise.%{locale}.yml']
+    # default catch-all (same as ['*', 'config/locales/%{locale}.yml'])
+    - 'config/locales/%{locale}.yml'
+```
+
+### Usage search
 
 ```yaml
+# i18n usage search in source
+search:
+  # search these directories (relative to your Rails.root directory, default: 'app/')
+  paths:
+    - 'app/'
+    - 'vendor/'
+  # include only files matching this glob pattern (default: blank = include all files)
+  include:
+    - '*.rb'
+    - '*.html.*'
+    - '*.text.*'
+  # explicitly exclude files (default: blank = exclude no files)
+  exclude: '*.js'
+  # search uses grep under the hood
+```
+
+### Fine-tuning
+
+Tasks may incorrectly report framework i18n keys as missing, also some patterns may not be detected.
+When all else fails, use the options below.
+
+```yaml
+# do not report these keys as unused
+ignore_unused:
+  - category.*.db_name
+
 # do not report these keys as missing (both on blank value and no key)
 ignore_missing:
   - devise.errors.unauthorized # ignore this key
@@ -51,33 +101,9 @@ ignore_eq_base:
   es,fr:
     - common.brand
 
-# do not report these keys as unused
-ignore_unused:
-  - category.*
-
 # do not report these keys ever
 ignore:
   - kaminari.*
-
-# where to read locale data from
-data:
-  # read paths for a given %{locale} (supports globs)
-  paths:
-    - 'config/locales/%{locale}.yml'
-  # you can also implement a custom storage layer, see the yaml one below
-  class: I18n::Tasks::Data::Yaml
-
-# search configuration (grep arguments)
-grep:
-  # search these directories (relative to your Rails.root directory, default: 'app/')
-  paths:
-    - 'app/'
-  # include only files matching this glob pattern (default: blank = include all files)
-  include:
-    - '*.rb'
-    - '*.html*'
-  # explicitly exclude files (default: blank = exclude no files)
-  exclude: '*.js'
 ```
 
 ## HTML report

data/lib/i18n/tasks.rb

@@ -1,10 +1,8 @@
 require 'i18n/tasks/version'
 require 'i18n/tasks/railtie'
-require 'i18n/tasks/key_pattern_matching'
-
-require 'i18n/tasks/data/yaml'
-require 'active_support/hash_with_indifferent_access'
-require 'active_support/core_ext/string/access'
+require 'active_support/core_ext/hash'
+require 'active_support/core_ext/string'
+require 'term/ansicolor'
 
 module I18n
   module Tasks
@@ -17,6 +15,10 @@ module I18n
           HashWithIndifferentAccess.new.merge(file.presence || {})
         end
       end
+
+      def warn_deprecated(message)
+        STDERR.puts Term::ANSIColor.yellow Term::ANSIColor.bold "i18n-tasks: [DEPRECATED] #{message}"
+      end
     end
   end
 end

data/lib/i18n/tasks/base_task.rb

@@ -1,19 +1,18 @@
 # coding: utf-8
-require 'term/ansicolor'
-require 'i18n/tasks/usage_search'
-require 'i18n/tasks/fuzzy_source_keys'
-require 'i18n/tasks/plural_keys'
+require 'i18n/tasks/key_pattern_matching'
 require 'i18n/tasks/relative_keys'
+require 'i18n/tasks/plural_keys'
+require 'i18n/tasks/source_keys'
 require 'i18n/tasks/translation_data'
 require 'i18n/tasks/ignore_keys'
 
 module I18n
   module Tasks
     class BaseTask
-      include UsageSearch
-      include PluralKeys
+      include KeyPatternMatching
       include RelativeKeys
-      include FuzzySourceKeys
+      include PluralKeys
+      include SourceKeys
       include TranslationData
       include IgnoreKeys
 
@@ -22,6 +21,11 @@ module I18n
       def config
         I18n::Tasks.config
       end
+
+      def warn_deprecated(message)
+        I18n::Tasks.warn_deprecated(message)
+      end
+
     end
   end
 end

data/lib/i18n/tasks/data/yaml.rb

@@ -1,22 +1,62 @@
+require 'i18n/tasks/data_traversal'
+require 'i18n/tasks/key_pattern_matching'
 module I18n::Tasks
   module Data
     class Yaml
+      include ::I18n::Tasks::DataTraversal
+      include ::I18n::Tasks::KeyPatternMatching
       attr_reader :options
 
+      DEFAULTS = {
+          read:  ['config/locales/%{locale}.yml'],
+          write: ['config/locales/%{locale}.yml']
+      }.with_indifferent_access
+
       def initialize(options)
-        @options = options
+        opt = (options || {}).with_indifferent_access
+        if opt.key?(:paths)
+          opt[:read] ||= opt.delete(:paths)
+          ::I18n::Tasks.warn_deprecated 'please rename "data.paths" key to "data.read" in config/i18n-tasks.yml'
+        end
+        opt = DEFAULTS.deep_merge(opt)
+        @read   = opt[:read]
+        @write  = opt[:write].map { |x| x.is_a?(String) ? ['*', x] : x }.map { |x|
+          [key_pattern_to_re(x[0]), x[1]]
+        }
       end
 
+      # get locale tree
       def get(locale)
-        options[:paths].map do |path|
-          Dir.glob path % { locale: locale }
-        end.flatten.map do |locale_file|
-          YAML.load_file locale_file
-        end.inject({}) do |hash, locale_data|
-          hash.deep_merge! locale_data || {}
-          hash
+        locale                        = locale.to_s
+        (@locale_data ||= {})[locale] ||= begin
+          @read.map do |path|
+            Dir.glob path % {locale: locale}
+          end.flatten.map do |locale_file|
+            YAML.load_file locale_file
+          end.inject({}) do |hash, locale_data|
+            hash.deep_merge! locale_data || {}
+            hash
+          end[locale.to_s]
+        end
+      end
+
+      alias [] get
+
+      # set locale tree
+      def set(locale, value_tree)
+        out = {}
+        traverse value_tree do |key, value|
+          route = @write.detect { |route| route[0] =~ key }
+          (out[route[1] % {locale: locale}] ||= []) << [key, value]
+        end
+        out.each do |path, data|
+          File.open(path, 'w') { |f|
+            f.write({locale.to_s => list_to_tree(data)}.to_yaml)
+          }
         end
       end
+
+      alias []= set
     end
   end
 end

data/lib/i18n/tasks/data_traversal.rb

@@ -0,0 +1,40 @@
+module I18n::Tasks::DataTraversal
+  # translation of the key found in the passed hash or nil
+  # @return [String,nil]
+  def t(hash, key)
+    key.split('.').inject(hash) { |r, seg| r[seg] if r }
+  end
+
+  # traverse hash, yielding with full key and value
+  # @param hash [Hash{String => String,Hash}] translation data to traverse
+  # @yield [full_key, value] yields full key and value for every translation in #hash
+  # @return [nil]
+  def traverse(path = '', hash)
+    q = [[path, hash]]
+    until q.empty?
+      path, value = q.pop
+      if value.is_a?(Hash)
+        value.each { |k, v| q << ["#{path}.#{k}", v] }
+      else
+        yield path[1..-1], value
+      end
+    end
+  end
+
+  def list_to_tree(list)
+    list = list.sort
+    tree = {}
+    list.each do |key, value|
+      key_segments = key.to_s.split('.')
+      node = key_segments[0..-2].inject(tree) do |r, segment|
+        if r.key?(segment)
+          r[segment]
+        else
+          r[segment] = {}
+        end
+      end
+      node[key_segments.last] = value
+    end
+    tree
+  end
+end

data/lib/i18n/tasks/key_pattern_matching.rb

@@ -14,7 +14,7 @@ module I18n::Tasks::KeyPatternMatching
   # convert key.* to key\..*
   def key_pattern_to_re(key_pattern)
     if key_pattern.end_with? '.'
-      $stderr.puts %Q(i18n-tasks: Deprecated "#{key_pattern}", please change to "#{key_pattern += '*'}".)
+      warn_deprecated %Q(please change pattern "#{key_pattern}" to "#{key_pattern += '*'}" in config/i18n-tasks.yml)
     end
     /^#{key_pattern.
         gsub(/\./, '\.').

data/lib/i18n/tasks/missing.rb

@@ -29,9 +29,9 @@ module I18n
       # present in base locale, but untranslated in another locale
       # @return Array{Hash}
       def keys_missing_translation(locale)
-        trn = locale_data(locale)[locale]
+        trn = data[locale]
         r   = []
-        traverse base_locale_data do |key, base_value|
+        traverse data[base_locale] do |key, base_value|
           value_in_locale = t(trn, key)
           if value_in_locale.blank? && !ignore_key?(key, :missing)
             r << {locale: locale, key: key, type: :blank, base_value: base_value}

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

@@ -6,29 +6,38 @@ module I18n
         include Term::ANSIColor
 
         def missing(missing)
-          $stderr.puts bold cyan "Missing keys and translations (#{missing.length})"
+          print_title "Missing keys and translations (#{missing.length})"
           if missing.present?
-            $stderr.puts "#{bold 'Legend:'} #{red '✗'} key missing, #{yellow bold '∅'} translation blank, #{blue bold '='} value equal to base locale; #{cyan 'value in base locale'}"
+            $stderr.puts "#{bold 'Legend:'} #{on_red '✗'} key missing, #{yellow bold '∅'} translation blank, #{blue bold '='} value equal to base locale, #{cyan 'value in base locale'}"
             key_col_width = missing.map { |x| x[:key] }.max_by(&:length).length + 2
             missing.each { |m| print_missing_translation m, key_col_width: key_col_width }
           else
-            $stderr.puts(bold green 'Good job! No translations missing!')
+            print_success 'Good job! No translations missing!'
           end
         end
 
         def unused(unused)
-          $stderr.puts bold cyan("Unused i18n keys (#{unused.length})")
+          print_title "Unused i18n keys (#{unused.length})"
           if unused.present?
             key_col_width = unused.max_by { |x| x[0].length }[0].length + 2
             unused.each { |(key, value)| puts "#{magenta key.ljust(key_col_width)}#{cyan value.to_s.strip}" }
           else
-            $stderr.puts(bold green 'Good job! Every translation is used!')
+            print_success 'Good job! Every translation is used!'
           end
         end
 
         private
 
         extend Term::ANSIColor
+
+        def print_title(title)
+          $stderr.puts "#{bold cyan title.strip} #{dark "|"} #{bold "i18n-tasks v#{I18n::Tasks::VERSION}"}"
+        end
+
+        def print_success(message)
+          $stderr.puts(bold green message)
+        end
+
         STATUS_TEXTS = {
             none:    red("✗".ljust(6)),
             blank:   yellow(bold '∅'.ljust(6)),

data/lib/i18n/tasks/prefill.rb

@@ -7,17 +7,9 @@ module I18n
       def perform
         # Will also rewrite en, good for ordering
         I18n.available_locales.map(&:to_s).each do |target_locale|
-          trn = locale_data(target_locale)
-          prefilled = { target_locale => base_locale_data }.deep_merge(trn)
-          File.open(locale_file_path(target_locale), 'w'){ |f| f.write prefilled.to_yaml }
+          data[target_locale] = data[base_locale].deep_merge(data[target_locale])
         end
       end
-
-      # main locale file path (for writing to)
-      # @return [String]
-      def locale_file_path(locale)
-        "config/locales/#{locale}.yml"
-      end
     end
   end
 end

data/lib/i18n/tasks/{usage_search.rb → source_keys.rb}

@@ -1,19 +1,5 @@
 require 'open3'
-module I18n::Tasks::UsageSearch
-  # grep config, also from config/i18n-tasks.yml
-  # @return [Hash{String => String,Hash,Array}]
-  def grep_config
-    @grep_config ||= (config[:grep] || {}).with_indifferent_access.tap do |conf|
-      conf[:paths] = ['app/'] if conf[:paths].blank?
-    end
-  end
-
-  # whether the key is used in the source
-  def used_key?(key)
-    @used_keys ||= find_source_keys.to_set
-    @used_keys.include?(key)
-  end
-
+module I18n::Tasks::SourceKeys
   # find all keys in the source (relative keys are returned in absolutized)
   # @return [Array<String>]
   def find_source_keys
@@ -33,8 +19,41 @@ module I18n::Tasks::UsageSearch
     end
   end
 
+  # whether the key is used in the source
+  def used_key?(key)
+    @used_keys ||= find_source_keys.to_set
+    @used_keys.include?(key)
+  end
+
+  # dynamically generated keys in the source, e.g t("category.#{category_key}")
+  def pattern_key?(key)
+    @pattern_keys_re ||= compile_start_with_re(pattern_key_prefixes)
+    !!(key =~ @pattern_keys_re)
+  end
+
+  # keys in the source that end with a ., e.g. t("category.#{cat.i18n_key}") or t("category." + category.key)
+  def pattern_key_prefixes
+    @pattern_keys_prefixes ||=
+        find_source_keys.select { |k| k =~ /\#{.*?}/ || k.ends_with?('.') }.map { |k| k.split(/\.?#/)[0].presence }.compact
+  end
+
   protected
 
+  # grep config, also from config/i18n-tasks.yml
+  # @return [Hash{String => String,Hash,Array}]
+  def grep_config
+    @grep_config ||= begin
+      if config.key?(:grep)
+        config[:search] ||= config.delete(:grep)
+        warn_deprecated 'please rename "grep" key to "search" in config/i18n-tasks.yml'
+      end
+      search_config = (config[:search] || {}).with_indifferent_access
+      search_config.tap do |conf|
+        conf[:paths] = %w(app/) if conf[:paths].blank?
+      end
+    end
+  end
+
   # Run grep searching for source keys and return grep output
   # @return [String] output of the grep command
   def run_grep

data/lib/i18n/tasks/translation_data.rb

@@ -1,58 +1,28 @@
+require 'i18n/tasks/data_traversal'
+require 'i18n/tasks/data/yaml'
+
 module I18n::Tasks::TranslationData
-  # locale data hash, with locale name as root
-  # @return [Hash{String => String,Hash}] locale data in nested hash format
-  def locale_data(locale)
-    locale                        = locale.to_s
-    (@locale_data ||= {})[locale] ||= data_source.get(locale) || {}
-  end
+  include I18n::Tasks::DataTraversal
 
   # I18n data provider
-  def data_source
-    return @source if @source
-    conf    = config[:data] || {}
-    @source = if conf[:class]
-                conf[:class].constantize.new(conf.except(:class))
-              else
-                I18n::Tasks::Data::Yaml.new(
-                    paths: Array(conf[:paths].presence || ['config/locales/%{locale}.yml'])
-                )
-              end
-  end
-
-  # translation of the key found in the passed hash or nil
-  # @return [String,nil]
-  def t(hash, key)
-    key.split('.').inject(hash) { |r, seg| r[seg] if r }
+  # @see I18n::Tasks::Data::Yaml
+  def data
+    return @data if @data
+    conf    = (config[:data] || {}).with_indifferent_access
+    adapter = (conf[:adapter].presence || conf[:class].presence || :yaml).to_s
+    if adapter !~ /[A-Z]/
+      adapter = "I18n::Tasks::Data::#{adapter.camelize}"
+    end
+    @data = adapter.constantize.new(conf.except(:adapter, :class))
   end
 
-  # traverse hash, yielding with full key and value
-  # @param hash [Hash{String => String,Hash}] translation data to traverse
-  # @yield [full_key, value] yields full key and value for every translation in #hash
-  # @return [nil]
-  def traverse(path = '', hash)
-    q = [[path, hash]]
-    until q.empty?
-      path, value = q.pop
-      if value.is_a?(Hash)
-        value.each { |k, v| q << ["#{path}.#{k}", v] }
-      else
-        yield path[1..-1], value
-      end
-    end
+  # whether the value for key exists in locale (defaults: base_locale)
+  def key_has_value?(key, locale = base_locale)
+    t(data[locale], key).present?
   end
 
   # @return [String] default i18n locale
   def base_locale
     I18n.default_locale.to_s
   end
-
-  # @return [Hash{String => String,Hash}] default i18n locale data
-  def base_locale_data
-    locale_data(base_locale)[base_locale]
-  end
-
-  # whether the value for key exists in locale (defaults: base_locale)
-  def key_has_value?(key, locale = base_locale)
-    t(locale_data(locale)[locale], key).present?
-  end
 end

data/lib/i18n/tasks/unused.rb

@@ -6,11 +6,11 @@ module I18n
     class Unused < BaseTask
       # @return [Array<[String, String]>] all the unused translations as an array of [key, value] pairs
       def find_keys
-        r    = []
-        data = base_locale_data
-        traverse data do |key, value|
+        r = []
+        d = self.data[base_locale]
+        traverse d do |key, value|
           next if pattern_key?(key) || ignore_key?(key, :unused)
-          key = depluralize_key(key, data)
+          key = depluralize_key(key, d)
           r << [key, value] unless used_key?(key)
         end
         r.uniq

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

data/spec/fixtures/app/views/index.html.slim

@@ -9,3 +9,4 @@ p = t 'ignore_eq_base_all.a'
 p = t 'ignore_eq_base_es.a'
 p = t 'numeric.a'
 p = t 'plural.a', count: 2
+p = t 'devise.a'

data/spec/fixtures/config/i18n-tasks.yml

@@ -1,25 +1,19 @@
-# do not report these keys as missing:
-ignore_missing:
-  - ignored_missing_key.a # one key to ignore
-  - ignored_pattern.*     # ignore the whole pattern
-
-# do not report these keys when they have the same value as the base locale version
-ignore_eq_base:
-  all:
-    - ignore_eq_base_all.a
-  es:
-    - ignore_eq_base_es.a
-
-# do not report these keys as unused
-ignore_unused:
-  - ignore_unused.a
-
-# do not report these keys ever
-ignore:
-  - ignore.a
+# i18n data storage
+data:
+  # The default YAML adapter supports reading from and writing to YAML files
+  adapter: yaml
+  # adapter options
+  read:
+    - 'config/locales/%{locale}.yml'
+    - 'config/locales/*.%{locale}.yml'
+  write:
+    # keys matched top to bottom
+    - ['devise.*', 'config/locales/devise.%{locale}.yml']
+    # default catch-all (same as ['*', 'config/locales/%{locale}.yml'])
+    - 'config/locales/%{locale}.yml'
 
-# grep configuration
-grep:
+# i18n usage search in source
+search:
   # search these directories (relative to your Rails.root directory, default: 'app/')
   paths:
     - 'app/'
@@ -31,11 +25,24 @@ grep:
     - '*.file'
   # explicitly exclude files (default: blank = exclude no files)
   exclude: '*.js'
+  # search uses grep under the hood
 
-# how to get the locale data
-data:
-  class: I18n::Tasks::Data::Yaml
-  paths:
-    # files for a given %{locale}
-    - 'config/locales/%{locale}.yml'
-    - 'config/locales/*.%{locale}.yml'
+# do not report these keys ever
+ignore:
+  - ignore.a
+
+# do not report these keys as unused
+ignore_unused:
+  - ignore_unused.a
+
+# do not report these keys as missing:
+ignore_missing:
+  - ignored_missing_key.a # one key to ignore
+  - ignored_pattern.*     # ignore the whole pattern
+
+# do not report these keys when they have the same value as the base locale version
+ignore_eq_base:
+  all:
+    - ignore_eq_base_all.a
+  es:
+    - ignore_eq_base_es.a

data/spec/i18n_tasks_spec.rb

@@ -19,10 +19,14 @@ describe 'rake i18n' do
   end
 
   describe 'prefill' do
-    it 'detects unused' do
+    it 'prefills from en' do
       TestCodebase.in_test_app_dir { YAML.load_file('config/locales/es.yml')['es']['missing_in_es'].should be_nil }
       TestCodebase.rake_result('i18n:prefill')
-      TestCodebase.in_test_app_dir { YAML.load_file('config/locales/es.yml')['es']['missing_in_es']['a'].should == 'EN_TEXT' }
+      TestCodebase.in_test_app_dir {
+        YAML.load_file('config/locales/es.yml')['es']['missing_in_es']['a'].should == 'EN_TEXT'
+        YAML.load_file('config/locales/devise.en.yml')['en']['devise']['a'].should == 'EN_TEXT'
+        YAML.load_file('config/locales/devise.es.yml')['es']['devise']['a'].should == 'ES_TEXT'
+      }
     end
   end
 
@@ -45,7 +49,8 @@ describe 'rake i18n' do
         'blank_in_es'         => {'a' => v},
         'relative'            => {'index' => {'title' => v}},
         'numeric'             => {'a' => v_num},
-        'plural'              => {'a' => {'one' => v, 'other' => "%{count} #{v}s"}}
+        'plural'              => {'a' => {'one' => v, 'other' => "%{count} #{v}s"}},
+        'devise'              => {'a' => v}
       }.tap { |r|
         gen = r["bench"] = {}
         BENCH_KEYS.times { |i| gen["key#{i}"] = v }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,7 +128,7 @@ files:
 - lib/i18n/tasks.rb
 - lib/i18n/tasks/base_task.rb
 - lib/i18n/tasks/data/yaml.rb
-- lib/i18n/tasks/fuzzy_source_keys.rb
+- lib/i18n/tasks/data_traversal.rb
 - lib/i18n/tasks/ignore_keys.rb
 - lib/i18n/tasks/key_pattern_matching.rb
 - lib/i18n/tasks/missing.rb
@@ -137,9 +137,9 @@ files:
 - lib/i18n/tasks/prefill.rb
 - lib/i18n/tasks/railtie.rb
 - lib/i18n/tasks/relative_keys.rb
+- lib/i18n/tasks/source_keys.rb
 - lib/i18n/tasks/translation_data.rb
 - lib/i18n/tasks/unused.rb
-- lib/i18n/tasks/usage_search.rb
 - lib/i18n/tasks/version.rb
 - lib/tasks/i18n-tasks.rake
 - spec/fixtures/app/assets/javascripts/application.js

data/lib/i18n/tasks/fuzzy_source_keys.rb

@@ -1,20 +0,0 @@
-require 'i18n/tasks/key_pattern_matching'
-
-# e.g t("category.#{category_key}")
-module I18n::Tasks
-  module FuzzySourceKeys
-    include KeyPatternMatching
-
-    # dynamically generated keys in the source, e.g t("category.#{category_key}")
-    def pattern_key?(key)
-      @pattern_keys_re ||= compile_start_with_re(pattern_key_prefixes)
-      !!(key =~ @pattern_keys_re)
-    end
-
-    # keys in the source that end with a ., e.g. t("category.#{cat.i18n_key}") or t("category." + category.key)
-    def pattern_key_prefixes
-      @pattern_keys_prefixes ||=
-          find_source_keys.select { |k| k =~ /\#{.*?}/ || k.ends_with?('.') }.map { |k| k.split(/\.?#/)[0].presence }.compact
-    end
-  end
-end