transync 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90302f66b201067dffbb9b3e55eded34a9d2bac1
-  data.tar.gz: 7a921bf6c24b68d4b5f94dbf472b9986d5d01c18
+  metadata.gz: f809b3fa2f4b40dd2b1ffcf0c505a0cc7e11df20
+  data.tar.gz: d30f41ff8d1ff9fe6b948158b1629f46111603ed
 SHA512:
-  metadata.gz: 9b3107c28d578555752291db1afe9023052c9e55e01407f51252b1eca986be2605a17d11e527508948dc31f01bb9394b5540687798407f82ca91e2de77697411
-  data.tar.gz: 60f2a4823fc51abd6b8855e16801ecc49ec2ce7529e0795566afa40aec9f2c090124a7b0a125666a9c8f8864ba4424e8bab630bcc0a924c958d51ce2238b57cc
+  metadata.gz: 0602b6c893ba7a6ecdc70bb222215b6b8edafd9807e5008b358ee482fff0a9f8b3c250ce978cf3d1a4bbe5c22f1d2d4f48ad91e415d915e8e36ad50d3b78ced2
+  data.tar.gz: 2ed3433d06f351c658dbeb34d968abce571b6bdb3ddc0b2321f2049d7384d127e453cf62509d5d23c202022961887847daa152f25986234f4fb608965aa78bd2

data/README.md

@@ -50,4 +50,5 @@ When running with test as second argument, changes won't be written to files or
 
 # TODO
 
+- update doesn't work for all languages (if we have two different language it will work only for one)
 - update for more than 2 languages

data/lib/transync/sync/init.rb

@@ -23,7 +23,7 @@ class Init
     # re-init spreadsheet after new worksheets were created
     TransyncConfig.init_spreadsheet
     sync = TranslationSync.new(@path, 'x2g')
-    sync.run('x2g')
+    sync.run('x2g', nil)
   end
 
 end

data/lib/transync/sync/sync_util.rb

@@ -3,24 +3,6 @@ require_relative '../xliff_trans/xliff_trans_reader'
 
 module SyncUtil
 
-  def self.check_and_get_xliff_files(languages, path, file)
-    valid = true
-    xliff_translations = []
-    all_translations_for_language = {}
-
-    languages.each do |language|
-      xliff_reader = XliffTransReader.new(path, file, languages)
-      if xliff_reader.valid?
-        xliff_translations << xliff_reader.translations(language)
-      else
-        valid = false
-        all_translations_for_language = xliff_reader.all_translations_for_language
-      end
-    end
-
-    return valid, xliff_translations, all_translations_for_language
-  end
-
   def self.info_clean(file, language, message)
     msg = "#{file} (#{language}) - #{message}"
     SyncUtil.log_and_puts(msg)

data/lib/transync/sync/translation_sync.rb

@@ -14,8 +14,8 @@ class TranslationSync
 
   def run(direction, test)
     @config['FILES'].each do |file|
-      valid, _ = SyncUtil::check_and_get_xliff_files(@config['LANGUAGES'], @path, file)
-      abort('Fix your Xliff translations first!') unless valid
+      xliff_files = XliffTransReader.new(@path, file, @config['LANGUAGES'])
+      abort('Fix your Xliff translations by hand or run transync update!') unless xliff_files.valid?
 
       @config['LANGUAGES'].each do |language|
         trans_sync = TranslationSync.new(@path, direction, file)

data/lib/transync/version.rb

@@ -1,3 +1,3 @@
 module Transync
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/lib/transync/xliff_trans/xliff_trans_reader.rb

@@ -3,14 +3,12 @@ require 'nokogiri'
 class XliffTransReader
   attr_accessor :path,
                 :file,
-                :languages,
-                :all_translations_for_language
+                :languages
 
   def initialize(path, file, languages)
     self.path       = path
     self.file       = file
     self.languages  = languages
-    self.all_translations_for_language = {file: file, language: nil, translations: {}}
   end
 
   def translations(language)
@@ -28,30 +26,70 @@ class XliffTransReader
     data
   end
 
-  # will go through each and find if any xliff is missing keys for translations
   def valid?
     missing = 0
+
+    check_all do |lang_a, lang_b, xliff_lang_value, x_trans_key|
+      if xliff_lang_value.nil?
+        p "Comparing #{file}.#{lang_a} against #{file}.#{lang_b} => #{file}.#{lang_b} "\
+          "is missing translation for key '#{x_trans_key}'"
+        missing += 1
+      end
+    end
+
+    missing == 0
+  end
+
+  def fill_with_missing_keys
     missing_translation_text = TransyncConfig::CONFIG['MISSING_TRANSLATION_TEXT'] || '#MISSING-TRANS#'
+    all_translations_for_language = {file: file, language: nil, translations: {}}
+    added = false
 
-    self.translations(self.languages.first)[:translations].keys.each do |x_trans_key|
-      self.languages.each do |key_lang|
-        xliff_reader = XliffTransReader.new(self.path, self.file, self.languages)
-        xliff_lang = xliff_reader.translations(key_lang)[:translations]
-        xliff_lang_value = xliff_lang[x_trans_key]
+    check_all do |lang_a, lang_b, xliff_lang_value, x_trans_key, translations_lang_b, last| # x_trans_key comes from lang_a translations
+      all_translations_for_language[:language] = lang_b
 
-        all_translations_for_language[:language] = key_lang
+      if xliff_lang_value.nil?
+        p "Comparing #{file}.#{lang_a} against #{file}.#{lang_b} => #{file}.#{lang_b} "\
+          "was missing translation for key '#{x_trans_key}' => setting value: '#{missing_translation_text} - #{x_trans_key}'"
+        all_translations_for_language[:translations][x_trans_key] = "#{missing_translation_text} - #{x_trans_key}"
+        added = true
+      else
+        all_translations_for_language[:translations][x_trans_key] = xliff_lang_value
+      end
 
-        if xliff_lang_value.nil?
-          p "#{file}.#{key_lang} is missing translation for key '#{x_trans_key}'"
-          all_translations_for_language[:translations][x_trans_key] = "#{missing_translation_text} - #{x_trans_key}"
-          missing += 1
-        else
-          all_translations_for_language[:translations][x_trans_key] = xliff_lang_value
+      if last
+        if added
+          all_translations_for_language[:translations] = translations_lang_b.merge(all_translations_for_language[:translations])
+          xliff_trans_writer = XliffTransWriter.new(path, file)
+          xliff_trans_writer.write(all_translations_for_language)
         end
+
+        # clear
+        all_translations_for_language[:translations] = {}
+        added = false
       end
     end
+  end
 
-    missing == 0
+  def check_all
+    self.languages.each do |lang_a|
+      self.languages.each do |lang_b|
+        next if lang_a == lang_b
+
+        xliff_reader = XliffTransReader.new(self.path, self.file, self.languages)
+        translations_lang_a = self.translations(lang_a)[:translations]
+        keys = translations_lang_a.keys
+        i = 1
+
+        keys.each do |x_trans_key|
+          translations_lang_b = xliff_reader.translations(lang_b)[:translations]
+          xliff_lang_value = translations_lang_b[x_trans_key]
+
+          yield(lang_a, lang_b, xliff_lang_value, x_trans_key, translations_lang_b, keys.length == i) # last key?
+          i += 1
+        end
+      end
+    end
   end
 
   # Reading from source tags in xliff

data/lib/transync.rb

@@ -20,21 +20,16 @@ module Transync
 
     if mode == 'test'
       TransyncConfig::CONFIG['FILES'].each do |file|
-        SyncUtil::check_and_get_xliff_files(TransyncConfig::CONFIG['LANGUAGES'], path, file)
+        xliff_files = XliffTransReader.new(path, file, TransyncConfig::CONFIG['LANGUAGES'])
+        p 'All translation have all keys, great!' if xliff_files.valid?
       end
     end
 
     if mode == 'update'
       TransyncConfig::CONFIG['FILES'].each do |file|
-        valid, _, all_translations_for_language =
-          SyncUtil::check_and_get_xliff_files(TransyncConfig::CONFIG['LANGUAGES'], path, file)
-
-        unless valid
-          xliff_trans_writer = XliffTransWriter.new(path, file)
-          xliff_trans_writer.write(all_translations_for_language)
-        end
+        xliff_files = XliffTransReader.new(path, file, TransyncConfig::CONFIG['LANGUAGES'])
+        xliff_files.fill_with_missing_keys
       end
-      p 'All xliff files should now have all the keys!'
     end
   end
 

data/test/fixtures/test.fr.xliff

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+    <file source-language="fr" datatype="plaintext" original="file.ext">
+        <body>
+            <trans-unit id="title">
+                <source>title</source>
+                <target>Title - FR</target>
+            </trans-unit>
+            <trans-unit id="round">
+                <source>round</source>
+                <target>Round - FR</target>
+            </trans-unit>
+            <trans-unit id="end_test">
+                <source>end_test</source>
+                <target>End test - FR</target>
+            </trans-unit>
+            <trans-unit id="end_test_2">
+                <source>end_test_2</source>
+                <target>End test 2 - FR</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>

data/test/fixtures/validators.fr.xliff

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+    <file source-language="fr" datatype="plaintext" original="file.ext">
+        <body>
+            <trans-unit id="title">
+                <source>title</source>
+                <target>Title - FR</target>
+            </trans-unit>
+            <trans-unit id="end_test_2">
+                <source>end_test_2</source>
+                <target>#MISSING-TRANS# - end_test_2</target>
+            </trans-unit>
+            <trans-unit id="round">
+                <source>round</source>
+                <target>Round - FR</target>
+            </trans-unit>
+            <trans-unit id="end_test">
+                <source>end_test</source>
+                <target>#MISSING-TRANS# - end_test</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>

data/test/g2x_spec.rb

@@ -32,11 +32,6 @@ describe 'g2x' do
   end
 
   it 'g2x sync should build new hash before writing it to xliff' do
-    _, xliff_translations = SyncUtil::check_and_get_xliff_files(%w(en), @path, @file)
-    xliff_translations[0][:file].must_equal @file
-    xliff_translations[0][:language].must_equal @language
-    xliff_translations[0][:translations].keys.size.must_equal 4
-
     trans_sync     = TranslationSync.new(@path, 'g2x', @file)
     new_xliff_hash = trans_sync.sync(@language, 'g2x')
 

data/test/update_spec.rb

@@ -0,0 +1,22 @@
+require 'minitest/spec'
+require 'minitest/autorun'
+
+require_relative '../lib/transync/gdoc_trans/gdoc_trans_reader'
+require_relative '../lib/transync/xliff_trans/xliff_trans_writer'
+require_relative '../lib/transync/sync/sync_util'
+
+describe 'update' do
+  before do
+    @path      = 'test/fixtures'
+    @languages = %w(en de fr)
+    SyncUtil.create_logger('update_test')
+  end
+
+  it 'test if xliff files are valid' do
+    xliff_files = XliffTransReader.new(@path, 'validators', @languages)
+    xliff_files.valid?.must_equal false, 'validators translations should not be valid, because we do not have all keys in german file.'
+
+    xliff_files.fill_with_missing_keys
+    xliff_files.valid?.must_equal true, 'validators translations should be valid after running fill_with_missing_keys'
+  end
+end

data/test/x2g_spec.rb

@@ -18,22 +18,11 @@ describe 'x2g' do
   end
 
   it 'test if xliff files are valid' do
-    xliff_trans_reader = XliffTransReader.new(@path, 'test', @languages)
-    valid = xliff_trans_reader.valid?
-    valid.must_equal true
+    xliff_files = XliffTransReader.new(@path, 'test', @languages)
+    xliff_files.valid?.must_equal true
 
-    xliff_trans_reader = XliffTransReader.new(@path, 'validators', @languages)
-    valid = xliff_trans_reader.valid?
-    valid.must_equal false, 'validators translations should not be valid, because we do not have all keys in german file.'
-  end
-
-  it 'test if all keys in all language files are presented' do
-    valid, _, _ = SyncUtil::check_and_get_xliff_files(TransyncConfig::CONFIG['LANGUAGES'], @path, 'test')
-    valid.must_equal true, 'test file should have all keys in both languages'
-
-    valid, _, all_trans = SyncUtil::check_and_get_xliff_files(TransyncConfig::CONFIG['LANGUAGES'], @path, 'validators')
-    valid.must_equal false, 'validators.de file is should have one key less then validators.en xliff file'
-    all_trans[:translations].size.must_equal 4
+    xliff_files = XliffTransReader.new(@path, 'validators', @languages)
+    xliff_files.valid?.must_equal false, 'validators translations should not be valid, because we do not have all keys in german file.'
   end
 
   it 'x2g sync should build correct new hash before writing it back to google doc' do
@@ -52,6 +41,6 @@ describe 'x2g' do
     gdoc_trans_reader = GdocTransReader.new(@file)
     gdoc_trans_writer = GdocTransWriter.new(gdoc_trans_reader.worksheet)
     gdoc_trans_writer.get_language_column_index('en').must_equal 2
-    gdoc_trans_writer.get_language_column_index('DE').must_equal 3
+    gdoc_trans_writer.get_language_column_index('de').must_equal 3
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transync
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - zigomir
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
@@ -94,9 +94,12 @@ files:
 - lib/transync/xliff_trans/xliff_trans_writer.rb
 - test/fixtures/test.de.xliff
 - test/fixtures/test.en.xliff
+- test/fixtures/test.fr.xliff
 - test/fixtures/validators.de.xliff
 - test/fixtures/validators.en.xliff
+- test/fixtures/validators.fr.xliff
 - test/g2x_spec.rb
+- test/update_spec.rb
 - test/x2g_spec.rb
 - transync.SAMPLE.yml
 - transync.gemspec
@@ -120,15 +123,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.1
 signing_key: 
 specification_version: 4
 summary: Synchronize XLIFF translations with Google Drive document
 test_files:
 - test/fixtures/test.de.xliff
 - test/fixtures/test.en.xliff
+- test/fixtures/test.fr.xliff
 - test/fixtures/validators.de.xliff
 - test/fixtures/validators.en.xliff
+- test/fixtures/validators.fr.xliff
 - test/g2x_spec.rb
+- test/update_spec.rb
 - test/x2g_spec.rb
 has_rdoc: