i18n-migrations 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b742b520e0c42a29cbed11f435eaf57293a4c958de7ed2eed8be1ed802bfc7da
-  data.tar.gz: b69d6b18f29f0290810322c8e051f5895ffd69982725b3cb8ea9b01630094af1
+  metadata.gz: a61642308e6f7429d13a4c6f1b0f6789b75af51091b3966474c72fe1834e79f9
+  data.tar.gz: 046affdbc02080b90a1d18e0b89f668a025e404e25016cab3036fa7151c1680f
 SHA512:
-  metadata.gz: 36e7b155f30d24c24fc84c181860595dbb995c7cf53f9ca6c7b693794b7b7cfa1a1f9a287c996c3ed75e7fe897b8a870946a37ec73c47bf25c2ea7c005fb766a
-  data.tar.gz: e5957eb775f2592d38824141e5c67cf42e8889c71c6cf239c98bb1ffeb0250529963ddc8f58d5df4a2a5dde0a51ca6a7c0cb848fae73c5648194a4989b7993bf
+  metadata.gz: b2383e487b6aff057aa3e78d831b692344bab7058ce9b94df3ee95b9e559fd9bbeb8112c5b75315097d5473679380f1f1ee9a0e46beb83b045ad2d1a501da5ed
+  data.tar.gz: ee172e7cda5416a57e31370dc694c5df868217b780a6de51b3eb99e6389d298e6f82d8c9997faaf19e9b9b6c1c821be1066714b82c9461e2d4bb659cda1dec04

data/.ruby-gemset

@@ -1 +1 @@
-transparentclassroom
+i18n-migrations

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.1
+ruby-2.6.4

data/lib/i18n/migrations/google_translate_dictionary.rb

@@ -44,7 +44,7 @@ module I18n
       # returns updated after term, errors
       def fix(before, after, key: nil)
         is_html = format(key) == :html
-        errors = []
+        errors = ["#{@to_locale}: #{key}"]
 
         # do not translate
         @do_not_translate.each do |term, bad_translations|
@@ -116,7 +116,7 @@ module I18n
         end
 
 
-        [after, errors]
+        [after, errors.length > 1 ? errors : []]
       end
 
       private

data/lib/i18n/migrations/locale.rb

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

data/lib/i18n/migrations/migration.rb

@@ -1,32 +1,42 @@
 module I18n
   module Migrations
     class Migration
+      class Logger
+        def initialize(verbose: false)
+          @verbose = verbose
+        end
+
+        def info(message)
+          puts message if @verbose
+        end
+      end
+
+      # translations = facade over translations
       # locale = en | es | ...
-      # data = all keys -> all translations in this locale
-      # notes = some keys -> notes about the translation in this locale
       # dictionary = call dictionary.lookup(term) to get localized version of a term
       # direction = :up | :down (up when migrating, down when rolling back)
-      def initialize(locale, data, notes, dictionary, direction = :up, verbose = false)
-        @locale, @data, @notes, @dictionary, @direction, @verbose = locale, data, notes, dictionary, direction, verbose
+      def initialize(translations:, locale_code:, dictionary:, direction: :up, logger: Logger.new)
+        @translations, @locale_code, @dictionary, @direction, @logger =
+            translations, locale_code, dictionary, direction, logger
       end
 
       # Overrides can be provided, e.g. { es: 'El foo de la barro' }
       def add(key, term, overrides = {})
         if @direction == :up
-          info "adding #{key}"
+          @logger.info "adding #{key}"
           _add key, term, overrides
         else
-          info "unadding #{key}"
+          @logger.info "unadding #{key}"
           _rm key
         end
       end
 
       def mv(old_key, new_key)
         if @direction == :up
-          info "moving #{old_key} => #{new_key}"
+          @logger.info "moving #{old_key} => #{new_key}"
           _mv old_key, new_key
         else
-          info "moving back #{new_key} => #{old_key}"
+          @logger.info "moving back #{new_key} => #{old_key}"
           _mv new_key, old_key
         end
       end
@@ -34,10 +44,10 @@ module I18n
       # Overrides can be provided, e.g. { es: 'El foo de la barro' }
       def rm(key, old_term, overrides = {})
         if @direction == :up
-          info "removing #{key}"
+          @logger.info "removing #{key}"
           _rm key
         else
-          info "unremoving #{key}"
+          @logger.info "unremoving #{key}"
           _add key, old_term, overrides
         end
       end
@@ -45,10 +55,10 @@ module I18n
       # Overrides can be provided, e.g. { es: 'El foo de la barro' }
       def update(key, new_term, old_term, overrides = {})
         if @direction == :up
-          info "updating #{key}"
+          @logger.info "updating #{key}"
           _update key, new_term, overrides
         else
-          info "unupdating #{key}"
+          @logger.info "unupdating #{key}"
           _update key, old_term, {}
         end
       end
@@ -63,7 +73,7 @@ module I18n
       def _mv(from, to)
         assert_exists! from
         assert_does_not_exist! to
-        @data[to] = @data.delete(from)
+        @translations.move_term(from, to)
       end
 
       def _update(key, term, overrides)
@@ -73,27 +83,28 @@ module I18n
 
       def _rm(key)
         assert_exists! key
-        @data.delete(key)
-        @notes.delete(key)
-      end
-
-      def info(message)
-        puts message if @verbose
+        delete_translation key
       end
 
       def assert_exists!(key)
-        raise "#{key} doesn't exist in #{@locale}" unless @data.has_key?(key)
+        raise "#{key} doesn't exist in #{@locale_code}" unless @translations.get_term(key)
       end
 
       def assert_does_not_exist!(key)
-        raise "#{key} already exists in #{@locale}" if @data.has_key?(key)
+        raise "#{key} already exists in #{@locale_code}" if @translations.get_term(key)
+      end
+
+      # should delete key & return translation
+      def delete_translation(key)
+        @translations.delete_term(key)
       end
 
       def assign_translation(key, term, overrides)
-        if overrides[@locale.to_sym]
-          @data[key] = overrides[@locale.to_sym]
+        if overrides[@locale_code.to_sym]
+          @translations.set_term(key, value: overrides[@locale_code.to_sym])
         else
-          @data[key], @notes[key] = @dictionary.lookup(term, key: key)
+          value, notes = @dictionary.lookup(term, key: key)
+          @translations.set_term(key, value: value, notes: notes)
         end
       end
     end

data/lib/i18n/migrations/migration_factory.rb

@@ -18,14 +18,50 @@ module I18n
         raise("Can't parse version: #{version}") unless version =~ /^(\d{12})_(.*)/
         migration_class_name = "#{$2.camelcase}#{$1}"
 
+        translations = Translations.new(data: data, notes: notes)
         migration = begin
-          migration_class_name.constantize.new(locale, data, notes, dictionary, direction)
+          migration_class_name.constantize.new(locale_code: locale,
+                                               translations: translations,
+                                               dictionary: dictionary,
+                                               direction: direction)
         rescue
           raise "Couldn't load migration #{migration_class_name} in #{filename}"
         end
 
         migration.change
       end
+
+      # This is a facade over our translations
+      # data = all keys -> all translations in this locale
+      # notes = some keys -> notes about the translation in this locale
+      class Translations
+        def initialize(data:, notes:)
+          @data, @notes = data, notes
+        end
+
+        def get_term(key)
+          @data[key]
+        end
+
+        def set_term(key, value:, notes: nil)
+          @data[key] = value
+          if notes.present?
+            @notes[key] = notes
+          else
+            @notes.delete(key)
+          end
+        end
+
+        def delete_term(key)
+          @data.delete(key)
+          @notes.delete(key)
+        end
+
+        def move_term(from, to)
+          @data[to] = @data.delete(from)
+          @notes[to] = @notes.delete(from)
+        end
+      end
     end
   end
 end

data/lib/i18n/migrations/migrator.rb

@@ -11,7 +11,7 @@ require 'config'
 require 'locale'
 require 'migration_factory'
 
-ASYNC = false
+CONCURRENT_THREADS = 4
 
 # 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
@@ -92,6 +92,7 @@ end
             migrate(locale.name)
           end
           locale.push(sheet)
+          sleep 4
         end
       end
 
@@ -106,7 +107,7 @@ end
       end
 
       def validate(locale_or_all)
-        each_locale(locale_or_all) do |locale|
+        each_locale(locale_or_all, async: false) do |locale|
           next if locale.main_locale?
           locale.update_info do |data, notes|
             locale.validate(data, notes)
@@ -116,17 +117,21 @@ end
 
       private
 
-      def each_locale(name = 'all')
+      def each_locale(name = 'all', async: true)
         locale_names = name == 'all' ? all_locale_names : [name]
 
-        if ASYNC
-          threads = locale_names.map do |l|
-            locale = locale_for(l)
-            Thread.new {yield locale}
+        if async
+          locale_names.each_slice(CONCURRENT_THREADS) do |some_locale_names|
+            threads = some_locale_names.map do |l|
+              locale = locale_for(l)
+              Thread.new {yield locale}
+            end
+            threads.each(&:join)
           end
-          threads.each(&:join)
         else
-          locale_names.each {|l| yield locale_for(l)}
+          locale_names.each do |l|
+            yield locale_for(l)
+          end
         end
       end
 

data/lib/i18n/migrations/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Migrations
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-migrations
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeremy Lightsmith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-02 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,8 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Migrations for doing i18n.