applocale 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b646796e6550e90db34d2e04dc0307e866678f71
-  data.tar.gz: 0a4b6c15a6a6e5249bfad7e691bda976a8eb1b29
+  metadata.gz: c867fde40c4818fa8274896d0386329514bc356b
+  data.tar.gz: 572063f121578458ff781751eda3a4a5ca7104ca
 SHA512:
-  metadata.gz: 43a409329ac1701dde09c3a091273b206b9b79f0aa50cbf91af9ea0d033d91a1ce871c2b7ffea1dc761b90fd3f9f573840e243d4fa2adfc2492b1e1f5ff4ba02
-  data.tar.gz: 7e2977f7fde645c2067a15e0861c50d1d3e23c5ecf663f8e323dc74e64d47ade2fb3ac2a7e4004a36ce499ba1d33147f3f983bc87a786e50bea9948d96cac4aa
+  metadata.gz: e77ca0d49da189afc99bc5d94a16dc600c9bc53bde9bb26c99456e53a158059bb89f78bcb63ca503516a7ec4e98b260018221b73374bdf727bc6acc541a03f4c
+  data.tar.gz: 4fe91b4192ac5a3cb4b4d861a07f18cdf03bc039e3b8c4a27e0743d37143b41a736fe46dde4c85701f9675ac6401f9a6eef8d4137e55db4d91728122c2513d0e

data/lib/applocale/Command/init.rb

@@ -12,7 +12,7 @@ require 'thor'
 module Applocale
   class Command
     class Init < Thor
-      desc "init [platform]", "Create Config File, platform: ios | android"
+      desc "init [platform]", "Create Config File, platform: ios | android | json"
       option :path, :desc => "Project dir path"
       def init(platform = nil)
         Applocale.create_config_file(platform, options[:path])

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

@@ -38,9 +38,11 @@ module Applocale
       if @platform == Platform::IOS
         result = self.parse_ios
         write_to_xlsx(@xlsxpath, sheetobj, result[:errorlist], result[:content], result[:keylist])
-      else
+      elsif @platform == Platform::ANDROID
         result = self.parse_android
         write_to_xlsx(@xlsxpath, sheetobj, result[:errorlist], result[:content], result[:keylist])
+      else
+        ErrorUtil::CommandError.new('Platform not supported').raise
       end
     end
 

data/lib/applocale/Core/convert_to_localefile.rb

@@ -4,7 +4,7 @@ require File.expand_path('../../Util/regex_util.rb', __FILE__)
 require File.expand_path('../../Util/injection.rb', __FILE__)
 
 require 'colorize'
-
+require 'json'
 
 module Applocale
   class ConvertToStrFile
@@ -19,6 +19,8 @@ module Applocale
           self.convert_to_stringfile(platform, langpath_obj, sheetcontent_list, injectObj)
         elsif platform == Platform::ANDROID
           self.convert_to_xml(platform, langpath_obj, sheetcontent_list, injectObj)
+        elsif platform == Platform::JSON
+          self.convert_to_json(platform, langpath_obj, sheetcontent_list, injectObj)
         end
       end
       puts 'Convert Finished !!!'.green
@@ -62,6 +64,28 @@ module Applocale
       target.close
     end
 
+    def self.convert_to_json(platform, lang_path_obj, sheet_content_list, inject_obj)
+      FileUtils.mkdir_p(File.dirname(lang_path_obj.filepath))
+      hash = sheet_content_list.map do |sheet_content|
+        sheet_content.get_rowInfo_sortby_key.map do |row|
+          content = ContentUtil.remove_escaped_new_line(row.content_dict[lang_path_obj.lang])
+          value = add_escape(platform, lang_path_obj.lang, row.key_str, content, inject_obj)
+          [row.key_str, value]
+        end.to_h
+      end.reduce({}, :merge)
+      section_last_row = sheet_content_list
+                              .map {|sheet_content| sheet_content.get_rowInfo_sortby_key.last&.key_str }
+                              .compact
+                              .reverse
+                              .drop(1)
+                              .reverse
+      json = JSON.pretty_generate(hash)
+      section_last_row.each { |row| json.gsub!(/(.*)("#{row}")(.*)/, '\1\2\3' + "\n") }
+      target = open(lang_path_obj.filepath, 'w')
+      target.puts(json)
+      target.close
+    end
+
     def self.add_escape(platform, lang, key, content, injectObj)
       value = content
       if injectObj.has_before_convent_to_locale

data/lib/applocale/Core/init.rb

@@ -23,13 +23,13 @@ module Applocale
       elsif Dir.glob("#{proj_apath}/**/*.gradle").length > 0
         platformsybom = Platform::ANDROID
       else
-        Applocale::ErrorUtil::CommandError.new("Mssing [platform] : ios | android ").raise
+        Applocale::ErrorUtil::CommandError.new("Missing [platform] : ios | android | json").raise
       end
     else
       platformsybom = Platform.init(platformStr.strip)
     end
     if platformsybom.nil?
-      ErrorUtil::CommandError.new("Invalid [platform] : ios | android ").raise
+      ErrorUtil::CommandError.new("Invalid [platform] : ios | android | json").raise
     else
       Applocale::Config::ConfigUtil.create_configfile_ifneed(platformsybom,proj_apath.to_s )
     end

data/lib/applocale/Util/config_util.rb

@@ -100,7 +100,7 @@ module Applocale
           error_list.push(error)
         else
           if Platform.init(platform).nil?
-            error = ErrorUtil::ConfigFileInValid.new("[platform] can only be 'ios' or 'android' ")
+            error = ErrorUtil::ConfigFileInValid.new("[platform] can only be 'ios', 'android' or 'json'.")
             error_list.push(error)
           else
             setting.platform = Platform.init(platform)

data/lib/applocale/Util/file_util.rb

@@ -7,6 +7,7 @@ module Applocale
     DIRNAME_MAIN = 'AppLocale'
     DIRNAME_IOS = 'IOS'
     DIRNAME_ANDROID = 'Android'
+    DIRNAME_JSON = 'locales'
     FILENAME_CONFIG = 'AppLocaleFile'
     FILENAME_XLSX = 'string.xlsx'
     GOOGLE_CREDENTIALS = 'google_credentials.yaml'
@@ -42,6 +43,8 @@ module Applocale
         dirname = DIRNAME_IOS
       elsif platform == Platform::ANDROID
         dirname = DIRNAME_ANDROID
+      elsif platform == Platform::JSON
+        dirname = DIRNAME_JSON
       end
       unless dirname.nil?
         filename = Locale.filename(platform, lang)

data/lib/applocale/Util/lang.rb

@@ -12,6 +12,8 @@ module Applocale
         return !FILENAME_IOS[locale].nil? ? FILENAME_IOS[locale] : "#{locale}.strings"
       elsif devicemodel == Platform::ANDROID
         return File.join(FILENAME_ANDROID[locale],'strings.xml')
+      elsif devicemodel == Platform::JSON
+        return "#{locale}.json"
       end
       return nil
     end

data/lib/applocale/Util/platform.rb

@@ -3,12 +3,15 @@ module Applocale
   module Platform
     IOS = :ios
     ANDROID = :Android
+    JSON = :json
 
     def self.init(platform)
       if platform.upcase == 'IOS'
         return Platform::IOS
       elsif platform.upcase == 'ANDROID'
         return Platform::ANDROID
+      elsif platform.upcase == 'JSON'
+        return Platform::JSON
       end
       return nil
     end
@@ -24,6 +27,8 @@ module Applocale
         if extn.downcase == '.xml'
           return true
         end
+      elsif platform == Platform::JSON
+        return extn.downcase == '.json'
       end
       return false
     end

data/lib/applocale/Util/regex_util.rb

@@ -90,5 +90,16 @@ module Applocale
       new_value = new_value.gsub(/\t/, "\\t")
       return new_value
     end
+
+    def self.remove_escaped_new_line(content)
+      reg = /(?<!\\)((?:\\{2})+)*\\"/
+      new_value = content.gsub(reg) {|match|
+        match.slice!(0)
+        match
+      }
+      new_value
+          .gsub(/\\n/, "\n")
+          .gsub(/\\t/, "\t")
+    end
   end
 end

data/lib/applocale/version.rb

@@ -1,3 +1,3 @@
 module Applocale
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: applocale
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Kennix
@@ -173,9 +173,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: for mobile application to manage locale
 test_files: []
-has_rdoc: