i18n-migrations 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba15d5100518deebb6bfd7a43960ee5c5f76e92e6cf2b998a5d69066321e7dff
-  data.tar.gz: 5e9816cf86492b7b5dd4c012fa402030c6db4d8cb2429cce411bbe38ac695803
+  metadata.gz: a61642308e6f7429d13a4c6f1b0f6789b75af51091b3966474c72fe1834e79f9
+  data.tar.gz: 046affdbc02080b90a1d18e0b89f668a025e404e25016cab3036fa7151c1680f
 SHA512:
-  metadata.gz: 171849dde3e0cc39e5d50e9a5632e03d36c5601dad85e47c6d639ed5c58461403457887bb45fd4164229f84220552aaf5b0a933ed73bb59e595bcd7a57626ccd
-  data.tar.gz: 14c98f74cd3e493af2fb9cf65f787025bc226d9bbe1802c1d3bcc0986bdb23d1a1f088e4eaa55c777ee8a754c1a21c6e1847edfaa86017d3765e92dcc350433a
+  metadata.gz: b2383e487b6aff057aa3e78d831b692344bab7058ce9b94df3ee95b9e559fd9bbeb8112c5b75315097d5473679380f1f1ee9a0e46beb83b045ad2d1a501da5ed
+  data.tar.gz: ee172e7cda5416a57e31370dc694c5df868217b780a6de51b3eb99e6389d298e6f82d8c9997faaf19e9b9b6c1c821be1066714b82c9461e2d4bb659cda1dec04

data/.ruby-gemset

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

data/.ruby-version

@@ -1 +1 @@
-ruby-2.5.5
+ruby-2.6.4

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/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Migrations
-    VERSION = "1.0.6"
+    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.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeremy Lightsmith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Migrations for doing i18n.