i18n-tasks 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44720a334107603e5ebb7fc2c579dedaf2187b12
-  data.tar.gz: 544cc1eac74d0e503bfc4251b8de2f6349013ec9
+  metadata.gz: 249e36d0665a2fda7758aede212244f485083b54
+  data.tar.gz: 149073894264064e8972f43833fdffb4df4d2e18
 SHA512:
-  metadata.gz: 1c7c8c3304432ef68a539bea0ec9bddc5c1cd5674c7113f31cbbc5c263b291af69aa79e1621307c69707fd7bbadf98d95cb4add710dd476e88b864d2ee0af4c9
-  data.tar.gz: 0af4770fb9a6345f8b3859731d39ce73346a3f0d0ae4421f9b900a4baf16926171865504eb54a23c1eda151a1eefce72ef73e47e160b1aa539990e620ebf21ed
+  metadata.gz: 772c68ce93f166f9c41886a3de694088031efb5433dd58cb8f3da032c91a3a5be3b55027d460a29f63ee2a41c7f9ad7d033a5d1abe4bb8693ea3cb175b409c3b
+  data.tar.gz: 354dd75548fc81da5eb335be15472dcf96fcd269e8c6ff077ec1c44833a10011e2aea69aecd79a8e1b93cde6a9b478ba56e6a8ca38eca89f6f431dcd202a44f9

data/README.md

@@ -16,11 +16,12 @@ Use `rake -T i18n` to get the list of tasks with descriptions. There are 3 tasks
     t 'category.' + category.key # 'category.arts_and_crafts' considered used
     t "category.#{category.key}" # also works
 
-`i18n:missing` may incorrectly show framework i18n keys as missing, to work around this use `.i18nignore` file in project root:
+Relative keys (`t '.title'`) are supported too.
 
-   devise.errors.unauthorized # ignore this key
-   pagination.views.          # ignore the whole pattern (note the .)
+`i18n:missing` may incorrectly show framework i18n keys as missing, to work around this use `.i18nignore` file in project root:
 
+    devise.errors.unauthorized # ignore this key
+    pagination.views.          # ignore the whole pattern (note the .)
 
 For more examples see [the tests](https://github.com/glebm/i18n-tasks/blob/master/spec/i18n_tasks_spec.rb#L43-L59).
 
@@ -29,7 +30,7 @@ Installation
 
 Simply add to Gemfile:
 
-    gem 'i18n-tasks', '~> 0.0.5'
+    gem 'i18n-tasks', '~> 0.0.7'
 
 Configuration
 -------------

data/lib/i18n/tasks/base_task.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'open3'
 require 'term/ansicolor'
 
@@ -22,11 +23,24 @@ module I18n
         "config/locales/#{locale}.yml"
       end
 
-      # find all keys in the source
+      # find all keys in the source (relative keys are returned in absolutized)
       def find_source_keys
         @source_keys ||= begin
-          grep_out  = run_command 'grep', '-horI', %q{\\bt(\\?\\s*['"]\\([^'"]*\\)['"]}, 'app/'
-          used_keys = grep_out.split("\n").map { |r| r.match(/['"](.*?)['"]/)[1] }.uniq.to_set
+          grep_out  = run_command 'grep', '-HorI', %q{\\bt(\\?\\s*['"]\\([^'"]*\\)['"]}, 'app/'
+          used_keys = grep_out.split("\n").map { |r|
+            key = r.match(/['"](.*?)['"]/)[1]
+            # absolutize relative key:
+            if key.start_with?('.')
+              path = r.split(':')[0]
+              # normalized path
+              path = Pathname.new(File.expand_path path).relative_path_from(Pathname.new(Dir.pwd)).to_s
+              # key prefix based on path
+              prefix = path.gsub(%r(app/views/|(\.[^/]+)*$), '').tr('/', '.')
+              "#{prefix}#{key}"
+            else
+              key
+            end
+          }.uniq.to_set
           used_keys = used_keys.reject { |k| k !~ /^[\w.\#{}]+$/ }
           exclude_patterns used_keys, ignore_patterns
         end

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

data/spec/i18n_tasks_spec.rb

@@ -33,40 +33,44 @@ describe 'rake i18n' do
           'unused'        => {'a' => v},
           'missing_in_es' => {'a' => v},
           'same_in_es'    => {'a' => v},
-          'blank_in_es'   => {'a' => v}
+          'blank_in_es'   => {'a' => v},
+          'relative'      => {'index' => {'title' => v}}
       }
     }
 
-    en_data                          = gen_data.('EN_TEXT')
-    es_data                          = gen_data.('ES_TEXT').except('missing_in_es')
-    es_data['same_in_es']['a'] = 'EN_TEXT'
-    es_data['blank_in_es']['a']      = ''
+    en_data                     = gen_data.('EN_TEXT')
+    es_data                     = gen_data.('ES_TEXT').except('missing_in_es')
+    es_data['same_in_es']['a']  = 'EN_TEXT'
+    es_data['blank_in_es']['a'] = ''
 
     fs = {
-        'config/locales/en.yml'     => {'en' => en_data}.to_yaml,
-        'config/locales/es.yml'     => {'es' => es_data}.to_yaml,
-        '.i18nignore' => <<-TEXT,
-          ignored_missing_key.a # one key to ignore
+        'config/locales/en.yml' => {'en' => en_data}.to_yaml,
+        'config/locales/es.yml' => {'es' => es_data}.to_yaml,
+        '.i18nignore'           => <<-TEXT,
+        ignored_missing_key.a # one key to ignore
 
-          ignored_pattern.      # ignore the whole pattern
+                  ignored_pattern.      # ignore the whole pattern
         TEXT
         'app/views/index.html.slim' => <<-SLIM,
         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'}
-        p = t 'used_but_missing.a'
-        p = t 'ignored_missing_key.a'
-        p = t 'ignored_pattern.some_key'
+                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'}
+                p = t 'used_but_missing.a'
+                p = t 'ignored_missing_key.a'
+                p = t 'ignored_pattern.some_key'
+        SLIM
+        'app/views/relative/index.html.slim' => <<-SLIM,
+                p = t '.title'
         SLIM
         'app/controllers/events_controller.slim' => <<-RUBY,
         class EventsController < ApplicationController
-           def show
-              redirect_to :edit, notice: I18n.t('cb.a')
-              I18n.t("cb.b", i: "Hello")
-              I18n.t("hash_pattern.\#{some_value}", i: "Hello")
-              I18n.t("hash_pattern2." + some_value, i: "Hello")
-           end
-        end
+                   def show
+                      redirect_to :edit, notice: I18n.t('cb.a')
+                      I18n.t("cb.b", i: "Hello")
+                      I18n.t("hash_pattern.\#{some_value}", i: "Hello")
+                      I18n.t("hash_pattern2." + some_value, i: "Hello")
+                   end
+                end
         RUBY
     }
     TestCodebase.setup fs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails