singleton-client 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43d840f37ce5f60b23e16623db0b4393f014eaeaafa0ddf91520225a93bd9c57
-  data.tar.gz: d3c1e045e6c75f7e09cd2790de733a217516afede51dbfede1224cbabcbd3b53
+  metadata.gz: 662845b2e8dcbe69030049114857506ba0e2d5fd0ab98fdf886ddfd07ed1c7a8
+  data.tar.gz: bafa7b6a9f9d68e735ad1c830f37ea7f770381cafd7ff4ecda142d1673cec9c3
 SHA512:
-  metadata.gz: 56593be0f8686d669216a849592b9100bb47f52087bf10938d1fae79fb123b9b4ee68baa10e8e627c2ef263e79f2f056aac777e2e5ebc3d8d7f5fbd15b758ce5
-  data.tar.gz: 5eca696945202e002be5c489ee37153d63c6498e4cc8639f5ea3ad11666ac63e4fffee59572e29fbeb0ff4c7489ff29b06a77cb57e2f9f077cde0663ca5e115b
+  metadata.gz: 3249cfcdce192e2e04670aefb03fd090c9b436171edeb80bec82d1d62816e8406d7aaaa92e3b85aec0d9e625babbab136d61e3e0d4ecf12d582c0fd99ad5a5c5
+  data.tar.gz: c694298fc391a1395ea62b4b3fe7595c5deae8fd1909d01af1b6097a03848583a81e5b0d52ef16339645bc74035f180feae9110cad56f0b67d082a95c72bb3e1

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

@@ -1,3 +1,5 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
 
 module SgtnClient
   
@@ -15,7 +17,7 @@ module SgtnClient
         else
           SgtnClient.logger.debug "[Source][getSource]getting sources from cache with key: " + cache_key
         end
-        s = items.nil?? nil : items[locale][key]
+        s = (items.nil? || items[locale].nil?)? nil : items[locale][key]  
         if items.nil? || s.nil?
           SgtnClient.logger.debug "[Source][getSource]source not found, return key: " + key
           #return key
@@ -68,4 +70,4 @@ module SgtnClient
 
   end
 
-end
+end

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

@@ -1,3 +1,6 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 module SgtnClient
     class T < Translation
 
@@ -19,4 +22,4 @@ module SgtnClient
             return getStrings(component, locale)
         end
     end
-end
+end

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

@@ -1,3 +1,6 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 require 'multi_json'
 
 module SgtnClient
@@ -56,6 +59,7 @@ module SgtnClient
 
       def self.getStrings(component, locale)
         SgtnClient.logger.debug "[Translation][getStrings]component=#{component}, locale=#{locale}"
+        locale = SgtnClient::LocaleUtil.get_best_locale(locale)
         items = get_cs(component, locale)
         default = SgtnClient::Config.configurations.default
         if items.nil? || items["messages"] == nil
@@ -77,6 +81,7 @@ module SgtnClient
       private
 
       def self.getTranslation(component, key, locale)
+        locale = SgtnClient::LocaleUtil.get_best_locale(locale)
         items = get_cs(component, locale)
         if items.nil? || items["messages"] == nil
           nil
@@ -86,12 +91,18 @@ module SgtnClient
       end
 
       def self.get_cs(component, locale)
-        flocale = SgtnClient::LocaleUtil.fallback(locale)
-        cache_key = SgtnClient::CacheUtil.get_cachekey(component, flocale)
+        # source locale always return source bundle
+        if locale == LocaleUtil.get_source_locale
+          sources = SgtnClient::Source.getSources(component, SgtnClient::Config.configurations.default)
+          messages = sources&.first&.last
+          return {'locale' => locale, 'component' => component, 'messages' => messages} if messages
+        end
+
+        cache_key = SgtnClient::CacheUtil.get_cachekey(component, locale)
         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)
+          items = load(component, locale)
           if items.nil?
             items = SgtnClient::Source.getSources(component, SgtnClient::Config.configurations.default)
             SgtnClient::Core::Cache.put(cache_key, items, 60)
@@ -144,4 +155,4 @@ module SgtnClient
 
   end
 
-end
+end

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

@@ -1,4 +1,7 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 require 'sgtn-client/cldr/localized_datetime'
 require 'sgtn-client/cldr/localized_date'
 require 'sgtn-client/cldr/localized_time'
-require 'sgtn-client/cldr/localized_str'
+require 'sgtn-client/cldr/localized_str'

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

@@ -1,3 +1,6 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 require 'date'
 require 'time'
 
@@ -24,4 +27,4 @@ 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
+      LOCALIZE

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

@@ -1,3 +1,6 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 require 'date'
 require 'time'
 
@@ -60,4 +63,4 @@ DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
               tz.display_name_for(self, display_name)
            end
         end
-      LOCALIZE
+      LOCALIZE

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

@@ -1,3 +1,5 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
 
 String.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
           def to_plural_s(locale, arg)
@@ -8,4 +10,4 @@ String.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
               num_str
             end
           end
-        LOCALIZE
+        LOCALIZE

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

@@ -1,3 +1,6 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 require 'date'
 require 'time'
 
@@ -24,4 +27,4 @@ Time.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
         def l_short_s(locale = TwitterCldr.locale)
            self.localize(locale).to_short_s
         end
-      LOCALIZE
+      LOCALIZE

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

@@ -1,3 +1,6 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 require 'date'
 
 module SgtnClient::Core
@@ -97,4 +100,4 @@ module SgtnClient::Core
             end
         end
 
-end
+end

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

@@ -1,3 +1,6 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 require 'erb'
 require 'yaml'
 
@@ -163,4 +166,4 @@ module SgtnClient
     end
   end
 
-end
+end

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

@@ -1,3 +1,6 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 require 'multi_json'
 require 'pp'
 

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

@@ -1,3 +1,6 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 require 'logger'
 
 module SgtnClient
@@ -47,4 +50,3 @@ module SgtnClient
   end
 
 end
-

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

@@ -1,3 +1,6 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 require 'rest-client'
 require 'multi_json'
 
@@ -18,4 +21,4 @@ module SgtnClient::Core
           return obj
         end
     end
-end
+end

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

@@ -1,3 +1,6 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 require 'json'
 
 module SgtnClient
@@ -35,4 +38,4 @@ module SgtnClient
               end
         end
     end
-end
+end

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

@@ -1,4 +1,9 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 module SgtnClient
+      LOGFILE_SHIFT_AGE = 4
+
       module Core
             autoload :Cache,        "sgtn-client/core/cache"
       end
@@ -44,7 +49,7 @@ module SgtnClient
                   end
                   file = File.open(file, 'a')
                   file.sync = true
-                  SgtnClient.logger = Logger.new(file)
+                  SgtnClient.logger = Logger.new(file, LOGFILE_SHIFT_AGE)
 
                   # Set log level for sandbox mode
                   env = SgtnClient::Config.default_environment

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

@@ -1,3 +1,6 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 require 'erb'
 require 'yaml'
 
@@ -38,14 +41,8 @@ module SgtnClient
         env = SgtnClient::Config.default_environment
         product_name = SgtnClient::Config.configurations[env]["product_name"]
         version = SgtnClient::Config.configurations[env]["version"].to_s
-        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
+        product_name + "_" + version + "_" + component + "_" + locale
       end
   end
 
-end
+end

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

@@ -1,3 +1,6 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 require 'erb'
 require 'yaml'
 
@@ -31,4 +34,4 @@ module SgtnClient
       end
   end
 
-end
+end

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

@@ -1,3 +1,6 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 module SgtnClient
 
     DEFAULT_LOCALES = ['en', 'de', 'es', 'fr', 'ko', 'ja', 'zh-Hans', 'zh-Hant']
@@ -10,6 +13,13 @@ module SgtnClient
                   }
 
     class LocaleUtil
+        def self.get_best_locale(locale)
+            fallback(process_locale(locale))
+        end
+        def self.process_locale(locale=nil)
+            locale ||= SgtnClient::Config.configurations.default
+            locale.to_s
+        end
         def self.fallback(locale)
             found = SgtnClient::DEFAULT_LOCALES.select {|e| e == locale}
             if !found.empty?
@@ -27,5 +37,10 @@ module SgtnClient
             end 
             return locale
         end
+        def self.get_source_locale
+            env = SgtnClient::Config.default_environment
+            source_locale = SgtnClient::Config.configurations[env]["default_language"]
+            source_locale || 'en'
+        end
     end
-end
+end

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

@@ -1,3 +1,5 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
 
 module SgtnClient
 
@@ -40,4 +42,4 @@ module SgtnClient
 
   end
 
-end
+end

data/lib/singleton-ruby.rb

@@ -1,3 +1,6 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 require "sgtn-client/sgtn-client"
 require 'sgtn-client/cldr/core_ext'
 require 'twitter_cldr'

data/lib/version.rb

@@ -1,3 +1,5 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
 
     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.4
+  version: 0.7.5
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client