applocale 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31a7dcd314ffff0b048da49dec9ce0535d8002c0
-  data.tar.gz: 181e9f985cfe69505f9ce1863945472a1f5a65d0
+  metadata.gz: 9d8869b79798773984196bbfc33f3358f9c52e50
+  data.tar.gz: aaab67885d67212dc783ed7be4560e3549739315
 SHA512:
-  metadata.gz: 85ef2622d09a3a69c3130ba330e1ad3d320b7e701077e7d702e9d4e15a2f6172cb9a527b445f69194c5797b906fe40cb8c0ce79753272b44e7e37010b2e5f753
-  data.tar.gz: a7db380a93dde08008a3a45951c7b60bf780fad3c1c2cd5549fdd9a006a5d544a8fdcf37a83178979b08455fd3e770c4c73ab574ddbe064b0d9507f428dd32af
+  metadata.gz: 0f6ee6f3cde1bcc235fb7cb6eefb042ad54bdb711921212f925e0f7ac978bd6066110d031b5da420ea486438dc173046b66128f3dd8d782b5941a113a93703e7
+  data.tar.gz: 81d2a69a19d328b2b9568783d9ce436d491eb4bdf25930febebc054795dd4efb7a809736ec20779e2eeda8f273730549ec7871f1dadeae73c9c11707a7dd0cf8

data/lib/applocale/Command/init.rb

@@ -4,6 +4,7 @@ require File.expand_path('../../Util/error_util.rb', __FILE__)
 require File.expand_path('../../Core/setting.rb', __FILE__)
 require File.expand_path('../../Core/init.rb', __FILE__)
 require File.expand_path('../../Core/ParserStringFile/parse_localized_resource.rb', __FILE__)
+require File.expand_path('../../version', __FILE__)
 
 require 'thor'
 
@@ -30,7 +31,7 @@ module Applocale
           self.class.help(shell)
           ErrorUtil::CommandError.new("Invalid [platform] : ios | android ").raise
         else
-          ConfigUtil.createConfigFileIfNeed(platformsybom)
+          ConfigUtil.create_configfile_ifneed(platformsybom)
         end
       end
 
@@ -38,19 +39,23 @@ module Applocale
       option :local, :desc => "Convert local xlsx file to localization string file"
       def update()
         is_local = !options[:local].nil?
-        puts is_local
-        ConfigUtil.loadAndValidateForXlsxToStringFile(false)
+        ConfigUtil.load_and_validate_xlsx_to_localefile(is_local)
         Setting.printlog
-        Applocale.start(is_local, Applocale::Setting)
+        Applocale.start_update(is_local, Applocale::Setting)
       end
 
       desc "reverse", "Convert localization string file to xlsx"
       option :skip, :desc => "Skip Error"
       def reverse()
         is_skip = !options[:skip].nil?
-        ConfigUtil.loadAndValidateForStringFileToXlsx()
+        ConfigUtil.load_and_validate_localefile_to_xlsx()
         Setting.printlog
-        Applocale::ParseLocalizedResource.new(is_skip)
+        Applocale::start_reverse(is_skip)
+      end
+
+      desc "version", "show the AppLocale verions"
+      def version()
+        puts Applocale::VERSION
       end
 
     end

data/lib/applocale/Core/Compare/compare_xlsx_str.rb

@@ -0,0 +1,2 @@
+class CompareXlsxStr
+end

data/lib/applocale/Core/{google_helper.rb → GoogleHepler/google_helper.rb}

@@ -3,9 +3,9 @@ require 'googleauth'
 require 'googleauth/stores/file_token_store'
 require 'google/apis/sheets_v4'
 require 'fileutils'
-require File.expand_path('../../Util/file_util.rb', __FILE__)
-require File.expand_path('../../Util/color_util.rb', __FILE__)
-require File.expand_path('../../Util/error_util.rb', __FILE__)
+require 'colorize'
+require File.expand_path('../../../Util/file_util.rb', __FILE__)
+require File.expand_path('../../../Util/error_util.rb', __FILE__)
 
 module Applocale
 
@@ -14,10 +14,10 @@ module Applocale
     APPLICATION_NAME = 'AppLocale'
     CLIENT_SECRETS_PATH = 'client_secret.json'
     CREDENTIALS_PATH = File.join(Dir.home, '.applan_credentials',
-                                 "drive-ruby-applocale.yaml")
+                                 'drive-ruby-applocale.yaml')
     SCOPE = [Google::Apis::DriveV3::AUTH_DRIVE_METADATA_READONLY, Google::Apis::DriveV3::AUTH_DRIVE, Google::Apis::DriveV3::AUTH_DRIVE_FILE]
 
-    def self.isGoogleLink(link)
+    def self.is_googlelink(link)
       if !link.nil? && link.length > 0
         if link.match(/https:\/\/docs.google.com\/spreadsheets\/d\/([^\/]*)/i)
           if $1.length > 0
@@ -27,18 +27,22 @@ module Applocale
       end
     end
 
-    def self.downloadSpreadSheet(spreadSheetId, filename)
-      puts "Start download from google, fileId: #{spreadSheetId} ...".green
+    def self.download_spreadsheet(spreadsheet_Id, filename)
+      puts "Start download from google, fileId: #{spreadsheet_Id} ...".green
       service = Google::Apis::DriveV3::DriveService.new
       service.client_options.application_name = APPLICATION_NAME
       service.authorization = self.authorize
-      content = service.export_file(spreadSheetId,
-                                    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-                                    download_dest: filename)
-      if File.exist? filename
-        puts "Download from google finished".green
-      else
-        ErrorUtil::DownloadXlsxError.new("Cannot download from google").raise
+      begin
+        content = service.export_file(spreadsheet_Id,
+                                      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                                      download_dest: filename)
+        if File.exist? filename
+          puts 'Download from google finished'.green
+        else
+          ErrorUtil::DownloadFromGoogleFail.new.raise
+        end
+      rescue
+        ErrorUtil::DownloadFromGoogleFail.new.raise
       end
     end
 
@@ -55,8 +59,8 @@ module Applocale
       if credentials.nil?
         url = authorizer.get_authorization_url(
             base_url: OOB_URI)
-        puts "!!! Open the following URL in the browser and enter the ".red +
-                 "resulting code after authorization:".red
+        puts '!!! Open the following URL in the browser and enter the '.red +
+                 'resulting code after authorization:'.red
         puts url.blue.on_white
         code = STDIN.gets.chomp
         credentials = authorizer.get_and_store_credentials_from_code(

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

@@ -0,0 +1,155 @@
+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/regex_util.rb', __FILE__)
+
+require 'rubyXL'
+require 'colorize'
+
+module Applocale
+  class ParseXLSX
+
+    @xlsx = nil
+    @sheetcontent_list = nil
+    @allkey_dict = {}
+    @all_error = nil
+    @setting = Setting
+
+    def initialize
+      @setting = Setting
+      puts "Start to Parse XLSX: \"#{@setting.xlsxpath}\" ...".green
+      @sheetcontent_list = Array.new
+      @allkey_dict = {}
+      @all_error = Array.new
+      self.parse
+    end
+
+    def result
+      return @sheetcontent_list
+    end
+
+    def parse
+      begin
+        workbook = RubyXL::Parser.parse(@setting.xlsxpath)
+      rescue
+        ErrorUtil::CannotOpenXlsxFile.new(@setting.xlsxpath).raise
+      end
+      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 = find_header(cells)
+            unless headerinfo.nil?
+              sheetcontent.header_rowno = rowno
+              sheetcontent.keyStr_with_colno = headerinfo[:keystr_colno]
+              sheetcontent.lang_with_colno_list = headerinfo[:lang_colno]
+            end
+          else
+            begin
+              rowcontent = parse_row(sheetname, rowno, worksheet.sheet_data[rowno], sheetcontent.keyStr_with_colno, sheetcontent.lang_with_colno_list)
+              unless rowcontent.nil?
+                prev_rowcontent = @allkey_dict[rowcontent.key_str.downcase]
+                if prev_rowcontent.nil?
+                  @allkey_dict[rowcontent.key_str.downcase] = rowcontent
+                  sheetcontent.rowinfo_list.push(rowcontent)
+                else
+                  error = ErrorUtil::ParseXlsxError::DuplicateKey.new(rowcontent, prev_rowcontent.sheetname, prev_rowcontent.rowno)
+                  @all_error.push(error)
+                end
+              end
+            rescue ErrorUtil::ParseXlsxError::ParseError => e
+              @all_error.push(e)
+
+            end
+          end
+        }
+        if sheetcontent.header_rowno.nil?
+          ErrorUtil::ParseXlsxError::HeadeNotFound.new(sheetname).to_warn
+        end
+        @sheetcontent_list.push(sheetcontent)
+      end
+      if @all_error.length > 0
+        ErrorUtil::ParseXlsxError::ParseError.raiseArr(@all_error)
+      end
+
+    end
+
+    def parse_row(sheetname, rowno, cells, keystr_with_colno, lang_with_colno_list)
+      begin
+        cell = cells[keystr_with_colno.colno]
+        val = cell && cell.value
+        keystr = to_value_key(val)
+      rescue ErrorUtil::ParseXlsxError::InValidKey => e
+        e.rowinfo.sheetname = sheetname
+        e.rowinfo.rowno = rowno
+        raise e
+      end
+
+      unless keystr.nil?
+        rowinfo = ParseXLSXModule::RowInfo.new(sheetname, rowno, keystr)
+        (0..lang_with_colno_list.length-1).each do |k|
+          lang_with_colno = lang_with_colno_list[k]
+          cell = cells[lang_with_colno.colno]
+          val = cell && cell.value
+          cell_value = val.to_s
+          lang_name = lang_with_colno.lang
+          rowinfo.content_dict[lang_name] = convert_contect(cell_value)
+        end
+        return rowinfo
+      end
+    end
+
+    def to_value_key(value)
+      if !value.nil? && value != ''
+        new_value = value.to_s
+        if ValidKey.is_validkey(@setting.platform, new_value)
+          return new_value
+        else
+          rowinfo = ParseXLSXModule::RowInfo.new(nil, nil, value)
+          raise ErrorUtil::ParseXlsxError::InValidKey.new(rowinfo)
+        end
+      end
+    end
+
+    def convert_contect(cell_value)
+      if cell_value.nil?
+        return ''
+      else
+        return ContentUtil.add_escaped_double_quote(cell_value)
+      end
+    end
+
+    def find_header(cells)
+      keystr_with_colno = nil
+      lang_with_colno_list = Array.new
+      k_header_lang_dict = []
+      colno = 0
+      cells.each{ |cell|
+        value = cell && cell.value
+        unless value.nil?
+          if value == @setting.keystr && keystr_with_colno.nil?
+            keystr_with_colno = ParseXLSXModule::KeyStrWithColNo.new(value, colno)
+          else
+            @setting.langlist.each do |lang, info|
+              if value == info[:xlsheader] && k_header_lang_dict.index(lang).nil?
+                lang_with_colno_list.push(ParseXLSXModule::LangWithColNo.new(info[:xlsheader], lang, colno))
+                k_header_lang_dict.push(lang)
+              end
+            end
+          end
+        end
+        colno += 1
+      }
+      if !keystr_with_colno.nil? && lang_with_colno_list.length == @setting.langlist.length
+        return {:keystr_colno => keystr_with_colno, :lang_colno => lang_with_colno_list}
+      end
+    end
+
+  end
+end

data/lib/applocale/Core/{parse_xlsx_module.rb → ParseXLSX/parse_xlsx_module.rb}

@@ -2,41 +2,40 @@ module Applocale
 
   module ParseXLSXModule
     class SheetContent
-      attr_accessor :sheetname, :header_rowno, :keyStrWithColNo, :langWithColNo_list, :rowinfo_list, :comment
+      attr_accessor :sheetname, :header_rowno, :keyStr_with_colno, :lang_with_colno_list, :rowinfo_list, :comment
 
       def initialize(sheetname)
         self.sheetname = sheetname
-        self.rowinfo_list = Array.new()
-        self.langWithColNo_list = Array.new()
+        self.rowinfo_list = Array.new
+        self.lang_with_colno_list = Array.new
         self.comment = sheetname
       end
 
-      def getRowInfoSortByKey()
+      def get_rowInfo_sortby_key
         return self.rowinfo_list.sort_by { |obj| obj.key_str.to_s }
       end
 
-      def getRowInfoSortByRowNo()
+      def get_rowInfo_sortby_rowno
         return self.rowinfo_list.sort_by { |obj| obj.rowno.to_i }
       end
 
       def to_s
-        str_keyStrWithColNo = ""
-        if !keyStrWithColNo.nil?
-          str_keyStrWithColNo = "\n\t#{keyStrWithColNo.to_s}"
+        str_keyStr_with_colno = ''
+        unless keyStr_with_colno.nil?
+          str_keyStr_with_colno = "\n\t#{keyStr_with_colno.to_s}"
         end
-        str_langWithColNo_list = ""
-        self.langWithColNo_list.each do |langWithColNo|
-          str_langWithColNo_list += "\n\t#{langWithColNo.to_s}"
+        str_lang_with_colno_list = ''
+        self.lang_with_colno_list.each do |langWithColNo|
+          str_lang_with_colno_list += "\n\t#{langWithColNo.to_s}"
         end
-        str_contentlist = "\n"
-        self.getRowInfoSortByRowNo().each do |value|
+        str_contentlist = '\n'
+        self.get_rowInfo_sortby_rowno.each do |value|
           str_contentlist += "\t #{value.to_s}\n"
         end
-
         "sheetname = #{sheetname}\n" +
             "header_rowno = #{header_rowno}\n" +
-            "keyStrWithColNo = #{str_keyStrWithColNo}\n" +
-            "langWithColNo_list = #{str_langWithColNo_list}\n" +
+            "keyStrWithColNo = #{str_keyStr_with_colno}\n" +
+            "langWithColNo_list = #{str_lang_with_colno_list}\n" +
             "rowinfo_list = #{str_contentlist}"
       end
     end
@@ -53,7 +52,7 @@ module Applocale
       end
 
       def to_s
-        "sheetname = #{sheetname}, rowno = #{rowno}, key_str = #{key_str}, content_dict = #{content_dict}"
+        "sheetname = #{sheetname}, rowno = #{rowno+1}, key_str = #{key_str}, content_dict = #{content_dict}"
       end
 
     end
@@ -68,7 +67,7 @@ module Applocale
       end
 
       def to_s
-        "{header_str => #{header_str}, colno => #{colno}}"
+        "{header_str => #{header_str}, colno => #{colno+1}}"
       end
 
     end
@@ -83,8 +82,9 @@ module Applocale
       end
 
       def to_s
-        "{header_str => #{header_str}, lang => #{lang}, colno => #{colno}}"
+        "{header_str => #{header_str}, lang => #{lang}, colno => #{colno+1}}"
       end
+
     end
 
   end

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

@@ -1,71 +1,58 @@
 require File.expand_path('../../setting.rb', __FILE__)
 require File.expand_path('../../../Util/platform.rb', __FILE__)
-require File.expand_path('../../parse_xlsx_module', __FILE__)
-require File.expand_path('../../../Util/color_util.rb', __FILE__)
+require File.expand_path('../../ParseXLSX/parse_xlsx_module', __FILE__)
 require File.expand_path('../parse_strings_file', __FILE__)
 require File.expand_path('../parse_xml_file', __FILE__)
 
 require 'rubyXL'
+require 'colorize'
 
 module Applocale
   class ParseLocalizedResource
-
-    # @xlsx = nil
-
     @skip_error = false
     @setting = Setting
-    # @xlsx = RubyXL::Workbook
-    # @allError = Array
-    # @sheetcontent_list = Array
 
     def initialize(skip_error = false)
       @skip_error = skip_error
       @setting = Setting
-
       FileUtils.mkdir_p(File.dirname(@setting.xlsxpath))
       FileUtils.rm(@setting.xlsxpath) if File.exist? @setting.xlsxpath
-
-      keystrwithColNo = ParseXLSXModule::KeyStrWithColNo.new(@setting.keystr, 0)
-      langwithColNolist = Array.new
+      keystr_with_colno = ParseXLSXModule::KeyStrWithColNo.new(@setting.keystr, 0)
+      lang_with_colno_list = Array.new
       colno = 1
-
       @setting.langlist.each do |key, langinfo|
-        langwithColNo = ParseXLSXModule::LangWithColNo.new(langinfo[:xlsheader], key, colno)
+        langwith_colno = ParseXLSXModule::LangWithColNo.new(langinfo[:xlsheader], key, colno)
         colno+=1
-        langwithColNolist.push(langwithColNo)
+        lang_with_colno_list.push(langwith_colno)
       end
-
       if @setting.platform == Platform::IOS
-        result = self.parseIOS()
-        writeToXlSX(@setting.xlsxpath, keystrwithColNo, langwithColNolist, result[:errorlist], result[:content], result[:keylist])
+        result = self.parse_ios
+        write_to_xlsx(@setting.xlsxpath, keystr_with_colno, lang_with_colno_list, result[:errorlist], result[:content], result[:keylist])
       else
-        result = self.parseAndroid()
-        writeToXlSX(@setting.xlsxpath, keystrwithColNo, langwithColNolist, result[:errorlist], result[:content], result[:keylist])
+        result = self.parse_android
+        write_to_xlsx(@setting.xlsxpath, keystr_with_colno, lang_with_colno_list, result[:errorlist], result[:content], result[:keylist])
       end
-
-
     end
 
-    def parseIOS()
-      result = ParseStringsFile.new()
+    def parse_ios
+      result = ParseStringsFile.new
       errorlist = result.errorlist
       content = result.strings_keys
       keylist = result.keys_list
       return {:errorlist => errorlist, :content => content, :keylist => keylist}
     end
 
-    def parseAndroid()
-      result = ParseXMLFile.new()
+    def parse_android
+      result = ParseXMLFile.new
       errorlist = result.errorlist
       content = result.strings_keys
       keylist = result.keys_list
       return {:errorlist => errorlist, :content => content, :keylist => keylist}
     end
 
-    def writeToXlSX(path, keystrwithColNo, langwithColNolist, errorlist, content, keylist)
+    def write_to_xlsx(path, keystrwithColNo, langwithColNolist, errorlist, content, keylist)
       ErrorUtil::ParseLocalizedError::ParseLocalizedError.raiseArr(errorlist, !@skip_error)
       puts "Start write to file: \"#{path}\" ...".green
-
       workbook = RubyXL::Workbook.new
       worksheet = workbook.worksheets[0]
       rowno = 0
@@ -73,11 +60,10 @@ module Applocale
       langwithColNolist.each do |langwithColNo|
         worksheet.add_cell(rowno, langwithColNo.colno, langwithColNo.header_str)
       end
-
       rowno+=1
       keylist.each do |key|
         worksheet.add_cell(rowno, keystrwithColNo.colno, key)
-        if !content[key].nil?
+        unless content[key].nil?
           langwithColNolist.each do |langwithColNo|
             lang = langwithColNo.lang.to_s
             worksheet.add_cell(rowno, langwithColNo.colno, content[key][lang][:value]) if !content[key][lang].nil? && !content[key][lang][:value].nil?
@@ -86,7 +72,7 @@ module Applocale
         rowno+=1
       end
       workbook.write(path)
-
     end
+
   end
 end