i18n-tasks 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe7070e53b66680ce9137f81c21755823c27cb2
-  data.tar.gz: 925f44e4027a20cff615a97b2ad2dcf3c8e10ff1
+  metadata.gz: 71be19b5936a14fe104e5637369097c2a835b57a
+  data.tar.gz: bf6e3c088c8f202032c81f71782acff219465c0c
 SHA512:
-  metadata.gz: e079e4bb84bde0365ac3628c63670317b7827db35fc1eef6789e1ce3eb82144a42de4e7ace9240e737c0b08db5e711b13a7be38465881f49b5989f856beb0cf9
-  data.tar.gz: 1878f3455bb41be8824e5dd59a235f4afafd1ca0830e1b881fc9e0f26688c50b7e7e95de97d8ee0a38f10b416f8bab7f3de4fb011237e3378586efc014e9ca81
+  metadata.gz: 22661c315b535b89fd04b9d8efc52781da3b5409f3474ae9ada566d98e96795ca802988c917fd300e90d889b6c6057ef4fab144d98e212d5f592e87303c57967
+  data.tar.gz: 1d9778f7d2ae1a3a56e76fe33ed00d7fcfb453337e224deac743b21213aee2b8f2beaadd005133abe991ea49004fe10a6c95743302f5152fa7aef378bc4ca017

data/CHANGES.md

@@ -1,10 +1,16 @@
-## 0.4.0 (not yet released)
+## 0.4.1
+
+* Improved error messages across the board
+* Fixed google translate issue with _html keys [#67](https://github.com/glebm/i18n-tasks/issues/67).
+
+## 0.4.0
 
 * In addition to pattern router, a new conservative router that keeps the keys in place. (See [#57](https://github.com/glebm/i18n-tasks/issues/57))
 * `i18n-tasks irb` for debugging
 * This release is a major refactoring to use real trees internally (as opposed to nested hashes).
 Real trees allow for much easier [traversal](/lib/i18n/tasks/data/tree/traversal.rb).
 With these trees, information can be associated with each node, which allows for things like the conservative router.
+* Accept keys with dashes (`-`) [#64](https://github.com/glebm/i18n-tasks/issues/64).
 
 ## 0.3.11
 

data/lib/i18n/tasks/base_task.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+require 'i18n/tasks/command_error'
 require 'i18n/tasks/key_pattern_matching'
 require 'i18n/tasks/logging'
 require 'i18n/tasks/plural_keys'

data/lib/i18n/tasks/command_error.rb

@@ -0,0 +1,7 @@
+module I18n
+  module Tasks
+    class CommandError < StandardError
+    end
+  end
+end
+

data/lib/i18n/tasks/commands_base.rb

@@ -32,7 +32,14 @@ module I18n::Tasks
       def cmd(name, &block)
         cmds[name] = OpenStruct.new(@next_def)
         @next_def  = {}
-        define_method(name, &block)
+        define_method name do |*args|
+          begin
+            instance_exec *args, &block
+          rescue CommandError => e
+            log_error e.message
+            exit 78
+          end
+        end
       end
 
       def desc(text)

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

@@ -39,7 +39,7 @@ module I18n
           def adapter_for(path)
             @fn_patterns.detect { |(name, pattern, adapter)|
               ::File.fnmatch(pattern, path)
-            } or raise "Adapter not found for #{path}. Registered adapters: #{@fn_patterns.inspect}"
+            } or raise CommandError.new("Adapter not found for #{path}. Registered adapters: #{@fn_patterns.inspect}")
           end
         end
       end

data/lib/i18n/tasks/data/router/pattern_router.rb

@@ -35,7 +35,7 @@ module I18n::Tasks
             path.gsub!(/\\\d+/) { |m| key_match[m[1..-1].to_i] }
             (out[path] ||= Set.new) << "#{locale}.#{key}"
           else
-            raise "no route matches key. routes = #{@routes_config}, key = #{key}"
+            raise CommandError.new("Cannot route key #{key}. Routes are #{@routes_config.inspect}")
           end
         end
         out.each do |dest, keys|

data/lib/i18n/tasks/google_translation.rb

@@ -9,12 +9,19 @@ module I18n::Tasks::GoogleTranslation
       opts[:key] = key
     end
     if opts[:key].blank?
-      $stderr.puts(Term::ANSIColor.red Term::ANSIColor.yellow 'You may need to provide Google API key as GOOGLE_TRANSLATE_API_KEY env var or translation.api_key in config/i18n-tasks.yml.
-You can obtain the key at https://code.google.com/apis/console.')
+      warn_missing_api_key
+      return []
     end
-    list.group_by { |k_v| k_v[0].end_with?('_html'.freeze) ? opts.merge(html: true) : opts.merge(format: 'text') }.map do |opts, strings|
-      fetch_google_translations(strings, opts)
-    end.reduce(:+)
+    key_idx = {}
+    list.each_with_index { |k_v, i| key_idx[k_v[0]] = i}
+    list.group_by { |k_v|
+      k_v[0].end_with?('_html'.freeze)
+    }.map do |html, slice|
+      t_opts = opts.merge(html ? {html: true} : {format: 'text'})
+      fetch_google_translations slice, t_opts
+    end.reduce(:+).tap { |l|
+      l.sort! { |a, b| key_idx[a[0]] <=> key_idx[b[0]] }
+    }
   end
 
   INTERPOLATION_KEY_RE = /%\{[^}]+\}/
@@ -22,6 +29,9 @@ You can obtain the key at https://code.google.com/apis/console.')
 
   def fetch_google_translations(list, opts)
     translated = EasyTranslate.translate(list.map { |l| l[1].gsub(INTERPOLATION_KEY_RE, UNTRANSLATABLE_STRING) }, opts)
+    if translated.blank?
+      raise CommandError.new('Google Translate returned no results. Make sure billing information is set at https://code.google.com/apis/console.')
+    end
     translated.each_with_index { |translation, i|
       if (original = list[i][1]) =~ INTERPOLATION_KEY_RE
         interpolation_keys = original.scan(INTERPOLATION_KEY_RE)
@@ -30,4 +40,11 @@ You can obtain the key at https://code.google.com/apis/console.')
     }
     list.map(&:first).zip(translated)
   end
+
+  private
+
+  def warn_missing_api_key
+    $stderr.puts Term::ANSIColor.red Term::ANSIColor.yellow 'Set Google API key via GOOGLE_TRANSLATE_API_KEY environmnet variable or translation.api_key in config/i18n-tasks.yml.
+Get the key at https://code.google.com/apis/console.'
+  end
 end

data/lib/i18n/tasks/logging.rb

@@ -13,6 +13,10 @@ module I18n::Tasks::Logging
     log_stderr Term::ANSIColor.yellow "i18n-tasks: [WARN] #{message}"
   end
 
+  def log_error(message)
+    log_stderr Term::ANSIColor.red Term::ANSIColor.bold "i18n-tasks: #{message}"
+  end
+
   def log_stderr(*args)
     STDERR.puts *args
   end

data/lib/i18n/tasks/relative_keys.rb

@@ -8,7 +8,7 @@ module I18n
         # normalized path
         path = File.expand_path path
         (path_root = roots.map { |path| File.expand_path path }.sort.reverse.detect { |root| path.start_with?(root + '/') }) or
-            raise "No relative key root detected for \"#{key}\" at #{path}. Please set relative_roots in config/i18n-tasks.yml (currently set to #{relative_roots})"
+            raise CommandError.new("Error scanning #{path}: cannot resolve relative key \"#{key}\".\nSet relative_roots in config/i18n-tasks.yml (currently #{relative_roots.inspect})")
         # key prefix based on path
         prefix = path.gsub(%r(#{path_root}/|(\.[^/]+)*$), '').tr('/', '.').gsub(%r(\._), '.')
         "#{prefix}#{key}"

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

@@ -16,7 +16,7 @@ module I18n::Tasks::Scanners
           conf[:exclude] = Array(conf[:exclude])
         else
           # exclude common binary extensions by default (images and fonts)
-          conf[:exclude] = %w(*.jpg *.png *.gif *.svg *.ico *.eot *.ttf *.woff)
+          conf[:exclude] = %w(*.jpg *.png *.gif *.svg *.ico *.eot *.ttf *.woff *.pdf)
         end
       end
       @record_src_loc = false

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

data/spec/google_translate_spec.rb

@@ -4,8 +4,11 @@ require 'i18n/tasks/commands'
 describe 'Google Translation' do
   include I18n::Tasks::GoogleTranslation
 
-  TEST_STRING = 'Hello, %{user}!'
-  TEST_RESULT = 'Hola, %{user}!'
+  tests = [
+      text_test = ['a', "Hello - %{user} O'neill!", "Hola - %{user} O'neill!"],
+      html_test = ['a_html', "Hello - <b>%{user} O'neill</b>", "Hola - <b>%{user} O'neill</b>"]
+  ]
+
 
   if ENV['GOOGLE_TRANSLATE_API_KEY']
     describe 'real world test' do
@@ -13,9 +16,10 @@ describe 'Google Translation' do
 
       context 'API' do
         it 'works' do
-          expect(google_translate(
-              [['common.hello', TEST_STRING]], from: :en, to: :es, key: ENV['GOOGLE_TRANSLATE_API_KEY']
-          )).to eq([['common.hello', TEST_RESULT]])
+          # Just one test with all the cases to lower the Google bill
+          translations = google_translate(
+              tests.map { |t| t[0..1] }, from: :en, to: :es, key: ENV['GOOGLE_TRANSLATE_API_KEY'])
+          expect(translations).to eq(tests.map { |t| [t[0], t[2]] })
         end
       end
 
@@ -33,9 +37,15 @@ describe 'Google Translation' do
 
         it 'works' do
           in_test_app_dir do
-            task.data[:en] = build_tree('en' => {'common' => {'hello' => TEST_STRING}})
+            task.data[:en] = build_tree('en' => {
+                'common' => {
+                    'hello' => text_test[1],
+                    'hello_html' => html_test[1]
+                }
+            })
             cmd.translate_missing
-            expect(task.t('common.hello', 'es')).to eq(TEST_RESULT)
+            expect(task.t('common.hello', 'es')).to eq(text_test[2])
+            expect(task.t('common.hello_html', 'es')).to eq(html_test[2])
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -206,6 +206,7 @@ files:
 - i18n-tasks.gemspec
 - lib/i18n/tasks.rb
 - lib/i18n/tasks/base_task.rb
+- lib/i18n/tasks/command_error.rb
 - lib/i18n/tasks/commands.rb
 - lib/i18n/tasks/commands_base.rb
 - lib/i18n/tasks/configuration.rb