singleton-client 0.7.0 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bff1730aecabe391982a491a349af0a51af8f7c894d79a3704866959460dec5
-  data.tar.gz: ef351201885c96d9ada076af3f780291fc645ac100541bcdb87a7dd2f5bdf9c6
+  metadata.gz: 43d840f37ce5f60b23e16623db0b4393f014eaeaafa0ddf91520225a93bd9c57
+  data.tar.gz: d3c1e045e6c75f7e09cd2790de733a217516afede51dbfede1224cbabcbd3b53
 SHA512:
-  metadata.gz: e10e2f79a2654cd0055dbfa555149c536aa2d7557b9ce1af12206abe2106e851cbb9b428e0e8f8fa6a6833a69f5566ec4a80df6d739d1c46d5b750a9e64d9653
-  data.tar.gz: f7cfc58191dae18ae6b1235980d2009e9d308982ac80c977ffd769884817d4b9745cfb5415996681b9085e366abd93c1b44119983663ecbdf2be4a8d59ff5c86
+  metadata.gz: 56593be0f8686d669216a849592b9100bb47f52087bf10938d1fae79fb123b9b4ee68baa10e8e627c2ef263e79f2f056aac777e2e5ebc3d8d7f5fbd15b758ce5
+  data.tar.gz: 5eca696945202e002be5c489ee37153d63c6498e4cc8639f5ea3ad11666ac63e4fffee59572e29fbeb0ff4c7489ff29b06a77cb57e2f9f077cde0663ca5e115b

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

@@ -1,5 +1,3 @@
-require 'erb'
-require 'yaml'
 
 module SgtnClient
   
@@ -8,43 +6,47 @@ module SgtnClient
   class Source
 
       def self.getSource(component, key, locale)
+        SgtnClient.logger.debug "[Source][getSource]component=#{component}, key=#{key}, locale=#{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
+          items = getBundle(component, locale)    
           SgtnClient::CacheUtil.write_cache(cache_key, items)
         else
-          SgtnClient.logger.debug "Getting sources from cache with key: " + cache_key
+          SgtnClient.logger.debug "[Source][getSource]getting sources from cache with key: " + cache_key
         end
-        if items.nil?
-          return key
+        s = items.nil?? nil : items[locale][key]
+        if items.nil? || s.nil?
+          SgtnClient.logger.debug "[Source][getSource]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)
+        SgtnClient.logger.debug "[Source][getSources]component=#{component}, locale=#{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)
         else
-          SgtnClient.logger.debug "Getting sources from cache with key: " + cache_key
+          SgtnClient.logger.debug "[Source][getSources]getting sources from cache with key: " + cache_key
         end
         return items
       end
 
       def self.loadBundles(locale)
+        SgtnClient.logger.debug "[Source][loadBundles]locale=#{locale}"
         env = SgtnClient::Config.default_environment
         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
@@ -52,23 +54,18 @@ module SgtnClient
 
       private
       def self.getBundle(component, locale)
+        SgtnClient.logger.debug "[Source][getBundle]component=#{component}, locale=#{locale}"
         env = SgtnClient::Config.default_environment
         source_bundle = SgtnClient::Config.configurations[env]["source_bundle"]
         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,38 @@ 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
+        SgtnClient.logger.debug "[Translation.getString]component: #{component}, key: #{key}, locale: #{locale}"
+        str = getTranslation(component, key, locale)
+        if str.nil?
+          str = SgtnClient::Source.getSource(component, key, SgtnClient::Config.configurations.default)
+          if str.nil?
+            SgtnClient.logger.debug "[Translation][getString] Missing source string with key: #{key}, component: #{component}, locale: #{locale}"
+          end
         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)
+        SgtnClient.logger.debug "[Translation][getString_p]component=#{component}, key=#{key}, locale=#{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)
+          if str.nil?
+            SgtnClient.logger.debug "[Translation][getString_p] Missing source string with key: #{key}, component: #{component}, locale: #{locale}"
+            return nil
+          end
+          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)
+         SgtnClient.logger.debug "[Translation][getString_f]component=#{component}, key=#{key}, locale=#{locale}"
+         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,24 +55,20 @@ 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
-
+        SgtnClient.logger.debug "[Translation][getStrings]component=#{component}, locale=#{locale}"
+        items = get_cs(component, locale)
         default = SgtnClient::Config.configurations.default
         if items.nil? || items["messages"] == nil
           items = {}
           s = SgtnClient::Source.getSources(component, default)
-          default_component, value = s.first
-          items["component"] = default_component
-          items["messages"] = value
-          items["locale"] = 'source'
+          if s.nil?
+            SgtnClient.logger.error "[Translation][getStrings] Missing component: #{component}, locale: #{locale}"
+          else
+            default_component, value = s.first
+            items["component"] = component
+            items["messages"] = value
+            items["locale"] = 'source'
+          end
         end
         return items
        end
@@ -72,40 +76,61 @@ module SgtnClient
 
       private
 
-      def self.getTranslations(component, locale)
+      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)
+        SgtnClient.logger.debug "[Translation][get_cs]cache_key=#{cache_key}"
+        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)
+            SgtnClient::Core::Cache.put(cache_key, items, 60)
+          else
+            SgtnClient::CacheUtil.write_cache(cache_key, items)
+          end
+        else
+          SgtnClient.logger.debug "[Translation]get translations from cache with key: " + cache_key
+        end
+
+        return items
+       end
+
+      def self.load(component, locale)
         env = SgtnClient::Config.default_environment
         mode = SgtnClient::Config.configurations[env]["bundle_mode"]
+        SgtnClient.logger.debug "[Translation][load]mode=#{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
         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)
+      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"]
-        SgtnClient.logger.debug "Getting translations from server: " + vip_server
         version = SgtnClient::Config.configurations[env]["version"].to_s
         url = vip_server + "/i18n/api/v2/translation/products/" + product_name + "/versions/" + version + "/locales/" + locale + "/components/" + component+ "?checkTranslationStatus=false&machineTranslation=false&pseudo=false"
-        SgtnClient.logger.debug url
         begin
           obj = SgtnClient::Core::Request.get(url)
         rescue => exception

data/lib/sgtn-client/cldr/core_ext.rb

@@ -0,0 +1,4 @@
+require 'sgtn-client/cldr/localized_datetime'
+require 'sgtn-client/cldr/localized_date'
+require 'sgtn-client/cldr/localized_time'
+require 'sgtn-client/cldr/localized_str'

data/lib/sgtn-client/cldr/localized_date.rb

@@ -0,0 +1,27 @@
+require 'date'
+require 'time'
+
+Date.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_full_s(locale = TwitterCldr.locale)
+             self.to_datetime().localize(locale).to_date().to_full_s
+          end
+        LOCALIZE
+
+Date.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_long_s(locale = TwitterCldr.locale)
+            self.to_datetime().localize(locale).to_date().to_long_s
+          end
+        LOCALIZE
+
+Date.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_medium_s(locale = TwitterCldr.locale)
+            self.to_datetime().localize(locale).to_date().to_medium_s
+          end
+        LOCALIZE
+
+
+Date.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+        def l_short_s(locale = TwitterCldr.locale)
+         self.to_datetime().localize(locale).to_date().to_short_s
+        end
+      LOCALIZE

data/lib/sgtn-client/cldr/localized_datetime.rb

@@ -0,0 +1,63 @@
+require 'date'
+require 'time'
+
+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, *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, *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, *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/cldr/localized_str.rb

@@ -0,0 +1,11 @@
+
+String.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def to_plural_s(locale, arg)
+            num_str = SgtnClient::Formatters::PluralFormatter.new(locale).num_s(self, arg)
+            if num_str.nil? || num_str.empty?
+              self.localize(locale) % arg
+            else
+              num_str
+            end
+          end
+        LOCALIZE

data/lib/sgtn-client/cldr/localized_time.rb

@@ -0,0 +1,27 @@
+require 'date'
+require 'time'
+
+Time.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_full_s(locale = TwitterCldr.locale)
+             self.localize(locale).to_full_s
+          end
+        LOCALIZE
+
+Time.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_long_s(locale = TwitterCldr.locale)
+             self.localize(locale).to_long_s
+          end
+        LOCALIZE
+
+Time.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_medium_s(locale = TwitterCldr.locale)
+             self.localize(locale).to_medium_s
+          end
+        LOCALIZE
+
+
+Time.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+        def l_short_s(locale = TwitterCldr.locale)
+           self.localize(locale).to_short_s
+        end
+      LOCALIZE

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

@@ -5,78 +5,95 @@ module SgtnClient::Core
             Entry = Struct.new(:expiry, :value)
 
             def self.initialize(disabled=false, opts={})
-                $opts = opts
-                SgtnClient.logger.debug "Initialize cache......"
+                @@opts = opts
+                @mutex = Mutex.new
                 if disabled == false
-                    $data = Hash.new
-                    SgtnClient.logger.debug "Cache is enabled!"
+                    @@data = Hash.new
+                    SgtnClient.logger.debug "[Cache][initialize]cache is enabled!"
                 else
-                    SgtnClient.logger.debug "Cache is disabled!"
+                    @@data = nil
+                    SgtnClient.logger.debug "[Cache][initialize]cache is disabled!"
                 end
             end
 
             def self.keys
-                if $data == nil
+                if @@data == nil
                     return nil
                 end
-                SgtnClient.logger.debug "Get cache keys"
-                $data.keys
+                SgtnClient.logger.debug "[Cache][keys]get cache keys"
+                @@data.keys
             end
 
             def self.get(key)
-                if $data == nil
-                    return nil
+                if @@data == nil
+                    return nil, nil
                 end
-                SgtnClient.logger.debug "Get cache for key: " + key
-                invalidate
-                $data[key][:value] if has(key)
+                SgtnClient.logger.debug "[Cache][get]get cache for key: " + key
+                invalidate(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
+                SgtnClient.logger.debug "[Cache][has]check if the cache has 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 || value == nil
+                        return nil
+                    end
+                    ttl ||= @@opts[:ttl]
+                    # hours from new
+                    SgtnClient.logger.debug "[Cache][put]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 "[Cache][delete]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 "[Cache][clear]clear cache!"
+                    @@data = Hash.new
                 end
-                SgtnClient.logger.debug "Clear cache!"
-                $data = Hash.new
             end
 
-            def self.invalidate
-                if $data == nil
-                    return nil
+            def self.invalidate(key)
+                @mutex.synchronize do
+                    if @@data == nil
+                        return nil, nil
+                    end
+                    SgtnClient.logger.debug "[Cache][invalidate]invalidate expired cache......"
+                    now = Time.now
+                    if has(key)
+                        v = @@data[key]
+                        expired = false
+                        SgtnClient.logger.debug "[Cache][invalidate]check cache: key=#{key}, expiredtime=#{v[:expiry]}, now=#{now}, expired=#{(v[:expiry] < now)}"
+                        if v[:expiry] < now
+                            SgtnClient.logger.debug "[Cache][invalidate]before deleting the cache: data=#{@@data}"
+                            @@data.delete(key)
+                            SgtnClient.logger.debug "[Cache][invalidate]after deleting the cache: data=#{@@data}"
+                            expired = true
+                        end
+                        return expired, v[:value]
+                    else
+                        return nil, nil
+                    end
                 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/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)
+          SgtnClient.logger.debug "[Request][get]url=#{url}"
+          res = RestClient::Resource.new(
+            url,
+            :verify_ssl       =>  false
+          ).get
           begin
             obj = MultiJson.load(res)
           rescue MultiJson::ParseError => exception

data/lib/sgtn-client/formatters/plurals/plural_formatter.rb

@@ -0,0 +1,38 @@
+require 'json'
+
+module SgtnClient
+    module Formatters
+        class PluralFormatter
+
+            attr_reader :locale
+
+            def initialize(locale = TwitterCldr.locale)
+              @locale = TwitterCldr.convert_locale(locale)
+            end
+
+            def num_s(string, replacements)
+                reg = Regexp.union(
+                  /%<(\{.*?\})>/
+                )
+                string.gsub(reg) do
+                  count_placeholder, patterns = if $1
+                    pluralization_hash = JSON.parse($1)
+                    if pluralization_hash.is_a?(Hash) && pluralization_hash.size == 1
+                      pluralization_hash.first
+                    else
+                      raise ArgumentError.new('expected a Hash with a single key')
+                    end
+                  else
+                    raise ArgumentError.new('invalide format')
+                  end
+                  count  = replacements[count_placeholder.to_sym].to_s
+                  if patterns.is_a?(Hash)
+                    return TwitterCldr::Utils.deep_symbolize_keys(patterns)[count.to_sym]
+                  else
+                    raise ArgumentError.new('expected patterns to be a Hash')
+                  end
+                end
+              end
+        end
+    end
+end

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

@@ -11,6 +11,12 @@ 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"
+      end
+
 
       class << self
             def configure(options = {}, &block)
@@ -32,6 +38,7 @@ module SgtnClient
 
                   # create log file
                   file = './sgtnclient_d.log'
+                  SgtnClient.logger.debug "[Client][load]create log file=#{file}"
                   if args[2] != nil
                         file = args[2]
                   end
@@ -42,7 +49,7 @@ module SgtnClient
                   # Set log level for sandbox mode
                   env = SgtnClient::Config.default_environment
                   mode = SgtnClient::Config.configurations[env]["mode"]
-                  SgtnClient.logger.info "Current mode is: " + mode
+                  SgtnClient.logger.debug "[Client][load]set log level, mode=#{mode}"
                   if mode == 'sandbox'
                         SgtnClient.logger.level = Logger::DEBUG
                   else 
@@ -51,6 +58,7 @@ module SgtnClient
 
                   # initialize cache
                   disable_cache = SgtnClient::Config.configurations[env]["disable_cache"]
+                  SgtnClient.logger.debug "[Client][load]cache initialize, disable_cache=#{disable_cache}"
                   if disable_cache != nil
                         SgtnClient::Core::Cache.initialize(disable_cache)
                   else

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

@@ -10,21 +10,27 @@ 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)
+        SgtnClient.logger.debug "[CacheUtil]get cache with key #{cache_key}, expired #{expired}"
+        return expired, items
       end
 
       def self.clear_cache()
         SgtnClient::Core::Cache.clear()
+        SgtnClient.logger.debug "[CacheUtil]clear cache"
       end
 
       def self.write_cache(cache_key, items)
+        if items.nil?
+          return nil
+        end
         env = SgtnClient::Config.default_environment
         cache_expiry_period = SgtnClient::Config.configurations[env]["cache_expiry_period"]
         # expired after 24 hours
         if cache_expiry_period == nil
             cache_expiry_period = 24*60
         end
+        SgtnClient.logger.debug "[CacheUtil]write cache with key #{cache_key}, cache_expiry_period #{cache_expiry_period}, itmes #{items}"
         SgtnClient::Core::Cache.put(cache_key, items, cache_expiry_period)
       end
 
@@ -32,7 +38,13 @@ 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
+        SgtnClient.logger.debug "[CacheUtil]get cache key: #{lc}"
+        return product_name + "_" + version + "_" + component + "_" + lc
       end
   end
 

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

@@ -0,0 +1,34 @@
+require 'erb'
+require 'yaml'
+
+module SgtnClient
+
+  class FileUtil
+
+      @mutex = Mutex.new
+
+      def self.read_json(bundlepath)
+        SgtnClient.logger.debug "[FileUtil]read json file from: " + 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)
+        SgtnClient.logger.debug "[FileUtil]read yml file from: " + 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/sgtn-client/util/validate-util.rb

@@ -4,8 +4,8 @@ module SgtnClient
   class ValidateUtil
 
       def self.validate_config()
-        SgtnClient.logger.debug "-----------Start to validate configuration's setting itmes-----------"
         env = SgtnClient::Config.default_environment
+        SgtnClient.logger.debug "[ValidateUtil][validate_config] env = #{env}"
         messages = "\n"
 
         mode = SgtnClient::Config.configurations[env]["mode"]
@@ -36,7 +36,6 @@ module SgtnClient
         if messages != "\n"
           raise SgtnClient::Exceptions::MissingConfig.new(messages)
         end
-        SgtnClient.logger.debug "-----------End  to  validate configuration's setting itmes-----------"
       end
 
   end

data/lib/singleton-ruby.rb

@@ -1,2 +1,3 @@
 require "sgtn-client/sgtn-client"
-
+require 'sgtn-client/cldr/core_ext'
+require 'twitter_cldr'

data/lib/version.rb

@@ -1,3 +1,3 @@
 
-    VERSION_INFO = [0, 1, 7].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.0
+  version: 0.7.4
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: twitter_cldr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.6'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +244,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: twitter_cldr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.6'
 description: Singleton Ruby client
 email: g11n-vip-project@vmware.com
 executables: []
@@ -241,13 +269,20 @@ files:
 - lib/sgtn-client/api/source.rb
 - lib/sgtn-client/api/t.rb
 - lib/sgtn-client/api/translation.rb
+- lib/sgtn-client/cldr/core_ext.rb
+- lib/sgtn-client/cldr/localized_date.rb
+- lib/sgtn-client/cldr/localized_datetime.rb
+- lib/sgtn-client/cldr/localized_str.rb
+- lib/sgtn-client/cldr/localized_time.rb
 - lib/sgtn-client/core/cache.rb
 - lib/sgtn-client/core/config.rb
 - lib/sgtn-client/core/exceptions.rb
 - lib/sgtn-client/core/logging.rb
 - lib/sgtn-client/core/request.rb
+- 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