i18n-tasks 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1264889059f8de7a6a8c40a6dfb00416c3ee2286
-  data.tar.gz: 26e908eddb28eed053d793d5dfb855ce22233b5d
+  metadata.gz: 31bf9c531249255541d82c38054138c02805bdad
+  data.tar.gz: d58609500eff53d8ed0ddd5b5f6abb94ead03085
 SHA512:
-  metadata.gz: fc33b2dd662033c1add64d55a02c337d917d4a3c1eb205480fc035ba92990ff593afca1117810f25eee75843a7bb873b5cdc124f9114cb8dc5f53978828af43a
-  data.tar.gz: 671318d2d1e6a615960ea71890f20a5ce2999c3b4b5a393420e4a65f08f94cfe6e39059885aae5358ddf7e4fa3bebab174defb0fde164efc06ac878cbd17bb8d
+  metadata.gz: 1b18557d8e748c7fe574f60ddda988703929b32a865fe33eb96523a33c83c92c7e2ec99191f9b5653ce8c114ebebedbbe24cccbfc3d3ebf6f928d82b542debfd
+  data.tar.gz: 1c584404ba07c8ec32465cc5719709d2aa41dbff76218c3cda010b5a72ea4db42824de5af66209a0c83b2f926b2b727d9a4f1095b129c34185ac5bea16536917

data/README.md

@@ -73,7 +73,7 @@ For more examples see [the tests](/spec/i18n_tasks_spec.rb).
 Simply add to Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.2.9'
+gem 'i18n-tasks', '~> 0.2.10'
 ```
 
 If you do not use Rails, you will also need to require the tasks in your Rakefile:

data/lib/i18n/tasks/fill_tasks.rb

@@ -46,7 +46,7 @@ module I18n::Tasks::FillTasks
     blank_keys = traverse_map_if(data[base_locale]) { |key, value|
       key if !key_value?(key, locale) && !ignore_key?(key, :missing)
     }
-    blank_keys += keys_missing_from_base if include_missing
+    blank_keys += keys_not_in_base if include_missing
 
     list         = blank_keys.uniq.zip fill_with.call(blank_keys)
     data[locale] = data[locale].deep_merge(list_to_tree(list))

data/lib/i18n/tasks/missing_keys.rb

@@ -1,20 +1,20 @@
 module I18n::Tasks::MissingKeys
   # @return Array missing keys, i.e. key that are in the code but are not in the base locale data
-  def keys_missing_from_base
+  def keys_not_in_base
     find_source_keys.reject { |key|
       key_value?(key, base_locale) || pattern_key?(key) || ignore_key?(key, :missing)
     }
   end
 
-  # @return Array keys missing value (but present in base)
-  def keys_missing_value(locale)
+  # @return Array keys missing (nil or blank?) in locale but present in base
+  def keys_blank_in_locale(locale)
     traverse_map_if data[base_locale] do |key, base_value|
       key if !ignore_key?(key, :missing) && !key_value?(key, locale) && !key_value?(depluralize_key(key), locale)
     end
   end
 
   # @return Array keys missing value (but present in base)
-  def keys_where_value_eq_base(locale)
+  def keys_eq_base(locale)
     traverse_map_if data[base_locale] do |key, base_value|
       key if base_value == t(locale, key) && !ignore_key?(key, :eq_base, locale)
     end

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

@@ -7,8 +7,7 @@ module I18n
       class Terminal < Base
         include Term::ANSIColor
 
-        def missing_translations(locales = nil)
-          recs = task.untranslated_keys(locales)
+        def missing_translations(recs = task.untranslated_keys)
           print_title missing_title(recs)
           if recs.present?
 

data/lib/i18n/tasks/untranslated_keys.rb

@@ -4,23 +4,47 @@ module I18n::Tasks::UntranslatedKeys
   # :key
   # :type — :blank, :missing, or :eq_base
   # :base_value — translation value in base locale if one is present
+  # @param [Array] locales - locales for which to return missing keys
   # @return [Array<Hash{Symbol => String,Symbol,nil}>]
   def untranslated_keys(locales = nil)
-    locales = self.non_base_locales if !locales || locales.empty?
-    keys = keys_missing_from_base.map { |key| {locale: base_locale, key: key, type: :none} } +
-        locales.map { |locale|
-          keys_missing_value(locale).map { |key| {locale: locale, key: key, type: :blank, base_value: t(base_locale, key)}} + keys_where_value_eq_base(locale).map { |key|
-            {locale: locale, key: key, type: :eq_base, base_value: t(base_locale, key)}
-          }
-        }.flatten
-    sort_keys keys
+    locales ||= self.locales
+    sort_key_infos(keys_not_in_base_info + keys_eq_base_info(locales) + keys_blank_in_locale_info(locales))
+  end
+
+  # @return [Array<Hash{Symbol => String,Symbol,nil}>]
+  def keys_not_in_base_info
+    sort_key_infos keys_to_info(keys_not_in_base, locale: base_locale, type: :none)
+  end
+
+  # @return [Array<Hash{Symbol => String,Symbol,nil}>]
+  def keys_eq_base_info(locales = nil)
+    locales ||= non_base_locales
+    sort_key_infos (locales - [base_locale]).inject([]) { |result, locale|
+      result + keys_to_info(keys_eq_base(locale), locale: locale, type: :eq_base)
+    }
+  end
+
+  # @return [Array<Hash{Symbol => String,Symbol,nil}>]
+  def keys_blank_in_locale_info(locales = nil)
+    locales ||= self.locales
+    sort_key_infos locales.inject([]) { |result, locale|
+      result + keys_to_info(keys_blank_in_locale(locale), locale: locale, type: :blank)
+    }
   end
 
   # sort first by locale, then by type
   # @return Array{Hash}
-  def sort_keys(keys)
+  def sort_key_infos(keys)
     keys.sort { |a, b|
-      (l = a[:locale] <=> b[:locale]).zero? ? a[:type] <=> b[:type] : l
+      by = [:locale, :type, :key].detect { |by| a[by] != b[by] }
+      a[by] <=> b[by]
     }
   end
+
+  protected
+
+  # convert the keys to a list of hashes with {key, base_value, *info}
+  def keys_to_info(keys, info = {})
+    keys.map { |key| {key: key, base_value: t(base_locale, key)}.merge(info) }
+  end
 end

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.2.9'
+    VERSION = '0.2.10'
   end
 end

data/lib/i18n/tasks.rb

@@ -3,6 +3,7 @@ require 'active_support/core_ext/hash'
 require 'active_support/core_ext/string'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/object/blank'
 require 'term/ansicolor'
 require 'erubis'
 require 'i18n/tasks/railtie' if defined?(Rails)
@@ -16,8 +17,8 @@ module I18n
     class << self
       def config
         @config ||= begin
-          file = File.read(CONFIG_FILES.detect { |f| File.exists?(f) })
-          file = YAML.load(Erubis::Eruby.new(file).result) if file.present?
+          file = CONFIG_FILES.detect { |f| File.exists?(f) }
+          file = YAML.load(Erubis::Eruby.new(File.read(file)).result) if file
           HashWithIndifferentAccess.new.merge(file.presence || {})
         end
       end

data/lib/tasks/i18n-tasks.rake

@@ -11,7 +11,24 @@ namespace :i18n do
 
   desc 'show missing translations'
   task :missing, [:locales] => 'i18n:setup' do |t, args|
-    i18n_report.missing_translations i18n_parse_locales args[:locales]
+    i18n_report.missing_translations i18n_tasks.untranslated_keys(i18n_parse_locales args[:locales])
+  end
+
+  namespace :missing do
+    desc 'keys present in code but not existing in base locale data'
+    task :not_in_base => 'i18n:setup' do
+      i18n_report.missing_translations i18n_tasks.keys_not_in_base_info
+    end
+
+    desc 'keys present but with value same as in base locale'
+    task :eq_base, [:locales] => 'i18n:setup' do
+      i18n_report.missing_translations i18n_tasks.keys_eq_base_info(i18n_parse_locales args[:locales])
+    end
+
+    desc 'keys that exist in base locale but are blank in passed locales'
+    task :blank, [:locales] => 'i18n:setup' do
+      i18n_report.missing_translations i18n_tasks.keys_eq_base_info(i18n_parse_locales args[:locales])
+    end
   end
 
   desc 'show unused translations'
@@ -79,7 +96,7 @@ namespace :i18n do
     end
 
     def i18n_parse_locales(arg = nil)
-      arg.try(:strip).try(:split, /\s*\+\s*/).try(:compact)
+      arg.try(:strip).try(:split, /\s*\+\s*/).try(:compact).try(:presence)
     end
   end
   include ::I18n::Tasks::RakeHelpers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake