i18n-tasks 0.7.12 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9d57ea517b4561e2eb31ddee6376bb9d65ef9c7
-  data.tar.gz: ddaf2b27bca1586c84625864809c970ac697e8de
+  metadata.gz: f23b45a33ecdc2b1ff1ce24733bbfc7561e64462
+  data.tar.gz: 4b09900b186afbf6ee67276cca45847f0d8e15f5
 SHA512:
-  metadata.gz: 669191968390c3ed44ba2537ecd51603a76f56f542c82499dbf3ce89d5c0b303085ba6d37ba40a0099c7947cf319a42e2b3513756aacf2c2f40c89dd592e9396
-  data.tar.gz: 88f3289f9e4734a074056d6be1d0310c2c8299c98679988664f62819cf39fa9b11ebb58df353bed86dc4fca21f72bed5bc784c5af0ba9820434e0fd18a6ead89
+  metadata.gz: 8b1cca5e5a2f5ede2defb56fe16bf9f15ba1546c2b610ebaeb282538611a800ad93f8cfb7521b13888cbecda2ca73e2718e2624250f989ffd0a7ad7350a557cf
+  data.tar.gz: d42a79921370c760f5fc557c9344d47e921580abf198fb00e19138474825b609f80104965eb7fc753de3ecacbf01a5e46390e8898e44c5a71c6806b2524c24ba

data/.travis.yml

@@ -1,11 +1,13 @@
 language: ruby
 rvm:
-- 2.2.0
-- 2.1.5
-- 2.0.0
+- 2.2.1
 - 1.9.3
 - jruby
-- rbx-2.4.1
+- rbx
+# travis uses old bundler (https://travis-ci.org/glebm/i18n-tasks/jobs/53485782)
+before_install: gem install bundler
+cache: bundler
+script: bundle exec rspec
 env:
   global:
   - TRAVIS=1

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 0.7.13
+
+* Fix relative keys when controller name consists of more than one word by [Yuji Nakayama](https://github.com/yujinakayama) [#132](https://github.com/glebm/i18n-tasks/pull/132).
+* Support keys with UTF8 word characters in the name. [#133](https://github.com/glebm/i18n-tasks/issues/133).
+* Change missing report column title from "Details" to "Value in other locales or source", display the locale [#130](https://github.com/glebm/i18n-tasks/issues/130).
+
 ## 0.7.12
 
 * Handle relative keys in controllers nested in modules by [Alexander Tipugin](https://github.com/atipugin). [#128](https://github.com/glebm/i18n-tasks/issues/128).

data/Gemfile

@@ -4,7 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'byebug', platform: :mri_21, require: false
+  gem 'byebug', platforms: [:mri_21, :mri_22], require: false
+  gem 'rubinius-debugger', platform: :rbx, require: false
 end
 
 gem 'codeclimate-test-reporter', group: :test, require: nil

data/README.md

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

data/config/locales/en.yml

@@ -2,7 +2,9 @@
 en:
   i18n_tasks:
     add_missing:
-      added: Added %{count} keys
+      added:
+        one: Added %{count} key
+        other: Added %{count} keys
     cmd:
       args:
         default_all: 'Default: all'
@@ -67,7 +69,6 @@ en:
     common:
       base_value: Base Value
       continue_q: Continue?
-      details: Details
       key: Key
       locale: Locale
       n_more: "%{count} more"
@@ -88,6 +89,7 @@ en:
     health:
       no_keys_detected: No keys detected. Check data.read in config/i18n-tasks.yml.
     missing:
+      details_title: Value in other locales or source
       none: No translations are missing.
     remove_unused:
       confirm:

data/config/locales/ru.yml

@@ -68,7 +68,6 @@ ru:
     common:
       base_value: "Исходное значение"
       continue_q: "Продолжить?"
-      details: "Детали"
       key: "Ключ"
       locale: "Язык"
       n_more: "ещё %{count}"
@@ -82,13 +81,14 @@ ru:
       title: "Данные (%{locales}):"
     google_translate:
       errors:
-        no_api_key: Задайте ключ API Google через переменную окружения GOOGLE_TRANSLATE_API_KEY
-          или translation.api_key в config/i18n-tasks.yml. Получите ключ через https://code.google.com/apis/console.
+        no_api_key: "Задайте ключ API Google через переменную окружения GOOGLE_TRANSLATE_API_KEY или
+          translation.api_key в config/i18n-tasks.yml. Получите ключ через https://code.google.com/apis/console."
         no_results: Google Translate не дал результатов. Убедитесь в том, что платежная информация
           добавлена в https://code.google.com/apis/console.
     health:
       no_keys_detected: "Ключи не обнаружены. Проверьте data.read в config/i18n-tasks.yml."
     missing:
+      details_title: "На других языках или в коде"
       none: "Всё переведено."
     remove_unused:
       confirm:

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

@@ -43,12 +43,11 @@ module I18n::Tasks
         cmd :tree_rename_key,
             args: '<key> <name> [tree]',
             desc: t('i18n_tasks.cmd.desc.tree_rename_key'),
-            opt:  [
-                      cmd_opt(:pattern).merge(short: :k, long: :key=, desc: proc {
-                        t('i18n_tasks.cmd.args.desc.key_pattern_to_rename') }),
-                      cmd_opt(:pattern).merge(short: :n, long: :name=, desc: proc {
-                        t('i18n_tasks.cmd.args.desc.new_key_name') })
-                  ] + cmd_opts(:data_format)
+            opt:  [cmd_opt(:pattern).merge(short: :k, long: :key=,
+                                           desc:  t('i18n_tasks.cmd.args.desc.key_pattern_to_rename')),
+                   cmd_opt(:pattern).merge(short: :n, long: :name=,
+                                           desc:  t('i18n_tasks.cmd.args.desc.new_key_name')),
+                   *cmd_opts(:data_format)]
 
         def tree_rename_key(opt = {})
           key    = opt_or_arg! :key, opt

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

@@ -43,10 +43,10 @@ module I18n::Tasks
           opt[key]
         end
 
-        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
+          if Common::VALID_LOCALE_RE !~ locale
+            raise CommandError.new(I18n.t('i18n_tasks.cmd.errors.invalid_locale', invalid: locale))
+          end
         end
       end
     end

data/lib/i18n/tasks/configuration.rb

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

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

@@ -34,7 +34,7 @@ module I18n
         end
 
         def load_file(path)
-          adapter_parse ::File.read(path), self.class.adapter_name_for_path(path)
+          adapter_parse ::File.read(path, encoding: 'UTF-8'), self.class.adapter_name_for_path(path)
         end
 
         def write_tree(path, tree)

data/lib/i18n/tasks/missing_keys.rb

@@ -69,10 +69,12 @@ module I18n::Tasks
       data[compared_to].select_keys { |key, _node|
         locale_key_missing? locale, depluralize_key(key, compared_to)
       }.set_root_key!(locale, type: :missing_diff).keys { |_key, node|
+        # change path and locale to base
+        data = {locale: locale, missing_diff_locale: node.data[:locale]}
         if node.data.key?(:path)
-          # change path and locale to base
-          node.data.update path: LocalePathname.replace_locale(node.data[:path], node.data[:locale], locale), locale: locale
+          data[:path] = LocalePathname.replace_locale(node.data[:path], node.data[:locale], locale)
         end
+        node.data.update data
       }
     end
 

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

@@ -11,7 +11,6 @@ module I18n::Tasks::Reports
       add_missing_sheet p.workbook
       add_unused_sheet p.workbook
       add_eq_base_sheet p.workbook
-      p.use_shared_strings = true
       FileUtils.mkpath(File.dirname(path))
       p.serialize(path)
       $stderr.puts Term::ANSIColor.green "Saved to #{path}"

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

@@ -11,9 +11,11 @@ module I18n
           forest = task.collapse_plural_nodes!(forest)
           if forest.present?
             print_title missing_title(forest)
-            print_table headings: [cyan(bold(I18n.t('i18n_tasks.common.locale'))), cyan(bold I18n.t('i18n_tasks.common.key')), I18n.t('i18n_tasks.common.details')] do |t|
+            print_table headings: [cyan(bold(I18n.t('i18n_tasks.common.locale'))),
+                                   cyan(bold I18n.t('i18n_tasks.common.key')),
+                                   I18n.t('i18n_tasks.missing.details_title')] do |t|
               t.rows = sort_by_attr!(forest_to_attr(forest)).map do |a|
-                [{value: cyan(a[:locale]), alignment: :center}, cyan(a[:key]), key_info(a)]
+                [{value: cyan(a[:locale]), alignment: :center}, cyan(a[:key]), missing_key_info(a)]
               end
             end
           else
@@ -74,6 +76,14 @@ module I18n
 
         private
 
+        def missing_key_info(leaf)
+          if leaf[:type] == :missing_used
+            first_occurrence leaf
+          else
+            "#{cyan leaf[:data][:missing_diff_locale]} #{leaf[:value].to_s.strip}"
+          end
+        end
+
         def print_occurrences(node, full_key = node.full_key)
           occurrences = node.data[:source_occurrences]
           puts "#{bold "#{full_key}"} #{green(occurrences.size.to_s) if occurrences.size > 1}"
@@ -84,8 +94,12 @@ module I18n
 
         def print_locale_key_value_table(locale_key_values)
           if locale_key_values.present?
-            print_table headings: [bold(cyan(I18n.t('i18n_tasks.common.locale'))), bold(cyan(I18n.t('i18n_tasks.common.key'))), I18n.t('i18n_tasks.common.value')] do |t|
-              t.rows = locale_key_values.map { |(locale, k, v)| [{value: cyan(locale), alignment: :center}, cyan(k), v.to_s] }
+            print_table headings: [bold(cyan(I18n.t('i18n_tasks.common.locale'))),
+                                   bold(cyan(I18n.t('i18n_tasks.common.key'))),
+                                   I18n.t('i18n_tasks.common.value')] do |t|
+              t.rows = locale_key_values.map { |(locale, k, v)|
+                [{value: cyan(locale), alignment: :center}, cyan(k), v.to_s]
+              }
             end
           else
             puts 'ø'
@@ -124,17 +138,7 @@ module I18n
         end
 
         def highlight_key(full_key, line, range = (0..-1))
-          result = line.dup
-          result[range] = result[range].sub(full_key) { |m| underline m }
-          result
-        end
-
-        def key_info(leaf)
-          if leaf[:type] == :missing_used
-            first_occurrence leaf
-          else
-            leaf[:value].to_s.strip
-          end
+          line.dup.tap { |s| s[range] = s[range].sub(full_key) { |m| underline m } }
         end
 
         def first_occurrence(leaf)

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

@@ -27,10 +27,11 @@ module I18n::Tasks::Scanners
           conf[:ignore_lines] = nil
         end
         conf[:ignore_lines] ||= {
-            'rb'   => %q(^\s*#(?!\si18n-tasks-use)),
-            'haml' => %q(^\s*-\s*#(?!\si18n-tasks-use)),
-            'slim' => %q(^\s*(?:-#|/)(?!\si18n-tasks-use)),
-            'erb'  => %q(^\s*<%\s*#(?!\si18n-tasks-use)),
+            'rb'     => %q(^\s*#(?!\si18n-tasks-use)),
+            'haml'   => %q(^\s*-\s*#(?!\si18n-tasks-use)),
+            'slim'   => %q(^\s*(?:-#|/)(?!\si18n-tasks-use)),
+            'coffee' => %q(^\s*#(?!\si18n-tasks-use)),
+            'erb'    => %q(^\s*<%\s*#(?!\si18n-tasks-use)),
         }
         @ignore_lines_res = conf[:ignore_lines].inject({}) { |h, (ext, re)| h.update(ext => Regexp.new(re)) }
         @key_filter = nil
@@ -59,7 +60,7 @@ module I18n::Tasks::Scanners
 
     def read_file(path)
       result = nil
-      File.open(path, 'rb') { |f| result = f.read }
+      File.open(path, 'rb', encoding: 'UTF-8') { |f| result = f.read }
       result
     end
 
@@ -126,7 +127,7 @@ module I18n::Tasks::Scanners
       key
     end
 
-    VALID_KEY_CHARS = /[-\w.?!;]/
+    VALID_KEY_CHARS = /(?:[[:word:]]|[-.?!;À-ž])/
     VALID_KEY_RE_STRICT = /^#{VALID_KEY_CHARS}+$/
     VALID_KEY_RE = /^(#{VALID_KEY_CHARS}|[:\#{@}\[\]])+$/
 

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

@@ -60,7 +60,7 @@ module I18n::Tasks::Scanners
     end
 
     def closest_method(location)
-      method = File.readlines(location[:src_path]).first(location[:line_num] - 1).reverse_each.find { |x| x=~ /\bdef\b/ }
+      method = File.readlines(location[:src_path], encoding: 'UTF-8').first(location[:line_num] - 1).reverse_each.find { |x| x=~ /\bdef\b/ }
       method &&= method.strip.sub(/^def\s*/, '').sub(/[\(\s;].*$/, '')
       method
     end

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

@@ -42,7 +42,8 @@ module I18n
           file_name = normalized_path.gsub(%r(#{path_root(normalized_path, roots)}/|(\.[^/]+)*$), '')
 
           if options[:closest_method].present?
-            "#{file_name.split('_').first}.#{options[:closest_method]}".tr('/', '.')
+            controller_name = file_name.sub(/_controller$/, '')
+            "#{controller_name}.#{options[:closest_method]}".tr('/', '.')
           else
             file_name.tr('/', '.').gsub(%r(\._), '.')
           end

data/lib/i18n/tasks/used_keys.rb

@@ -11,11 +11,10 @@ module I18n::Tasks
     # @return [Array<String>]
     def used_tree(opts = {})
       return scanner.with_key_filter(opts[:key_filter]) { used_tree(opts.except(:key_filter)) } if opts[:key_filter]
-      key_attrs = scanner.keys(opts.slice(:strict))
       Data::Tree::Node.new(
           key: 'used',
           data: {key_filter: scanner.key_filter},
-          children: Data::Tree::Siblings.from_key_attr(key_attrs)
+          children: Data::Tree::Siblings.from_key_attr(scanner.keys(opts.slice(:strict)))
       ).to_siblings
     end
 

data/lib/i18n/tasks/version.rb

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

data/spec/commands/tree_commands_spec.rb

@@ -41,17 +41,18 @@ describe 'Tree commands' do
       {'a' => {'b' => {'a' => '1'}}}
     end
 
+    def rename_key(from, to)
+      JSON.parse run_cmd(:tree_rename_key, key: from, name: to, format: 'json', arguments: [forest.to_json])
+    end
+
     it 'renames root node' do
-      renamed = JSON.parse run_cmd(:tree_rename_key, key: 'a', name: 'x', format: 'json', arguments: [forest.to_json])
-      expect(renamed).to eq(forest.tap { |f| f['x'] = f.delete('a') })
+      expect(rename_key('a', 'x')).to eq(forest.tap { |f| f['x'] = f.delete('a') })
     end
     it 'renames node' do
-      renamed = JSON.parse run_cmd(:tree_rename_key, key: 'a.b', name: 'x', format: 'json', arguments: [forest.to_json])
-      expect(renamed).to eq(forest.tap { |f| f['a']['x'] = f['a'].delete('b') })
+      expect(rename_key('a.b', 'x')).to eq(forest.tap { |f| f['a']['x'] = f['a'].delete('b') })
     end
     it 'renames leaf' do
-      renamed = JSON.parse run_cmd(:tree_rename_key, key: 'a.b.a', name: 'x', format: 'json', arguments: [forest.to_json])
-      expect(renamed).to eq(forest.tap { |f| f['a']['b']['x'] = f['a']['b'].delete('a') })
+      expect(rename_key('a.b.a', 'x')).to eq(forest.tap { |f| f['a']['b']['x'] = f['a']['b'].delete('a') })
     end
   end
 

data/spec/file_system_data_spec.rb

@@ -95,7 +95,7 @@ describe 'File system i18n' do
         data[:en] = data[:en].merge!('en' => locale_data)
         files     = %w(pizza.en.json sushi.en.json)
         expect(Dir['*.json'].sort).to eq(files.sort)
-        files.each { |f| expect(JSON.parse(File.read f)['en']).to eq({File.basename(f, '.en.json') => keys}) }
+        files.each { |f| expect(JSON.parse(File.read(f, encoding: 'UTF-8'))['en']).to eq({File.basename(f, '.en.json') => keys}) }
       }
     end
   end

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

@@ -3,6 +3,7 @@
 / t(:fp_comment)
 / i18n-tasks-use t(:fn_comment)
 = t 'only_in_es'
+#x = t 'not_a_comment'
 p #{t('ca.a')} #{t 'ca.b'} #{t "ca.c"}
 p #{t 'ca.d'} #{t 'ca.f', i: 'world'} #{t 'ca.e', i: 'world'}
 p #{t 'missing_in_es.a'} #{t 'same_in_es.a'} #{t 'blank_in_es.a'}
@@ -25,3 +26,4 @@ p = t 'devise.a'
 p = t :missing_symbol_key
 p #{t :"missing_symbol.key_two"} #{t :'missing_symbol.key_three'}
 = t 'present_in_es_but_not_en.a'
+= t 'latin_extra.çüéö'

data/spec/i18n_tasks_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 require 'fileutils'
 
 describe 'i18n-tasks' do
-  delegate :run_cmd, :i18n_task, :in_test_app_dir, to: :TestCodebase
+  delegate :run_cmd, :i18n_task, :in_test_app_dir, :i18n_cmd, to: :TestCodebase
 
   describe 'health' do
     it 'outputs stats' do
       t     = i18n_task
       stats = in_test_app_dir { t.forest_stats(t.data_forest t.locales) }
-      out   = capture_stderr { run_cmd :health }
+      out   = in_test_app_dir { capture_stderr { capture_stdout { i18n_cmd.run(:health) } } }
       stats.values.each do |v|
         expect(out).to include(v.to_s)
       end
@@ -37,26 +37,22 @@ describe 'i18n-tasks' do
         )
     }
     it 'detects missing' do
-      capture_stderr do
-        es_keys = expected_missing_keys.grep(/^es\./)
-        expect(run_cmd :missing).to be_i18n_keys expected_missing_keys
-        # locale argument
-        expect(run_cmd :missing, locales: %w(es)).to be_i18n_keys es_keys
-        expect(run_cmd :missing, arguments: %w(es)).to be_i18n_keys es_keys
-      end
+      es_keys = expected_missing_keys.grep(/^es\./)
+      expect(run_cmd :missing).to be_i18n_keys expected_missing_keys
+      # locale argument
+      expect(run_cmd :missing, locales: %w(es)).to be_i18n_keys es_keys
+      expect(run_cmd :missing, arguments: %w(es)).to be_i18n_keys es_keys
     end
   end
 
   describe 'eq_base' do
     it 'detects eq_base' do
-      capture_stderr do
-        expect(run_cmd :eq_base).to be_i18n_keys %w(es.same_in_es.a)
-      end
+      expect(run_cmd :eq_base).to be_i18n_keys %w(es.same_in_es.a)
     end
   end
 
   let(:expected_unused_keys) do
-     %w(unused.a unused.numeric unused.plural).map do |k|
+    %w(unused.a unused.numeric unused.plural).map do |k|
       %w(en es).map { |l| "#{l}.#{k}" }
     end.reduce(:+)
   end
@@ -69,31 +65,25 @@ describe 'i18n-tasks' do
 
   describe 'unused' do
     it 'detects unused' do
-      capture_stderr do
-        expect(run_cmd :unused).to be_i18n_keys expected_unused_keys
-      end
+      expect(run_cmd :unused).to be_i18n_keys expected_unused_keys
     end
 
     it 'detects unused (--strict)' do
-      capture_stderr do
-        expect(run_cmd :unused, strict: true).to be_i18n_keys expected_unused_keys_strict
-      end
+      expect(run_cmd :unused, strict: true).to be_i18n_keys expected_unused_keys_strict
     end
   end
 
   describe 'remove_unused' do
     it 'removes unused' do
       in_test_app_dir do
-        t = i18n_task
+        t      = i18n_task
         unused = expected_unused_keys.map { |k| ::I18n::Tasks::SplitKey.split_key(k, 2)[1] }
         unused.each do |key|
           expect(t.key_value?(key, :en)).to be true
           expect(t.key_value?(key, :es)).to be true
         end
         ENV['CONFIRM'] = '1'
-        capture_stderr {
-          run_cmd :remove_unused
-        }
+        run_cmd :remove_unused
         t.data.reload
         unused.each do |key|
           expect(t.key_value?(key, :en)).to be false
@@ -131,7 +121,7 @@ describe 'i18n-tasks' do
   describe 'xlsx_report' do
     it 'saves' do
       in_test_app_dir {
-        capture_stderr { run_cmd :xlsx_report }
+        run_cmd :xlsx_report
         expect(File).to exist 'tmp/i18n-report.xlsx'
         FileUtils.cp('tmp/i18n-report.xlsx', '..')
       }
@@ -197,20 +187,18 @@ describe 'i18n-tasks' do
 
   describe 'find' do
     it 'prints usages' do
-      capture_stderr do
-        result = Term::ANSIColor.uncolor(run_cmd :find, arguments: ['used.*'])
-        expect(result).to eq(<<-TXT)
+      result = Term::ANSIColor.uncolor(run_cmd :find, arguments: ['used.*'])
+      expect(result).to eq(<<-TXT)
 used.a 2
   app/views/usages.html.slim:1 p = t 'used.a'
   app/views/usages.html.slim:2 b = t 'used.a'
-        TXT
-      end
+      TXT
     end
   end
 
 
   # --- setup ---
-  BENCH_KEYS = 10
+  BENCH_KEYS = ENV['BENCH_KEYS'].to_i
   before(:each) do
     gen_data = ->(v) {
       v_num = v.chars.map(&:ord).join('').to_i
@@ -242,21 +230,25 @@ used.a 2
           'devise'                 => {'a' => v},
           'scoped'                 => {'x' => v},
           'very'                   => {'scoped' => {'x' => v}},
-          'used'                   => {'a' => v}
+          'used'                   => {'a' => v},
+          'latin_extra'            => {'çüéö' => v},
+          'not_a_comment'          => v
       }.tap { |r|
-        gen = r["bench"] = {}
-        BENCH_KEYS.times { |i| gen["key#{i}"] = v }
+        if BENCH_KEYS > 0
+          gen = r['bench'] = {}
+          BENCH_KEYS.times { |i| gen["key#{i}"] = v }
+        end
       }
     }
 
-    en_data                            = gen_data.('EN_TEXT')
-    es_data                            = gen_data.('ES_TEXT').except(
-        'missing_in_es', 'missing_in_es_plural_1', 'missing_in_es_plural_2')
-    es_data['same_in_es']['a']         = 'EN_TEXT'
-    es_data['blank_in_es']['a']        = ''
-    es_data['ignore_eq_base_all']['a'] = 'EN_TEXT'
-    es_data['ignore_eq_base_es']['a']  = 'EN_TEXT'
-    es_data['only_in_es'] = 1
+    en_data = gen_data.('EN_TEXT')
+    es_data = gen_data.('ES_TEXT').except('missing_in_es', 'missing_in_es_plural_1', 'missing_in_es_plural_2')
+
+    es_data['same_in_es']['a']          = 'EN_TEXT'
+    es_data['blank_in_es']['a']         = ''
+    es_data['ignore_eq_base_all']['a']  = 'EN_TEXT'
+    es_data['ignore_eq_base_es']['a']   = 'EN_TEXT'
+    es_data['only_in_es']               = 1
     es_data['present_in_es_but_not_en'] = {'a' => 'ES_TEXT'}
 
     fs = fixtures_contents.merge(

data/spec/relative_keys_spec.rb

@@ -29,6 +29,19 @@ describe 'Relative keys' do
         expect(key).to eq('users.create.success')
       end
 
+      context 'multiple words in controller name' do
+        it 'works' do
+          key = scanner.absolutize_key(
+            '.success',
+            'app/controllers/admin_users_controller.rb',
+            %w(app/controllers),
+            'create'
+          )
+
+          expect(key).to eq('admin_users.create.success')
+        end
+      end
+
       context 'nested in module' do
         it 'works' do
           key = scanner.absolutize_key(

data/spec/support/i18n_tasks_output_matcher.rb

@@ -15,7 +15,6 @@ RSpec::Matchers.define :be_i18n_keys do |expected|
     locale_col = 0
     key_col = 1
     actual.map { |row|
-      key =
       key = "#{row[locale_col]}.#{row[key_col]}"
       key = key[0..-2] if key.end_with?(':')
       key

data/spec/support/test_codebase.rb

@@ -22,11 +22,7 @@ module TestCodebase
   end
 
   def run_cmd(name, *args, &block)
-    in_test_app_dir do
-      silence_stream($stderr) {
-        capture_stdout { i18n_cmd.run(name, *args, &block) }
-      }
-    end
+    in_test_app_dir { capture_stdout { capture_stderr { i18n_cmd.run(name, *args, &block) } } }
   end
 
   def setup(files = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.7.13
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -333,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Manage localization and translation with the awesome power of static analysis