applocale 0.1.1 → 0.1.2

data/lib/applocale/Util/file_util.rb

@@ -4,56 +4,56 @@ require 'pathname'
 
 module Applocale
   class FileUtil
-    @@dirname_main = "AppLocale"
-    @@dirname_ios = "IOS"
-    @@dirname_android = "Android"
-    @@filename_config = "AppLocaleFile.yaml"
-    @@filename_xlsx = "string.xlsx"
+    DIRNAME_MAIN = 'AppLocale'
+    DIRNAME_IOS = 'IOS'
+    DIRNAME_ANDROID = 'Android'
+    FILENAME_CONFIG = 'AppLocaleFile.yaml'
+    FILENAME_XLSX = 'string.xlsx'
 
     def self.filename_config
-      return @@filename_config
+      return FILENAME_CONFIG
     end
 
-    def self.mainFolderPathStr
-      pathstr = File.join(Dir.pwd, @@dirname_main)
+    def self.mainfolder_pathstr
+      pathstr = File.join(Dir.pwd, DIRNAME_MAIN)
       Dir.mkdir pathstr unless File.exist?(pathstr)
       return pathstr
     end
 
-    def self.configFilePathStr
-      filename = @@filename_config
-      pathstr = File.join(self.mainFolderPathStr, filename)
+    def self.configfile_pathstr
+      filename = FILENAME_CONFIG
+      pathstr = File.join(self.mainfolder_pathstr, filename)
       return pathstr
     end
+    #
+    # def self.create_configfile_ifneed(platform)
+    #   pathstr = self.configfile_pathstr
+    #   ConfigUtil.create_configfile(platform, pathstr) unless File.exist?(pathstr)
+    # end
 
-    def self.createConfigFileIfNeed(platform)
-      pathstr = self.configFilePathStr
-      self.createConfigFile(pathstr, platform) unless File.exist?(pathstr)
-    end
-
-    def self.defaultLocaleFileRelativePathStr(platform, lang)
+    def self.get_default_localefile_relative_pathstr(platform, lang)
       if platform == Platform::IOS
-        dirname = @@dirname_ios
+        dirname = DIRNAME_IOS
       elsif platform == Platform::ANDROID
-        dirname = @@dirname_android
+        dirname = DIRNAME_ANDROID
       end
-      if !dirname.nil?
-        dirpathstr = File.join(self.mainFolderPathStr, dirname)
+      unless dirname.nil?
+        dirpathstr = File.join(self.mainfolder_pathstr, dirname)
         Dir.mkdir dirpathstr unless File.exist?(dirpathstr)
         filename = Locale.filename(platform, lang)
         filepathstr = File.join(dirpathstr, filename)
         filepath = Pathname.new(filepathstr)
-        configfilepath = Pathname.new(File.dirname(self.configFilePathStr))
+        configfilepath = Pathname.new(File.dirname(self.configfile_pathstr))
         return filepath.relative_path_from(configfilepath).to_s
       end
       return nil
     end
 
-    def self.defaultXlsxRelativePathStr
-      filename = @@filename_xlsx
-      pathstr = File.join(self.mainFolderPathStr, filename)
+    def self.get_default_xlsx_relativepath_str
+      filename = FILENAME_XLSX
+      pathstr = File.join(self.mainfolder_pathstr, filename)
       filepath = Pathname.new(pathstr)
-      configfilepath = Pathname.new(File.dirname(self.configFilePathStr))
+      configfilepath = Pathname.new(File.dirname(self.configfile_pathstr))
       return filepath.relative_path_from(configfilepath).to_s
     end
   end

data/lib/applocale/Util/lang.rb

@@ -11,7 +11,7 @@ module Applocale
       if devicemodel == Platform::IOS
         return !FILENAME_IOS[locale].nil? ? FILENAME_IOS[locale] : "#{locale}.strings"
       elsif devicemodel == Platform::ANDROID
-        return File.join(FILENAME_ANDROID[locale],"strings.xml")
+        return File.join(FILENAME_ANDROID[locale],'strings.xml')
       end
       return nil
     end

data/lib/applocale/Util/platform.rb

@@ -5,13 +5,28 @@ module Applocale
     ANDROID = :Android
 
     def self.init(platform)
-      if platform.upcase == "IOS"
+      if platform.upcase == 'IOS'
         return Platform::IOS
-      elsif platform.upcase == "ANDROID"
+      elsif platform.upcase == 'ANDROID'
         return Platform::ANDROID
       end
       return nil
     end
+
+    def self.is_valid_path(platform, path)
+      newpath = path.to_s.strip
+      extn = File.extname  newpath
+      if platform == Platform::IOS
+        if extn.downcase == '.strings'
+          return true
+        end
+      elsif platform == Platform::ANDROID
+        if extn.downcase == '.xml'
+          return true
+        end
+      end
+      return false
+    end
   end
 
 end

data/lib/applocale/Util/regex_util.rb

@@ -4,11 +4,11 @@ require File.expand_path('../platform.rb', __FILE__)
 
 module Applocale
   class ValidKey
-    REGEX_KEYSTR_IOS = /\A[0-9a-zA-Z\_]+\z/
+    REGEX_KEYSTR_IOS = /\A[0-9a-zA-Z_]+\z/
 
-    def self.isValidKey(platfrom, key)
+    def self.is_validkey(platfrom, key)
       return false if key.nil?
-      return false if key.strip == ""
+      return false if key.strip.length <= 0
       result = !REGEX_KEYSTR_IOS.match(key).nil?
       return result
     end
@@ -18,25 +18,25 @@ module Applocale
     REGEX_ESCAPED_QUOTE = /(?<!\\)(?:\\{2})*(\\")/
     REGEX_NON_ESCAPE_QUOTE = /(?<!\\)(?:\\{2})*(")/
 
-    def self.removeEscape(platform, content)
+    def self.remove_escape(platform, content)
       if platform == Platform::IOS
-        return self.removeEscapedDoubleQuote(content)
+        return self.remove_escaped_double_quote(content)
       elsif platform == Platform::ANDROID
-        return self.removeEscapedForAndroid(content)
+        return self.remove_escaped_android(content)
       end
       return content
     end
 
-    def self.addEscape(platform, content)
+    def self.add_escape(platform, content)
       if platform == Platform::IOS
-        return self.addEscapedDoubleQuote(content)
+        return self.add_escaped_double_quote(content)
       elsif platform == Platform::ANDROID
-        return self.addEscapedForAndroid(content)
+        return self.add_escaped_android(content)
       end
       return content
     end
 
-    def self.addEscapedForAndroid(content)
+    def self.add_escaped_android(content)
       # \u \U \0 don't know
       reg = /(?<!\\)((?:\\{2})+)*\\[c-eg-mo-qsw-zA-TW-Z!$%()*+,-.\/;:>\[\]^_`{|}~89]/
       new_value = content.gsub(reg) {|match|
@@ -46,22 +46,22 @@ module Applocale
       reg = /(?<!\\)((?:\\{2})+)*(\\r)/
       new_value = new_value.gsub(reg) {|match|
         match.slice!(-1)
-        match + "n"
+        match + 'n'
       }
-      new_value = new_value.gsub(/&/, "&amp;")
-      new_value = new_value.gsub(/</, "&lt;")
+      new_value = new_value.gsub(/&/, '&amp;')
+      new_value = new_value.gsub(/</, '&lt;')
       # new_value = new_value.gsub(/>/, "&gt;")
       return new_value
     end
 
-    def self.removeEscapedForAndroid(content)
-      new_value = content.gsub(/&lt;/, "<")
-      new_value = new_value.gsub(/&amp;/, "&")
+    def self.remove_escaped_android(content)
+      new_value = content.gsub(/&lt;/, '<')
+      new_value = new_value.gsub(/&amp;/, '&')
       puts "test=#{content}==#{new_value}"
       return new_value
     end
 
-    def self.addEscapedDoubleQuote(content)
+    def self.add_escaped_double_quote(content)
       reg = /(?<!\\)((?:\\{2})+)"|(?<!\\)"|^"/
       new_value = content.gsub(reg) {|match|
           "\\" + match
@@ -69,7 +69,7 @@ module Applocale
       return new_value
     end
 
-    def self.removeEscapedDoubleQuote(content)
+    def self.remove_escaped_double_quote(content)
       reg = /(?<!\\)((?:\\{2})+)*\\"/
       new_value = content.gsub(reg) {|match|
         match.slice!(0)

data/lib/applocale/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: applocale
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kennix
@@ -161,17 +161,17 @@ files:
 - lib/applocale.rb
 - lib/applocale/AppLocaleFile.yaml
 - lib/applocale/Command/init.rb
+- lib/applocale/Core/Compare/compare_xlsx_str.rb
+- lib/applocale/Core/GoogleHepler/client_secret.json
+- lib/applocale/Core/GoogleHepler/google_helper.rb
+- lib/applocale/Core/ParseXLSX/parse_xlsx.rb
+- lib/applocale/Core/ParseXLSX/parse_xlsx_module.rb
 - lib/applocale/Core/ParserStringFile/parse_localized_resource.rb
 - lib/applocale/Core/ParserStringFile/parse_strings_file.rb
 - lib/applocale/Core/ParserStringFile/parse_xml_file.rb
-- lib/applocale/Core/client_secret.json
-- lib/applocale/Core/convert_to_str_file.rb
-- lib/applocale/Core/google_helper.rb
+- lib/applocale/Core/convert_to_localefile.rb
 - lib/applocale/Core/init.rb
-- lib/applocale/Core/parse_xlsx.rb
-- lib/applocale/Core/parse_xlsx_module.rb
 - lib/applocale/Core/setting.rb
-- lib/applocale/Util/color_util.rb
 - lib/applocale/Util/config_util.rb
 - lib/applocale/Util/error_util.rb
 - lib/applocale/Util/file_util.rb

data/lib/applocale/Core/parse_xlsx.rb

@@ -1,166 +0,0 @@
-require File.expand_path('../setting.rb', __FILE__)
-require File.expand_path('../parse_xlsx_module.rb', __FILE__)
-require File.expand_path('../../Util/error_util.rb', __FILE__)
-require File.expand_path('../../Util/color_util.rb', __FILE__)
-require File.expand_path('../../Util/regex_util.rb', __FILE__)
-
-require 'rubyXL'
-
-
-module Applocale
-  class ParseXLSX
-
-    @xlsx = nil
-    @sheetcontent_list = nil
-    @allError = nil
-    @setting = Setting
-
-    def initialize()
-      @setting = Setting
-      puts "Start to Parse XLSX: \"#{@setting.xlsxpath}\" ...".green
-      # @xlsx = Roo::Spreadsheet.open(@@setting.xlsxpath)
-      @sheetcontent_list = Array.new
-      @allKeyDict = {}
-      @allError = Array.new
-
-      self.parse()
-    end
-
-    def result
-      return @sheetcontent_list
-    end
-
-    def parse()
-
-      workbook = RubyXL::Parser.parse(@setting.xlsxpath)
-      workbook.worksheets.each do |worksheet|
-        sheetName = worksheet.sheet_name
-        sheetcontent = ParseXLSXModule::SheetContent.new(sheetName)
-
-        rowno = -1
-        worksheet.each {|row|
-          rowno += 1
-          # colno = 0
-          next if row.nil?
-          cells = row && row.cells
-          if sheetcontent.header_rowno.nil?
-            headerinfo = findHeader(cells)
-            if !headerinfo.nil?
-              sheetcontent.header_rowno = rowno
-              sheetcontent.keyStrWithColNo = headerinfo[:keystr_colno]
-              sheetcontent.langWithColNo_list = headerinfo[:lang_colno]
-            end
-          else
-            begin
-              rowcontent = parseRow(sheetName, rowno, worksheet.sheet_data[rowno], sheetcontent.keyStrWithColNo, sheetcontent.langWithColNo_list)
-              if !rowcontent.nil?
-                prev_rowcontent = @allKeyDict[rowcontent.key_str.downcase]
-                if prev_rowcontent.nil?
-                  @allKeyDict[rowcontent.key_str.downcase] = rowcontent
-                  sheetcontent.rowinfo_list.push(rowcontent)
-                else
-                  error = ErrorUtil::ParseXlsxError::ErrorDuplicateKey.new(rowcontent, "duplicate with sheet '#{prev_rowcontent.sheetname}' row '#{prev_rowcontent.rowno}'")
-                  @allError.push(error)
-                end
-              end
-            rescue ErrorUtil::ParseXlsxError::ParseError => e
-              @allError.push(e)
-
-            end
-          end
-        }
-        if sheetcontent.header_rowno.nil?
-          ErrorUtil::ParseXlsxError::HeadeNotFoundError.new("Header not found in sheet: #{sheetName}").to_warn
-        end
-        @sheetcontent_list.push(sheetcontent)
-      end
-      if @allError.length > 0
-        ErrorUtil::ParseXlsxError::ParseError.raiseArr(@allError)
-      end
-
-    end
-
-    def parseRow(sheetname, rowno, cells, keyStrWithColNo, langWithColNo_list)
-      begin
-        cell = cells[keyStrWithColNo.colno]
-        val = cell && cell.value
-        keystr = toValueKey(val)
-      rescue ErrorUtil::ParseXlsxError::ErrorInValidKey => e
-        e.rowinfo.sheetname = sheetname
-        e.rowinfo.rowno = rowno
-        raise e
-      end
-
-      if !keystr.nil?
-        rowinfo = ParseXLSXModule::RowInfo.new(sheetname, rowno, keystr)
-        for k in 0..langWithColNo_list.length-1
-          langWithColNo = langWithColNo_list[k]
-          cell = cells[langWithColNo.colno]
-          val = cell && cell.value
-          cell_value = val.to_s
-          lang_name = langWithColNo.lang
-          rowinfo.content_dict[lang_name] = convertContect(cell_value)
-        end
-        return rowinfo
-      end
-      return nil
-    end
-
-    def toValueKey(value)
-      if !value.nil? && value != ""
-        new_value = value.to_s
-        if ValidKey.isValidKey(@setting.platform, new_value)
-          return new_value
-        else
-          rowinfo = ParseXLSXModule::RowInfo.new(nil, nil, value)
-          raise ErrorUtil::ParseXlsxError::ErrorInValidKey.new(rowinfo, "Invaild Key: #{value}")
-        end
-      end
-      return nil
-    end
-
-    def convertContect(cell_value)
-      if cell_value.nil?
-        return ""
-      else
-        return ContentUtil.addEscapedDoubleQuote(cell_value)
-      end
-    end
-
-    def findHeader(cells)
-      keyStrWithColNo = nil
-      langWithColNo_list = Array.new()
-      k_header_lang_dict = []
-      colno = 0
-      cells.each{ |cell|
-        value = cell && cell.value
-        if !value.nil?
-          if value == @setting.keystr && keyStrWithColNo.nil?
-            keyStrWithColNo = ParseXLSXModule::KeyStrWithColNo.new(value, colno)
-          else
-            @setting.langlist.each do |lang, info|
-              if value == info[:xlsheader] && k_header_lang_dict.index(lang).nil?
-                langWithColNo_list.push(ParseXLSXModule::LangWithColNo.new(info[:xlsheader], lang, colno))
-                k_header_lang_dict.push(lang)
-              end
-            end
-          end
-        end
-        colno += 1
-      }
-
-      allPass = true
-      for i in 0..langWithColNo_list.length-1
-        if langWithColNo_list[i].nil?
-          allPass = false
-          break
-        end
-      end
-      if !keyStrWithColNo.nil? && langWithColNo_list.length == @setting.langlist.length
-        return {:keystr_colno => keyStrWithColNo, :lang_colno => langWithColNo_list}
-      end
-      return nil
-    end
-
-  end
-end

data/lib/applocale/Util/color_util.rb

@@ -1,28 +0,0 @@
-require 'colorize'
-
-
-# class String
-#   def black;          "\e[30m#{self}\e[0m" end
-#   def red;            "\e[31m#{self}\e[0m" end
-#   def green;          "\e[32m#{self}\e[0m" end
-#   def brown;          "\e[33m#{self}\e[0m" end
-#   def blue;           "\e[34m#{self}\e[0m" end
-#   def magenta;        "\e[35m#{self}\e[0m" end
-#   def cyan;           "\e[36m#{self}\e[0m" end
-#   def gray;           "\e[37m#{self}\e[0m" end
-#
-#   def bg_black;       "\e[40m#{self}\e[0m" end
-#   def bg_red;         "\e[41m#{self}\e[0m" end
-#   def bg_green;       "\e[42m#{self}\e[0m" end
-#   def bg_brown;       "\e[43m#{self}\e[0m" end
-#   def bg_blue;        "\e[44m#{self}\e[0m" end
-#   def bg_magenta;     "\e[45m#{self}\e[0m" end
-#   def bg_cyan;        "\e[46m#{self}\e[0m" end
-#   def bg_gray;        "\e[47m#{self}\e[0m" end
-#
-#   def bold;           "\e[1m#{self}\e[22m" end
-#   def italic;         "\e[3m#{self}\e[23m" end
-#   def underline;      "\e[4m#{self}\e[24m" end
-#   def blink;          "\e[5m#{self}\e[25m" end
-#   def reverse_color;  "\e[7m#{self}\e[27m" end
-# end