n42translation 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce8725b1932a987f51bba7099ce82a312bb9b821
-  data.tar.gz: 51a8089a033c2df52d87572f35562d87cfb9add8
+  metadata.gz: e70af4ad0c11621e44f9ad9adc1a0f36fa0cb6c4
+  data.tar.gz: 15ab09f954d2268539f0156abaeca16b6ff97fc5
 SHA512:
-  metadata.gz: bba10b71bb89113f79ec7c4b247083c758fa73cb7ae50a828a19533ec76c908d8afce7ffd11490029508dd279668ecc28fe3c9c02d3a2a40564a13aff85a1ea4
-  data.tar.gz: 67fe97b54058148d71d9226808de9c9239ba4ff8816c398d4c246cf46d3186bdd29afa6b2308c63f7fbcd58b5876ffd1f028e04e2edfdf4ca0d4bc7f77856e42
+  metadata.gz: 39afed9be9e708930a1ccacf2a601e4b04afd54460f7ff45bbdba736047e9b02deb70a8b7da5ab892b438eb28b3bb01223653a5e1a6b549b6ee11c13b50bc66c
+  data.tar.gz: aa45a8991a502022a4a2ca194c29d7c2dbb2c7f3b27bb01261b03f8f3153b8381b99b9f8acc693a920b23f30db8f880ee3699b5675fa318c4bc7af263cb85d41

data/.gitignore

@@ -4,3 +4,5 @@ locales/csv
 locales/iOS
 locales/Rails
 locales/builds
+
+*.gem

data/Gemfile.lock

@@ -1,15 +1,16 @@
 PATH
   remote: .
   specs:
-    n42translation (0.0.9)
-      activesupport
-      builder
-      thor
+    n42translation (0.1.2)
+      activesupport (~> 4.2)
+      builder (~> 3.2)
+      thor (~> 0.19)
+      write_xlsx (~> 0.83)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.1)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -17,10 +18,10 @@ GEM
       tzinfo (~> 1.1)
     builder (3.2.2)
     i18n (0.7.0)
-    json (1.8.2)
-    minitest (5.5.1)
+    json (1.8.3)
+    minitest (5.9.1)
     rubyzip (1.1.7)
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -34,6 +35,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.0)
+  bundler (~> 1.6)
   n42translation!
-  write_xlsx
+
+BUNDLED WITH
+   1.10.6

data/lib/n42translation/cli.rb

@@ -211,12 +211,15 @@ module N42translation
 
     def build_csv(source_path, project_name, outputfile_path, platforms, default_language)
       languages = get_languages(project_name)
-      language_yamls = {}
-      languages.each do |language|
-        language_yamls["#{language}"] = platforms.map {|platform| yaml_for_platform_and_lang(source_path, project_name, platform, language) }.reduce({}, :merge)
-      end
 
-      csv_data = N42translation::CSVConvert.createCSV(language_yamls.values.map{|yml| join_hash_keys(yml,'.')}, languages, join_hash_keys(language_yamls[default_language],'.'), default_language)
+      language_hashes = languages.map do |language|
+        d = platforms.map do |platform|
+          join_hash_keys(yaml_for_platform_and_lang(source_path, project_name, platform, language), '.')
+        end.reduce({},:merge)
+        [language.to_sym, d]
+      end.to_h
+
+      csv_data = N42translation::CSVConvert.createCSV(language_hashes, languages, language_hashes[default_language.to_sym], default_language )
 
       filename = File.join(outputfile_path,'csv',"#{project_name}.csv")
       FileUtils.mkpath(File.dirname(filename))
@@ -225,12 +228,15 @@ module N42translation
 
     def build_xlsx(source_path, project_name, outputfile_path, platforms, default_language)
       languages = get_languages(project_name)
-      language_yamls = {}
-      languages.each do |language|
-        language_yamls["#{language}"] = platforms.map {|platform| yaml_for_platform_and_lang(source_path, project_name, platform, language) }.reduce({}, :merge)
-      end
 
-      csv_data = N42translation::CSVConvert.createCSV(language_yamls.values.map{|yml| join_hash_keys(yml,'.')}, languages, join_hash_keys(language_yamls[default_language],'.'), default_language)
+      language_hashes = languages.map do |language|
+        d = platforms.map do |platform|
+          join_hash_keys(yaml_for_platform_and_lang(source_path, project_name, platform, language), '.')
+        end.reduce({},:merge)
+        [language.to_sym, d]
+      end.to_h
+
+      csv_data = N42translation::CSVConvert.createCSV(language_hashes, languages, language_hashes[default_language.to_sym], default_language )
 
       filename = File.join(outputfile_path,'xlsx',"#{project_name}.xlsx")
       FileUtils.mkpath(File.dirname(filename))

data/lib/n42translation/config.rb

@@ -9,7 +9,7 @@ module N42translation
         project_name: n42translation_project
         languages: de,en
         targets:
-          all: ios,android,rails,csv,xlsx
+          all: ios,android,rails
           mobile: ios,android
         target_build_path_names:
           android: Android

data/lib/n42translation/csv_convert.rb

@@ -2,31 +2,34 @@ require 'yaml'
 
 module N42translation
   class CSVConvert
-    def self.createCSV(ymls, langs, default_yml, default_language)
+    def self.createCSV(language_hashes, langs, default_yml, default_language)
 
-      keys = ymls.map{|yml| yml.keys }.flatten.uniq
+      keys = language_hashes.dup.map do |lang, lang_hash|
+        lang_hash.keys
+      end.flatten.uniq
 
       rows = []
       rows << ["key",langs].flatten
 
       keys.each do |key|
-        rows << [key, get_values_from_key(ymls, key, default_yml, default_language)].flatten
+        rows << [
+          key,
+          get_values_from_key(language_hashes, key, default_yml, default_language)
+        ].flatten
       end
 
       rows
     end
 
     private
-    def self.get_values_from_key(ymls, key, default_yml, default_language)
-      ymls.map do |yml|
-        val = yml[key.to_s]
-        if yml[key.to_s].nil?
+
+    def self.get_values_from_key(language_hashes, key, default_yml, default_language)
+      default_language_name = default_language.to_s.upcase
+      language_hashes.map do |lang, language_hash|
+        val = language_hash[key.to_s]
+        if val.nil?
           default_val = default_yml[key.to_s]
-          if default_val.nil?
-            "TODO: "
-          else
-            "TODO: #{default_val}(#{default_language.to_s.upcase})"
-          end
+          "TODO: #{default_val.nil? ? '' : "#{default_val}(#{default_language_name})"}"
         else
           val
         end

data/lib/n42translation/version.rb

@@ -1,3 +1,3 @@
 module N42translation
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: n42translation
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Wolfgang Lutz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: n42translation
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Translation helper to build translations files from a single source