singleton-client 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d1aaec2ddcbbb860b477feb06dedcb64b5ec626864c2a89c31e38451e6069f
-  data.tar.gz: c1d3e0125bed7151a337eb8f595a08e74424d2a04b0b6ce3b53d3aac8c66ae49
+  metadata.gz: 7b866f4160d99e04ac3140bf8da0e7f15abf5db1fac6360d2e5d8f8a6c392eb8
+  data.tar.gz: 7e4977b0480ef04e774a2891fafee6d6b76fc1abbafd436e718f9846c138d545
 SHA512:
-  metadata.gz: 16da077e3ed50925a0cd0fbd6865c4a9ba05c66bf2dca1b5911a9c494f3669b823dc9653688a80be1b285b1d300dfa70a16524d45bfa9b0079c63c6ecf16f5bb
-  data.tar.gz: 3079b1570e08d8b622013d5e7431ed98339d14f5be83c2c108a649f18f968e4a1d903459861ba4a3f4d29acd553ac706ed6c4d1274769cc9ed1c57c44c846da8
+  metadata.gz: e34e259dbf04c59adb5ab96e3fde9d73a3918f9a7d284e5a33313185c1e6afbd25e43c850e3eedabbdb8602c6b32bbdb3cb76efee3536d1d7d615ddd43e94316
+  data.tar.gz: 73f14c209b98942d919c6037b31dd5f14ac44350609e8ab42d7afdc75098a42072794b40266145c44080c936c1a90aa86b7cea4d6e2b85053d30bf2db7d22324

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

@@ -1,5 +1,3 @@
-require 'erb'
-require 'yaml'
 
 module SgtnClient
   
@@ -17,11 +15,14 @@ module SgtnClient
         else
           SgtnClient.logger.debug "Getting sources from cache with key: " + cache_key
         end
-        if items.nil?
-          return key
+        s = items[locale][key]
+        if items.nil? || s.nil?
+          SgtnClient.logger.debug "Source not found, return key: " + key
+          #return key
+          return nil
+        else
+          return s
         end
-        str = items[locale][key]
-        return str
       end
 
       def self.getSources(component, locale)
@@ -42,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
@@ -57,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

@@ -12,30 +12,25 @@ module SgtnClient
   class Translation
 
       def self.getString(component, key, 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
+        str = getTranslation(component, key, locale)
+        if str.nil?
+          str = SgtnClient::Source.getSource(component, key, SgtnClient::Config.configurations.default)
         end
+        str
+      end
 
-        default = SgtnClient::Config.configurations.default
-        if items.nil? || items["messages"] == nil
-          return SgtnClient::Source.getSource(component, key, default)
-        end
-        str = items["messages"][key]
+      def self.getString_p(component, key, plural_args, locale)
+        str = getTranslation(component, key, locale)
         if str.nil?
-          return SgtnClient::Source.getSource(component, key, default)
+          str = SgtnClient::Source.getSource(component, key, SgtnClient::Config.configurations.default)
+          str.to_plural_s(:en, plural_args)
         else
-          return str
+          str.to_plural_s(locale, plural_args)
         end
-       end
+      end
 
-      def self.getString_f(component, key, args, locale)
-         s = getString(component, key, locale)
+      def self.getString_f(component, key, args, locale, *optionals)
+         s = getString(component, key, locale, *optionals)
          if args.is_a?(Hash)
           args.each do |source, arg|
             s.gsub! "{#{source}}", arg
@@ -62,7 +57,7 @@ module SgtnClient
           items = {}
           s = SgtnClient::Source.getSources(component, default)
           default_component, value = s.first
-          items["component"] = default_component
+          items["component"] = component
           items["messages"] = value
           items["locale"] = 'source'
         end
@@ -72,6 +67,28 @@ module SgtnClient
 
       private
 
+      def self.getTranslation(component, key, 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)
+          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)
         env = SgtnClient::Config.default_environment
         mode = SgtnClient::Config.configurations[env]["bundle_mode"]
@@ -89,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/cldr/localized_datetime.rb

@@ -1,27 +1,63 @@
 require 'date'
 require 'time'
 
-DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
-          def l_full_s(locale = TwitterCldr.locale)
-             self.localize(locale).to_full_s
+DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 2
+          def l_full_s(locale = TwitterCldr.locale, *args)
+            timezone = args[0]
+            display_name = args[1]
+            if timezone.nil?
+               self.localize(locale).to_full_s
+            elsif display_name.nil?
+               self.localize(locale).with_timezone(timezone).to_full_s
+            else
+               tz = TwitterCldr::Timezones::Timezone.instance(timezone, locale)
+               tz.display_name_for(self, display_name)
+            end
           end
         LOCALIZE
 
 DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
-          def l_long_s(locale = TwitterCldr.locale)
-             self.localize(locale).to_long_s
+          def l_long_s(locale = TwitterCldr.locale, *args)
+             timezone = args[0]
+             display_name = args[1]
+             if timezone.nil?
+                self.localize(locale).to_long_s
+             elsif display_name.nil?
+                self.localize(locale).with_timezone(timezone).to_long_s
+             else
+                tz = TwitterCldr::Timezones::Timezone.instance(timezone, locale)
+                tz.display_name_for(self, display_name)
+             end
           end
         LOCALIZE
 
 DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
-          def l_medium_s(locale = TwitterCldr.locale)
-             self.localize(locale).to_medium_s
+          def l_medium_s(locale = TwitterCldr.locale, *args)
+             timezone = args[0]
+             display_name = args[1]
+             if timezone.nil?
+                self.localize(locale).to_medium_s
+             elsif display_name.nil?
+                self.localize(locale).with_timezone(timezone).to_medium_s
+             else
+                tz = TwitterCldr::Timezones::Timezone.instance(timezone, locale)
+                tz.display_name_for(self, display_name)
+             end
           end
         LOCALIZE
 
 
 DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
-        def l_short_s(locale = TwitterCldr.locale)
-           self.localize(locale).to_short_s
+        def l_short_s(locale = TwitterCldr.locale, *args)
+           timezone = args[0]
+           display_name = args[1]
+           if timezone.nil?
+              self.localize(locale).to_short_s
+           elsif display_name.nil?
+              self.localize(locale).with_timezone(timezone).to_short_s
+           else
+              tz = TwitterCldr::Timezones::Timezone.instance(timezone, locale)
+              tz.display_name_for(self, display_name)
+           end
         end
       LOCALIZE

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

data/lib/version.rb

@@ -1,3 +1,3 @@
 
-    VERSION_INFO = [0, 1, 8].freeze
+    VERSION_INFO = [0, 2, 1].freeze
     VERSION = VERSION_INFO.map(&:to_s).join('.').freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singleton-client
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-25 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