i18n-tasks 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4a2353a4fb77dc7513547b875f9e22959bf0e65
-  data.tar.gz: 327f3a171a0991b71aba09799d7e508967f88a63
+  metadata.gz: b9ffd7cede573f8a4cee0a811d80345a6e8ebb37
+  data.tar.gz: 813300ebfe3b65e3d624c6c67636121f8d874603
 SHA512:
-  metadata.gz: cc558aa7656a508ce7fa49a49e3b842bb4922625c6387edef62242b9d40f22fdc1052e2ec06429246ca66e85d583f26afb4fe1ac51c6b01409ad1e9f18fe9af7
-  data.tar.gz: e2a120d28f080bb114b9fe31749a881224b654e6beeac8fb60494a6c982a8928cf480cc19a9f98d4a21ea56347bb6795d7cbb6763c89d0db99500ccdfcab77bb
+  metadata.gz: e205fafc63991aae11c9a7506886b235fe2c5dd612402ebb12de0c9c9954887b97a426a8dbbcb8122251c56c65281516fff37e677b9def315d9975de6f39b8d4
+  data.tar.gz: 0991e4295a36944f8545ee25259307f20c239b87d1e968515c1e55895fcf252f52666272f4a1b6e09bb9e2c1b137d24f30fe5ad83ac9480859e1c8cf0bc7ae35

data/.gitignore

@@ -23,7 +23,6 @@ Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
-doc/
 lib/bundler/man
 pkg
 rdoc

data/README.md

@@ -3,6 +3,8 @@ i18n-tasks  [![Build Status](https://travis-ci.org/glebm/i18n-tasks.png?branch=m
 
 Rails I18n tasks to find missing / unused translations and more. Works with slim / coffee / haml etc.
 
+![i18n-missing-screenshot]
+
 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](https://github.com/glebm/i18n-tasks/blob/master/lib/i18n/tasks/missing.rb))*
@@ -27,3 +29,5 @@ Configuration
 -------------
 
 Currently i18n-tasks only reports / writes to locale data in `config/locales/{locale_code}.yml`. *PRs making this configurable welcome!*
+
+  [i18n-missing-screenshot]: https://raw.github.com/glebm/i18n-tasks/master/doc/img/i18n-missing.png "rake i18n:missing output screenshot"

data/lib/i18n/tasks/missing.rb

@@ -1,16 +1,44 @@
+# coding: utf-8
 require 'i18n/tasks/base_task'
 
 module I18n
   module Tasks
     class Missing < BaseTask
-      DESC = 'find all missing keys and missing translations'
+      DESC = 'Missing keys and translations'
+
       def perform
-        $stderr.puts DESC
+        missing = find_missing
+        STDERR.puts bold cyan("= #{DESC} (#{missing.length}) =")
+        status_texts = {
+            none: red("✗ #{bold 'none'}".ljust(19)),
+            blank: yellow(bold '∅ blank'.ljust(11)),
+            eq_base: yellow(bold "= #{base_locale.ljust(9)}")
+        }
+
+        missing.sort_by { |m| m[:type] }.reverse_each do |m|
+          locale, key, base_value = m[:locale], m[:key], m[:base_value]
+          status_text = ' ' + status_texts[m[:type]]
+          case m[:type]
+            when :none
+              puts "#{red p_locale base_locale} #{status_text} #{p_key key}"
+            when :blank
+              puts "#{p_locale locale} #{status_text} #{p_key key} #{cyan base_value}"
+            when :eq_base
+              puts "#{p_locale locale} #{status_text} #{p_key key} #{cyan base_value}"
+          end
+        end
+      end
+
+
+
+      def find_missing
+        missing = []
+
         # missing keys (in the code but not in base locale data)
         pattern_prefixes = find_source_pattern_prefixes
         find_source_keys.each do |key|
           if t(base[base_locale], key).blank? && !pattern_prefixes.any? { |pp| key.start_with?(pp) }
-            puts "#{red print_locale base_locale}  #{red "✗ #{bold 'none'}"}\t #{print_key key}"
+            missing << {locale: :en, type: :none, key: key}
           end
         end
 
@@ -19,23 +47,22 @@ module I18n
           trn = get_locale_data(locale)[locale]
           traverse base[base_locale] do |key, base_value|
             translated = t(trn, key)
-            data       = "\t #{print_key key} #{cyan base_value}"
-            s = if translated.blank?
-              "#{yellow bold '∅ blank'}#{data}"
+            if translated.blank?
+              missing << {locale: locale, key: key, type: :blank, base_value: base_value}
             elsif translated == base_value
-              "#{yellow bold "= #{base_locale}" }#{data}"
+              missing << {locale: locale, key: key, type: :eq_base, base_value: base_value}
             end
-            puts "#{print_locale locale}  #{s}" if s
           end
         end
+
+        missing
       end
 
-      private
-      def print_locale(locale)
+      def p_locale(locale)
         ' ' + bold(locale.ljust(5))
       end
 
-      def print_key(key)
+      def p_key(key)
         magenta(key).ljust(50)
       end
 

data/lib/i18n/tasks/task_helpers.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'open3'
 require 'term/ansicolor'
 

data/lib/i18n/tasks/unused.rb

@@ -1,16 +1,26 @@
+# coding: utf-8
 require 'i18n/tasks/base_task'
 
 module I18n
   module Tasks
     class Unused < BaseTask
+      DESC = 'Unused i18n keys'
       def perform
+        unused = find_unused
+        STDERR.puts bold cyan("= #{DESC} (#{unused.length}) =")
+        unused.each do |(key, value)|
+          puts " #{magenta(key).ljust(60)}\t#{cyan value}"
+        end
+      end
+
+      def find_unused
         used_keys = find_source_keys
         pattern_prefixes = find_source_pattern_prefixes
+        r = []
         traverse base[base_locale] do |key, value|
-          if !used_keys.include?(key) && !pattern_prefixes.any? { |pp| key.start_with?(pp) }
-            puts "#{yellow 'unused'.ljust(10)}#{magenta(key).ljust(60)}\t#{cyan value}"
-          end
+          r << [key, value] if !used_keys.include?(key) && !pattern_prefixes.any? { |pp| key.start_with?(pp) }
         end
+        r
       end
     end
   end

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/spec/i18n_tasks_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'spec_helper'
 
 describe 'rake i18n' do

data/spec/support/0_test_codebase_env.rake

@@ -0,0 +1,4 @@
+task :environment do
+  I18n.default_locale = 'en'
+  I18n.available_locales = %w(en es)
+end

data/spec/support/i18n_tasks_output_matcher.rb

@@ -1,14 +1,24 @@
 RSpec::Matchers.define :be_i18n_keys do |expected|
-  match do |actual|
-    r = actual.split("\n").map { |x|
+  locale_re = /^\w{2}\b/
+  extract_keys = ->(actual){
+    locales = I18n.available_locales.map(&:to_s)
+    actual.split("\n").map { |x|
       x.strip!
       key = x.gsub(/\s+/, ' ').split(' ').reverse.detect { |p| p && p.include?('.') }
-      if x =~ /^\w{2}\b/
+      if x =~ locale_re && locales.include?(x[0..1]) && !(key =~ locale_re && locales.include(key[0..1]))
         x.split(' ', 2)[0] + '.' + key
       else
         key
       end
     }
-    r.sort == expected.sort
+  }
+
+  match do |actual|
+    extract_keys.(actual).sort == expected.sort
+  end
+
+  failure_message_for_should do |actual|
+    "Expected #{expected.sort}, but had #{extract_keys.(actual).sort}"
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,6 +109,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- doc/img/i18n-missing.png
 - i18n-tasks.gemspec
 - lib/i18n/tasks.rb
 - lib/i18n/tasks/base_task.rb
@@ -121,6 +122,7 @@ files:
 - lib/tasks/i18n-tasks.rake
 - spec/i18n_tasks_spec.rb
 - spec/spec_helper.rb
+- spec/support/0_test_codebase_env.rake
 - spec/support/i18n_tasks_output_matcher.rb
 - spec/support/test_codebase.rb
 - spec/support/test_codebase_env.rake
@@ -151,6 +153,7 @@ summary: Rails I18n tasks to find missing / unused translations and more
 test_files:
 - spec/i18n_tasks_spec.rb
 - spec/spec_helper.rb
+- spec/support/0_test_codebase_env.rake
 - spec/support/i18n_tasks_output_matcher.rb
 - spec/support/test_codebase.rb
 - spec/support/test_codebase_env.rake