applocale 0.1.1 → 0.1.2

data/lib/applocale/Core/ParserStringFile/parse_strings_file.rb

@@ -27,6 +27,8 @@ module Applocale
       @in_multiline_comments = false
       keyrowno = {}
       linenum = 0
+      begin
+
       IO.foreach(strings_path, mode: 'r:bom|utf-8') {|line|
         linenum += 1
         line.strip!
@@ -64,7 +66,7 @@ module Applocale
             break
           end
 
-          if !ValidKey.isValidKey(@platform, key)
+          if !ValidKey.is_validkey(@platform, key)
             error = ErrorUtil::ParseLocalizedError::InvalidKey.new(key, strings_path, lang, linenum)
             @errorlist.push(error)
             break
@@ -76,7 +78,7 @@ module Applocale
           if @strings_keys[key][lang.to_s].nil?
             @strings_keys[key][lang.to_s] = Hash.new
             @strings_keys[key][lang.to_s][:rowno] = linenum
-            @strings_keys[key][lang.to_s][:value] = ContentUtil.removeEscape(@platform, value)
+            @strings_keys[key][lang.to_s][:value] = ContentUtil.remove_escape(@platform, value)
             keyrowno[key] = linenum
           else
             error = ErrorUtil::ParseLocalizedError::DuplicateKey.new(key, keyrowno[key], strings_path, lang, linenum)
@@ -87,6 +89,9 @@ module Applocale
           end
         end
       }
+      rescue
+        ErrorUtil::ParseLocalizedError::InvalidFile.new(strings_path).raise
+      end
     end
 
     def parse_token(linenum, line, sep, lang, file)
@@ -153,5 +158,6 @@ module Applocale
       end
       return value, line[n..-1]
     end
+
   end
 end

data/lib/applocale/Core/ParserStringFile/parse_xml_file.rb

@@ -22,7 +22,6 @@ module Applocale
     end
 
     def to_parse_strings_file(lang, strings_path)
-      xml_doc = nil
       return if !File.exist? strings_path
       puts "Start to Parse xml file: \"#{strings_path}\" ...".green
 
@@ -38,7 +37,7 @@ module Applocale
           end
           if @strings_keys[key][lang.to_s].nil?
             @strings_keys[key][lang.to_s] = Hash.new
-            @strings_keys[key][lang.to_s][:value] = ContentUtil.removeEscape(@platform, value)
+            @strings_keys[key][lang.to_s][:value] = ContentUtil.remove_escape(@platform, value)
           else
             error = ErrorUtil::ParseLocalizedError::DuplicateKey.new(key, -1, strings_path, lang, -1)
             @errorlist.push(error)
@@ -46,6 +45,6 @@ module Applocale
         end
       end
     end
-  end
 
+  end
 end

data/lib/applocale/Core/{convert_to_str_file.rb → convert_to_localefile.rb}

@@ -1,7 +1,7 @@
 require File.expand_path('../setting.rb', __FILE__)
 require File.expand_path('../../Util/platform.rb', __FILE__)
-require File.expand_path('../../Util/color_util.rb', __FILE__)
 require File.expand_path('../../Util/regex_util.rb', __FILE__)
+require 'colorize'
 
 module Applocale
   class ConvertToStrFile
@@ -10,57 +10,51 @@ module Applocale
       setting.langlist.each do |lang, langinfo|
         puts "Start to convert to string file for [\"#{lang}\"] #{langinfo[:path]}...".green
         if setting.platform == Platform::IOS
-          self.convertToStrings(setting.platform, lang, langinfo[:path], sheetcontent_list)
+          self.convert_to_localefile(setting.platform, lang, langinfo[:path], sheetcontent_list)
         elsif setting.platform == Platform::ANDROID
-          self.convertToXML(setting.platform,lang, langinfo[:path], sheetcontent_list)
+          self.convert_to_xml(setting.platform, lang, langinfo[:path], sheetcontent_list)
         end
       end
-
-      puts "Convert Finished !!!".green
+      puts 'Convert Finished !!!'.green
     end
 
-    def self.convertToStrings(platform, lang, langfilepath, sheetcontent_list)
+    def self.convert_to_localefile(platform, lang, langfilepath, sheetcontent_list)
       FileUtils.mkdir_p(File.dirname(langfilepath))
       target = open(langfilepath, 'w')
-
       sheetcontent_list.each do |sheetcontent|
-        target.puts("/*******************************")
+        contentlist = sheetcontent.get_rowInfo_sortby_key
+        next if contentlist.length <= 0
+        target.puts('/*******************************')
         target.puts(" *   #{sheetcontent.comment}")
-        target.puts(" *******************************/")
-        target.puts("")
-        contentlist = sheetcontent.getRowInfoSortByKey()
+        target.puts(' *******************************/')
+        target.puts('')
         contentlist.each do |rowinfo|
           content = rowinfo.content_dict[lang]
-          value = ContentUtil.addEscape(platform,content)
+          value = ContentUtil.add_escape(platform, content)
           target.puts("\"#{rowinfo.key_str.downcase}\" = \"#{value}\";")
         end
-        target.puts("")
+        target.puts('')
       end
       target.close
-
     end
 
-    def self.convertToXML(platform, lang, langfilepath, sheetcontent_list)
+    def self.convert_to_xml(platform, lang, langfilepath, sheetcontent_list)
       FileUtils.mkdir_p(File.dirname(langfilepath))
       target = open(langfilepath, 'w')
-      target.puts("<resources>")
-
+      target.puts('<resources>')
       sheetcontent_list.each do |sheetcontent|
         target.puts("   <!-- #{sheetcontent.comment} -->")
-        contentlist = sheetcontent.getRowInfoSortByKey()
+        contentlist = sheetcontent.get_rowInfo_sortby_key
         contentlist.each do |rowinfo|
           content = rowinfo.content_dict[lang]
-          value = ContentUtil.addEscape(platform,content)
+          value = ContentUtil.add_escape(platform, content)
           target.puts("   <string name=\"#{rowinfo.key_str.downcase}\">#{value}</string>")
         end
-        target.puts("")
+        target.puts('')
       end
-
-      target.puts("</resources>")
+      target.puts('</resources>')
       target.close
     end
 
   end
 end
-
-# attr_accessor :link, :platform, :keystr, :langlist, :langfilepathlist, :xlsxpath

data/lib/applocale/Core/init.rb

@@ -1,19 +1,23 @@
 require File.expand_path('../setting.rb', __FILE__)
-require File.expand_path('../google_helper.rb', __FILE__)
-require File.expand_path('../parse_xlsx', __FILE__)
-require File.expand_path('../convert_to_str_file', __FILE__)
+require File.expand_path('../GoogleHepler/google_helper.rb', __FILE__)
+require File.expand_path('../ParseXLSX/parse_xlsx', __FILE__)
+require File.expand_path('../convert_to_localefile', __FILE__)
 
 module Applocale
-  def self.start(is_localupdate, setting)
-    if !is_localupdate
-      google_file_id = GoogleHelper.isGoogleLink(setting.link)
-      if !google_file_id.nil?
-        GoogleHelper.downloadSpreadSheet(google_file_id,setting.xlsxpath)
+  def self.start_update(is_localupdate, setting)
+    unless is_localupdate
+      google_file_id = GoogleHelper.is_googlelink(setting.link)
+      unless google_file_id.nil?
+        GoogleHelper.download_spreadsheet(google_file_id, setting.xlsxpath)
       end
     end
 
-    parseXlsx = ParseXLSX.new()
-    ConvertToStrFile.convert(parseXlsx.result)
+    parse_xlsx = ParseXLSX.new
+    ConvertToStrFile.convert(parse_xlsx.result)
   end
 
-end
+  def self.start_reverse(is_skip)
+    Applocale::ParseLocalizedResource.new(is_skip)
+  end
+
+end

data/lib/applocale/Core/setting.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../Util/color_util.rb', __FILE__)
+require 'colorize'
 
 module Applocale
   class Setting
@@ -7,12 +7,13 @@ module Applocale
     end
 
     def self.printlog
-      puts " In Setting"
+      puts ' In Setting'
       puts "  link = #{self.link}"
       puts "  platform = #{self.platform}"
       puts "  keystr = #{self.keystr}"
       puts "  langlist = #{self.langlist}"
       puts "  xlsxpath = #{self.xlsxpath}"
     end
+
   end
 end

data/lib/applocale/Util/config_util.rb

@@ -8,22 +8,22 @@ require 'pathname'
 
 module Applocale
   class ConfigUtil
-    def self.createConfigFileIfNeed(platform)
-      pathstr = FileUtil.configFilePathStr
-      self.createConfigFile(platform, pathstr) unless File.exist?(pathstr)
+    def self.create_configfile_ifneed(platform)
+      pathstr = FileUtil.configfile_pathstr
+      self.create_configfile(platform, pathstr) unless File.exist?(pathstr)
     end
 
-    def self.createConfigFile(platform, configfile_pathstr)
+    def self.create_configfile(platform, configfile_pathstr)
       src_pathstr = File.expand_path("../../#{FileUtil.filename_config}", __FILE__)
 
-      File.open(src_pathstr, "r") do |form|
-        File.open(configfile_pathstr, "w") do |to|
+      File.open(src_pathstr, 'r') do |form|
+        File.open(configfile_pathstr, 'w') do |to|
           form.each_line do |line|
             newline = line.gsub("\#{platform}", "#{platform.to_s}")
-            newline = newline.gsub("\#{path_zh_TW}", FileUtil.defaultLocaleFileRelativePathStr(platform, Locale::ZH_TW))
-            newline = newline.gsub("\#{path_zh_CN}", FileUtil.defaultLocaleFileRelativePathStr(platform, Locale::ZH_CN))
-            newline = newline.gsub("\#{path_en_US}", FileUtil.defaultLocaleFileRelativePathStr(platform, Locale::EN_US))
-            newline = newline.gsub("\#{xlsxpath}", FileUtil.defaultXlsxRelativePathStr())
+            newline = newline.gsub("\#{path_zh_TW}", FileUtil.get_default_localefile_relative_pathstr(platform, Locale::ZH_TW))
+            newline = newline.gsub("\#{path_zh_CN}", FileUtil.get_default_localefile_relative_pathstr(platform, Locale::ZH_CN))
+            newline = newline.gsub("\#{path_en_US}", FileUtil.get_default_localefile_relative_pathstr(platform, Locale::EN_US))
+            newline = newline.gsub("\#{xlsxpath}", FileUtil.get_default_xlsx_relativepath_str)
             to.puts(newline)
           end
 
@@ -31,60 +31,64 @@ module Applocale
       end
     end
 
-    def self.loadAndValidateForXlsxToStringFile(is_local_update)
+    def self.load_and_validate_xlsx_to_localefile(is_local_update)
       config_yaml = self.load_config
-      self.validateForXlsxToStringFile(config_yaml, is_local_update)
+      self.validate_xlsx_to_localefile(config_yaml, is_local_update)
     end
 
-    def self.loadAndValidateForStringFileToXlsx()
+    def self.load_and_validate_localefile_to_xlsx()
       config_yaml = self.load_config
-      self.validateForStringFileToXlsx(config_yaml)
+      self.validate_localefile_to_xlsx(config_yaml)
     end
 
     # private
     def self.load_config
-      configfile_path = FileUtil.configFilePathStr
+      configfile_path = FileUtil.configfile_pathstr
       unless File.exist?(configfile_path)
-        ErrorUtil::MissingConfigFileError.new("Missing ConfigFile").raise
+        ErrorUtil::MissingConfigFile.new.raise
+      end
+      begin
+        config_yaml = YAML.load_file configfile_path
+      rescue
+        ErrorUtil::ConfigFileInValid.new('ConfigFile format is invalid.').raise
       end
-      config_yaml = YAML.load_file configfile_path
       return config_yaml
     end
 
-    def self.validateForXlsxToStringFile(config_yaml, is_local_update)
-      error_list = self.validateCommon(config_yaml)
+    def self.validate_xlsx_to_localefile(config_yaml, is_local_update)
+      error_list = self.validate_common(config_yaml)
       if is_local_update
-        if !File.exist? Setting.xlsxpath
-          error = ErrorUtil::ConfigFileValidError.new("#{Setting.xlsxpath} do not exist")
+        unless File.exist? Setting.xlsxpath
+          error = ErrorUtil::ConfigFileInValid.new("#{Setting.xlsxpath} do not exist")
           error_list.push(error)
         end
       else
-        if Setting.link.nil?
-          error = ErrorUtil::ConfigFileValidError.new("[link] should not be empty")
+        if config_yaml['link'].to_s.strip.nil? || config_yaml['link'].to_s.strip.length <= 0
+          error = ErrorUtil::ConfigFileInValid.new('[link] should not be empty')
           error_list.push(error)
         end
       end
-      ErrorUtil::ConfigFileValidError.raiseArr(error_list)
+      ErrorUtil::ConfigFileInValid.raiseArr(error_list)
     end
 
-    def self.validateForStringFileToXlsx(config_yaml)
-      error_list = self.validateCommon(config_yaml)
-      Setting.langlist.each do |lang, langinfo|
-        if !File.exist? langinfo[:path]
-          error = ErrorUtil::ConfigFileValidError.new("#{langinfo[:path]} do not exist")
+    def self.validate_localefile_to_xlsx(config_yaml)
+      error_list = self.validate_common(config_yaml)
+      Setting.langlist.each do |_, langinfo|
+        unless File.exist? langinfo[:path]
+          error = ErrorUtil::ConfigFileInValid.new("#{langinfo[:path]} do not exist")
           error_list.push(error)
         end
       end
-      ErrorUtil::ConfigFileValidError.raiseArr(error_list)
+      ErrorUtil::ConfigFileInValid.raiseArr(error_list)
     end
 
-    def self.validateCommon(config_yaml)
+    def self.validate_common(config_yaml)
       error_list = Array.new
-      link = config_yaml["link"].to_s
-      platform = config_yaml["platform"].to_s
-      keystr = config_yaml["keystr"].to_s
-      langlist = config_yaml["langlist"]
-      xlsxpath = config_yaml["xlsxpath"].to_s
+      link = config_yaml['link'].to_s.strip
+      platform = config_yaml['platform'].to_s.strip
+      keystr = config_yaml['keystr'].to_s.strip
+      langlist = config_yaml['langlist']
+      xlsxpath = config_yaml['xlsxpath'].to_s.strip
 
       newlink = nil
       newplatform = nil
@@ -92,9 +96,9 @@ module Applocale
       newlanglist = Hash.new
       newxlsxpath = nil
 
-      if !(link.nil? || link.length == 0)
+      unless link.nil? || link.length == 0
         if (link =~ /^https/).nil? && (link =~ /^http/).nil?
-          error = ErrorUtil::ConfigFileValidError.new("Invalid link for [link] : #{link}")
+          error = ErrorUtil::ConfigFileInValid.new("Invalid link for [link] : #{link}")
           error_list.push(error)
         else
           newlink = link
@@ -103,21 +107,21 @@ module Applocale
 
       if !(xlsxpath.nil? || xlsxpath.length == 0)
         if !(Pathname.new xlsxpath).absolute?
-          newxlsxpath = File.expand_path(xlsxpath, File.dirname(FileUtil.configFilePathStr))
+          newxlsxpath = File.expand_path(xlsxpath, File.dirname(FileUtil.configfile_pathstr))
         else
           newxlsxpath = xlsxpath
         end
       else
-        error = ErrorUtil::ConfigFileValidError.new("[xlsxpath] should not be empty or missing")
+        error = ErrorUtil::ConfigFileInValid.new('[xlsxpath] should not be empty or missing')
         error_list.push(error)
       end
 
       if platform.nil? || platform.length == 0
-        error = ErrorUtil::ConfigFileValidError.new("[platform] should not be empty")
+        error = ErrorUtil::ConfigFileInValid.new('[platform] should not be empty')
         error_list.push(error)
       else
         if Platform.init(platform).nil?
-          error = ErrorUtil::ConfigFileValidError.new("[platform] can only be 'ios' or 'android' ")
+          error = ErrorUtil::ConfigFileInValid.new("[platform] can only be 'ios' or 'android' ")
           error_list.push(error)
         else
           newplatform = Platform.init(platform)
@@ -125,33 +129,44 @@ module Applocale
       end
 
       if keystr.nil? || keystr.length == 0
-        error = ErrorUtil::ConfigFileValidError.new("[keystr] should not be empty")
+        error = ErrorUtil::ConfigFileInValid.new('[keystr] should not be empty')
         error_list.push(error)
       else
         newkeystr = keystr
       end
 
       if langlist.nil?
-        error = ErrorUtil::ConfigFileValidError.new("[langlist] should not be empty or missing")
+        error = ErrorUtil::ConfigFileInValid.new('[langlist] should not be empty or missing')
         error_list.push(error)
       elsif !(langlist.is_a? Hash)
-        error = ErrorUtil::ConfigFileValidError.new("[langlist] wrong format")
+        error = ErrorUtil::ConfigFileInValid.new('[langlist] wrong format')
         error_list.push(error)
       else
         if langlist.length <= 0
-          error = ErrorUtil::ConfigFileValidError.new("[langlist] should not be empty ")
+          error = ErrorUtil::ConfigFileInValid.new('[langlist] should not be empty ')
           error_list.push(error)
         end
         langlist.each do |lang, arr|
           if arr.length != 2
-            error = ErrorUtil::ConfigFileValidError.new("[langlist] wrong format")
+            error = ErrorUtil::ConfigFileInValid.new('[langlist] wrong format')
             error_list.push(error)
           else
             path = arr[1]
-            if !(Pathname.new path).absolute?
-              path = File.expand_path(path, File.dirname(FileUtil.configFilePathStr))
+            unless (Pathname.new path).absolute?
+              path = File.expand_path(path, File.dirname(FileUtil.configfile_pathstr))
+            end
+            if newplatform != nil
+              if Platform.is_valid_path(newplatform, path)
+                newlanglist[lang] = {:xlsheader => arr[0], :path => path}
+              else
+                if newplatform == Platform::IOS
+                  error = ErrorUtil::ConfigFileInValid.new("wrong locale file type: IOS should be .strings : #{path}")
+                else
+                  error = ErrorUtil::ConfigFileInValid.new("wrong locale file type: Android should be .xml : #{path}")
+                end
+                error_list.push(error)
+              end
             end
-            newlanglist[lang] = {:xlsheader => arr[0], :path => path}
           end
         end
       end

data/lib/applocale/Util/error_util.rb

@@ -1,12 +1,11 @@
-require File.expand_path('../color_util.rb', __FILE__)
-
+require 'colorize'
 
 module Applocale
   module ErrorUtil
     class CommonError < StandardError
       def raise
         puts "** Error: #{self.message}".red
-        abort("")
+        abort('')
       end
 
       def to_warn
@@ -17,10 +16,13 @@ module Applocale
     class CommandError < CommonError;
     end
 
-    class MissingConfigFileError < CommonError;
+    class MissingConfigFile < CommonError
+      def message
+        "Missing ConfigFile"
+      end
     end
 
-    class ConfigFileValidError < CommonError
+    class ConfigFileInValid < CommonError
       def self.raiseArr(list = nil)
         if !list.nil? && list.length > 0
           puts "*** ConfigError ***".red
@@ -30,29 +32,44 @@ module Applocale
           abort("")
         end
       end
-      # attr_accessor :msg
-      # def initialize(msg)
-      #   self.msg = msg
-      # end
     end
 
-    class DownloadXlsxError < CommonError
+    class DownloadFromGoogleFail < CommonError
+      def message
+        "Cannot download from google"
+      end
+    end
 
+    class CannotOpenXlsxFile < CommonError
+      attr_accessor :path
+      def initialize(path)
+        @path = path
+      end
+      def message
+        "Can't open xlsx file #{self.path}"
+      end
     end
+  end
+end
 
+module Applocale
+  module ErrorUtil
 
     module ParseXlsxError
       class ParseError < CommonError
 
-        attr_accessor :rowinfo, :msg
+        attr_accessor :rowinfo
 
-        def initialize(rowinfo = nil, msg = nil)
+        def initialize(rowinfo = nil)
           @rowinfo = rowinfo
-          @msg = msg
         end
 
         def message
-          "#{rowinfo.to_s} - #{msg}"
+          self.msg
+        end
+
+        def msg
+          return rowinfo.to_s
         end
 
         def self.raiseArr(list = nil)
@@ -67,13 +84,43 @@ module Applocale
 
       end
 
-      class HeadeNotFoundError < ParseError;
+      class HeadeNotFound < ParseError
+        attr_accessor :sheetname
+        def initialize(sheetname)
+          @sheetname = sheetname
+        end
+
+        def message
+          "Header not found in sheet: #{self.sheetname}"
+        end
       end
-      class ErrorDuplicateKey < ParseError;
+
+      class DuplicateKey < ParseError
+        attr_accessor :duplicate_sheetname, :duplicate_rowno
+
+        def initialize(rowinfo, duplicate_sheetname, duplicate_rowno)
+          @rowinfo = rowinfo
+          @duplicate_sheetname = duplicate_sheetname
+          @duplicate_rowno = duplicate_rowno
+        end
+
+        def message
+          "DuplicateKey [#{self.rowinfo.key_str}] - #{self.msg} : duplicateWithSheet: #{self.duplicate_sheetname} Row: #{self.duplicate_rowno+1}"
+        end
       end
-      class ErrorInValidKey < ParseError;
+
+      class InValidKey < ParseError;
+        def message
+          "InvalidKey [#{self.rowinfo.key_str}] - #{self.msg}"
+        end
       end
     end
+  end
+end
+
+
+module Applocale
+  module ErrorUtil
 
     module ParseLocalizedError
       class ParseLocalizedError < CommonError
@@ -90,7 +137,7 @@ module Applocale
         end
 
         def msg
-          return "lang: #{lang}, rowno: #{row_no}, file: #{file}"
+          return "lang: #{self.lang}, rowno: #{self.row_no}, file: #{self.file}"
         end
 
         def raise(is_exit = true)
@@ -110,6 +157,16 @@ module Applocale
 
       end
 
+      class InvalidFile < ParseLocalizedError
+        attr_accessor :path
+        def initialize(path)
+          @path = path
+        end
+        def message
+          "Can't open file #{self.path}"
+        end
+      end
+
       class InvalidKey < ParseLocalizedError
         attr_accessor :key
 
@@ -121,7 +178,7 @@ module Applocale
         end
 
         def message
-          "InvalidKey [#{key}] - #{self.msg}"
+          "InvalidKey [#{self.key}] - #{self.msg}"
         end
       end
 
@@ -132,6 +189,7 @@ module Applocale
       end
       class DuplicateKey < ParseLocalizedError
         attr_accessor :key, :duplicate_rowno
+
         def initialize(key, duplicate_rowno, file, lang, row_no)
           @key = key
           @duplicate_rowno = duplicate_rowno
@@ -141,7 +199,7 @@ module Applocale
         end
 
         def message
-          "DuplicateKey [#{key}] - #{self.msg} : duplicateWithRow: #{duplicate_rowno}"
+          "DuplicateKey [#{self.key}] - #{self.msg} : duplicateWithRow: #{self.duplicate_rowno}"
         end
       end
     end