singleton-ruby 0.0.9 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2e9bf60e2c6e5a1c59e1d0b25a9acb3d7f645c08aab5365d725895bd5a0c5f0
-  data.tar.gz: 54d2803ac84376f0df6223d9aa3d4eb1a553f8b93214acc1591c95566de5346d
+  metadata.gz: c2e092b1d69a9639d976877f5ad64486ebe37a6d64bdaef84f1aa10a1424ae6e
+  data.tar.gz: 42f5c443bf2e9a20004ba147586de5088d9fdb1a7cd56b422f0b8fff85ea82ec
 SHA512:
-  metadata.gz: 1e8775d0142dddcfef46c2ba781ed0885f16854fccab273f2483f1fbd0e6744cc1a360d569f3e32c92acc40ebd001864c45448eeaa70443095952a81eab79b2d
-  data.tar.gz: 3b009b345f63e0c97fcbe983b15673ea82199264fef1135ac3e0922677bf07fd1695ba5c011ad5932730266cb08228dccb5d5ff68670289df80ae98f146a13cd
+  metadata.gz: 4e269b9d4dc398a51491bcaa8c71304c360cc082cce8bc6f49ca07ddd7d72849f26341d65d1700e452eb5976197eb5a95542f09e9bf1aa595e2448becd894353
+  data.tar.gz: d8230f6464e7c1c4f940665f55bfb0fdb577553c980b844ecd45803e77ee3ca4ffdf346c67deec784daf17d94fc2bd2cbbdf2ed8e4b9eb565f24a12d3191f788

data/README.md

@@ -7,5 +7,31 @@
 ## Run Unit Test
 rake spec:unit
 
+## Usage
+
+Basic Usage:
+
+```ruby
+require 'singleton-ruby'
+
+include SgtnClient
+
+SgtnClient.load(file, mode)
+
+SgtnClient::Source.loadBundles(locale)
+
+@Result = SgtnClient::Translation.getString(component, key, locale)
+
+```
+## API
+
+### Get a string's translation
+SgtnClient::Translation.getString(component, key, locale)
+
+### Get a string's translation and format it with placeholders
+SgtnClient::Translation.getString_F(component, key, args, locale)
+
+
+
 
 

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
@@ -25,8 +24,22 @@ module SgtnClient
         return str
       end
 
+      def self.getSources(component, locale)
+        cache_key = SgtnClient::CacheUtil.get_cachekey(component, locale)
+        items = SgtnClient::CacheUtil.get_cache(cache_key)
+        if items.nil?
+          items = getBundle(component, locale)
+          SgtnClient.logger.debug "Putting sources items into cache with key: " + cache_key
+          SgtnClient::CacheUtil.write_cache(cache_key, items)
+        else
+          SgtnClient.logger.debug "Getting sources from cache with key: " + cache_key
+        end
+        return items
+      end
+
       def self.loadBundles(locale)
         env = SgtnClient::Config.default_environment
+        SgtnClient::Config.configurations.default = locale
         source_bundle = SgtnClient::Config.configurations[env]["source_bundle"]
         SgtnClient.logger.debug "Loading [" + locale + "] bundles from path: " + source_bundle
         Dir.children(source_bundle).each do |component|
@@ -40,10 +53,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,32 +6,61 @@ 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)
-        end
 
+        default = SgtnClient::Config.configurations.default
+        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
+       end
 
+      def self.getString_f(component, key, args, locale)
+         s = getString(component, key, locale)
+         puts 1111
+         puts SgtnClient::Config.configurations.default
+         puts s
+         return s % args
       end
 
+      def self.getStrings(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, flocale)
+          SgtnClient::CacheUtil.write_cache(cache_key, items)
+        else
+          SgtnClient.logger.debug "Getting translations from cache with key: " + cache_key
+        end
+
+        default = SgtnClient::Config.configurations.default
+        if items.nil? || items["messages"] == nil
+          items = SgtnClient::Source.getSources(component, default)
+        end
+        return items
+       end
+
+
       private
 
       def self.getTranslations(component, locale)
@@ -67,6 +96,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/core/config.rb

@@ -65,13 +65,6 @@ module SgtnClient
     class << self
 
         @@config_cache = {}
-  
-        # Load configurations from file
-        # === Arguments
-        # * <tt>file_name</tt>             -- Configuration file path
-        # * <tt>default_environment</tt> (Optional)    -- default environment configuration to load
-        # === Example
-        #   Config.load('config/paypal.yml', 'development')
         def load(file_name, default_env = default_environment)
           @@config_cache        = {}
           @@configurations      = read_configurations(file_name)

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

@@ -14,7 +14,7 @@ module SgtnClient
       def to_s
         begin
           response_body = JSON.parse(response.body)
-          debug_id = response["paypal-debug-id"]
+          debug_id = response["sgtn-debug-id"]
           debug_id = response["correlation-id"] if debug_id.to_s == ''
           debug_id = response_body["debug_id"] if debug_id.to_s == ''
         rescue

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, 3].freeze
     VERSION = VERSION_INFO.map(&:to_s).join('.').freeze

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

@@ -0,0 +1,5 @@
+default:
+  helloworld: "Hello world"
+  hello: "Hello"
+  welcome: "%s, welcome login %s!"
+  login: "%s login %s!"

data/spec/config/locales/l10n/bundles/test/4.8.1/JAVA/messages_de.json

@@ -0,0 +1,8 @@
+{
+  "component" : "JAVA",
+  "messages" : {
+    "helloworld" : "Hallo Welt",
+    "welcome":     "%s, Willkommen in der %s des Logins!!"
+  },
+  "locale" : "de"
+}

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

@@ -0,0 +1,8 @@
+{
+  "component" : "JAVA",
+  "messages" : {
+    "helloworld" : "Hello world",
+    "welcome":     "%s, welcome login %s!"
+  },
+  "locale" : "en"
+}

data/spec/config/locales/l10n/bundles/test/4.8.1/JAVA/messages_latest.json

@@ -0,0 +1,8 @@
+{
+  "component" : "JAVA",
+  "messages" : {
+    "helloworld" : "Hello world",
+    "welcome":     "%s, welcome login %s!"
+  },
+  "locale" : "latest"
+}

data/spec/config/locales/l10n/bundles/test/4.8.1/JAVA/messages_zh-Hans.json

@@ -0,0 +1,8 @@
+{
+  "component" : "JAVA",
+  "messages" : {
+    "helloworld" : "你好世界",
+    "welcome":     "%s，欢迎登录%s！"
+  },
+  "locale" : "zh-Hans"
+}

data/spec/config/locales/l10n/bundles/test/4.8.1/JAVA/messages_zh-Hant.json

@@ -0,0 +1,8 @@
+{
+  "component" : "JAVA",
+  "messages" :  {
+    "helloworld" : "你好，世界",
+    "welcome":     "%s，歡迎登錄%s！"
+  },
+  "locale" : "zh-Hant"
+}

data/spec/config/sgtnclient-invalidate.yml

@@ -1,9 +1,5 @@
 test: &default
 
-  # Credentials for REST APIs
-  client_id: tee
-  client_secret: 89987
-
   # Mode can be 'live' or 'sandbox'
   mode: sandbox1
 
@@ -14,16 +10,16 @@ test: &default
   signature: sfds-RWy
   # # With Certificate
   # cert_path: "config/cert_key.pem"
-  sandbox_email_address: linr@vmware.com
+  sandbox_email_address: linr@aa.com
 
   # #Product Name
-  product_name: logInsight
+  product_name: test
 
   # # bundle version
   version: 4.8
 
   # # HTTP Proxy
-  vip_server: https://g11n-vip-dev-1.eng.vmware.com:8090
+  vip_server: https://server:8090
 
   # # mode of bundle: online/offline
   bundle_mode: offline1www

data/spec/config/sgtnclient.yml

@@ -1,9 +1,5 @@
 test: &default
 
-  # Credentials for REST APIs
-  client_id: tee
-  client_secret: 89987
-
   # Mode can be 'live' or 'sandbox'
   mode: sandbox
 
@@ -14,16 +10,16 @@ test: &default
   signature: sfds-RWy
   # # With Certificate
   # cert_path: "config/cert_key.pem"
-  sandbox_email_address: linr@vmware.com
+  sandbox_email_address: linr@aa.com
 
   # #Product Name
-  product_name: logInsight
+  product_name: test
 
   # # bundle version
   version: 4.8.1
 
   # # HTTP Proxy
-  vip_server: https://g11n-vip-dev-1.eng.vmware.com:8090
+  vip_server: https://server:8090
 
   # # mode of bundle: online/offline
   bundle_mode: offline

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'bundler/setup'
 require_relative '../lib/sgtn-client/sgtn-client.rb'
-require 'twitter_cldr'
+require 'logger'
 
 if ENV['COVERAGE']
   require 'simplecov'
@@ -12,29 +12,22 @@ if ENV['COVERAGE']
 end
 
 Bundler.require :default, :test
-#SgtnClient.load("./spec/config/sgtnclient.yml", "test")
-
-#require 'SgtnClient'
 
 include SgtnClient
 include SgtnClient::Logging
 include SgtnClient::Exceptions
 
-require 'logger'
-
 SgtnClient.load("./spec/config/sgtnclient.yml", "test", './sgtnclient.log')
 
 Dir[File.expand_path("../support/**/*.rb", __FILE__)].each {|f| require f }
 
 # Set logger for http
 http_log = File.open(File.expand_path('../log/http.log', __FILE__), "w")
-#Payment.api.http.set_debug_output(http_log)
 
 RSpec.configure do |config|
   config.filter_run_excluding :integration => true
   config.filter_run_excluding :disabled => true
   config.include SampleData
-  # config.include PayPal::SDK::REST::DataTypes
 end
 
 WebMock.allow_net_connect!

data/spec/unit/cache_spec.rb

@@ -5,20 +5,19 @@ describe SgtnClient do
 
     before :each do
       env = SgtnClient::Config.default_environment
-      SgtnClient::Config.configurations[env]["bundle_mode"] = 'online'
+      SgtnClient::Config.configurations[env]["bundle_mode"] = 'offline'
       SgtnClient::Config.configurations[env]["cache_expiry_period"] = 1
-      SgtnClient::Source.loadBundles("en")
+      SgtnClient::Source.loadBundles("default")
     end
 
     it "GETTranslation" 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 '主机'
-
+      expect(SgtnClient::Translation.getString("JAVA", "helloworld", "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 '主机'
+      expect(SgtnClient::Translation.getString("JAVA", "helloworld", "zh-Hans")).to eq '你好世界'
 
       # get from server again after data is expired
       SgtnClient.logger.debug "----------Sleep 70s---------"
@@ -26,7 +25,7 @@ describe SgtnClient do
       #sleep 70
       puts Time.now
       SgtnClient.logger.debug "----------Start to get translation from expired cache---------"
-      expect(SgtnClient::Translation.getString("JAVA", "com.vmware.loginsight.web.settings.stats.StatsTable.host", "zh-Hans")).to eq '主机'
+      expect(SgtnClient::Translation.getString("JAVA", "helloworld", "zh-Hans")).to eq '你好世界'
 
       SgtnClient.logger.debug "----------End to get translation from server---------"
     end

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,25 +6,47 @@ 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
-      expect(SgtnClient::Translation.getString("JAVA", "com.vmware.loginsight.web.settings.stats.StatsTable.host", "zh-Hans")).to eq '主机'
+      expect(SgtnClient::Translation.getString("JAVA", "helloworld", "zh-Hans")).to eq '你好世界'
       # get from cache in 2nd time
-      expect(SgtnClient::Translation.getString("JAVA", "com.vmware.loginsight.web.settings.stats.StatsTable.host", "zh-Hans")).to eq '主机'
+      expect(SgtnClient::Translation.getString("JAVA", "helloworld", "zh-Hans")).to eq '你好世界'
+
+      expect(SgtnClient::Translation.getString_f("JAVA", "welcome", ["机器人", "虚拟世界"], "zh-Hans")).to eq '机器人，欢迎登录虚拟世界！'
+      # get from cache in 2nd time
+      expect(SgtnClient::Translation.getString_f("JAVA", "welcome", ["机器人", "虚拟世界"], "zh-Hans")).to eq '机器人，欢迎登录虚拟世界！'    
+    end
+
+    it "GET_EN" do
+      expect(SgtnClient::Translation.getString("JAVA", "hello", "en")).to eq 'Hello'
+      # get from cache in 2nd time
+      expect(SgtnClient::Translation.getString("JAVA", "hello", "en")).to eq 'Hello'
     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", "helloworld", "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", "helloworld", "zh-CN")).to eq '你好世界'
     end
 
     it "NonExistingKey" do
-      expect(SgtnClient::Translation.getString("JAVA", "hello", "zh-Hans")).to eq 'Hello world'
+      expect(SgtnClient::Translation.getString("JAVA", "hello", "zh-Hans")).to eq 'Hello'
+      # get from cache in 2nd time
+      expect(SgtnClient::Translation.getString("JAVA", "hello", "zh-Hans")).to eq 'Hello'
+
+      expect(SgtnClient::Translation.getString_f("JAVA", "login", ["Robot", "VM"], "zh-Hans")).to eq 'Robot login VM!'
+      # get from cache in 2nd time
+      expect(SgtnClient::Translation.getString_f("JAVA", "login", ["Robot", "VM"], "zh-Hans")).to eq 'Robot login VM!'    
+    end
+
+    it "Component" do
+      jsonObj = SgtnClient::Translation.getStrings("JAVA", "zh-Hans");
+      expect(jsonObj["component"]).to eq 'JAVA'
       # get from cache in 2nd time
-      expect(SgtnClient::Translation.getString("JAVA", "hello", "zh-Hans")).to eq 'Hello world'
+      jsonObj_c = SgtnClient::Translation.getStrings("JAVA", "zh-Hans");
+      expect(jsonObj_c["component"]).to eq 'JAVA'
     end
   end
 

data/spec/unit/onclient_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe SgtnClient do
+  describe "OnlineAPI" do
+
+    before :each do
+      env = SgtnClient::Config.default_environment
+      SgtnClient::CacheUtil.clear_cache()
+      SgtnClient::Config.configurations[env]["bundle_mode"] = 'offline'
+      SgtnClient::Source.loadBundles("default")
+    end
+
+    it "GET_EN" do
+      expect(SgtnClient::Translation.getString("JAVA", "helloworld", "en")).to eq 'Hello world'
+      # get from cache in 2nd time
+      expect(SgtnClient::Translation.getString("JAVA", "helloworld", "en")).to eq 'Hello world'
+    end
+
+    it "GET" do
+      expect(SgtnClient::Translation.getString("JAVA", "helloworld", "zh-Hans")).to eq '你好世界'
+      # get from cache in 2nd time
+      expect(SgtnClient::Translation.getString("JAVA", "helloworld", "zh-Hans")).to eq '你好世界'
+    end
+
+    it "NonExistingKey" do
+      expect(SgtnClient::Translation.getString("JAVA", "hello", "zh-Hans")).to eq 'Hello'
+      # get from cache in 2nd time
+      expect(SgtnClient::Translation.getString("JAVA", "hello", "zh-Hans")).to eq 'Hello'
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singleton-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.3
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2021-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -202,20 +202,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -244,8 +230,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.6'
-description: A Singleton client for Ruby
-email: li@vmware.com
+description: Singleton Ruby client
+email: g11n-vip-project@vmware.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -254,10 +240,6 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- lib/generators/sgtnclient/USAGE
-- lib/generators/sgtnclient/install_generator.rb
-- lib/generators/sgtnclient/templates/sgtnclient.rb
-- lib/generators/sgtnclient/templates/sgtnclient.yml
 - lib/sgtn-client/api/source.rb
 - lib/sgtn-client/api/translation.rb
 - lib/sgtn-client/core/cache.rb
@@ -267,18 +249,18 @@ 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/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/locales/default/JAVA/default.yml
+- spec/config/locales/l10n/bundles/test/4.8.1/JAVA/messages_de.json
+- spec/config/locales/l10n/bundles/test/4.8.1/JAVA/messages_en.json
+- spec/config/locales/l10n/bundles/test/4.8.1/JAVA/messages_latest.json
+- spec/config/locales/l10n/bundles/test/4.8.1/JAVA/messages_zh-Hans.json
+- spec/config/locales/l10n/bundles/test/4.8.1/JAVA/messages_zh-Hant.json
+- spec/config/locales/l10n/bundles/test/4.8.1/creation.json
+- spec/config/locales/l10n/bundles/test/4.8.1/version.json
 - spec/config/sample_data.yml
 - spec/config/sgtnclient-invalidate.yml
 - spec/config/sgtnclient.yml
@@ -288,13 +270,14 @@ 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:
-- MIT
+- EPL
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -311,20 +294,19 @@ 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.
+summary: Singleton Ruby client
 test_files:
-- spec/config/locales/default/JAVA/en.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/locales/default/JAVA/default.yml
+- spec/config/locales/l10n/bundles/test/4.8.1/JAVA/messages_de.json
+- spec/config/locales/l10n/bundles/test/4.8.1/JAVA/messages_en.json
+- spec/config/locales/l10n/bundles/test/4.8.1/JAVA/messages_latest.json
+- spec/config/locales/l10n/bundles/test/4.8.1/JAVA/messages_zh-Hans.json
+- spec/config/locales/l10n/bundles/test/4.8.1/JAVA/messages_zh-Hant.json
+- spec/config/locales/l10n/bundles/test/4.8.1/creation.json
+- spec/config/locales/l10n/bundles/test/4.8.1/version.json
 - spec/config/sample_data.yml
 - spec/config/sgtnclient-invalidate.yml
 - spec/config/sgtnclient.yml
@@ -334,7 +316,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/lib/generators/sgtnclient/USAGE

@@ -1,3 +0,0 @@
-To copy a PayPal SDK default configuration and initializer to your Rails App.
-
-  rails g sgtnclient:install

data/lib/generators/sgtnclient/install_generator.rb

@@ -1,15 +0,0 @@
-module SgtnClient
-    module Generators
-      class InstallGenerator < Rails::Generators::Base
-        source_root File.expand_path('../templates', __FILE__)
-
-        def copy_config_file
-          copy_file "sgtnclient.yml", "config/sgtnclient.yml"
-        end
-
-        def copy_initializer_file
-          copy_file "sgtnclient.rb",  "config/initializers/sgtnclient.rb"
-        end
-      end
-    end
-end

data/lib/generators/sgtnclient/templates/sgtnclient.rb

@@ -1,2 +0,0 @@
-SgtnClient.load("config/sgtnclient.yml", Rails.env)
-PSgtnClient.logger = Rails.logger

data/lib/generators/sgtnclient/templates/sgtnclient.yml

@@ -1,33 +0,0 @@
-test: &default
-
-  # Credentials for REST APIs
-  client_id: tee
-  client_secret: 89987
-
-  # Mode can be 'live' or 'sandbox'
-  mode: sandbox
-
-  # Credentials for Classic APIs
-  app_id: APP-80W284485P519543T
-  username: linr
-  password: fdasf
-  signature: sfds-RWy
-  # # With Certificate
-  # cert_path: "config/cert_key.pem"
-  sandbox_email_address: linr@vmware.com
-
-  # #Product Name
-  product_name: logInsight
-
-  # # bundle version
-  version: 4.8.1
-
-  # # HTTP Proxy
-  vip_server: https://g11n-vip-dev-1.eng.vmware.com:8090
-
-development:
-  <<: *default
-
-production:
-  <<: *default
-  mode: live

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_de.json

@@ -1,11 +0,0 @@
-{
-  "component" : "JAVA",
-  "messages" : {
-    "com.vmware.loginsight.web.settings.stats.StatsTable.host" : "Host",
-    "com.vmware.loginsight.web.settings.stats.StatsTableType.eventsIngestionRatePerSecond" : "Erfassungsrate für Ereignisse (pro Sekunde)",
-    "com.vmware.loginsight.web.settings.stats.StatsTableType.eventsIngestionRatePerSecond.help" : "Die tatsächliche Erfassungsrate (Syslog + API) jedes Knotens nach der Nachrichtenneuverteilung.<br />Log Insight-Knoten verteilen Nachrichten neu, um eine gleichmäßige Erfassung pro Knoten zu erzielen und für eine ausgewogene Aufbewahrung und Leistung zu sorgen.<br /><br />Beachten Sie, dass die Erfassungsrate für jeden Knoten unter der konfigurierten maximalen Erfassungsrate eines Knotens liegen muss.<br /><br />Informationen zur tatsächlichen Rate der Ereignisse, die vor der Nachrichtenneuverteilung direkt an jeden Knoten gesandt werden, finden Sie in den Tabellen \"Eingangsrate für Syslog-Ereignisse (pro Sekunde)\" und \"Eingangsrate für API-Ereignisse (pro Sekunde)\" unten.",
-    "com.vmware.loginsight.web.settings.stats.StatsTableType.syslogEventsIncomingRatePerSecond" : "Eingangsrate für Syslog-Ereignisse (pro Sekunde)",
-    "com.vmware.loginsight.web.utilities.EmailUtil.upgrade.body48" : "Auf {0} wird nun Version {1} ausgeführt. Es folgen einige interessante neue Funktionen der Version {1}. Wir schätzen wie immer Ihre anhaltende Unterstützung und freuen uns auf Ihre Rückmeldungen unter {3} und {4} auf Twitter.<br /><br /><b>vRealize Log Insight-Serverfunktionen</b><br />• TODO weitere Serverfunktionen hinzufügen.<br /><br /><b>vRealize Log Insight-Agentenfunktionen</b><br />• TODO weitere Agentenfunktionen hinzufügen.<br /><br />Weitere Informationen zu den neuen Funktionen von {0} finden Sie unter {0} v{1} {2}.<br /><br />Viel Spaß bei der Protokollierung<br />Das {0}-Team<br /><br />"
-  },
-  "locale" : "de"
-}

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

@@ -1,12 +0,0 @@
-{
-  "component" : "JAVA",
-  "messages" : {
-    "hello": "@hello@",
-    "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.",
-    "com.vmware.loginsight.web.settings.stats.StatsTableType.syslogEventsIncomingRatePerSecond" : "Syslog Events Incoming Rate (Per Second)",
-    "com.vmware.loginsight.web.actions.settings.HealthActionBean.machineLearningAliases" : "Machine Learning Aliases"
-  },
-  "locale" : "en"
-}

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

@@ -1,11 +0,0 @@
-{
-  "component" : "JAVA",
-  "messages" : {
-    "com.vmware.loginsight.web.settings.stats.StatsTableType.queryOrigin" : "Query Origin",
-    "com.vmware.loginsight.web.settings.stats.StatsTableType.queryOrigin.help" : "The origin refers to where the query originated from:<br /><br />Interactive Analytics<br />• <span style=\"font-weight: bold;\">Chart</span> - visualization above the search bar<br />• <span style=\"font-weight: bold;\">Events</span> - tab below the search bar<br />• <span style=\"font-weight: bold;\">Event Types</span> - tab below the search bar<br />• <span style=\"font-weight: bold;\">Event Trends</span> - tab below the search bar<br />• <span style=\"font-weight: bold;\">Alerts</span> - from the alert icon to the right of the search bar<br />• <span style=\"font-weight: bold;\">Facet</span> - chart when expanding a field<br /><br />Internal<br />• <span style=\"font-weight: bold;\">Precompute</span> - cache queries<br />• <span style=\"font-weight: bold;\">Schema</span>\t- machine learning queries<br />• <span style=\"font-weight: bold;\">Tools</span> - internal-only<br />• <span style=\"font-weight: bold;\">Other</span> - internal-only<br />",
-    "com.vmware.loginsight.web.settings.stats.StatsTableType.eventsIngestionRatePerSecond" : "Events Ingestion Rate (Per Second)",
-    "com.vmware.loginsight.web.settings.stats.StatsTable.host" : "Host",
-    "com.vmware.loginsight.web.utilities.EmailUtil.upgrade.body48" : "{0} is now running version {1}. Below are some of the exciting new features we've added to the {1} release. As always, we appreciate your continued support and value your feedback in our {3} and {4} on Twitter.<br /><br /><b>vRealize Log Insight Server Features</b><br />• TODO add server features.<br /><br /><b>vRealize Log Insight Agent Features</b><br />• TODO add agent features.<br /><br />For more information about {0}'s new features, take a look at the {0} v{1} {2}.<br /><br />Happy Logging,<br />The {0} Team<br /><br \\>"
-  },
-  "locale" : "latest"
-}

data/spec/config/locales/l10n/bundles/logInsight/4.8.1/JAVA/messages_zh-Hans.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"
-}

data/spec/config/locales/l10n/bundles/logInsight/4.8.1/JAVA/messages_zh-Hant.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-Hant"
-}

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"
-}

data/spec/unit/restclient_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-describe SgtnClient do
-  describe "OnlineAPI" do
-
-    before :each do
-      env = SgtnClient::Config.default_environment
-      SgtnClient::Config.configurations[env]["bundle_mode"] = 'online'
-      SgtnClient::Source.loadBundles("en")
-    end
-
-    it "GET" do
-      expect(SgtnClient::Translation.getString("JAVA", "com.vmware.loginsight.web.settings.stats.StatsTable.host", "zh-Hans")).to eq '主机'
-      # get from cache in 2nd time
-      expect(SgtnClient::Translation.getString("JAVA", "com.vmware.loginsight.web.settings.stats.StatsTable.host", "zh-Hans")).to eq '主机'
-    end
-
-    it "NonExistingKey" do
-      expect(SgtnClient::Translation.getString("JAVA", "hello", "zh-Hans")).to eq 'Hello world'
-      # get from cache in 2nd time
-      expect(SgtnClient::Translation.getString("JAVA", "hello", "zh-Hans")).to eq 'Hello world'
-    end
-  end
-
-end