singleton-ruby 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2e9bf60e2c6e5a1c59e1d0b25a9acb3d7f645c08aab5365d725895bd5a0c5f0
-  data.tar.gz: 54d2803ac84376f0df6223d9aa3d4eb1a553f8b93214acc1591c95566de5346d
+  metadata.gz: 978dd434bf07cb9ccc6966760af86f85259105512b5a4118474b859d43186cf6
+  data.tar.gz: 89629f003c872b85c49cb9b5fdcca99e5fedd51b7d10d6888f6c1246abf03da8
 SHA512:
-  metadata.gz: 1e8775d0142dddcfef46c2ba781ed0885f16854fccab273f2483f1fbd0e6744cc1a360d569f3e32c92acc40ebd001864c45448eeaa70443095952a81eab79b2d
-  data.tar.gz: 3b009b345f63e0c97fcbe983b15673ea82199264fef1135ac3e0922677bf07fd1695ba5c011ad5932730266cb08228dccb5d5ff68670289df80ae98f146a13cd
+  metadata.gz: 4692a75171757d89bc02f9daaef93486362d1eddd31e4d4f56d615bf1323034d5a8ca322f3ba7c8f170f8905da4e6064beaa04e6ce5d62323045b03655a0744a
+  data.tar.gz: 88c5610594c579322fc2fe3c33689e00330412351f4b82f3f782c9e55ef7eaab40f98c20123e1c8b985c3a6f74408e01b6e5d950aabd5f695205d9f6aad8be73

data/lib/sgtn-client/api/source.rb

@@ -7,12 +7,11 @@ module SgtnClient
 
   class Source
 
-      def self.getSource(component, key)
-        locale = "en"
+      def self.getSource(component, key, locale)
         cache_key = SgtnClient::CacheUtil.get_cachekey(component, locale)
         items = SgtnClient::CacheUtil.get_cache(cache_key)
         if items.nil?
-          items = getBundle(component)
+          items = getBundle(component, locale)
           SgtnClient.logger.debug "Putting sources items into cache with key: " + cache_key
           SgtnClient::CacheUtil.write_cache(cache_key, items)
         else
@@ -40,10 +39,10 @@ module SgtnClient
 
       private
 
-      def self.getBundle(component)
+      def self.getBundle(component, locale)
         env = SgtnClient::Config.default_environment
         source_bundle = SgtnClient::Config.configurations[env]["source_bundle"]
-        bundlepath = source_bundle  + "/" + component + "/en.yml"
+        bundlepath = source_bundle  + "/" + component + "/" + locale + ".yml"
         SgtnClient.logger.debug "Getting source from  bundle: " + bundlepath
         begin
           bundle = read_yml(bundlepath)

data/lib/sgtn-client/api/translation.rb

@@ -6,26 +6,27 @@ module SgtnClient
     autoload :Request,     "sgtn-client/core/request"
     autoload :Cache,       "sgtn-client/core/cache"
     autoload :CacheUtil,   "sgtn-client/util/cache-util"
+    autoload :LocaleUtil,   "sgtn-client/util/locale-util"
   end
   
   class Translation
 
       def self.getString(component, key, locale)
-        cache_key = SgtnClient::CacheUtil.get_cachekey(component, locale)
+        flocale = SgtnClient::LocaleUtil.fallback(locale)
+        cache_key = SgtnClient::CacheUtil.get_cachekey(component, flocale)
         items = SgtnClient::CacheUtil.get_cache(cache_key)
         if items.nil?
-          items = getTranslations(component, locale)
+          items = getTranslations(component, flocale)
           SgtnClient::CacheUtil.write_cache(cache_key, items)
         else
           SgtnClient.logger.debug "Getting translations from cache with key: " + cache_key
         end
-        if items.nil?
-          return SgtnClient::Source.getSource(component, key)
+        if items.nil? || items["messages"] == nil
+          return SgtnClient::Source.getSource(component, key, "default")
         end
-
         str = items["messages"][key]
         if str.nil?
-          return SgtnClient::Source.getSource(component, key)
+          return SgtnClient::Source.getSource(component, key, "default")
         else
           return str
         end
@@ -67,6 +68,7 @@ module SgtnClient
         SgtnClient.logger.debug "Getting translations from server: " + vip_server
         version = SgtnClient::Config.configurations[env]["version"].to_s
         url = vip_server + "/i18n/api/v2/translation/products/" + product_name + "/versions/" + version + "/locales/" + locale + "/components/" + component+ "?checkTranslationStatus=false&machineTranslation=false&pseudo=false"
+        SgtnClient.logger.debug url
         begin
           obj = SgtnClient::Core::Request.get(url)
         rescue => exception

data/lib/sgtn-client/sgtn-client.rb

@@ -9,6 +9,7 @@ module SgtnClient
       autoload :Logging,            "sgtn-client/core/logging"
       autoload :Exceptions,         "sgtn-client/core/exceptions"
       autoload :ValidateUtil,       "sgtn-client/util/validate-util"
+      autoload :LocaleUtil,         "sgtn-client/util/locale-util"
 
       class << self
             def configure(options = {}, &block)

data/lib/sgtn-client/util/cache-util.rb

@@ -14,6 +14,10 @@ module SgtnClient
         return items
       end
 
+      def self.clear_cache()
+        SgtnClient::Core::Cache.clear()
+      end
+
       def self.write_cache(cache_key, items)
         env = SgtnClient::Config.default_environment
         cache_expiry_period = SgtnClient::Config.configurations[env]["cache_expiry_period"]

data/lib/sgtn-client/util/locale-util.rb

@@ -0,0 +1,31 @@
+module SgtnClient
+
+    DEFAULT_LOCALES = ['en', 'de', 'es', 'fr', 'ko', 'ja', 'zh-Hans', 'zh-Hant']
+
+    MAP_LOCALES = {
+                    "zh-CN" =>"zh-Hans",
+                    "zh-TW" =>"zh-Hant",
+                    "zh-Hans-CN" =>"zh-Hans",
+                    "zh-Hant-TW" =>"zh-Hant",
+                  }
+
+    class LocaleUtil
+        def self.fallback(locale)
+            found = SgtnClient::DEFAULT_LOCALES.select {|e| e == locale}
+            if !found.empty?
+                return found[0]
+            end
+            if SgtnClient::MAP_LOCALES.key?(locale)
+                return SgtnClient::MAP_LOCALES[locale]
+            end
+            parts = locale.split("-")
+            if parts.size > 1
+                f = SgtnClient::DEFAULT_LOCALES.select {|e| e == parts[0]}
+                if !f.empty?
+                    return f[0]
+                end
+            end 
+            return locale
+        end
+    end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 
-    VERSION_INFO = [0, 0, 9].freeze
+    VERSION_INFO = [0, 1, 0].freeze
     VERSION = VERSION_INFO.map(&:to_s).join('.').freeze

data/spec/config/locales/default/JAVA/default.yml

@@ -0,0 +1,3 @@
+default:
+  hello: "Hello world"
+  com.vmware.loginsight.web.settings.stats.StatsTable.host: "Host"

data/spec/config/locales/l10n/bundles/logInsight/4.8.1/JAVA/messages_en.json

@@ -1,7 +1,7 @@
 {
   "component" : "JAVA",
   "messages" : {
-    "hello": "@hello@",
+    "hello": "Hello world",
     "com.vmware.loginsight.web.settings.stats.StatsTable.host" : "Host",
     "com.vmware.loginsight.web.settings.stats.StatsTableType.eventsIngestionRatePerSecond" : "Events Ingestion Rate (Per Second)",
     "com.vmware.loginsight.web.settings.stats.StatsTableType.eventsIngestionRatePerSecond.help" : "The actual ingestion rate (syslog + API) of each node after message rebalancing.<br />Log Insight nodes will rebalance messages to attempt uniform ingestion per node for balanced retention and performance.<br /><br />Note that the ingestion rate of each node must be below the ingestion rate configuration maximum for a node.<br /><br />For the actual rate of events being sent directly to each node prior to message rebalancing, see the Syslog Events Incoming Rate (Per Second) and API Events Incoming Rate (Per Second) tables below.",

data/spec/unit/cache_spec.rb

@@ -7,7 +7,7 @@ describe SgtnClient do
       env = SgtnClient::Config.default_environment
       SgtnClient::Config.configurations[env]["bundle_mode"] = 'online'
       SgtnClient::Config.configurations[env]["cache_expiry_period"] = 1
-      SgtnClient::Source.loadBundles("en")
+      SgtnClient::Source.loadBundles("default")
     end
 
     it "GETTranslation" do
@@ -15,7 +15,6 @@ describe SgtnClient do
       # get translation from server
       SgtnClient.logger.debug "----------Start to get translation from server---------"
       expect(SgtnClient::Translation.getString("JAVA", "com.vmware.loginsight.web.settings.stats.StatsTable.host", "zh-Hans")).to eq '主机'
-
       # get translation from cache
       SgtnClient.logger.debug "----------Start to get translation from cache---------"
       expect(SgtnClient::Translation.getString("JAVA", "com.vmware.loginsight.web.settings.stats.StatsTable.host", "zh-Hans")).to eq '主机'

data/spec/unit/locale_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe SgtnClient do
+  describe "Locale" do
+
+    before :each do
+    end
+
+    it "fallback" do
+      expect(SgtnClient::LocaleUtil.fallback('ja-JP')).to eq 'ja'
+      expect(SgtnClient::LocaleUtil.fallback('de-DE')).to eq 'de'
+      expect(SgtnClient::LocaleUtil.fallback('zh')).to eq 'zh'
+      expect(SgtnClient::LocaleUtil.fallback('zh-Hans')).to eq 'zh-Hans'
+      expect(SgtnClient::LocaleUtil.fallback('zh-Hant')).to eq 'zh-Hant'
+      expect(SgtnClient::LocaleUtil.fallback('zh-CN')).to eq 'zh-Hans'
+      expect(SgtnClient::LocaleUtil.fallback('zh-TW')).to eq 'zh-Hant'
+      expect(SgtnClient::LocaleUtil.fallback('zh-Hans-CN')).to eq 'zh-Hans'
+      expect(SgtnClient::LocaleUtil.fallback('zh-Hant-TW')).to eq 'zh-Hant'
+      expect(SgtnClient::LocaleUtil.fallback('kong-kong')).to eq 'kong-kong'
+    end
+  end
+
+end

data/spec/unit/offclient_spec.rb

@@ -6,7 +6,7 @@ describe SgtnClient do
     before :each do
       env = SgtnClient::Config.default_environment
       SgtnClient::Config.configurations[env]["bundle_mode"] = 'offline'
-      SgtnClient::Source.loadBundles("en")
+      SgtnClient::Source.loadBundles("default")
     end
 
     it "GET" do
@@ -15,10 +15,16 @@ describe SgtnClient do
       expect(SgtnClient::Translation.getString("JAVA", "com.vmware.loginsight.web.settings.stats.StatsTable.host", "zh-Hans")).to eq '主机'
     end
 
+    it "GET_EN" do
+      expect(SgtnClient::Translation.getString("JAVA", "hello", "en")).to eq 'Hello world'
+      # get from cache in 2nd time
+      expect(SgtnClient::Translation.getString("JAVA", "hello", "en")).to eq 'Hello world'
+    end
+
     it "GET_zh_CN" do
-      expect(SgtnClient::Translation.getString("JAVA", "com.vmware.loginsight.web.settings.stats.StatsTable.host", "zh_CN")).to eq '主机'
+      expect(SgtnClient::Translation.getString("JAVA", "com.vmware.loginsight.web.settings.stats.StatsTable.host", "zh-CN")).to eq '主机'
       # get from cache in 2nd time
-      expect(SgtnClient::Translation.getString("JAVA", "com.vmware.loginsight.web.settings.stats.StatsTable.host", "zh_CN")).to eq '主机'
+      expect(SgtnClient::Translation.getString("JAVA", "com.vmware.loginsight.web.settings.stats.StatsTable.host", "zh-CN")).to eq '主机'
     end
 
     it "NonExistingKey" do

data/spec/unit/{restclient_spec.rb → onclient_spec.rb}

@@ -5,8 +5,15 @@ describe SgtnClient do
 
     before :each do
       env = SgtnClient::Config.default_environment
+      SgtnClient::CacheUtil.clear_cache()
       SgtnClient::Config.configurations[env]["bundle_mode"] = 'online'
-      SgtnClient::Source.loadBundles("en")
+      SgtnClient::Source.loadBundles("default")
+    end
+
+    it "GET_EN" do
+      expect(SgtnClient::Translation.getString("JAVA", "hello", "en")).to eq 'Hello world'
+      # get from cache in 2nd time
+      expect(SgtnClient::Translation.getString("JAVA", "hello", "en")).to eq 'Hello world'
     end
 
     it "GET" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singleton-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -267,16 +267,16 @@ files:
 - lib/sgtn-client/core/request.rb
 - lib/sgtn-client/sgtn-client.rb
 - lib/sgtn-client/util/cache-util.rb
+- lib/sgtn-client/util/locale-util.rb
 - lib/sgtn-client/util/validate-util.rb
 - lib/singleton-ruby.rb
 - lib/version.rb
-- spec/config/locales/default/JAVA/en.yml
+- spec/config/locales/default/JAVA/default.yml
 - spec/config/locales/l10n/bundles/logInsight/4.8.1/JAVA/messages_de.json
 - spec/config/locales/l10n/bundles/logInsight/4.8.1/JAVA/messages_en.json
 - spec/config/locales/l10n/bundles/logInsight/4.8.1/JAVA/messages_latest.json
 - spec/config/locales/l10n/bundles/logInsight/4.8.1/JAVA/messages_zh-Hans.json
 - spec/config/locales/l10n/bundles/logInsight/4.8.1/JAVA/messages_zh-Hant.json
-- spec/config/locales/l10n/bundles/logInsight/4.8.1/JAVA/messages_zh_CN.json
 - spec/config/locales/l10n/bundles/logInsight/4.8.1/creation.json
 - spec/config/locales/l10n/bundles/logInsight/4.8.1/version.json
 - spec/config/sample_data.yml
@@ -288,9 +288,10 @@ files:
 - spec/unit/cache_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/inconfig_spec.rb
+- spec/unit/locale_spec.rb
 - spec/unit/logging_spec.rb
 - spec/unit/offclient_spec.rb
-- spec/unit/restclient_spec.rb
+- spec/unit/onclient_spec.rb
 - spec/unit/version_spec.rb
 homepage: https://github.com/vmware/singleton
 licenses:
@@ -311,18 +312,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Singleton client for Ruby.
 test_files:
-- spec/config/locales/default/JAVA/en.yml
+- spec/config/locales/default/JAVA/default.yml
 - spec/config/locales/l10n/bundles/logInsight/4.8.1/JAVA/messages_de.json
 - spec/config/locales/l10n/bundles/logInsight/4.8.1/JAVA/messages_en.json
 - spec/config/locales/l10n/bundles/logInsight/4.8.1/JAVA/messages_latest.json
 - spec/config/locales/l10n/bundles/logInsight/4.8.1/JAVA/messages_zh-Hans.json
 - spec/config/locales/l10n/bundles/logInsight/4.8.1/JAVA/messages_zh-Hant.json
-- spec/config/locales/l10n/bundles/logInsight/4.8.1/JAVA/messages_zh_CN.json
 - spec/config/locales/l10n/bundles/logInsight/4.8.1/creation.json
 - spec/config/locales/l10n/bundles/logInsight/4.8.1/version.json
 - spec/config/sample_data.yml
@@ -334,7 +334,8 @@ test_files:
 - spec/unit/cache_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/inconfig_spec.rb
+- spec/unit/locale_spec.rb
 - spec/unit/logging_spec.rb
 - spec/unit/offclient_spec.rb
-- spec/unit/restclient_spec.rb
+- spec/unit/onclient_spec.rb
 - spec/unit/version_spec.rb

data/spec/config/locales/default/JAVA/en.yml

@@ -1,2 +0,0 @@
-en:
-  hello: "Hello world"

data/spec/config/locales/l10n/bundles/logInsight/4.8.1/JAVA/messages_zh_CN.json

@@ -1,11 +0,0 @@
-{
-  "component" : "JAVA",
-  "messages" : {
-    "com.vmware.loginsight.web.settings.stats.StatsTable.host" : "主机",
-    "com.vmware.loginsight.web.settings.stats.StatsTableType.eventsIngestionRatePerSecond" : "事件载入速率 (每秒)",
-    "com.vmware.loginsight.web.settings.stats.StatsTableType.eventsIngestionRatePerSecond.help" : "消息再平衡之后每个节点的实际载入速率 (syslog + API)。<br />Log Insight 节点将再平衡消息以尝试每节点的统一载入，从而实现平衡保留和性能。<br /><br />请注意，每个节点的载入速率必须低于配置的最大节点载入速率。<br /><br />有关消息再平衡之前直接发送到每个节点的事件的实际速率，请参见下述“Syslog 事件入站速率 (每秒)”和“API 事件入站速率 (每秒)”表。",
-    "com.vmware.loginsight.web.settings.stats.StatsTableType.syslogEventsIncomingRatePerSecond" : "Syslog 事件入站速率 (每秒)",
-    "com.vmware.loginsight.web.utilities.EmailUtil.upgrade.body48" : "{0} 现在正在运行版本 {1}。下面是 {1} 版本中新增的一些出色功能。我们感谢您一如既往地支持，同时非常重视您通过 Twitter 针对我们的 {3} 和 {4} 提供的反馈。<br /><br /><b>vRealize Log Insight 服务器功能</b><br />• TODO 增加服务器功能。<br /><br /><b>vRealize Log Insight 代理功能</b><br />• TODO 增加代理功能。<br /><br />有关 {0} 的新功能的详细信息，请查看 {0} v{1} {2}。<br /><br />祝您使用愉快!<br />{0} 团队<br /><br />"
-  },
-  "locale" : "zh-Hans"
-}