phraseapp_android 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1bfba10c4b6cbe4cdcebe6b43238b0f5831aee6
-  data.tar.gz: 04b26134b3a91b71167c0faca54154e1e023caaa
+  metadata.gz: e93e77c6176e4fae785005ad6e07522cf258961b
+  data.tar.gz: 1801f2e7bda8d371c5240145b69ee0671aa022fd
 SHA512:
-  metadata.gz: 57e1cf5c6bebf15704a1814ead25ee5892a07a9d5d95dfe8487c804aebda8f9925ba80b2c9588676aabd849197bb01c7d8d7768f338d94112c128e4929117f3d
-  data.tar.gz: ccc4b1ea8f4eff82714bd367e4dccdaa38ab976e646e41bf4b7885f28af456e34f022d53a28d18c5d8701c6ef6c023d984bf1ecf86b99fa227ef29986c51a0af
+  metadata.gz: 4436a3b1498b843cc05d71787e909716327ec6c34b5a652c8b430e354f62b9c2800337937bb194f9045c4117e1c4f4353c521eed73f211f6d4a67f9bc4e157c3
+  data.tar.gz: 740ddce5b12a579e27ee4aae46fde0aba2e02155fe0651ed0e856728481fd926abfe1e8349c55e7842d15b39aa3e53a38a87ed42a19cd0311b9bccc140940a77

data/.gitignore

@@ -8,3 +8,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/lib/phraseapp_android/missing_translations.rb

@@ -39,50 +39,44 @@ class PhraseApp::Android::MissingTranslations < PhraseApp::Android::PhraseAppCli
   end
 
   def pull_locale(locale)
-    strings_updated = 0
-    arrays_updated = 0
-    missing = find locale
-    if missing.size > 0
-      strings = read_locale_file 'strings', locale
-      arrays = read_locale_file 'arrays', locale
-
-      params = PhraseApp::RequestParams::LocaleDownloadParams.new file_format: 'xml'
-      doc = Nokogiri::XML client.locale_download(project_id, locale, params)
-
-      missing.each do |el|
-        name = el.attr 'name'
-        translated = doc.at('//resources').search("#{el.name}[@name=#{name}]").first
-        if translated
-          if el.name == 'string'
-            str = Nokogiri::XML::Node.new 'string', strings
-            str['name'] = name
-            str.content = translated.text
-            strings.at('//resources').children.last.after str
-            strings_updated += 1
-          elsif el.name == 'string-array'
-            str = Nokogiri::XML::Node.new 'string-array', arrays
-            str['name'] = name
-            translated.element_children.each do |child|
-              item = Nokogiri::XML::Node.new 'item', arrays
-              item.content = child.text
-              str.add_child item
-            end
-            arrays.at('//resources').children.last.after str
-            arrays_updated += 1
-          end
-        end
-      end
+    stats = {
+        strings: {added: 0, updated: 0},
+        arrays: {added: 0, updated: 0}
+    }
 
-      if strings_updated + arrays_updated > 0
-        PhraseApp::Android::FileFormatter.new.apply('strings', locale) if strings_updated > 0
-        PhraseApp::Android::FileFormatter.new.apply('arrays', locale) if arrays_updated > 0
-        puts "#{strings_updated + arrays_updated} translation keys were updated.".green
-      else
-        puts 'no keys were updated.'.yellow
-      end
+    strings = doc_to_hash read_locale_file('strings', locale)
+    arrays = doc_to_hash read_locale_file('arrays', locale)
+    current = strings.merge arrays
+
+    params = PhraseApp::RequestParams::LocaleDownloadParams.new file_format: 'xml'
+    doc = Nokogiri::XML client.locale_download(project_id, locale, params)
+    recent = doc_to_hash doc
+
+    merge_translations current, recent, :strings, stats
+    merge_translations current, recent, :arrays, stats
+
+    formatter = PhraseApp::Android::FileFormatter.new
+
+    if stats[:strings][:added] + stats[:strings][:updated] > 0
+      updated_strings = formatter.apply_to_xml_doc hash_to_doc(current[:strings])
+      write_to_file locale_file_name('strings', locale), updated_strings
     end
 
-    [strings_updated, arrays_updated]
+    if stats[:arrays][:added] + stats[:arrays][:updated] > 0
+      updated_arrays = formatter.apply_to_xml_doc hash_to_doc(current[:arrays])
+      write_to_file locale_file_name('arrays', locale), updated_arrays
+    end
+
+    added = stats[:strings][:added] + stats[:arrays][:added]
+    updated = stats[:strings][:updated] + stats[:arrays][:updated]
+
+    if added + updated > 0
+      puts "#{added + updated} keys were updated!".green
+    else
+      puts 'no keys were updated.'.yellow
+    end
+
+    stats
   end
 
   private
@@ -104,4 +98,58 @@ class PhraseApp::Android::MissingTranslations < PhraseApp::Android::PhraseAppCli
     [strings, arrays]
   end
 
+  def doc_to_hash(doc)
+    result = {strings: {}, arrays: {}}
+    doc.at('//resources').element_children.each do |el|
+      if el.name == 'string'
+        result[:strings][el.attr('name')] = el.text
+      elsif el.name == 'string-array'
+        result[:arrays][el.attr('name')] = el.element_children.map { |c| c.text }
+      end
+    end
+    result.reject { |k, v| v.empty? }
+  end
+
+  def merge_translations(current, updated, key, stats)
+    updated[key].each do |name, values|
+      current[key] ||= {}
+      current_value = current[key][name]
+      if current_value
+        if values != current_value
+          current[key][name] = values
+          stats[key][:updated] += 1
+        end
+      else
+        current[key][name] = values
+        stats[key][:added] += 1
+      end
+    end
+  end
+
+  def hash_to_doc(source)
+    doc = Nokogiri::XML::Document.new
+    doc.encoding = 'utf-8'
+    res = doc.create_element 'resources', 'xmlns:tools' => 'http://schemas.android.com/tools'
+    doc.add_child res
+
+    source.each do |name, value|
+      if value.is_a? Array
+        str = Nokogiri::XML::Node.new 'string-array', res
+        str['name'] = name
+        value.each do |text_item|
+          item = Nokogiri::XML::Node.new 'item', str
+          item.content = text_item
+          str.add_child item
+        end
+        res.add_child str
+      else
+        str = Nokogiri::XML::Node.new 'string', res
+        str['name'] = name
+        str.content = value
+        res.add_child str
+      end
+    end
+    doc
+  end
+
 end

data/lib/phraseapp_android/phrase_app_client.rb

@@ -47,8 +47,12 @@ module PhraseApp
       end
 
       def write_xml_to_file(path, doc)
+        write_to_file path, doc.to_xml(ident: 4)
+      end
+
+      def write_to_file(path, contents)
         File.open path, 'w' do |f|
-          f.write doc.to_xml(ident: 4)
+          f.write contents
         end
       end
 

data/lib/phraseapp_android/version.rb

@@ -1,3 +1,3 @@
 module PhraseappAndroid
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phraseapp_android
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sergey Glukhov (serggl)