singleton-client-test 0.7.0.22 → 0.7.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2082040853f3d440a7b553e29c4df5d224661b4b78eb097a58affbe989975823
-  data.tar.gz: 4a8571720c12840af891c9e5d9a41da1bdf5593fa13e41ab43ac87416311bff7
+  metadata.gz: 6a0d174f65d5ce5b87ead4f4c61bc57070bc051ab51bc65343c7ca50a0fd0b68
+  data.tar.gz: eaf356bee612ecf0f512083e029964de5307acd3dc05555c710ce386384346ea
 SHA512:
-  metadata.gz: 2ab00997146011e894f21ce5b340abadd24890906f16c7e9731d058ab63f5c6da0a67ac225a1148a73516a9743797002626868ec7daada8441bcb412ad5b591d
-  data.tar.gz: f0c5225b09ab87fe78cb38abe7505a74b9717873ff00f7119190f829c61644efa4fdfb18a79306c2531277dd9bedc24d26e623ba11ab417a20b2a1787d167e48
+  metadata.gz: 512573410bae6caa91cf0b893f27e95a0864a0374e75bd601a55a2f471ca75ed69c6f537aeb24ca7b9202a6bc59c231a838c3d5a167fdc56f130c8ab844a32e5
+  data.tar.gz: 6a2f2f82f806b564ede5218c7cda2123e528515f5089bb4ea3658451598174d140006e9d075ed68e4b1ae3c04b78b4dc3892a00bc26e447387edb282a8f35c9b

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

@@ -5,10 +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!"
@@ -16,67 +17,75 @@ 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)
-                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.22
+  version: 0.7.0.26
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2022-01-25 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