applocale 0.1.6 → 0.2.0

data/lib/applocale/Util/error_util.rb

@@ -1,4 +1,5 @@
 require 'colorize'
+require File.expand_path('../file_util.rb', __FILE__)
 
 module Applocale
   module ErrorUtil
@@ -25,7 +26,7 @@ module Applocale
     class ConfigFileInValid < CommonError
       def self.raiseArr(list = nil)
         if !list.nil? && list.length > 0
-          puts "*** ConfigError ***".red
+          puts "*** ConfigFile Error ***".red
           list.each do |err|
             puts "#{err.message}".red
           end
@@ -105,7 +106,7 @@ module Applocale
         end
 
         def message
-          "DuplicateKey [#{self.rowinfo.key_str}] - #{self.msg} : duplicateWithSheet: #{self.duplicate_sheetname} Row: #{self.duplicate_rowno+1}"
+          "DuplicateKey [#{self.rowinfo.key_str}] - #{self.msg} : duplicateWithSheet: #{self.duplicate_sheetname} Row: #{self.duplicate_rowno}"
         end
       end
 

data/lib/applocale/Util/file_util.rb

@@ -3,58 +3,57 @@ require File.expand_path('../lang.rb', __FILE__)
 require 'pathname'
 
 module Applocale
-  class FileUtil
+  class FilePathUtil
     DIRNAME_MAIN = 'AppLocale'
     DIRNAME_IOS = 'IOS'
     DIRNAME_ANDROID = 'Android'
-    FILENAME_CONFIG = 'AppLocaleFile.yaml'
+    FILENAME_CONFIG = 'AppLocaleFile'
     FILENAME_XLSX = 'string.xlsx'
+    GOOGLE_CREDENTIALS = 'google_credentials.yaml'
 
-    def self.filename_config
-      return FILENAME_CONFIG
+    def self.get_proj_absoluat_path(proj_path)
+      path = proj_path
+      if !(Pathname.new proj_path).absolute?
+        path = File.expand_path(proj_path,Dir.pwd)
+      end
+      return path
+    end
+
+    def self.default_google_credentials_filename
+      return GOOGLE_CREDENTIALS
     end
 
-    def self.mainfolder_pathstr
-      pathstr = File.join(Dir.pwd, DIRNAME_MAIN)
-      Dir.mkdir pathstr unless File.exist?(pathstr)
-      return pathstr
+    def self.default_config_filename
+      return FILENAME_CONFIG
     end
 
-    def self.configfile_pathstr
-      filename = FILENAME_CONFIG
-      pathstr = File.join(self.mainfolder_pathstr, filename)
-      return pathstr
+    def self.default_mainfolder
+      return DIRNAME_MAIN
     end
-    #
-    # def self.create_configfile_ifneed(platform)
-    #   pathstr = self.configfile_pathstr
-    #   ConfigUtil.create_configfile(platform, pathstr) unless File.exist?(pathstr)
-    # end
 
-    def self.get_default_localefile_relative_pathstr(platform, lang)
+    def self.default_localefile_relative_pathstr(platform, lang)
       if platform == Platform::IOS
         dirname = DIRNAME_IOS
       elsif platform == Platform::ANDROID
         dirname = DIRNAME_ANDROID
       end
       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.configfile_pathstr))
-        return filepath.relative_path_from(configfilepath).to_s
+        return "#{dirname}/#{filename}"
       end
       return nil
     end
 
-    def self.get_default_xlsx_relativepath_str
+    def self.default_xlsx_relativepath_str
       filename = FILENAME_XLSX
-      pathstr = File.join(self.mainfolder_pathstr, filename)
-      filepath = Pathname.new(pathstr)
-      configfilepath = Pathname.new(File.dirname(self.configfile_pathstr))
-      return filepath.relative_path_from(configfilepath).to_s
+      return filename
+    end
+
+    def self.str_to_folderpathstr(str)
+      pathstr = Pathname.new(str.strip)
+      if File.directory?(pathstr)
+        pathstr = File.join(self.configfile_pathstr, FilePathUtil.default_config_filename).to_s
+      end
     end
   end
 end

data/lib/applocale/Util/injection.rb

@@ -0,0 +1,79 @@
+
+
+module Applocale
+  class Injection
+    def self.load(rubycode)
+      obj = Applocale::Injection.new()
+      obj.load(rubycode)
+      return obj
+    end
+
+    def load(rubycode)
+      if !rubycode.nil?
+        eval rubycode
+      end
+    end
+
+    public
+    def has_convent_to_locale
+      return defined?(convent_to_locale) == 'method'
+    end
+
+    public
+    def load_convent_to_locale(lang, key, value)
+      return convent_to_locale(lang, key, value)
+    end
+
+    public
+    def has_before_convent_to_locale
+      return defined?(before_convent_to_locale) == 'method'
+    end
+
+    public
+    def load_before_convent_to_locale(lang, key, value)
+      return before_convent_to_locale(lang, key, value)
+    end
+
+    public
+    def has_after_convent_to_locale
+      return defined?(after_convent_to_locale) == 'method'
+    end
+
+    public
+    def load_after_convent_to_locale(lang, key, value)
+      return after_convent_to_locale(lang, key, value)
+    end
+
+    #
+    public
+    def has_parse_from_locale
+      return defined?(parse_from_locale) == 'method'
+    end
+
+    public
+    def load_parse_from_locale(lang, key, value)
+      return parse_from_locale(lang, key, value)
+    end
+
+    public
+    def has_before_parse_from_locale
+      return defined?(before_parse_from_locale) == 'method'
+    end
+
+    public
+    def load_before_parse_from_locale(lang, key, value)
+      return before_parse_from_locale(lang, key, value)
+    end
+
+    public
+    def has_after_parse_from_locale
+      return defined?(after_parse_from_locale) == 'method'
+    end
+
+    public
+    def load_after_parse_from_locale(lang, key, value)
+      return after_parse_from_locale(lang, key, value)
+    end
+
+  end
+end

data/lib/applocale/Util/regex_util.rb

@@ -37,33 +37,35 @@ module Applocale
     end
 
     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|
-        match.slice!(0)
-        match
-      }
+      new_value = content
+      new_value = new_value.gsub(/'/, "\\'")
       reg = /(?<!\\)((?:\\{2})+)*(\\r)/
       new_value = new_value.gsub(reg) {|match|
         match.slice!(-1)
         match + 'n'
       }
+      reg = /(?<!\\)((?:\\{2})+)"|(?<!\\)"|^"/
+      new_value = new_value.gsub(reg) {|match|
+        "\\" + match
+      }
       new_value = new_value.gsub(/&/, '&amp;')
+      new_value = new_value.gsub(/%@/, '%s')
       new_value = new_value.gsub(/</, '&lt;')
-      # new_value = new_value.gsub(/>/, "&gt;")
+      new_value = new_value.gsub(/>/, '&gt;')
       return new_value
     end
 
     def self.remove_escaped_android(content)
-      new_value = content.gsub(/&lt;/, '<')
-      new_value = new_value.gsub(/&amp;/, '&')
-      puts "test=#{content}==#{new_value}"
+      new_value = content
+      new_value = new_value.gsub(/%s/, '%@')
+      new_value = new_value.gsub(/\\'/, "'")
       return new_value
     end
 
     def self.add_escaped_double_quote(content)
+      new_value = content
       reg = /(?<!\\)((?:\\{2})+)"|(?<!\\)"|^"/
-      new_value = content.gsub(reg) {|match|
+      new_value = new_value.gsub(reg) {|match|
           "\\" + match
       }
       return new_value
@@ -89,32 +91,4 @@ module Applocale
       return new_value
     end
   end
-end
-
-# test = "aasb\\c"
-# new = test.slice(-1)
-# test.slice!(-2)
-# puts test
-# puts new
-
-# ex = "\\"
-# qu = "&"
-#
-# (0..10).each do |i|
-#   test = ([ex]*i).join("") + qu + "abcd" + ([ex]*i).join("") + qu + "def"
-#   puts "#{test}"
-#   puts Applocale::ContentUtil.addEscapedForAndroid(test)
-#   puts "------------------------------------"
-# end
-
-
-#
-# #
-# #
-# # test = qu
-# # test1 = ex + qu
-# # test2 = ex + ex + qu
-# # test3 = ex + ex + ex + qu
-# # test4 = ex + ex + ex + ex + qu
-# #
-# # Applocale::ContentUtil.removeEscapeFroXlsx(test)
+end

data/lib/applocale/version.rb

@@ -1,3 +1,3 @@
 module Applocale
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,121 +1,121 @@
 --- !ruby/object:Gem::Specification
 name: applocale
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Kennix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.19.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.19.4
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.3.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.3.23
 description: It can convert file between string and xlsx, also support download xlsx
-  from google
+  from google. You can also setup conversion logic for string value of each project
 email:
 - kennixdev@gmail.com
 executables:
@@ -125,9 +125,12 @@ extra_rdoc_files: []
 files:
 - exe/applocale
 - lib/applocale.rb
-- lib/applocale/AppLocaleFile.yaml
+- lib/applocale/AppLocaleFile
 - lib/applocale/Command/init.rb
 - lib/applocale/Core/Compare/compare_xlsx_str.rb
+- lib/applocale/Core/FindStrKey/find_str_key.rb
+- lib/applocale/Core/FindStrKey/find_str_key_ios.rb
+- lib/applocale/Core/FindStrKey/find_str_key_result.rb
 - lib/applocale/Core/GoogleHepler/client_secret.json
 - lib/applocale/Core/GoogleHepler/google_helper.rb
 - lib/applocale/Core/ParseXLSX/parse_xlsx.rb
@@ -141,6 +144,7 @@ files:
 - lib/applocale/Util/config_util.rb
 - lib/applocale/Util/error_util.rb
 - lib/applocale/Util/file_util.rb
+- lib/applocale/Util/injection.rb
 - lib/applocale/Util/lang.rb
 - lib/applocale/Util/platform.rb
 - lib/applocale/Util/regex_util.rb
@@ -155,17 +159,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: for mobile application to manage locale