singleton-client-test 0.7.0.21 → 0.7.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6a32015e94de289514c6587a66bd298bae1cc4a0beb577fe1652a290d6da7d5
-  data.tar.gz: '048750240bb9fa432ae55cf59de230294554203075d3d1213aee11e0f1fdcc8d'
+  metadata.gz: 581b02396037c20da7ab2a9248e8522c60735bd1e6e11dd8d4a15af259737b2c
+  data.tar.gz: ec310a666d7c5384e552fdaad105d06972fded90df51f0760a4622abc8e39489
 SHA512:
-  metadata.gz: 1ea50e6bb782afda6877e0f2ebc978fbfa1ae4aca97aeec79f667a761536f882a2ba604e807471e802c9be37b2704f71e5bfe33e66dfde4975772cb9fdf9e569
-  data.tar.gz: d9e63703cbdd8527d7c2ff89016d252c71ae9f56edec8bd15b947d99ff7fda0347e972635a0231b717f66793b7e69bfbf4fde20a72d529a8f1f38d51a5e127d3
+  metadata.gz: b51088e04941faff963f289b7bbfefcfa9730f78682cb85adca816044dc1432972c3eb1c1f940ac2128b4953397a2ab565a1dbfc0b63fe00f9d79f49b4de7b3a
+  data.tar.gz: 545e8d51467d99c4ea57eb45d9f23a651997de2b07fe9eb331fd39f7042728fe2d23312ff8b0fda0f83564674aaf3d42fcf921266241913e875bb2371ccd1af6

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

@@ -1,5 +1,3 @@
-require 'erb'
-require 'yaml'
 
 module SgtnClient
   
@@ -45,9 +43,10 @@ module SgtnClient
         SgtnClient::Config.configurations.default = locale
         source_bundle = SgtnClient::Config.configurations[env]["source_bundle"]
         SgtnClient.logger.debug "Loading [" + locale + "] source bundles from path: " + source_bundle
-        Dir.children(source_bundle).each do |component|
+        Dir.foreach(source_bundle) do |component|
+          next if component == '.' || component == '..'
           yamlfile = File.join(source_bundle, component + "/" + locale + ".yml")
-          bundle = read_yml(yamlfile)
+          bundle = SgtnClient::FileUtil.read_yml(yamlfile)
           cachekey = SgtnClient::CacheUtil.get_cachekey(component, locale)
           SgtnClient::CacheUtil.write_cache(cachekey,bundle)
         end
@@ -60,18 +59,13 @@ module SgtnClient
         bundlepath = source_bundle  + "/" + component + "/" + locale + ".yml"
         SgtnClient.logger.debug "Getting source from  bundle: " + bundlepath
         begin
-          bundle = read_yml(bundlepath)
+          bundle = SgtnClient::FileUtil.read_yml(bundlepath)
         rescue => exception
           SgtnClient.logger.error exception.message
         end
         return bundle
       end
 
-      def self.read_yml(file_name)
-        erb = ERB.new(File.read(file_name))
-        erb.filename = file_name
-        YAML.load(erb.result)
-      end
   end
 
 end

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

@@ -73,7 +73,12 @@ module SgtnClient
         items = SgtnClient::CacheUtil.get_cache(cache_key)
         if items.nil?
           items = getTranslations(component, flocale)
-          SgtnClient::CacheUtil.write_cache(cache_key, items)
+          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
@@ -101,13 +106,7 @@ module SgtnClient
         translation_bundle = SgtnClient::Config.configurations[env]["translation_bundle"]
         bundlepath = translation_bundle + "/" + product_name + "/" + version + "/" + component + "/messages_" + locale + ".json"
         SgtnClient.logger.debug "Getting translations from offline bundle: " + bundlepath
-        begin
-          file = File.read(bundlepath)
-          data_hash = MultiJson.load(file)
-        rescue => exception
-          SgtnClient.logger.error exception.message
-        end
-        return data_hash
+        SgtnClient::FileUtil.read_json(bundlepath)
       end
 
       def self.get_server(component, locale)

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

@@ -6,6 +6,7 @@ module SgtnClient::Core
 
             def self.initialize(disabled=false, opts={})
                 $opts = opts
+                @mutex = Mutex.new
                 SgtnClient.logger.debug "Initialize cache......"
                 if disabled == false
                     $data = Hash.new
@@ -41,42 +42,50 @@ module SgtnClient::Core
             end
 
             def self.put(key, value, ttl=nil)
-                if $data == nil
-                    return nil
+                @mutex.synchronize do
+                    if $data == nil
+                        return nil
+                    end
+                    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)
                 end
-                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)
             end
 
             def self.delete(key)
-                if $data == nil
-                    return nil
+                @mutex.synchronize do
+                    if $data == nil
+                        return nil
+                    end
+                    SgtnClient.logger.debug "Delete cache for key: " + key
+                    $data.delete key
                 end
-                SgtnClient.logger.debug "Delete cache for key: " + key
-                $data.delete key
             end
 
             def self.clear
-                if $data == nil
-                    return nil
+                @mutex.synchronize do
+                    if $data == nil
+                        return nil
+                    end
+                    SgtnClient.logger.debug "Clear cache!"
+                    $data = Hash.new
                 end
-                SgtnClient.logger.debug "Clear cache!"
-                $data = Hash.new
             end
 
             def self.invalidate
-                if $data == nil
-                    return nil
+                @mutex.synchronize do
+                    if $data == nil
+                        return 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}
                 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}
             end
         end
 

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/sgtn-client.rb

@@ -11,6 +11,7 @@ module SgtnClient
       autoload :Exceptions,         "sgtn-client/core/exceptions"
       autoload :ValidateUtil,       "sgtn-client/util/validate-util"
       autoload :LocaleUtil,         "sgtn-client/util/locale-util"
+      autoload :FileUtil,           "sgtn-client/util/file-util"
 
       module Formatters
             autoload :PluralFormatter,    "sgtn-client/formatters/plurals/plural_formatter"

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

@@ -0,0 +1,32 @@
+require 'erb'
+require 'yaml'
+
+module SgtnClient
+
+  class FileUtil
+
+      @mutex = Mutex.new
+
+      def self.read_json(bundlepath)
+        @mutex.synchronize do
+          data_hash = nil
+          begin
+            file = File.read(bundlepath)
+            data_hash = MultiJson.load(file)
+          rescue => exception
+            SgtnClient.logger.error exception.message
+          end
+          return data_hash
+        end
+      end
+
+      def self.read_yml(file_name)
+        @mutex.synchronize do
+          erb = ERB.new(File.read(file_name))
+          erb.filename = file_name
+          YAML.load(erb.result)
+        end
+      end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singleton-client-test
 version: !ruby/object:Gem::Version
-  version: 0.7.0.21
+  version: 0.7.0.25
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -282,6 +282,7 @@ files:
 - lib/sgtn-client/formatters/plurals/plural_formatter.rb
 - lib/sgtn-client/sgtn-client.rb
 - lib/sgtn-client/util/cache-util.rb
+- lib/sgtn-client/util/file-util.rb
 - lib/sgtn-client/util/locale-util.rb
 - lib/sgtn-client/util/validate-util.rb
 - lib/singleton-ruby.rb