applocale 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e84a39280ab284159150cd5263596bdfe45098f9
-  data.tar.gz: 83bedb2834ff382221e89a20a190f02a9a7d1fb9
+SHA256:
+  metadata.gz: f480b988ac9b04365a14cfcc0fb6af05f80dc6ed57074df795115c4e65eccd66
+  data.tar.gz: 7ff2ea0fa652e029b3d54f1c97d8c22b8714f0ac15ad888d18b169263f075b7a
 SHA512:
-  metadata.gz: 60382d4febffe2a2e84e33d444863b2cea1e3fdf81dddc9f63cccd8f18fc1079061d2eac7e5fec023797b5dbadc96a4b3f9594f297dbec7c4d4078a346d52999
-  data.tar.gz: b5b170f7e332ec9f0bfbd4d2ea90f7680b583524fe1c0da7ef6ffaa1961782a09eaed81cd27ef889a012d6ca5858be08d3eb8ba67433d8708c7c018af6f39da8
+  metadata.gz: 14f9b9bfcd25af8df125c1914d4c658c134f921325c1d1ec5bfc073007f728124c8ea0b5b4454e2abd98be4322c77de43fa0a587976ae694c193c99efef402e8
+  data.tar.gz: 1a1214c98a866e60212b0d5a482009703f149abf91cd0221998eddf89655506bd62a8d9dbb5f1f72702067e302d96dcb62aa597ca721f4169cba798433d0dd70

data/lib/applocale/AppLocaleFile

@@ -51,6 +51,7 @@ isSkipEmptyKey: false
 #     return value
 # end
 
-# def is_skip_by_key(sheetname, lang, key)
+# def is_skip_by_key(sheetname, key)
 #     return true
-# end
+# end
+

data/lib/applocale/Command/init.rb

@@ -56,5 +56,3 @@ module Applocale
     end
   end
 end
-
-

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

@@ -18,16 +18,19 @@ module Applocale
     @langlist
     @sheetobj_list
     @is_skip_empty_key
+    @injectobj
 
-    def initialize(platfrom, csv_directory, langlist, sheetobj_list, is_skip_empty_key)
-      @platform = platfrom
-      @csv_directory = csv_directory
-      @langlist = langlist
-      @sheetobj_list = sheetobj_list
+
+    def initialize(setting)
+      @platform = setting.platform
+      @csv_directory = setting.export_to
+      @langlist = setting.lang_path_list
+      @sheetobj_list = setting.sheet_obj_list
       @sheetcontent_list = Array.new
       @allkey_dict = {}
       @all_error = Array.new
-      @is_skip_empty_key = is_skip_empty_key
+      @is_skip_empty_key = setting.is_skip_empty_key
+      @injectobj = setting.injection
       # puts "Start to Parse CSV: \"#{csv_directory}\" ...".green
       parse
     end
@@ -51,8 +54,18 @@ module Applocale
         rows.each_with_index do |row, index|
           next if sheet_content.header_rowno == index
           row_content = parse_row(sheet_name, index, row, sheet_content.keyStr_with_colno, sheet_content.lang_with_colno_list)
-          handle_duplicate_key_if_any!(row_content)
-          sheet_content.rowinfo_list.push(row_content)
+          next if row_content.nil?
+          toskip = false
+          if @injectobj.has_is_skip_by_key
+            is_skip_by_key = @injectobj.load_is_skip_by_key(sheet_name, row_content.key_str)
+            if is_skip_by_key.to_s.downcase == "true"
+              toskip = true
+            end
+          end
+          if !toskip
+            handle_duplicate_key_if_any!(row_content)
+            sheet_content.rowinfo_list.push(row_content)
+          end
         end
         sheet_content
       end
@@ -116,6 +129,8 @@ module Applocale
         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}"
+          else
+            return
           end
         else
           raise "ParseCSVError: Invaild Key in sheet #{sheet_name}, row: #{index}, key_str: #{key_str}"

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

@@ -24,17 +24,19 @@ module Applocale
     @langlist
     @sheetobj_list
     @is_skip_empty_key
+    @injectobj
 
-    def initialize(platfrom, xlsxpath, langlist, sheetobj_list, is_skip_empty_key)
-      @platform = platfrom
-      @xlsxpath = xlsxpath
-      @langlist = langlist
-      @sheetobj_list = sheetobj_list
+    def initialize(setting)
+      @platform = setting.platform
+      @xlsxpath = setting.xlsxpath
+      @langlist = setting.lang_path_list
+      @sheetobj_list = setting.sheet_obj_list
       puts "Start to Parse XLSX: \"#{@xlsxpath}\" ...".green
       @sheetcontent_list = Array.new
       @allkey_dict = {}
       @all_error = Array.new
-      @is_skip_empty_key = is_skip_empty_key
+      @is_skip_empty_key = setting.is_skip_empty_key
+      @injectobj = setting.injection
       self.parse
     end
 
@@ -133,6 +135,12 @@ module Applocale
       end
 
       unless keystr.nil?
+        if @injectobj.has_is_skip_by_key
+          is_skip_by_key = @injectobj.load_is_skip_by_key(sheetname, keystr)
+          if is_skip_by_key.to_s.downcase == "true"
+            return nil
+          end
+        end
         rowinfo = ParseModelModule::RowInfo.new(sheetname, rowno, keystr)
         lang_with_colno_list.each do |lang_with_colno|
           cell = cells[lang_with_colno.colno - 1]

data/lib/applocale/Core/convert_to_localefile.rb

@@ -9,9 +9,12 @@ require 'json'
 module Applocale
   class ConvertToStrFile
 
-    def self.convert(platform, lang_path_list, sheetcontent_list, rubycode)
 
-      injectObj = Applocale::Injection.load(rubycode)
+    def self.convert(setting, sheetcontent_list)
+
+      platform = setting.platform
+      lang_path_list =  setting.lang_path_list
+      injectObj = setting.injection
 
       lang_path_list.each do |langpath_obj|
         puts "Start to convert to string file for [\"#{langpath_obj.lang}\"] #{langpath_obj.filepath}...".green
@@ -73,12 +76,6 @@ 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
@@ -95,12 +92,6 @@ 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
@@ -118,16 +109,6 @@ module Applocale
           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

data/lib/applocale/Core/init.rb

@@ -68,11 +68,11 @@ 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, setting.is_skip_empty_key)
+      parser = Applocale::ParseCSV.new(setting)
     when 'xlsx'
-      parser = Applocale::ParseXLSX.new(setting.platform, setting.xlsxpath, setting.lang_path_list, setting.sheet_obj_list, setting.is_skip_empty_key)
+      parser = Applocale::ParseXLSX.new(setting)
     end
-    ConvertToStrFile.convert(setting.platform, setting.lang_path_list,parser.result, setting.rubycode)
+    ConvertToStrFile.convert(setting, parser.result)
   end
 
   def self.start_reverse( is_skip, projpath = Dir.pwd)

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, :is_skip_empty_key
+      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, :injection
       def initialize(configfile_pathstr)
         self.configfile_pathstr = configfile_pathstr
         self.lang_path_list = Array.new

data/lib/applocale/Util/config_util.rb

@@ -3,6 +3,7 @@ require File.expand_path('../file_util.rb', __FILE__)
 require File.expand_path('../error_util.rb', __FILE__)
 require File.expand_path('../platform.rb', __FILE__)
 require File.expand_path('../../Core/setting.rb', __FILE__)
+require File.expand_path('../injection.rb', __FILE__)
 
 require 'pathname'
 
@@ -86,6 +87,8 @@ module Applocale
         isSkipEmptyKey = config_yaml['isSkipEmptyKey']
         setting = Applocale::Config::Setting.new(self.configfile_pathstr)
         setting.rubycode = rubycode
+        setting.injection = Applocale::Injection.load(rubycode)
+
         unless link.nil? || link.length == 0
           if (link =~ /^https/).nil? && (link =~ /^http/).nil?
             error = ErrorUtil::ConfigFileInValid.new("Invalid link for [link] : #{link}")

data/lib/applocale/Util/injection.rb

@@ -81,8 +81,9 @@ module Applocale
     end
 
     public
-    def load_is_skip_by_key(sheetname, lang, key)
-      return is_skip_by_key(sheetname, lang, key)
+    def load_is_skip_by_key(sheetname, key)
+      return is_skip_by_key(sheetname, key)
     end
+
   end
 end

data/lib/applocale/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: applocale
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Kennix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2019-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,9 +114,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.23
-description: It can convert file between string and xlsx, also support download xlsx
-  or csv from google. You can also setup conversion logic for string value of each
-  project. Support ios and android.
+description: Applocale is a localization tool, It can convert file between string
+  and xlsx ,csv, also support download xlsx or csv from google. You can also setup
+  conversion logic for string value of each project. Support ios, android and json
+  format.
 email:
 - kennixdev@gmail.com
 - johnwongapi@gmail.com
@@ -173,9 +174,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: for mobile application to manage locale
+summary: for mobile application to manage localization
 test_files: []
-has_rdoc: