singleton-client-test 0.7.0.23 → 0.7.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa4b0bc9356e4e2a2b02be92de8e534093d825d903d7494a121c94fdc4153a3d
-  data.tar.gz: 7531f9a8b73f2267c6240ef0099ee4fcb6d68a52e957ec1c498d0fa573e2de7f
+  metadata.gz: '0989ae16ca4fcfd6088931a367ac5eb671fd8e087a8d9e32539a2480d1107b34'
+  data.tar.gz: d750961a5b1c116914f50a947626e0fc4e8a391b3fa28b8e2a77e3651c823ba2
 SHA512:
-  metadata.gz: 85ebde63fec80442f71486ff98f15553eb2521d6b672b76965c292b89faf05ba886cd89016bf74fe1be817066a9cddb13ed8beeb5f23e8ee14be03ab82feb297
-  data.tar.gz: 045f61ca5068ae70dc8a1220b052f390d09972c3f3e7be71f757b146e741a4e99ce3888033256c5503861951af6cd76e93296aa855c7ed28d56e613f21776970
+  metadata.gz: 89e893c6f79dde564732300a4431581effb0dc6aeb7eb3f8fc665c8108d4eaf0292a64e962da259f931c9ebf21299ae05d0db4cac427ec78c5a50c3c81d9a562
+  data.tar.gz: fd50009cbda5e06c8e1a3d7f81ec02c6b1d060fec95d6824b8e8713f33c48acad660be1e276ee565403cc8eda5abcf9d8f6f0faa936b895ceb9cef29feec0dbd

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

@@ -42,16 +42,7 @@ module SgtnClient
       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
-
+        items = get_cs(component, locale)
         default = SgtnClient::Config.configurations.default
         if items.nil? || items["messages"] == nil
           items = {}
@@ -68,33 +59,44 @@ module SgtnClient
       private
 
       def self.getTranslation(component, key, locale)
+        items = get_cs(component, locale)
+        if items.nil? || items["messages"] == nil
+          nil
+        else
+          items["messages"][key]
+        end
+      end
+
+      def self.get_cs(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)
+          items = load(component, flocale)
+          if items.nil?
+            items = SgtnClient::Source.getSources(component, SgtnClient::Config.configurations.default)
+            SgtnClient::Core::Cache.put(cache_key, items, 60)
+          else
+            SgtnClient::CacheUtil.write_cache(cache_key, items)
+          end
         else
           SgtnClient.logger.debug "Getting translations from cache with key: " + cache_key
         end
-        if items.nil? || items["messages"] == nil
-          nil
-        else
-          items["messages"][key]
-        end
-      end
-      
-      def self.getTranslations(component, locale)
+
+        return items
+       end
+
+      def self.load(component, locale)
         env = SgtnClient::Config.default_environment
         mode = SgtnClient::Config.configurations[env]["bundle_mode"]
         if mode == 'offline'
-          return get_offbundle(component, locale)
+          return load_o(component, locale)
         else
-          return get_server(component, locale)
+          return load_s(component, locale)
         end
       end
 
-      def self.get_offbundle(component, locale)
+      def self.load_o(component, locale)
         env = SgtnClient::Config.default_environment
         product_name = SgtnClient::Config.configurations[env]["product_name"]
         version = SgtnClient::Config.configurations[env]["version"].to_s
@@ -104,7 +106,7 @@ module SgtnClient
         SgtnClient::FileUtil.read_json(bundlepath)
       end
 
-      def self.get_server(component, locale)
+      def self.load_s(component, locale)
         env = SgtnClient::Config.default_environment
         product_name = SgtnClient::Config.configurations[env]["product_name"]
         vip_server = SgtnClient::Config.configurations[env]["vip_server"]

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

@@ -5,11 +5,11 @@ module SgtnClient::Core
             Entry = Struct.new(:expiry, :value)
 
             def self.initialize(disabled=false, opts={})
-                $opts = opts
+                @@opts = opts
                 @mutex = Mutex.new
                 SgtnClient.logger.debug "Initialize cache......"
                 if disabled == false
-                    $data = Hash.new
+                    @@data = Hash.new
                     SgtnClient.logger.debug "Cache is enabled!"
                 else
                     SgtnClient.logger.debug "Cache is disabled!"
@@ -17,74 +17,74 @@ module SgtnClient::Core
             end
 
             def self.keys
-                if $data == nil
+                if @@data == nil
                     return nil
                 end
                 SgtnClient.logger.debug "Get cache keys"
-                $data.keys
+                @@data.keys
             end
 
             def self.get(key)
-                if $data == nil
+                if @@data == nil
                     return nil
                 end
                 SgtnClient.logger.debug "Get cache for key: " + key
                 invalidate
-                $data[key][:value] if has(key)
+                @@data[key][:value] if has(key)
             end
 
             def self.has(key)
-                if $data == nil
+                if @@data == nil
                     return nil
                 end
                 SgtnClient.logger.debug "Has cache for key: " + key
-                $data.has_key? key
+                @@data.has_key? key
             end
 
             def self.put(key, value, ttl=nil)
                 @mutex.synchronize do
-                    if $data == nil
+                    if @@data == nil
                         return nil
                     end
-                    ttl ||= @opts[:ttl]
+                    ttl ||= @@opts[:ttl]
                     # hours from new
                     SgtnClient.logger.debug "Put cache for key '" + key + "' with expired time at'" + (Time.now + ttl*60).to_s
-                    $data[key] = Entry.new(Time.now + ttl*60, value)
+                    @@data[key] = Entry.new(Time.now + ttl*60, value)
                 end
             end
 
             def self.delete(key)
                 @mutex.synchronize do
-                    if $data == nil
+                    if @@data == nil
                         return nil
                     end
                     SgtnClient.logger.debug "Delete cache for key: " + key
-                    $data.delete key
+                    @@data.delete key
                 end
             end
 
             def self.clear
                 @mutex.synchronize do
-                    if $data == nil
+                    if @@data == nil
                         return nil
                     end
                     SgtnClient.logger.debug "Clear cache!"
-                    $data = Hash.new
+                    @@data = Hash.new
                 end
             end
 
             def self.invalidate
                 @mutex.synchronize do
-                    if $data == nil
+                    if @@data == nil
                         return nil
                     end
                     SgtnClient.logger.debug "Invalidating expired cache......"
                     now = Time.now
-                    $data.each {
+                    @@data.each {
                         |k, v|
                             SgtnClient.logger.debug "Checking cache: key=#{k}, expiredtime=#{v[:expiry]}, now=#{now}, expired=#{(v[:expiry] < now)}"
                         }
-                    $data.delete_if {|k, v| v[:expiry] < now}
+                        @@data.delete_if {|k, v| v[:expiry] < now}
                 end
             end
         end

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

@@ -40,7 +40,7 @@ module SgtnClient
     :rest_endpoint, :rest_token_endpoint, :client_id, :client_secret,
     :openid_endpoint, :openid_redirect_uri, :openid_client_id, :openid_client_secret,
     :verbose_logging, :product_name, :version, :vip_server, :bundle_mode,
-    :translation_bundle, :source_bundle, :cache_expiry_period, :disable_cache
+    :translation_bundle, :source_bundle, :cache_expiry_period, :disable_cache, :default_language
 
 
     # Create Config object

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

@@ -4,7 +4,11 @@ require 'multi_json'
 module SgtnClient::Core
     class Request
         def self.get(url)
-          res = RestClient.get(url)
+          #res = RestClient.get(url)
+          res = RestClient::Resource.new(
+            url,
+            :verify_ssl       =>  false
+          ).get
           begin
             obj = MultiJson.load(res)
           rescue MultiJson::ParseError => exception

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

@@ -32,7 +32,12 @@ module SgtnClient
         env = SgtnClient::Config.default_environment
         product_name = SgtnClient::Config.configurations[env]["product_name"]
         version = SgtnClient::Config.configurations[env]["version"].to_s
-        return product_name + "_" + version + "_" + component + "_" + locale
+        default_l = SgtnClient::Config.configurations[env]["default_language"]
+        if default_l == nil
+          default_l = 'en'
+        end
+        lc = locale == default_l ? SgtnClient::Config.configurations.default: locale
+        return product_name + "_" + version + "_" + component + "_" + lc
       end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singleton-client-test
 version: !ruby/object:Gem::Version
-  version: 0.7.0.23
+  version: 0.7.0.27
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -306,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Singleton Ruby client