singleton-client-test 0.7.0.27 → 0.7.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0989ae16ca4fcfd6088931a367ac5eb671fd8e087a8d9e32539a2480d1107b34'
-  data.tar.gz: d750961a5b1c116914f50a947626e0fc4e8a391b3fa28b8e2a77e3651c823ba2
+  metadata.gz: d56e992042fd4e5633b41c3de989fd805a44978c696dd7b9692da4191e22b4d4
+  data.tar.gz: 99bcb2f0d4e6e502f88c90a5ae27a12349e2af35ff8a2356d781e97e57b8af74
 SHA512:
-  metadata.gz: 89e893c6f79dde564732300a4431581effb0dc6aeb7eb3f8fc665c8108d4eaf0292a64e962da259f931c9ebf21299ae05d0db4cac427ec78c5a50c3c81d9a562
-  data.tar.gz: fd50009cbda5e06c8e1a3d7f81ec02c6b1d060fec95d6824b8e8713f33c48acad660be1e276ee565403cc8eda5abcf9d8f6f0faa936b895ceb9cef29feec0dbd
+  metadata.gz: 8f84668bb050779955dbafbb37dd5e2e41a4d793c18552f3c1a51725e906db03e7a13f098329d36596f71adebedf90159d5cc0a85344f8f0bd3c1bd46ca555c9
+  data.tar.gz: 4e5f2b2a430b96ca92bd67c9381bfd043f8808a800da6950e5f2e855f860560e96e43ea6f80ef0f9651138026cda0cf7f6ae1f1b84a77b4ea1d0d5de05c0215d

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

@@ -7,7 +7,7 @@ module SgtnClient
 
       def self.getSource(component, key, locale)
         cache_key = SgtnClient::CacheUtil.get_cachekey(component, locale)
-        items = SgtnClient::CacheUtil.get_cache(cache_key)
+        expired, 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
@@ -15,7 +15,7 @@ module SgtnClient
         else
           SgtnClient.logger.debug "Getting sources from cache with key: " + cache_key
         end
-        s = items[locale][key]
+        s = items.nil?? nil : items[locale][key]
         if items.nil? || s.nil?
           SgtnClient.logger.debug "Source not found, return key: " + key
           #return key
@@ -27,8 +27,8 @@ module SgtnClient
 
       def self.getSources(component, locale)
         cache_key = SgtnClient::CacheUtil.get_cachekey(component, locale)
-        items = SgtnClient::CacheUtil.get_cache(cache_key)
-        if items.nil?
+        expired, items = SgtnClient::CacheUtil.get_cache(cache_key)
+        if items.nil? || expired
           items = getBundle(component, locale)
           SgtnClient.logger.debug "Putting sources items into cache with key: " + cache_key
           SgtnClient::CacheUtil.write_cache(cache_key, items)

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

@@ -15,6 +15,9 @@ module SgtnClient
         str = getTranslation(component, key, locale)
         if str.nil?
           str = SgtnClient::Source.getSource(component, key, SgtnClient::Config.configurations.default)
+          if str.nil?
+            SgtnClient.logger.error "Can't find the key " + key + " in source path!"
+          end
         end
         str
       end
@@ -23,6 +26,10 @@ module SgtnClient
         str = getTranslation(component, key, locale)
         if str.nil?
           str = SgtnClient::Source.getSource(component, key, SgtnClient::Config.configurations.default)
+          if str.nil?
+            SgtnClient.logger.error "Can't find the key " + key + " in source path!"
+            return nil
+          end
           str.to_plural_s(:en, plural_args)
         else
           str.to_plural_s(locale, plural_args)
@@ -31,6 +38,9 @@ module SgtnClient
 
       def self.getString_f(component, key, args, locale, *optionals)
          s = getString(component, key, locale, *optionals)
+         if s.nil?
+          return nil
+         end
          if args.is_a?(Hash)
           args.each do |source, arg|
             s.gsub! "{#{source}}", arg
@@ -47,10 +57,14 @@ module SgtnClient
         if items.nil? || items["messages"] == nil
           items = {}
           s = SgtnClient::Source.getSources(component, default)
-          default_component, value = s.first
-          items["component"] = component
-          items["messages"] = value
-          items["locale"] = 'source'
+          if s.nil?
+            SgtnClient.logger.error "Can't find the component " + component + " in source path!"
+          else
+            default_component, value = s.first
+            items["component"] = component
+            items["messages"] = value
+            items["locale"] = 'source'
+          end
         end
         return items
        end
@@ -70,8 +84,8 @@ module SgtnClient
       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?
+        expired, items = SgtnClient::CacheUtil.get_cache(cache_key)
+        if items.nil? || expired
           items = load(component, flocale)
           if items.nil?
             items = SgtnClient::Source.getSources(component, SgtnClient::Config.configurations.default)

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

@@ -12,6 +12,7 @@ module SgtnClient::Core
                     @@data = Hash.new
                     SgtnClient.logger.debug "Cache is enabled!"
                 else
+                    @@data = nil
                     SgtnClient.logger.debug "Cache is disabled!"
                 end
             end
@@ -26,11 +27,10 @@ module SgtnClient::Core
 
             def self.get(key)
                 if @@data == nil
-                    return nil
+                    return nil, nil
                 end
                 SgtnClient.logger.debug "Get cache for key: " + key
-                invalidate
-                @@data[key][:value] if has(key)
+                invalidate(key)
             end
 
             def self.has(key)
@@ -73,18 +73,27 @@ module SgtnClient::Core
                 end
             end
 
-            def self.invalidate
+            def self.invalidate(key)
                 @mutex.synchronize do
                     if @@data == nil
-                        return nil
+                        return nil, nil
                     end
                     SgtnClient.logger.debug "Invalidating expired cache......"
                     now = Time.now
-                    @@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}
+                    if has(key)
+                        v = @@data[key]
+                        expired = false
+                        SgtnClient.logger.debug "Checking cache: key=#{key}, expiredtime=#{v[:expiry]}, now=#{now}, expired=#{(v[:expiry] < now)}"
+                        if v[:expiry] < now
+                            SgtnClient.logger.debug "Before deleting the cache: data=#{@@data}"
+                            @@data.delete(key)
+                            SgtnClient.logger.debug "After deleting the cache: data=#{@@data}"
+                            expired = true
+                        end
+                        return expired, v[:value]
+                    else
+                        return nil, nil
+                    end
                 end
             end
         end

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

@@ -10,8 +10,8 @@ module SgtnClient
   class CacheUtil
 
       def self.get_cache(cache_key)
-        items = SgtnClient::Core::Cache.get(cache_key)
-        return items
+        expired, items = SgtnClient::Core::Cache.get(cache_key)
+        return expired, items
       end
 
       def self.clear_cache()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singleton-client-test
 version: !ruby/object:Gem::Version
-  version: 0.7.0.27
+  version: 0.7.0.28
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client