applocale 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06a01f99dce9df71c355dfbe1a03b85fac6cb9b4
-  data.tar.gz: 8b7a559af7ab08cf16284bee8d78eb37277ac35f
+  metadata.gz: e84a39280ab284159150cd5263596bdfe45098f9
+  data.tar.gz: 83bedb2834ff382221e89a20a190f02a9a7d1fb9
 SHA512:
-  metadata.gz: 86e57f20ab0ea767f5dc54a1e15d9d20b6d97fb467bcfd4786ec3a93217922b75d225d39bbd4d5bd0a11b2201bea49137e922cb6a391f31d09d60f6f99b94c0e
-  data.tar.gz: 64ecc8367c813080d9cc9a48304e1f8dff02955d319de749458134156528fd189bac8e119b38259cd8e9c94d190c8ec95ec3f8605a6da319d3605203fb0c6415
+  metadata.gz: 60382d4febffe2a2e84e33d444863b2cea1e3fdf81dddc9f63cccd8f18fc1079061d2eac7e5fec023797b5dbadc96a4b3f9594f297dbec7c4d4078a346d52999
+  data.tar.gz: b5b170f7e332ec9f0bfbd4d2ea90f7680b583524fe1c0da7ef6ffaa1961782a09eaed81cd27ef889a012d6ca5858be08d3eb8ba67433d8708c7c018af6f39da8

data/lib/applocale.rb

@@ -8,4 +8,5 @@ end
 
 if ARGV.length > 0
   Applocale::Command::Init.start(ARGV)
-end
+end
+

data/lib/applocale/AppLocaleFile

@@ -24,6 +24,7 @@ sheetname:
     en_US: "B"
     zh_TW: "C"
     zh_CN: "D"
+isSkipEmptyKey: false
 
 
 # def convent_to_locale(lang, key, value)
@@ -48,4 +49,8 @@ sheetname:
 
 # def after_parse_from_locale(lang, key, value)
 #     return value
+# end
+
+# def is_skip_by_key(sheetname, lang, key)
+#     return true
 # end

data/lib/applocale/Core/ParseCSV/parse_csv.rb

@@ -17,8 +17,9 @@ module Applocale
     @csv_directory
     @langlist
     @sheetobj_list
+    @is_skip_empty_key
 
-    def initialize(platfrom, csv_directory, langlist, sheetobj_list)
+    def initialize(platfrom, csv_directory, langlist, sheetobj_list, is_skip_empty_key)
       @platform = platfrom
       @csv_directory = csv_directory
       @langlist = langlist
@@ -26,6 +27,7 @@ module Applocale
       @sheetcontent_list = Array.new
       @allkey_dict = {}
       @all_error = Array.new
+      @is_skip_empty_key = is_skip_empty_key
       # puts "Start to Parse CSV: \"#{csv_directory}\" ...".green
       parse
     end
@@ -63,39 +65,61 @@ module Applocale
     def find_header(sheet, rows)
       sheet_name = sheet.sheetname
       sheet_info_obj = sheet.obj
-      sheet_language_list = sheet_info_obj.lang_headers
-      sheet_key_header = sheet_info_obj.key_header
+      if sheet_info_obj.is_a? Applocale::Config::SheetInfoByHeader
 
-      header_row_index = rows.index do |row|
-        row.include?(sheet_key_header)
-      end
+        sheet_language_list = sheet_info_obj.lang_headers
+        sheet_key_header = sheet_info_obj.key_header
 
-      header_row_info = rows[header_row_index] unless header_row_index.nil?
-      header_column_index = header_row_info&.index { |cell| cell == sheet_key_header }
-      if header_row_index.nil? || header_column_index.nil?
-        raise "ParseCSVError: Header not found in sheet #{sheet_name}"
-      end
-      key_header_info = ParseModelModule::KeyStrWithColNo.new(sheet_key_header, header_column_index)
-
-      language_header_list = sheet_language_list.map do |key, value|
-        cell_index = header_row_info.index { |cell| cell == value }
-        cell_index.nil? ? nil : ParseModelModule::LangWithColNo.new(value, key, cell_index)
-      end.compact
-      unless language_header_list.length == sheet_language_list.length
-        raise "ParseCSVError: Wrong language keys in sheet #{sheet_name}"
+        header_row_index = rows.index do |row|
+          row.include?(sheet_key_header)
+        end
+
+        header_row_info = rows[header_row_index] unless header_row_index.nil?
+        header_column_index = header_row_info.index { |cell| cell == sheet_key_header }
+        if header_row_index.nil? || header_column_index.nil?
+          raise "ParseCSVError: Header not found in sheet #{sheet_name}"
+        end
+        key_header_info = ParseModelModule::KeyStrWithColNo.new(sheet_key_header, header_column_index)
+
+        language_header_list = sheet_language_list.map do |key, value|
+          cell_index = header_row_info.index { |cell| cell == value }
+          cell_index.nil? ? nil : ParseModelModule::LangWithColNo.new(value, key, cell_index)
+        end.compact
+        unless language_header_list.length == sheet_language_list.length
+          raise "ParseCSVError: Wrong language keys in sheet #{sheet_name}"
+        end
+
+        {
+          header_row_index: header_row_index,
+          key_header_info: key_header_info,
+          language_header_list: language_header_list
+        }
+      else
+        cell_index = Applocale::ParseXLSXModule::Helper.collabel_to_colno(sheet_info_obj.key_col) - 1
+        key_header_info = ParseModelModule::KeyStrWithColNo.new("", cell_index)
+        language_header_list = sheet_info_obj.lang_cols.map do |key, value|
+          cell_index = Applocale::ParseXLSXModule::Helper.collabel_to_colno(value) - 1
+          ParseModelModule::LangWithColNo.new("", key, cell_index)
+        end.compact
+
+        {
+            header_row_index: -1,
+            key_header_info: key_header_info,
+            language_header_list: language_header_list
+        }
       end
-      {
-        header_row_index: header_row_index,
-        key_header_info: key_header_info,
-        language_header_list: language_header_list
-      }
     end
 
     def parse_row(sheet_name, index, row, key_header_info, language_header_list)
       key_str = row[key_header_info.colno]
-
       unless ValidKey.is_validkey(@platform, key_str)
-        raise "ParseCSVError: Invaild Key in sheet #{sheet_name}, row: #{index}, key_str: #{key_str}"
+        if (key_str.nil? || key_str.length == 0)
+          if !@is_skip_empty_key
+            raise "ParseCSVError: Key can not be empty, in sheet #{sheet_name}, row: #{index}, key_str: #{key_str}"
+          end
+        else
+          raise "ParseCSVError: Invaild Key in sheet #{sheet_name}, row: #{index}, key_str: #{key_str}"
+        end
       end
       rowinfo = ParseModelModule::RowInfo.new(sheet_name, index, key_str)
       rowinfo.content_dict = Hash[language_header_list.map { |language_header| [language_header.lang, ContentUtil.from_excel(row[language_header.colno] || '')] }]

data/lib/applocale/Core/ParseXLSX/parse_xlsx.rb

@@ -23,8 +23,9 @@ module Applocale
     @xlsxpath
     @langlist
     @sheetobj_list
+    @is_skip_empty_key
 
-    def initialize(platfrom, xlsxpath, langlist, sheetobj_list)
+    def initialize(platfrom, xlsxpath, langlist, sheetobj_list, is_skip_empty_key)
       @platform = platfrom
       @xlsxpath = xlsxpath
       @langlist = langlist
@@ -33,6 +34,7 @@ module Applocale
       @sheetcontent_list = Array.new
       @allkey_dict = {}
       @all_error = Array.new
+      @is_skip_empty_key = is_skip_empty_key
       self.parse
     end
 
@@ -126,6 +128,10 @@ module Applocale
         raise e
       end
 
+      if keystr.nil? && !@is_skip_empty_key
+        raise "ParseCSVError: Key can not be empty, in sheet #{sheetname}, row: #{rowno}, key_str: #{keystr}"
+      end
+
       unless keystr.nil?
         rowinfo = ParseModelModule::RowInfo.new(sheetname, rowno, keystr)
         lang_with_colno_list.each do |lang_with_colno|

data/lib/applocale/Core/convert_to_localefile.rb

@@ -31,7 +31,8 @@ module Applocale
       file_header_comment = []
       is_double_dash_comment = false
       is_multiline_comment = false
-      File.open(langpath_obj.filepath, 'r').each do |line|
+      if File.file?(langpath_obj.filepath)
+        File.open(langpath_obj.filepath, 'r').each do |line|
         if is_double_dash_comment
           break unless line.strip.start_with?('//')
           file_header_comment.push(line)
@@ -57,6 +58,7 @@ module Applocale
             break
           end
         end
+        end
       end
 
       target = open(langpath_obj.filepath, 'w')
@@ -71,6 +73,12 @@ module Applocale
         target.puts('')
         contentlist.each do |rowinfo|
           content = rowinfo.content_dict[langpath_obj.lang]
+          if injectObj.has_is_skip_by_key
+            is_skip_by_key = injectObj.load_is_skip_by_key(sheetcontent.sheetname, langpath_obj.lang, rowinfo.key_str)
+            if is_skip_by_key.to_s.downcase == "true"
+              next
+            end
+          end
           value = self.add_escape(platform, langpath_obj.lang, rowinfo.key_str, content, injectObj)
           target.puts("\"#{rowinfo.key_str}\" = \"#{value}\";")
         end
@@ -87,6 +95,12 @@ module Applocale
         contentlist = sheetcontent.get_rowInfo_sortby_key
         contentlist.each do |rowinfo|
           content = rowinfo.content_dict[langpath_obj.lang]
+          if injectObj.has_is_skip_by_key
+            is_skip_by_key = injectObj.load_is_skip_by_key(sheetcontent.sheetname, langpath_obj.lang, rowinfo.key_str)
+            if is_skip_by_key.to_s.downcase == "true"
+              next
+            end
+          end
           value = self.add_escape(platform, langpath_obj.lang, rowinfo.key_str, content, injectObj)
           target.puts("   <string name=\"#{rowinfo.key_str}\">#{value}</string>")
         end
@@ -99,18 +113,29 @@ module Applocale
     def self.convert_to_json(platform, lang_path_obj, sheet_content_list, inject_obj)
       FileUtils.mkdir_p(File.dirname(lang_path_obj.filepath))
       hash = sheet_content_list.map do |sheet_content|
-        sheet_content.get_rowInfo_sortby_key.map do |row|
+        newResult = sheet_content.get_rowInfo_sortby_key.map do |row|
           content = ContentUtil.remove_escaped_new_line(row.content_dict[lang_path_obj.lang])
           value = add_escape(platform, lang_path_obj.lang, row.key_str, content, inject_obj)
           [row.key_str, value]
         end.to_h
+        newResult = newResult.select do |key, value|
+          to_skip = false
+          if inject_obj.has_is_skip_by_key
+            is_skip_by_key = inject_obj.load_is_skip_by_key(sheet_content.sheetname, lang_path_obj.lang, key)
+            if is_skip_by_key.to_s.downcase == "true"
+              to_skip = true
+            end
+          end
+          !to_skip
+        end
+        newResult
       end.reduce({}, :merge)
       section_last_row = sheet_content_list
-                              .map {|sheet_content| sheet_content.get_rowInfo_sortby_key.last&.key_str }
-                              .compact
-                              .reverse
-                              .drop(1)
-                              .reverse
+                             .map {|sheet_content| sheet_content.get_rowInfo_sortby_key.last.key_str }
+                             .compact
+                             .reverse
+                             .drop(1)
+                             .reverse
       json = JSON.pretty_generate(hash)
       section_last_row.each { |row| json.gsub!(/(.*)("#{row}")(.*)/, '\1\2\3' + "\n") }
       target = open(lang_path_obj.filepath, 'w')

data/lib/applocale/Core/init.rb

@@ -68,9 +68,9 @@ module Applocale
     end
     case setting.export_format
     when 'csv'
-      parser = Applocale::ParseCSV.new(setting.platform, setting.export_to, setting.lang_path_list, setting.sheet_obj_list)
+      parser = Applocale::ParseCSV.new(setting.platform, setting.export_to, setting.lang_path_list, setting.sheet_obj_list, setting.is_skip_empty_key)
     when 'xlsx'
-      parser = Applocale::ParseXLSX.new(setting.platform, setting.xlsxpath, setting.lang_path_list, setting.sheet_obj_list)
+      parser = Applocale::ParseXLSX.new(setting.platform, setting.xlsxpath, setting.lang_path_list, setting.sheet_obj_list, setting.is_skip_empty_key)
     end
     ConvertToStrFile.convert(setting.platform, setting.lang_path_list,parser.result, setting.rubycode)
   end

data/lib/applocale/Core/setting.rb

@@ -21,7 +21,7 @@ require 'colorize'
 module Applocale
   module Config
     class Setting
-      attr_accessor :configfile_pathstr, :link, :platform, :xlsxpath, :google_credentials_path, :lang_path_list, :sheet_obj_list, :rubycode, :export_format, :export_to
+      attr_accessor :configfile_pathstr, :link, :platform, :xlsxpath, :google_credentials_path, :lang_path_list, :sheet_obj_list, :rubycode, :export_format, :export_to, :is_skip_empty_key
       def initialize(configfile_pathstr)
         self.configfile_pathstr = configfile_pathstr
         self.lang_path_list = Array.new
@@ -46,6 +46,7 @@ module Applocale
 
         puts " export_format: #{export_format}"
         puts " export_to: #{export_to}"
+        puts " is_skip_empty_key: #{self.is_skip_empty_key} "
         # puts self.rubycode
 
       end

data/lib/applocale/Util/config_util.rb

@@ -83,7 +83,7 @@ module Applocale
         sheetname = config_yaml['sheetname']
         export_format = config_yaml['export_format']
         export_to = config_yaml['export_to']
-
+        isSkipEmptyKey = config_yaml['isSkipEmptyKey']
         setting = Applocale::Config::Setting.new(self.configfile_pathstr)
         setting.rubycode = rubycode
         unless link.nil? || link.length == 0
@@ -207,6 +207,14 @@ module Applocale
           end
         end
 
+        if isSkipEmptyKey.nil?
+          setting.is_skip_empty_key = true
+        elsif isSkipEmptyKey.to_s.downcase == "true" || isSkipEmptyKey.to_s.downcase == "false"
+          setting.is_skip_empty_key = isSkipEmptyKey
+        else
+          error = ErrorUtil::ConfigFileInValid.new("[isSkipEmptyKey] must be boolean ")
+          error_list.push(error)
+        end
         setting.printlog
         ErrorUtil::ConfigFileInValid.raiseArr(error_list)
         return setting

data/lib/applocale/Util/injection.rb

@@ -75,5 +75,14 @@ module Applocale
       return after_parse_from_locale(lang, key, value)
     end
 
+    public
+    def has_is_skip_by_key
+      return defined?(is_skip_by_key) == 'method'
+    end
+
+    public
+    def load_is_skip_by_key(sheetname, lang, key)
+      return is_skip_by_key(sheetname, lang, key)
+    end
   end
-end
+end

data/lib/applocale/version.rb

@@ -1,3 +1,3 @@
 module Applocale
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: applocale
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Kennix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-13 00:00:00.000000000 Z
+date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,8 +173,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: for mobile application to manage locale
 test_files: []
+has_rdoc: