transync 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f11c17bb6bb01279bc8eadbdddff263cfdd781b7
-  data.tar.gz: ba5f4718b72927ad95d3413a70f11004532ddd1e
+  metadata.gz: 5e731d0853faec16a75252dfc64f65ae783d6a69
+  data.tar.gz: c26ef0c56ef0652d1a6a7cc93472965053fdbb83
 SHA512:
-  metadata.gz: 92218c53c2be5315c7642f009f4b84c753c05340ceb8e5bdf2b4f338bec33d4e844975bc25b93a64c577820cd7f4422d9fab5c74070d39ed0836a35dd227fcdc
-  data.tar.gz: d4a2c10e8576748018de65c6ecf773d426f50bc3ea7080bc281324887e5a98ce285c1ced540405dc1a427907b0d0027ac7cffe67732997634dbc8d7df9ba9cd5
+  metadata.gz: 92476f9124ea09d46e7b98574a07df504f73d5aa0bca336b39ebb87249253b38aa9d75791c91f9771996424c70319834b7cf04c47c718afb40271acdfad7b1e3
+  data.tar.gz: 6c5a099fca0df65ecbbf957ba6918e1d76b7d3936a1ca33403ea56b05432f973aabdb8bc34d12bbfb2d8d66c2828d40cb39ea489de0a6d0786d27a72658ba38b

data/README.md

@@ -47,6 +47,8 @@ Updating GDoc from our xliff files. It won't delete any key, it will only add ne
 
 Gem docs available at http://gimite.net/doc/google-drive-ruby
 
-# Known issues
+# TODO
 
-It won't add keys as it should if not all languages are set in transync.yml
+- more tests, edge cases
+- more OOP
+- update for more than 2 languages

data/lib/transync.rb

@@ -1,5 +1,4 @@
-require_relative 'transync/sync/xliff_2_gdoc_main'
-require_relative 'transync/sync/gdoc_2_xliff_main'
+require_relative 'transync/sync/translation_sync'
 require_relative 'transync/sync/init'
 require_relative 'transync/sync/sync_util'
 
@@ -7,16 +6,11 @@ module Transync
 
   def self.run(mode)
     FileUtils.mkdir('.transync_log') unless Dir.exist?('.transync_log')
-    path = GdocTrans::CONFIG['XLIFF_FILES_PATH']
+    path = TransyncConfig::CONFIG['XLIFF_FILES_PATH']
 
-    if mode == 'x2g'
-      x2g = Xliff2GdocMain.new(path)
-      x2g.run
-    end
-
-    if mode == 'g2x'
-      g2x = Gdoc2XliffMain.new(path)
-      g2x.run
+    if mode == 'x2g' or mode == 'g2x'
+      sync = TranslationSync.new(path, mode)
+      sync.run(mode)
     end
 
     if mode == 'init'
@@ -25,15 +19,22 @@ module Transync
     end
 
     if mode == 'test'
-      GdocTrans::CONFIG['FILES'].each do |file|
-        SyncUtil::check_and_get_xliff_files(GdocTrans::CONFIG['LANGUAGES'], path, file)
+      TransyncConfig::CONFIG['FILES'].each do |file|
+        SyncUtil::check_and_get_xliff_files(TransyncConfig::CONFIG['LANGUAGES'], path, file)
       end
     end
 
     if mode == 'update'
-      GdocTrans::CONFIG['FILES'].each do |file|
-        SyncUtil::check_and_get_xliff_files(GdocTrans::CONFIG['LANGUAGES'], path, file, true)
+      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
       end
+      p 'All xliff files should now have all the keys!'
     end
   end
 

data/lib/transync/gdoc_trans/gdoc_trans_reader.rb

@@ -1,27 +1,23 @@
-require 'google_drive'
-require_relative 'gdoc_trans'
+require_relative '../transync_config'
 
 class GdocTransReader
-  attr_accessor :worksheet
+  attr_reader :worksheet
 
-  def initialize(gdoc_access, tab)
-    session = GoogleDrive.login(gdoc_access['email'], gdoc_access['password'])
-
-    worksheet_tabs = session.spreadsheet_by_key(gdoc_access['key']).worksheets
-    # select the right tab from worksheet
-    self.worksheet = worksheet_tabs.detect{ |w| w.title == tab }
-    abort("#{tab} tab is not defined in GDoc") if self.worksheet.nil?
+  # file represents tab in spreadsheet
+  def initialize(file)
+    @worksheet = TransyncConfig::WORKSHEETS.detect{ |w| w.title == file }
+    abort("#{file} tab is not defined in GDoc") if @worksheet.nil?
   end
 
-  def build_trans_hash(language = 'en')
-    trans_hash = { title: worksheet.title, language: language, translations: [] }
-
-    key_column = GdocTrans::WORKSHEET_COLUMNS[:key]
-    language_column = GdocTrans::WORKSHEET_COLUMNS[language.to_sym]
+  def translations(language)
+    trans_hash = { file: @worksheet.title, language: language, translations: {} }
+    key_column      = TransyncConfig::WORKSHEET_COLUMNS[:key]
+    language_column = TransyncConfig::WORKSHEET_COLUMNS[language.to_sym]
 
-    (GdocTrans::START_ROW..worksheet.num_rows).to_a.each do |row|
-      translation = { key: worksheet[row, key_column], value: worksheet[row, language_column] }
-      trans_hash[:translations] << translation
+    (TransyncConfig::START_ROW..@worksheet.num_rows).to_a.each do |row|
+      key   = @worksheet[row, key_column]
+      value = @worksheet[row, language_column]
+      trans_hash[:translations][key] = value
     end
 
     trans_hash

data/lib/transync/gdoc_trans/gdoc_trans_writer.rb

@@ -1,28 +1,33 @@
 require 'google_drive'
-require_relative 'gdoc_trans'
 
 class GdocTransWriter
-  attr_accessor :worksheet
 
   def initialize(worksheet)
     @worksheet = worksheet
   end
 
-  def write(row, column, data)
-    @worksheet[row, GdocTrans::WORKSHEET_COLUMNS[column.to_sym]] = data
-  end
+  def write(trans_hash)
+    language    = trans_hash[:language]
+    lang_column = get_language_column_index(language)
+    abort("Language (#{language}) not found in worksheet (#{@worksheet.title})!") if lang_column == 0
+
+    row = 2
 
-  def shift_up(old_row_num, rows_count)
-    # shift up that many times we're missing till the end
-    (old_row_num..rows_count).to_a.each do |new_row|
-      (1..worksheet.num_cols).to_a.each do |col|
-        cell = @worksheet[new_row, col]
-        @worksheet[new_row, col] = ''
-        @worksheet[new_row + 1, col] = cell
-      end
+    trans_hash[:translations].keys.each do |trans_key|
+      trans_value = trans_hash[:translations][trans_key]
+      @worksheet[row, 1]           = trans_key
+      @worksheet[row, lang_column] = trans_value
+      row += 1
     end
 
-    @worksheet
+    @worksheet.save
+  end
+
+  def get_language_column_index(language)
+    (2..@worksheet.num_cols).each do |column|
+      return column if @worksheet[1, column].downcase == language.downcase
+    end
+    0
   end
 
 end

data/lib/transync/sync/init.rb

@@ -1,26 +1,15 @@
-require 'yaml'
-require_relative '../gdoc_trans/gdoc_trans_writer'
-require_relative 'xliff_to_gdoc'
-
 class Init
-  attr_reader :path, :config
 
   def initialize(path)
-    @path = path
-    @config = GdocTrans::CONFIG
-    @gdoc_access = @config['GDOC']
+    @path   = path
+    @config = TransyncConfig::CONFIG
   end
 
   def run
-    # first we want to add all the files to spreadsheet as worksheets (tabs)
-    # add_worksheet(title, max_rows = 100, max_cols = 20)
-    session = GoogleDrive.login(@gdoc_access['email'], @gdoc_access['password'])
-    spreadsheet = session.spreadsheet_by_key(@gdoc_access['key'])
-
     @config['FILES'].each do |file|
-      worksheet = spreadsheet.worksheets.select { |s| s.title == file }.first
+      worksheet = TransyncConfig::WORKSHEETS.detect{ |s| s.title == file }
       if worksheet.nil?
-        worksheet = spreadsheet.add_worksheet(file)
+        worksheet = TransyncConfig::SPREADSHEET.add_worksheet(file)
         p "Adding #{file} worksheet to spreadsheet with first row (key and languages)"
       end
 
@@ -31,11 +20,10 @@ class Init
       worksheet.save
     end
 
-    # now sync all our keys and translations to gdoc
-    # this won't work if local files are not 'clean'.
-    # to make them clean run test and update first!
-    x2g = Xliff2GdocMain.new(path)
-    x2g.run
+    # re-init spreadsheet after new worksheets were created
+    TransyncConfig.init_spreadsheet
+    sync = TranslationSync.new(@path, 'x2g')
+    sync.run('x2g')
   end
 
 end

data/lib/transync/sync/sync_util.rb

@@ -3,23 +3,22 @@ require_relative '../xliff_trans/xliff_trans_reader'
 
 module SyncUtil
 
-  def self.check_and_get_xliff_files(languages, path, file, create = false)
+  def self.check_and_get_xliff_files(languages, path, file)
+    valid = true
     xliff_translations = []
-    added = false
+    all_translations_for_language = {}
 
     languages.each do |language|
-      xliff_reader = XliffTransReader.new(path, file, language, languages)
-      if xliff_reader.valid?(create)
-        xliff_translations << xliff_reader.get_translations
+      xliff_reader = XliffTransReader.new(path, file, languages)
+      if xliff_reader.valid?
+        xliff_translations << xliff_reader.translations(language)
       else
-        added = true if create
-        abort('Fix your Xliff translations first!') unless create
+        valid = false
+        all_translations_for_language = xliff_reader.all_translations_for_language
       end
     end
 
-    p 'Missing translations were added!' if create and added
-
-    xliff_translations
+    return valid, xliff_translations, all_translations_for_language
   end
 
   def self.info_clean(file, language, message)
@@ -27,8 +26,9 @@ module SyncUtil
     SyncUtil.log_and_puts(msg)
   end
 
-  def self.info_diff(file, language, operation, trans)
-    msg = "#{file} (#{language}) - #{operation}: '#{trans[:key]}' => '#{trans[:value]}'"
+  def self.info_diff(file, language, operation, trans_key, trans_value)
+    msg = "#{file} (#{language}) - #{operation}: '#{trans_key}'"
+    msg += " to '#{trans_value}'" unless trans_value.nil?
     SyncUtil.log_and_puts(msg)
   end
 
@@ -38,7 +38,6 @@ module SyncUtil
   end
 
   def self.create_logger(direction)
-    # gdoc2xliff or xliff2gdoc
     @logger = Logger.new(".transync_log/#{direction}.log", 'monthly')
   end
 

data/lib/transync/sync/translation_sync.rb

@@ -0,0 +1,50 @@
+require_relative '../gdoc_trans/gdoc_trans_reader'
+require_relative '../gdoc_trans/gdoc_trans_writer'
+require_relative '../xliff_trans/xliff_trans_writer'
+
+class TranslationSync
+
+  def initialize(path, direction, file = nil)
+    @path   = path
+    @file   = file
+    @config = TransyncConfig::CONFIG
+    SyncUtil.create_logger(direction)
+  end
+
+  def run(direction)
+    @config['FILES'].each do |file|
+      valid, _ = SyncUtil::check_and_get_xliff_files(@config['LANGUAGES'], @path, file)
+      abort('Fix your Xliff translations first!') unless valid
+
+      @config['LANGUAGES'].each do |language|
+        trans_sync = TranslationSync.new(@path, direction, file)
+        trans_hash = trans_sync.sync(language, direction)
+
+        if direction == 'x2g'
+          gdoc_trans_reader = GdocTransReader.new(file)
+          gdoc_trans_writer = GdocTransWriter.new(gdoc_trans_reader.worksheet)
+          gdoc_trans_writer.write(trans_hash)
+        else
+          xliff_trans_writer = XliffTransWriter.new(@path, file)
+          xliff_trans_writer.write(trans_hash)
+        end
+      end
+    end
+  end
+
+  def sync(language, direction)
+    gdoc_trans_reader  = GdocTransReader.new(@file)
+    xliff_trans_reader = XliffTransReader.new(@path, @file, nil) # we dont need languages for translations method
+
+    g_trans_hash = gdoc_trans_reader.translations(language)
+    x_trans_hash = xliff_trans_reader.translations(language)
+
+    # We need to merge on translations hash, not whole hash since it will only merge first level
+    x2g_merged_translations = g_trans_hash[:translations].merge(x_trans_hash[:translations])
+    g2x_merged_translations = x_trans_hash[:translations].merge(g_trans_hash[:translations])
+
+    merged_translations = direction == 'x2g' ? x2g_merged_translations : g2x_merged_translations
+    {file: @file, language: language, translations: merged_translations}
+  end
+
+end

data/lib/transync/{gdoc_trans/gdoc_trans.rb → transync_config.rb}

@@ -1,11 +1,26 @@
-module GdocTrans
+require 'yaml'
+require 'google_drive'
+
+module TransyncConfig
+  # Result of WORKSHEET_COLUMNS should be something like this
+  # depends on LANGUAGES set in settings yaml file
+  # WORKSHEET_COLUMNS = { key: 1, en: 2, de: 3 }
   WORKSHEET_COLUMNS = { key: 1 }
   START_ROW = 2
 
+  def self.init_spreadsheet
+    session     = GoogleDrive.login(CONFIG['GDOC']['email'], CONFIG['GDOC']['password'])
+    spreadsheet = session.spreadsheet_by_key(CONFIG['GDOC']['key'])
+    worksheets  = spreadsheet.worksheets
+
+    return spreadsheet, worksheets
+  end
+
   begin
     CONFIG = YAML.load(File.open('transync.yml'))
-  rescue
-    p 'File transync.yml does not exist'
+    SPREADSHEET, WORKSHEETS = TransyncConfig.init_spreadsheet
+  rescue => e
+    p e.message
     exit(1)
   end
 
@@ -15,8 +30,4 @@ module GdocTrans
     value = index + 2
     WORKSHEET_COLUMNS[key.to_sym] = value
   end
-
-  # Result of WORKSHEET_COLUMNS should be something like this
-  # depends on LANGUAGES set in settings yaml file
-  # WORKSHEET_COLUMNS = { key: 1, en: 2, de: 3 }
 end

data/lib/transync/version.rb

@@ -1,3 +1,3 @@
 module Transync
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/transync/xliff_trans/xliff_trans_reader.rb

@@ -1,29 +1,27 @@
 require 'nokogiri'
 
 class XliffTransReader
-  attr_accessor :dir, :file, :language, :languages
-
-  def initialize(dir, file, language, languages)
-    self.dir = dir
-    self.file = file
-    self.language = language
-    self.languages = languages
+  attr_accessor :path,
+                :file,
+                :languages,
+                :all_translations_for_language
+
+  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 get_translations
-    data = {
-      language: language,
-      translations: []
-    }
+  def translations(language)
+    data = { file: file, language: language, translations: {} }
 
-    open_file do |doc|
-      # hacky hack, xliff is dirty as hell
+    open_file(language) do |doc|
       doc.remove_namespaces!
       doc.xpath('//trans-unit').each do |node|
-        data[:translations] << {
-          key: node.xpath('source').text,
-          value: node.xpath('target').text,
-        }
+        key   = node.xpath('source').text
+        value = node.xpath('target').text
+        data[:translations][key] = value
       end
     end
 
@@ -31,49 +29,35 @@ class XliffTransReader
   end
 
   # will go through each and find if any xliff is missing keys for translations
-  def valid?(create = false)
+  def valid?
     missing = 0
-    missing_translation_text = GdocTrans::CONFIG['MISSING_TRANSLATION_TEXT'] || '#MISSING-TRANS#'
-    all_translations_for_language = {language: nil, translations: []}
+    missing_translation_text = TransyncConfig::CONFIG['MISSING_TRANSLATION_TEXT'] || '#MISSING-TRANS#'
 
-    self.get_translations[:translations].each do |x_trans|
+    self.translations(self.languages.first)[:translations].keys.each do |x_trans_key|
       self.languages.each do |key_lang|
-        next if key_lang == language
-
-        xliff_reader = XliffTransReader.new(self.dir, self.file, key_lang, self.languages)
-        xliff_lang = xliff_reader.get_translations[:translations]
-        xliff_lang_value = xliff_lang.detect{ |xt| xt[:key] == x_trans[:key] }
+        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]
 
         all_translations_for_language[:language] = key_lang
 
         if xliff_lang_value.nil?
-          p "#{file}.#{key_lang} is missing translation for key '#{x_trans[:key]}'" unless create
-          return false unless create
-
-          p "#{missing + 1}. #{file}.#{key_lang} was missing translation for key '#{x_trans[:key]}'."
-          all_translations_for_language[:translations] << {
-              key: x_trans[:key],
-              value: "#{missing_translation_text} - #{x_trans[:key]}"
-          }
+          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] << xliff_lang_value
+          all_translations_for_language[:translations][x_trans_key] = xliff_lang_value
         end
       end
     end
 
-    if missing > 0 and create
-      xliff_trans_writer = XliffTransWriter.new(dir, file, all_translations_for_language)
-      xliff_trans_writer.save
-    end
-
     missing == 0
   end
 
   # Reading from source tags in xliff
-  def open_file
+  def open_file(language)
     begin
-      xml_file = File.open(file_path)
+      xml_file = File.open(file_path(language))
       doc = Nokogiri::XML(xml_file)
       yield doc
     rescue Errno::ENOENT => e
@@ -83,8 +67,8 @@ class XliffTransReader
 
 private
 
-  def file_path
-    "#{dir}/#{file}.#{language}.xliff"
+  def file_path(language)
+    "#{path}/#{file}.#{language}.xliff"
   end
 
 end

data/lib/transync/xliff_trans/xliff_trans_writer.rb

@@ -1,20 +1,15 @@
 require 'builder'
 
 class XliffTransWriter
-  attr_accessor :data,
-                :path,
-                :file,
-                :language
 
-  def initialize(path, file, data)
+  def initialize(path, file)
     @path = path
     @file = file
-    @language = data[:language]
-    @data = data
   end
 
-  def save
-    translations = data[:translations]
+  def write(trans_hash)
+    language     = trans_hash[:language]
+    translations = trans_hash[:translations]
 
     xml = Builder::XmlMarkup.new( :indent => 4 )
     xml.instruct! :xml, :encoding => 'UTF-8'
@@ -22,10 +17,10 @@ class XliffTransWriter
       xliff.file :'source-language' => language, :datatype => 'plaintext', :original => 'file.ext' do |file|
         file.body do |body|
 
-          translations.each do |trans|
-            body.tag! 'trans-unit', :id => trans[:key] do |trans_unit|
-              trans_unit.source trans[:key]
-              trans_unit.target trans[:value]
+          translations.keys.each do |trans_key|
+            body.tag! 'trans-unit', :id => trans_key do |trans_unit|
+              trans_unit.source trans_key
+              trans_unit.target translations[trans_key]
             end
           end
 
@@ -33,13 +28,13 @@ class XliffTransWriter
       end
     end
 
-    File.open(file_path, 'w') { |file| file.write(xml.target!) }
+    File.open(file_path(language), 'w') { |file| file.write(xml.target!) }
   end
 
 private
 
-  def file_path
-    "#{path}/#{file}.#{language}.xliff"
+  def file_path(language)
+    "#{@path}/#{@file}.#{language}.xliff"
   end
 
 end

data/test/fixtures/test.de.xliff

@@ -14,6 +14,10 @@
                 <source>end_test</source>
                 <target>xxx</target>
             </trans-unit>
+            <trans-unit id="end_test_2">
+                <source>end_test_2</source>
+                <target>End test 2 DE</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

data/test/fixtures/test.en.xliff

@@ -14,6 +14,10 @@
                 <source>end_test</source>
                 <target>End test</target>
             </trans-unit>
+            <trans-unit id="end_test_2">
+                <source>end_test_2</source>
+                <target>End test 2</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

data/test/fixtures/validators.en.xliff

@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="de" datatype="plaintext" original="file.ext">
+    <file source-language="en" datatype="plaintext" original="file.ext">
         <body>
             <trans-unit id="title">
                 <source>title</source>
                 <target>Titel</target>
             </trans-unit>
+            <trans-unit id="end_test_2">
+                <source>end_test_2</source>
+                <target>End test 2</target>
+            </trans-unit>
             <trans-unit id="round">
                 <source>round</source>
                 <target>Rund</target>

data/test/g2x_spec.rb

@@ -0,0 +1,50 @@
+require 'minitest/spec'
+require 'minitest/autorun'
+
+require_relative '../lib/transync/transync_config'
+require_relative '../lib/transync/gdoc_trans/gdoc_trans_reader'
+require_relative '../lib/transync/sync/sync_util'
+require_relative '../lib/transync/sync/translation_sync'
+
+# Expects this data in test worksheet
+# Key	      EN	    DE
+# title	    Title	  Titel
+# round	    Round	  Rund
+# end_test	meh	    xxx
+describe 'g2x' do
+  before do
+    @file     = 'test' # file or worksheet title aka spreadsheet tab
+    @path     = 'test/fixtures'
+    @language = 'en'
+    SyncUtil.create_logger('g2x_test')
+  end
+
+  it 'google doc translation reader should build correct trans hash' do
+    gdoc_trans_reader = GdocTransReader.new(@file)
+    trans_hash = gdoc_trans_reader.translations(@language)
+    trans_hash[:file].must_equal @file
+    trans_hash[:language].must_equal @language
+    trans_hash[:translations].keys.size.must_equal 3
+
+    trans_hash[:translations]['title'].must_equal 'Title'
+    trans_hash[:translations]['round'].must_equal 'Round'
+    trans_hash[:translations]['end_test'].must_equal 'meh'
+  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')
+
+    new_xliff_hash[:file].must_equal @file
+    new_xliff_hash[:language].must_equal @language
+    new_xliff_hash[:translations].size.must_equal 4
+
+    new_xliff_hash[:translations]['end_test'].must_equal 'meh'
+    new_xliff_hash[:translations]['end_test_2'].must_equal 'End test 2'
+  end
+end

data/test/x2g_spec.rb

@@ -0,0 +1,57 @@
+require 'minitest/spec'
+require 'minitest/autorun'
+
+require_relative '../lib/transync/transync_config'
+require_relative '../lib/transync/gdoc_trans/gdoc_trans_reader'
+require_relative '../lib/transync/gdoc_trans/gdoc_trans_writer'
+require_relative '../lib/transync/sync/sync_util'
+require_relative '../lib/transync/sync/translation_sync'
+require_relative '../lib/transync/xliff_trans/xliff_trans_reader'
+
+describe 'x2g' do
+  before do
+    @file      = 'test'
+    @path      = 'test/fixtures'
+    @language  = 'en'
+    @languages = %w(en de)
+    SyncUtil.create_logger('x2g_test')
+  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_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
+  end
+
+  it 'x2g sync should build correct new hash before writing it back to google doc' do
+    trans_sync = TranslationSync.new(@path, 'x2g', @file)
+    trans_hash = trans_sync.sync(@language, 'x2g')
+
+    trans_hash[:file].must_equal @file
+    trans_hash[:language].must_equal @language
+    trans_hash[:translations].keys.size.must_equal 4
+
+    trans_hash[:translations]['title'].must_equal 'Title'
+    trans_hash[:translations]['round'].must_equal 'Round'
+    trans_hash[:translations]['end_test'].must_equal 'End test'
+    trans_hash[:translations]['end_test_2'].must_equal 'End test 2'
+
+    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
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transync
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - zigomir
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
@@ -82,15 +82,12 @@ files:
 - Rakefile
 - bin/transync
 - lib/transync.rb
-- lib/transync/gdoc_trans/gdoc_trans.rb
 - lib/transync/gdoc_trans/gdoc_trans_reader.rb
 - lib/transync/gdoc_trans/gdoc_trans_writer.rb
-- lib/transync/sync/gdoc_2_xliff_main.rb
-- lib/transync/sync/gdoc_to_xliff.rb
 - lib/transync/sync/init.rb
 - lib/transync/sync/sync_util.rb
-- lib/transync/sync/xliff_2_gdoc_main.rb
-- lib/transync/sync/xliff_to_gdoc.rb
+- lib/transync/sync/translation_sync.rb
+- lib/transync/transync_config.rb
 - lib/transync/version.rb
 - lib/transync/xliff_trans/xliff_trans_reader.rb
 - lib/transync/xliff_trans/xliff_trans_writer.rb
@@ -98,6 +95,8 @@ files:
 - test/fixtures/test.en.xliff
 - test/fixtures/validators.de.xliff
 - test/fixtures/validators.en.xliff
+- test/g2x_spec.rb
+- test/x2g_spec.rb
 - transync.SAMPLE.yml
 - transync.gemspec
 homepage: ''
@@ -120,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Synchronize XLIFF translations with Google Drive document
@@ -129,3 +128,6 @@ test_files:
 - test/fixtures/test.en.xliff
 - test/fixtures/validators.de.xliff
 - test/fixtures/validators.en.xliff
+- test/g2x_spec.rb
+- test/x2g_spec.rb
+has_rdoc: 

data/lib/transync/sync/gdoc_2_xliff_main.rb

@@ -1,39 +0,0 @@
-require 'yaml'
-require_relative '../gdoc_trans/gdoc_trans_reader'
-require_relative '../xliff_trans/xliff_trans_writer'
-require_relative 'gdoc_to_xliff'
-require_relative 'sync_util'
-
-class Gdoc2XliffMain
-  attr_reader :path, :config
-
-  def initialize(path)
-    @path = path
-    @config = GdocTrans::CONFIG
-    SyncUtil.create_logger('gdoc2xliff')
-  end
-
-  def run
-    @config['FILES'].each do |file|
-      xliff_translations = SyncUtil::check_and_get_xliff_files(@config['LANGUAGES'], path, file)
-      gdoc_trans_reader = GdocTransReader.new(@config['GDOC'], file)
-
-      @config['LANGUAGES'].each do |language|
-        options = {
-          xliff_translations: xliff_translations,
-          gdoc_trans_reader: gdoc_trans_reader,
-          language: language
-        }
-
-        gdoc_to_xliff = GdocToXliff.new(options)
-        dirty, new_xliff_hash = gdoc_to_xliff.sync
-
-        xliff_trans_writer = XliffTransWriter.new(path, file, new_xliff_hash)
-        xliff_trans_writer.save if dirty
-
-        SyncUtil.info_clean(file, language, 'was clean. Already has same keys and values inside Xliff') unless dirty
-      end
-    end
-  end
-
-end

data/lib/transync/sync/gdoc_to_xliff.rb

@@ -1,50 +0,0 @@
-require_relative 'sync_util'
-
-class GdocToXliff
-  attr_accessor :xliff_translations,
-                :gdoc_trans_reader,
-                :language
-
-  def initialize(options = {})
-    self.xliff_translations = options[:xliff_translations]
-    self.gdoc_trans_reader = options[:gdoc_trans_reader]
-    self.language = options[:language]
-  end
-
-  def sync
-    dirty = false
-    gdoc_tab_language = gdoc_trans_reader.build_trans_hash(language)
-    file = gdoc_tab_language[:title]
-
-    new_xliff_hash = {
-      language: language,
-      file: file,
-      translations: []
-    }
-
-    xliff_for_language = xliff_translations.detect{ |x| x[:language] == language }[:translations]
-    gdoc_tab_language[:translations].each do |gdoc_trans|
-      x_trans = xliff_for_language.detect{ |x| x[:key] == gdoc_trans[:key] }
-
-      # whole key is missing
-      if x_trans.nil?
-        SyncUtil.info_diff(file, language, 'Adding', gdoc_trans)
-
-        new_xliff_hash[:translations] << gdoc_trans
-        dirty = true
-      elsif gdoc_trans[:value] != x_trans[:value]
-        SyncUtil.info_diff(file, language, 'Changing', gdoc_trans)
-
-        x_trans[:value] = gdoc_trans[:value]
-        new_xliff_hash[:translations] << x_trans
-        dirty = true
-      else
-        # nothing new
-        new_xliff_hash[:translations] << gdoc_trans
-      end
-    end
-
-    return dirty, new_xliff_hash
-  end
-
-end

data/lib/transync/sync/xliff_2_gdoc_main.rb

@@ -1,41 +0,0 @@
-require 'yaml'
-require_relative '../gdoc_trans/gdoc_trans_reader'
-require_relative '../gdoc_trans/gdoc_trans_writer'
-require_relative 'xliff_to_gdoc'
-require_relative 'sync_util'
-
-class Xliff2GdocMain
-  attr_reader :path, :config
-
-  def initialize(path)
-    @path = path
-    @config = GdocTrans::CONFIG
-    SyncUtil.create_logger('xliff2gdoc')
-  end
-
-  def run
-    @config['FILES'].each do |file|
-      xliff_translations = SyncUtil::check_and_get_xliff_files(@config['LANGUAGES'], path, file)
-
-      gdoc_trans_reader = GdocTransReader.new(@config['GDOC'], file)
-      gdoc_trans_writer = GdocTransWriter.new(gdoc_trans_reader.worksheet)
-
-      @config['LANGUAGES'].each do |language|
-        options = {
-          xliff_translations: xliff_translations,
-          gdoc_trans_reader: gdoc_trans_reader,
-          gdoc_trans_writer: gdoc_trans_writer,
-          language: language,
-          languages: @config['LANGUAGES']
-        }
-        xliff_to_gdoc = XliffToGdoc.new(options)
-        dirty = xliff_to_gdoc.sync
-
-        # save it back on google drive
-        gdoc_trans_writer.worksheet.save if dirty
-        SyncUtil.info_clean(file, language, 'was clean. Already has same keys and values inside GDoc') unless dirty
-      end
-    end
-  end
-
-end

data/lib/transync/sync/xliff_to_gdoc.rb

@@ -1,64 +0,0 @@
-require_relative 'sync_util'
-
-class XliffToGdoc
-  attr_accessor :xliff_translations,
-                :gdoc_trans_reader,
-                :gdoc_trans_writer,
-                :language,
-                :languages,
-                :logger
-
-  def initialize(options = {})
-    self.xliff_translations = options[:xliff_translations]
-    self.gdoc_trans_reader = options[:gdoc_trans_reader]
-    self.gdoc_trans_writer = options[:gdoc_trans_writer]
-    self.language = options[:language]
-    self.languages = options[:languages]
-  end
-
-  def sync
-    gdoc_tab_language = gdoc_trans_reader.build_trans_hash(language)
-    dirty = false
-    file = gdoc_tab_language[:title]
-
-    xliff_for_language = xliff_translations.detect{ |x| x[:language] == language }
-    xliff_for_language[:translations].each_with_index do |x_trans, index|
-
-      # for current xliff translation find the same trans key in google doc
-      gdoc_trans = gdoc_tab_language[:translations].detect{ |g_trans| g_trans[:key] == x_trans[:key] }
-      current_row = index + GdocTrans::START_ROW
-
-      # whole key is missing
-      if gdoc_trans.nil?
-        # heavy coupling
-        gdoc_trans_reader.worksheet = gdoc_trans_writer.shift_up(current_row, xliff_for_language[:translations].length)
-        # recalculate hashes after shift
-        gdoc_tab_language = gdoc_trans_reader.build_trans_hash(language)
-
-        gdoc_trans_writer.write(current_row, 'key',    x_trans[:key])
-        gdoc_trans_writer.write(current_row, language, x_trans[:value])
-
-        SyncUtil.info_diff(file, language, 'Adding', x_trans)
-
-        # Go for all other languages if key was missing
-        languages.each do |key_lang|
-          next if key_lang == language
-
-          xliff_lang = xliff_translations.detect{ |xt| xt[:language] == key_lang }
-          xliff_lang_value = xliff_lang[:translations].detect{ |xt| xt[:key] == x_trans[:key] }
-
-          gdoc_trans_writer.write(current_row, key_lang, xliff_lang_value[:value])
-        end
-
-        dirty = true
-      elsif gdoc_trans[:value] != x_trans[:value]
-        gdoc_trans_writer.write(current_row, language, x_trans[:value])
-        SyncUtil.info_diff(file, language, 'Changing', x_trans)
-        dirty = true
-      end
-    end
-
-    dirty
-  end
-
-end