locraft 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49c54082e2fd1485e1bec98037de840be8de3eb2
-  data.tar.gz: 62d2f02ca95fddc96130a1b6a74d9c377c749ce0
+  metadata.gz: 585cc878bec06aabeb780f92d6fdd1fabb16daf0
+  data.tar.gz: 6589e550e52cbb96f59b79e35af0928a11fdeb94
 SHA512:
-  metadata.gz: 6e7f7844b14497ce39f7132306a13e2248362ffea1beb8e314938524f8c3eec97f3f63947891784e6e75cfabfaa41f01f637b176412527245e7853822e48878e
-  data.tar.gz: 12b1a3b2c288748ef26dfe81ef94f6cf9f9177b1f1097ba6b58f9faf7e890ef88a9d8ec7807a31db4f915752f1f28dc75544fb1e4882417cd20a283dc816f4ca
+  metadata.gz: 4fcc07735e43f7ffd3e2ded9ea69b817b9e1d088cfaf78b5817710862665b9023aa03a127818809e0a8fad7065d222a9eba6790a02765133c1e186f39fd274f0
+  data.tar.gz: 1026ace142c16d6f13621f584ba3b28107cc1f3f329fb7ca8fe9451cc1bccc923153a9421ba8fdfb78d54225d52146d82779a0fb1533e395cbddbed751213f35

data/lib/locraft/config.rb

@@ -12,6 +12,7 @@ module Locraft
     attr_accessor :gdoc_comments_column
     attr_accessor :dev_lang
     attr_accessor :dev_prefix
+    attr_accessor :keys_map
     attr_accessor :macro_file
     attr_accessor :macro_destination
     attr_accessor :strings_basename
@@ -29,6 +30,7 @@ module Locraft
       self.gdoc_comments_column = 'Comments'
       self.dev_lang = OBJC
       self.dev_prefix = 'XYZ'
+      self.keys_map = {}
       self.macro_file = 'LocalizedConstants'
       self.macro_destination = './'
       self.strings_basename = 'Localizable'

data/lib/locraft/csv_parser.rb

@@ -18,14 +18,18 @@ module Locraft
       rows = csv_rows(csv_body)
       localizations_hash = {}
       @config.langs.keys.each do |lang|
-        localizations_hash[lang] = parse_rows_for_lang(rows, lang)
+        localizations_hash[lang] = parse_rows_for_lang(rows, lang) || []
       end
       localizations_hash
     end
 
     # return localizations array
     def parse_rows_for_lang(rows, lang)
-      rows.map { |row| Localization.load_with_csv_row(row, @config, lang) }
+      if rows.first.keys.include? lang
+        rows.map { |row| Localization.load_with_csv_row(row, @config, lang) }
+      else
+        warn "WARNING: there is no such a language in doc file: [#{lang}]"
+      end
     end
   end
 end

data/lib/locraft/localization.rb

@@ -9,8 +9,9 @@ module Locraft
       localization = Localization.new
       localization.language = lang
       localization.comment = row[config.gdoc_comments_column]&.strip
-      localization.key = (row[config.gdoc_keys_column] || row[config.default_lang])&.strip
       localization.value = (row[lang] || row[config.default_lang])&.strip
+      key = (row[config.gdoc_keys_column] || row[config.default_lang])&.strip
+      localization.key = config.keys_map[key] || key
       localization
     end
 

data/lib/locraft/resources/sample_locraft.config

@@ -10,14 +10,14 @@ Locraft::Config.new do |conf|
   conf.langs = {
       'English' => 'en',
       'Russian' => 'ru'
-  } # default: {'English' => 'en', 'Russian' => 'ru'}
-
+  } # default: { 'English' => 'en', 'Russian' => 'ru' }
   conf.default_lang = 'English' # default: 'English'
   conf.gdoc_sheet = 0 # default: 0
   conf.gdoc_keys_column = 'Keys' # default: 'Keys'
   conf.gdoc_comments_column = 'Comments' # default: 'Comments'
-  conf.dev_prefix = 'XYZ' # default: 'XYZ'
   conf.dev_lang = OBJC # OBJC or SWIFT, default: OBJC
+  conf.dev_prefix = 'XYZ' # default: 'XYZ'
+  conf.keys_map = {}
   conf.macro_file = 'LocalizedConstants' # default: 'LocalizedConstants'
   conf.macro_destination = './' # default: './'
   conf.strings_basename = 'Localizable' # default: 'Localizable'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locraft
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - sroik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive