i18n-migrations 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0f8d5372c9541fdf212f771cbf6fa9f8159fb4f6fb5dab37beca63862cf2deb
-  data.tar.gz: 6f6d8dc7c053da0500415dbe8999bd015eec3023d92898c177b54af5962b4fc6
+  metadata.gz: b28ece541b9bbbaeb46aa30e606571ee8a8d4126ee76b8950692c23677fe8eb2
+  data.tar.gz: 5692f437d5e61bfc8dd758335c5f3b3d27c910b2a1336eb95b1e100ab65fe7bf
 SHA512:
-  metadata.gz: 905e9f53dda1e46c7a169ffe869260854964fa323baf030d71f8c9d76d16ba40db658b0235da346256123c8a3e21d0805beef3c055c6efc733e8070a02f0403f
-  data.tar.gz: f3f1cec60dfb164bc0d61e9a81004eb9ebd527568613af170f9d3429e15bf9ddc1803f8258476c5c621e299e3ee87354067e361e34ee29b37937dc8ee74827f3
+  metadata.gz: 4daa370126c01254c4d436120247f018eb32218e6ba9ee655d09eeaf0e00dc252949d66e160806c8304b878dbb0dd9bba3d1a8d1daa585b00c895066ca89d086
+  data.tar.gz: 7086d6183999b34bed8507a7b5596dfcb6b247cb813352927f0721fd03ba1bb440cb4c97633ae63d8f1bfec85b579af5271ab4e005ba1edbb0bb4390c20782ae

data/.i18n-migrations.default.yml

@@ -4,6 +4,15 @@ migration_dir: i18n/migrate
 # this is where your locale files will live (en.yml, es.yml, etc). it will be relative to your config file
 locales_dir: config/locales
 
+# number of threads to concurrently perform migration operations for locales (optional)
+# concurrency: 4
+
+# number of threads to concurrently perform push operation for locales (optional)
+# push_concurrency: 4
+
+# seconds to wait time between push operations per thread, can be used to avoid API throttling (optional)
+# wait_seconds: 0
+
 # this is the locale you will be translating from
 main_locale: en
 

data/.travis.yml

@@ -1,3 +1,2 @@
 language: ruby
-rvm:
-  - 2.0.0
+cache: bundler

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+  # ignore - like in prod
+end
+
+task :default => :spec

data/lib/i18n/migrations/config.rb

@@ -4,6 +4,8 @@ module I18n
   module Migrations
     class Config
       CONFIG_FILE_NAME = '.i18n-migrations.yml'
+      DEFAULT_CONCURRENCY = 4
+      DEFAULT_WAIT_SECONDS = 0
 
       def initialize(config_file_name = CONFIG_FILE_NAME)
         @config_file_name = config_file_name
@@ -43,6 +45,18 @@ module I18n
         get_value(:google_translate_api_key)
       end
 
+      def concurrency
+        get_value(:concurrency, DEFAULT_CONCURRENCY)
+      end
+
+      def push_concurrency
+        get_value(:push_concurrency, concurrency)
+      end
+
+      def wait_seconds
+        get_value(:wait_seconds, DEFAULT_WAIT_SECONDS)
+      end
+
       def read!
         yaml_file = find_config_file(@config_file_name)
         unless yaml_file
@@ -72,7 +86,7 @@ module I18n
 
       private
 
-      def get_value(key)
+      def get_value(key, default = nil)
         if key.is_a?(Array)
           value = @config
           key.each do |key_part|
@@ -85,6 +99,8 @@ module I18n
           value
         elsif @config.has_key?(key.to_s)
           @config[key.to_s]
+        elsif default.present?
+          default
         else
           raise ArgumentError, "You must have defined #{key} in #{@root_dir}/#{@config_file_name}"
         end

data/lib/i18n/migrations/crowd_translate_client.rb

@@ -1,4 +1,5 @@
 require 'faraday'
+require 'active_support/core_ext/object'
 
 module I18n
   module Migrations

data/lib/i18n/migrations/google_translate_dictionary.rb

@@ -1,4 +1,5 @@
-require 'rest-client'
+require 'faraday'
+require 'active_support/core_ext/object'
 
 module I18n
   module Migrations
@@ -141,7 +142,10 @@ module I18n
                    q: q }
         url = 'https://www.googleapis.com/language/translate/v2'
         begin
-          RestClient.get url, { accept: :json, params: params }
+          Faraday.get(url) do |req|
+            req.headers['Content-Type'] = 'application/json'
+            req.params = params
+          end
         rescue Exception
           puts "Google Translate Error: #{$!.message}"
           puts "  #{url}?#{params.map { |k, v| [k, URI.escape(v.to_s)].join('=') }.join('&')}"

data/lib/i18n/migrations/locale.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'yaml'
 require 'active_support'
 require 'colorize'
+require 'active_support/core_ext/object'
 
 # this class does all the work, but doesn't hold config or do more than one locale
 module I18n

data/lib/i18n/migrations/migration_factory.rb

@@ -1,4 +1,5 @@
 require 'active_support/inflector'
+require 'active_support/core_ext/object'
 
 module I18n
   module Migrations

data/lib/i18n/migrations/migrator.rb

@@ -11,8 +11,6 @@ require 'i18n/migrations/locale'
 require 'i18n/migrations/migration_factory'
 require 'i18n/migrations/crowd_translate_client'
 
-CONCURRENT_THREADS = 3
-
 # this class knows how to do all the things the cli needs done.
 # it mostly delegates to locale to do it, often asking multiple locales to do the same thing
 module I18n
@@ -84,7 +82,7 @@ end
       end
 
       def push(locale_or_all, force = false)
-        each_locale(locale_or_all) do |locale|
+        each_locale(locale_or_all, concurrency: config.push_concurrency) do |locale|
           next if locale.main_locale?
           sheet = get_google_spreadsheet(locale.name)
           unless force
@@ -92,7 +90,7 @@ end
             migrate(locale.name)
           end
           locale.push(sheet)
-          sleep 4
+          wait
         end
       end
 
@@ -130,13 +128,12 @@ end
         end
       end
 
-      private
-
-      def each_locale(name = 'all', async: true)
+      private def each_locale(name = 'all', async: true, concurrency: config.concurrency)
         locale_names = name == 'all' ? all_locale_names : [name]
 
+        puts "Using #{concurrency} concurrency"
         if async
-          locale_names.each_slice(CONCURRENT_THREADS) do |some_locale_names|
+          locale_names.each_slice(concurrency) do |some_locale_names|
             threads = some_locale_names.map do |l|
               locale = locale_for(l)
               Thread.new { yield locale }
@@ -150,31 +147,37 @@ end
         end
       end
 
-      def all_locale_names
+      private def all_locale_names
         [config.main_locale] + config.other_locales
       end
 
-      def get_google_spreadsheet(locale)
+      private def get_google_spreadsheet(locale)
         GoogleSpreadsheet.new(locale,
                               config.google_spreadsheet(locale),
                               config.google_service_account_key_path).sheet
       end
 
-      def new_dictionary(locale)
+      private def new_dictionary(locale)
         GoogleTranslateDictionary.new(from_locale: config.main_locale,
                                       to_locale: locale,
                                       key: config.google_translate_api_key,
                                       do_not_translate: config.main_locale == locale ? {} : config.do_not_translate(locale))
       end
 
-      def new_migrations
+      private def new_migrations
         MigrationFactory.new(config.migration_dir)
       end
 
-      def new_crowd_translate_client
+      private def new_crowd_translate_client
         CrowdTranslateClient.new
       end
 
+      private def wait
+        if config.wait_seconds > 0
+          puts "Pausing #{config.wait_seconds}s to not run into Google Translate API throttling..."
+          sleep config.wait_seconds
+        end
+      end
     end
   end
 end

data/lib/i18n/migrations/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Migrations
-    VERSION = "1.1.4"
+    VERSION = "1.1.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n-migrations
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Jeremy Lightsmith