i18n-migrations 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13e2d9e3d4aa1ec30fa0584c624d96388fac4aa31e11a6705fa61c39f8ff9a6c
-  data.tar.gz: a88a38c024f92727aaf57bff6950ae5a9d3665d9b86cd26a382cecdb13ec085e
+  metadata.gz: 0b8b7ac35780cf4cf39728ec9c140324a1df5b21868fbeff0d8082eb2b612e1e
+  data.tar.gz: c8c7f5867dc9d8485d527d0b9286a3925eaa69eea40e82ae5ee0a6ca2240f89e
 SHA512:
-  metadata.gz: e9eec7ad2d69e380a74b03b26e95be54c9bfb5d59f69cc1115f457f0fbecd0c6f0cec334d2f92b8970550cf42e2e0e9a46818d6b69a2bb7bfbb2f7bd086320ea
-  data.tar.gz: be7bac66cd9be3219e930e9568762c1ffe07b313d7712ab4f7ce424d85625c4770b35bbf749d69dd528dd656c29ab1b615f1cd337ef612d9e32221ec2d3716dc
+  metadata.gz: 3ebecbc35805df21ae0db20ac14931517fb6e55126a3a3b853d1486ab59264f38ea58e66077f665ed226b66afb828544866dae8810fd6c6c93c5ce52f9367d89
+  data.tar.gz: 5a449c05dd1f4d2a2a5492cf0e0ff6fb016344fc1db735e51eaeff4bc9466f62cfb1979c381ad8d35fa503e58d8964fbe044438e9ec1ac51a09fb1483d4356bc

data/lib/i18n/migrations/backends/crowd_translate_backend.rb

@@ -6,8 +6,8 @@ module I18n
       class CrowdTranslateBackend
         attr_reader :client
 
-        def initialize
-          @client = CrowdTranslateClient.new
+        def initialize(client: CrowdTranslateClient.new)
+          @client = client
         end
 
         def pull(locale)
@@ -15,22 +15,56 @@ module I18n
           locale.migrate!
         end
 
-        def push(locale, force = false)
-          raise "CrowdTranslate does not support -f flag yet" if force
+        def push(locale, force: false)
+          if force
+            force_push(locale)
+          end
 
           # do this just once
           unless @migrations_synced
-            @client.sync_migrations(locale.migrations)
+            sync_migrations(locale.migrations)
             @migrations_synced = true
           end
           pull(locale)
         end
 
+        # this will replace everything about a locale, it will create a locale that does not yet exist
+        def force_push(locale)
+          data, notes = locale.read_data_and_notes(parse: false)
+          client.put_locale(locale.name,
+                            name: locale.name,
+                            yaml_file: data,
+                            yaml_notes_file: notes)
+
+        end
+
         def pull_from_crowd_translate(locale)
-          data = @client.get_locale_file(locale.name)
+          data = client.get_locale_file(locale.name)
           locale.write_raw_data("#{locale.name}.yml", data)
           locale.write_remote_version(YAML::load(data)[locale.name])
         end
+
+        def sync_migrations(migrations)
+          local_versions = migrations.all_versions
+          remote_versions = client.get_migration_versions
+
+          if (extra_versions = remote_versions - local_versions).present?
+            raise("You may not upload migrations to the server because it has migrations not found locally: " +
+                    "#{extra_versions.join(', ')}")
+          end
+
+          if (versions_to_add = local_versions - remote_versions).present?
+            versions_to_add.each do |version|
+              begin
+                client.put_migration(version: version, ruby_file: migrations.get_migration(version: version))
+              rescue
+                puts "There was an error updating migration:".red
+                puts "  #{migrations.migration_file(version: version)}".bold
+                raise
+              end
+            end
+          end
+        end
       end
     end
   end

data/lib/i18n/migrations/backends/crowd_translate_client.rb

@@ -16,31 +16,21 @@ module I18n
           )
         end
 
-        def sync_migrations(migrations)
-          local_versions = migrations.all_versions
-          remote_versions = JSON.parse(get('migrations.json'))
+        def get_locale_file(locale_code)
+          get("locales/#{locale_code}.yml")
+        end
 
-          if (extra_versions = remote_versions - local_versions).present?
-            raise("You may not upload migrations to the server because it has migrations not found locally: " +
-                    "#{extra_versions.join(', ')}")
-          end
+        def get_migration_versions
+          JSON.parse(get('migrations.json'))
+        end
 
-          if (versions_to_add = local_versions - remote_versions).present?
-            versions_to_add.each do |version|
-              begin
-                put("migrations/#{version}.json",
-                    migration: { ruby_file: migrations.get_migration(version: version) })
-              rescue
-                puts "There was an error updating migration:".red
-                puts "  #{migrations.migration_file(version: version)}".bold
-                raise
-              end
-            end
-          end
+        def put_migration(version:, ruby_file:)
+          put("migrations/#{version}.json", migration: { ruby_file: ruby_file })
         end
 
-        def get_locale_file(locale_code)
-          get("locales/#{locale_code}.yml")
+        def put_locale(locale_code, name:, yaml_file:, yaml_notes_file:)
+          put("locales/#{locale_code}",
+              locale: { name: name, yaml_file: yaml_file, yaml_notes_file: yaml_notes_file })
         end
 
         private

data/lib/i18n/migrations/backends/google_spreadsheets_backend.rb

@@ -16,7 +16,7 @@ module I18n
           locale.migrate!
         end
 
-        def push(locale, force = false)
+        def push(locale, force: false)
           return if locale.main_locale?
 
           sheet = get_google_spreadsheet(locale.name)

data/lib/i18n/migrations/locale.rb

@@ -106,13 +106,13 @@ module I18n
         read_versions(read_data).last
       end
 
-      def read_data
-        read_from_file("#{@name}.yml")
+      def read_data(parse: true)
+        read_from_file("#{@name}.yml", parse: parse)
       end
 
-      def read_data_and_notes
-        data = read_data
-        notes = main_locale? ? {} : read_from_file("../#{@name}_notes.yml")
+      def read_data_and_notes(parse: true)
+        data = read_data(parse: parse)
+        notes = main_locale? ? (parse ? {} : '--- {}') : read_from_file("../#{@name}_notes.yml", parse: parse)
         [data, notes]
       end
 
@@ -185,11 +185,14 @@ module I18n
         (data['VERSION'] && data['VERSION'].split("\n")) || []
       end
 
-      def read_from_file(filename)
+      def read_from_file(filename, parse: true)
         filename = File.join(@locales_dir, filename)
         begin
+          contents = File.read(filename)
+          return contents unless parse
+
           hash = {}
-          add_to_hash(hash, YAML.load(File.read(filename))[@name.to_s])
+          add_to_hash(hash, YAML.load(contents)[@name.to_s])
           hash
         rescue
           puts "Error loading #{filename}"

data/lib/i18n/migrations/migrator.rb

@@ -79,7 +79,7 @@ end
 
       def push(locale_or_all, force = false)
         each_locale(locale_or_all, concurrency: config.push_concurrency) do |locale|
-          backend.push(locale, force)
+          backend.push(locale, force: force)
           wait
         end
       end

data/lib/i18n/migrations/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Migrations
-    VERSION = "1.2.3"
+    VERSION = "1.2.4"
   end
 end

metadata

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