singleton-client-test 0.7.0.37 → 0.7.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 365e6be5a17d3f95f2529789f8632092e859c793c96d67b4f8ddd6492f3e3687
-  data.tar.gz: a2df815daeda06f52484e61ef7c64e2c5bc6ce5d46332a10b60187bbc2440a59
+  metadata.gz: 66531dc1471879c17d807694ff65b64e60bfd35a093d7eb739b728d7e0ae3321
+  data.tar.gz: 200e2f4b3ab09a0cfeefe1131ed61494fbec0a1f63974d36a9ce9379d117d066
 SHA512:
-  metadata.gz: 64ef532c3de19ee72c7b0c28661c1192856eb9ebdef0a335d7d702d98b0d7bf56411691cd3ce2c8ceeae829d0d8d8eaad53981cde88721b49e606c657f053028
-  data.tar.gz: 27d63abbf9b7df87e20997664eebc97853ae1837f5f3c3853c1f77ce1ace43000d25482ae6f261a3d18788fbba9f026ca75374e1a14c078aa068dbdfec8a532a
+  metadata.gz: d85cd8e706659abb1ec1a6e1364b5fcddf2b2c14bca9d616e49d0d28a7657984e26752e48b310763e51f536cbaefb56d99585fe09d46a68cc8cc75f1504e784b
+  data.tar.gz: 924846467b0707fb90b95f77a604546822e2e1ae3dbbc79cb3541fdbd1dcc99fd17df0b00762dd5ee2073a08a8f2044cbb260f986ded95e6ca42ce089cf35046

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

@@ -4,12 +4,10 @@
 require 'sgtn-client/loader/source'
 
 module SgtnClient
-  autoload :CacheUtil, 'sgtn-client/util/cache-util'
-
   class Source
     def self.loadBundles(locale)
       SgtnClient.logger.debug "[Source][loadBundles]locale=#{locale}"
-      SgtnClient::Config.configurations.default = locale
+      Config.configurations.default = locale
     end
   end
 end

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

@@ -1,6 +1,8 @@
 # Copyright 2022 VMware, Inc.
 # SPDX-License-Identifier: EPL-2.0
 
+require 'request_store'
+
 module SgtnClient
   class T
     def self.s(key)

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

@@ -43,7 +43,7 @@ module SgtnClient
       def translate(key, component, locale = nil, **kwargs)
         SgtnClient.logger.debug "[#{method(__callee__).owner}.#{__callee__}] key: #{key}, component: #{component}, locale: #{locale}, args: #{kwargs}"
 
-        locale = locale.nil? ? self.locale : SgtnClient::LocaleUtil.get_best_locale(locale)
+        locale = locale.nil? ? self.locale : LocaleUtil.get_best_locale(locale)
 
         result = get_bundle(component, locale)&.fetch(key, nil)
         if result.nil? && !LocaleUtil.is_source_locale(locale)
@@ -61,7 +61,7 @@ module SgtnClient
         if kwargs.empty?
           result
         else
-          locale = result.locale if result.is_a?(SgtnClient::StringUtil)
+          locale = result.locale if result.is_a?(StringUtil)
           result.localize(locale) % kwargs
         end
       end
@@ -70,7 +70,7 @@ module SgtnClient
       def get_translations(component, locale = nil)
         SgtnClient.logger.debug "[#{method(__callee__).owner}.#{__callee__}] component: #{component}, locale: #{locale}"
 
-        locale = locale.nil? ? self.locale : SgtnClient::LocaleUtil.get_best_locale(locale)
+        locale = locale.nil? ? self.locale : LocaleUtil.get_best_locale(locale)
         items = get_bundle(component, locale)
         if items.nil? && !LocaleUtil.is_source_locale(locale)
           items = get_bundle(component, LocaleUtil.get_source_locale)
@@ -81,11 +81,11 @@ module SgtnClient
       end
 
       def locale
-        RequestStore.store[:locale] ||= SgtnClient::LocaleUtil.get_fallback_locale
+        RequestStore.store[:locale] ||= LocaleUtil.get_fallback_locale
       end
 
       def locale=(value)
-        RequestStore.store[:locale] = SgtnClient::LocaleUtil.get_best_locale(value)
+        RequestStore.store[:locale] = LocaleUtil.get_best_locale(value)
       end
 
       private
@@ -99,13 +99,13 @@ module SgtnClient
       end
 
       def get_bundle!(component, locale)
-        id = SgtnClient::Common::BundleID.new(component, locale)
-        bundles = SgtnClient::Config.available_bundles
+        id = Common::BundleID.new(component, locale)
+        bundles = Config.available_bundles
         unless bundles.nil? || bundles.empty? || bundles.include?(id)
-          raise SgtnClient::SingletonError, 'bundle is unavailable.'
+          raise SingletonError, 'bundle is unavailable.'
         end
 
-        SgtnClient::Config.loader.get_bundle(component, locale)
+        Config.loader.get_bundle(component, locale)
       end
     end
     extend Implementation

data/lib/sgtn-client/common.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+#  Copyright 2022 VMware, Inc.
+#  SPDX-License-Identifier: EPL-2.0
+
+module SgtnClient
+  module Common # :nodoc:
+    autoload :BundleID, 'sgtn-client/common/data'
+  end
+end

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

@@ -1,7 +1,7 @@
 # Copyright 2022 VMware, Inc.
 # SPDX-License-Identifier: EPL-2.0
 
-require 'date'
+require 'time'
 
 module SgtnClient::Core
         class Cache
@@ -31,4 +31,4 @@ module SgtnClient::Core
             end
         end
 
-end
+end

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

@@ -3,15 +3,10 @@
 
 require 'erb'
 require 'yaml'
+require 'set'
 require 'observer'
 
 module SgtnClient
-  #include Exceptions
-
-  module TranslationLoader
-    autoload :LoaderFactory, 'sgtn-client/loader/loader_factory'
-  end
-
   module Configuration
 
     def config
@@ -130,7 +125,7 @@ module SgtnClient
           if configurations[env]
             @@config_cache[env] ||= new(configurations[env])
           else
-            raise SgtnClient::Exceptions::MissingConfig.new("Configuration[#{env}] NotFound")
+            raise Exceptions::MissingConfig.new("Configuration[#{env}] NotFound")
           end
         end
         
@@ -162,8 +157,8 @@ module SgtnClient
 
         def loader
           @loader ||= begin
-            config = SgtnClient::Config.configurations[SgtnClient::Config.default_environment]
-            SgtnClient::TranslationLoader::LoaderFactory.create(config)
+            config = Config.configurations[Config.default_environment]
+            TranslationLoader::LoaderFactory.create(config)
           end
         end
 

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

@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: EPL-2.0
 
 require 'logger'
+require 'time'
 
 module SgtnClient
 

data/lib/sgtn-client/i18n_backend.rb

@@ -0,0 +1,46 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
+require 'i18n'
+
+module SgtnClient # :nodoc:
+  # When integrating Singleton in a client application that is already using [I18n::Backend (https://www.rubydoc.info/github/svenfuchs/i18n/master/I18n/Backend/), it would be useful to have Singleton override the said module in order to minimize necessary changes. Here is a common usage:
+  #
+  #   I18n::Backend::Simple.include(I18n::Backend::Fallbacks) # add fallbacks behavior to current backend
+  #   I18n.backend = I18n::Backend::Chain.new(Sgtn::I18nBackend.new(component_name), I18n.backend)
+  #   I18n.enforce_available_locales=false # disable available locales check
+  #   I18n.default_locale = :en
+  class I18nBackend
+    def initialize(component)
+      @component = component
+    end
+
+    def initialized?
+      @initialized = true
+    end
+
+    def load_translations(*) end
+
+    def store_translations(*) end
+
+    def available_locales
+      SgtnClient::Config.available_locales.to_a
+    end
+
+    def reload!; end
+
+    def eager_load!; end
+
+    def translations; end
+
+    def exists?(locale, key)
+      !!(translate(locale, key) { nil })
+    end
+
+    def translate(locale, key, options)
+      flat_key = I18n::Backend::Flatten.normalize_flat_keys(locale, key, options[:scope], '.')
+      values = options.except(*I18n::RESERVED_KEYS)
+      SgtnClient::Translation.translate(flat_key, @component, locale, **values) { nil }
+    end
+  end
+end

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

@@ -4,20 +4,16 @@
 # SPDX-License-Identifier: EPL-2.0
 
 module SgtnClient
-  autoload :CacheUtil, 'sgtn-client/util/cache-util'
-
   module TranslationLoader
-    autoload :CONSTS, 'sgtn-client/loader/consts'
-
     module Cache # :nodoc:
       # get from cache, return expired data immediately
       def get_bundle(component, locale)
         SgtnClient.logger.debug "[#{__FILE__}][#{__callee__}] component=#{component}, locale=#{locale}"
 
-        key = SgtnClient::CacheUtil.get_cachekey(component, locale)
-        cache_item = SgtnClient::CacheUtil.get_cache(key)
+        key = CacheUtil.get_cachekey(component, locale)
+        cache_item = CacheUtil.get_cache(key)
         if cache_item
-          if SgtnClient::CacheUtil.is_expired(cache_item)
+          if CacheUtil.is_expired(cache_item)
             Thread.new do # TODO: Use one thread # refresh in background
               begin
                 load_bundle(component, locale)
@@ -37,22 +33,22 @@ module SgtnClient
       def load_bundle(component, locale)
         SgtnClient.logger.debug "[#{__FILE__}][#{__callee__}] component=#{component}, locale=#{locale}"
 
-        key = SgtnClient::CacheUtil.get_cachekey(component, locale)
+        key = CacheUtil.get_cachekey(component, locale)
         item = super
-        SgtnClient::CacheUtil.write_cache(key, item) if item
+        CacheUtil.write_cache(key, item) if item
         item
       end
 
       def available_bundles
         SgtnClient.logger.debug "[#{__FILE__}][#{__callee__}]"
 
-        cache_item = SgtnClient::CacheUtil.get_cache(CONSTS::AVAILABLE_BUNDLES_KEY)
+        cache_item = CacheUtil.get_cache(CONSTS::AVAILABLE_BUNDLES_KEY)
         if cache_item
-          if SgtnClient::CacheUtil.is_expired(cache_item)
+          if CacheUtil.is_expired(cache_item)
             Thread.new do # TODO: Use one thread
               begin
                 item = super
-                SgtnClient::CacheUtil.write_cache(CONSTS::AVAILABLE_BUNDLES_KEY, item) if item
+                CacheUtil.write_cache(CONSTS::AVAILABLE_BUNDLES_KEY, item) if item
               rescue StandardError => e
                 SgtnClient.logger.error 'an error occured while loading available bundles.'
                 SgtnClient.logger.error e
@@ -63,7 +59,7 @@ module SgtnClient
         end
 
         item = super
-        SgtnClient::CacheUtil.write_cache(CONSTS::AVAILABLE_BUNDLES_KEY, item) if item
+        CacheUtil.write_cache(CONSTS::AVAILABLE_BUNDLES_KEY, item) if item
         item
       end
     end

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

@@ -1,6 +1,8 @@
 # Copyright 2022 VMware, Inc.
 # SPDX-License-Identifier: EPL-2.0
 
+require 'set'
+
 module SgtnClient
   module TranslationLoader
     class Chain
@@ -23,7 +25,7 @@ module SgtnClient
           end
         end
 
-        raise exception || SgtnClient::SingletonError.new("can't load component: #{component}, locale: #{locale}")
+        raise exception || SingletonError.new("can't load component: #{component}, locale: #{locale}")
       end
 
       def available_bundles

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

@@ -3,14 +3,6 @@
 
 module SgtnClient
   module TranslationLoader
-    autoload :Source, 'sgtn-client/loader/source'
-    autoload :SgtnServer, 'sgtn-client/loader/server'
-    autoload :LocalTranslation, 'sgtn-client/loader/local_translation'
-    autoload :Chain, 'sgtn-client/loader/chain_loader'
-    autoload :SourceComparer, 'sgtn-client/loader/source_comparer'
-    autoload :SingleLoader, 'sgtn-client/loader/single_loader'
-    autoload :Cache, 'sgtn-client/loader/cache'
-
     module LoaderFactory
       def self.create(config)
         SgtnClient.logger.info "[#{method(__callee__).owner}.#{__callee__}] config=#{config}"
@@ -19,10 +11,10 @@ module SgtnClient
         loaders << Source.new(config) if config['source_bundle']
         loaders << SgtnServer.new(config) if config['vip_server']
         loaders << LocalTranslation.new(config) if config['translation_bundle']
-        raise SgtnClient::SingletonError, 'no translation is available!' if loaders.empty?
+        raise SingletonError, 'no translation is available!' if loaders.empty?
 
         chain_loader = Class.new(Chain)
-        chain_loader.include SourceComparer if config['source_bundle'] || config['vip_server']
+        chain_loader.include SourceComparer
         chain_loader.include SingleLoader
         chain_loader.include Cache
 

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

@@ -3,15 +3,10 @@
 
 require 'json'
 require 'pathname'
+require 'set'
 
 module SgtnClient
-  module Common
-    autoload :BundleID, 'sgtn-client/common/data'
-  end
-
   module TranslationLoader
-    autoload :CONSTS, 'sgtn-client/loader/consts'
-
     class LocalTranslation
       BUNDLE_PREFIX = 'messages_'.freeze
       BUNDLE_SUFFIX = '.json'.freeze
@@ -21,8 +16,6 @@ module SgtnClient
       end
 
       def load_bundle(component, locale)
-        return if locale == CONSTS::REAL_SOURCE_LOCALE # return when querying source
-
         SgtnClient.logger.debug "[#{method(__callee__).owner}.#{__callee__}] component=#{component}, locale=#{locale}"
 
         file_name = BUNDLE_PREFIX + locale + BUNDLE_SUFFIX
@@ -31,7 +24,7 @@ module SgtnClient
         bundle_data = JSON.parse(File.read(file_path))
         messages = bundle_data['messages']
 
-        raise SgtnClient::SingletonError, "no messages in local bundle file: #{file_path}." unless messages
+        raise SingletonError, "no messages in local bundle file: #{file_path}." unless messages
 
         messages
       end

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

@@ -5,15 +5,10 @@
 
 require 'faraday'
 require 'faraday_middleware'
+require 'set'
 
 module SgtnClient
-  module Common
-    autoload :BundleID, 'sgtn-client/common/data'
-  end
-
   module TranslationLoader
-    autoload :CONSTS, 'sgtn-client/loader/consts'
-
     class SgtnServer
       ERROR_ILLEGAL_DATA = 'server returned illegal data.'
       ERROR_BUSINESS_ERROR = 'server returned business error.'
@@ -23,7 +18,7 @@ module SgtnClient
       def initialize(config)
         @server_url = config['vip_server']
 
-        product_root = format('/i18n/api/v2/translation/products/%s/versions/%s', config['product_name'], config['version'])
+        product_root = format('i18n/api/v2/translation/products/%s/versions/%s', config['product_name'], config['version'])
 
         @bundle_url = "#{product_root}/locales/%s/components/%s"
         @locales_url = "#{product_root}/localelist"
@@ -73,7 +68,7 @@ module SgtnClient
 
       def extract_data(parsedbody, path_to_data)
         data = parsedbody.dig('data', *path_to_data)
-        raise SgtnClient::SingletonError, "no expected data in response. Body is: #{parsedbody}" unless data
+        raise SingletonError, "no expected data in response. Body is: #{parsedbody}" unless data
 
         data
       end
@@ -81,13 +76,13 @@ module SgtnClient
       def process_business_error(parsedbody)
         b_code = parsedbody.dig('response', 'code')
         unless b_code >= 200 && b_code < 300 || b_code >= 600 && b_code < 700
-          raise SgtnClient::SingletonError, "#{ERROR_BUSINESS_ERROR} #{parsedbody['response']}"
+          raise SingletonError, "#{ERROR_BUSINESS_ERROR} #{parsedbody['response']}"
         end
 
         # 600 means a successful response, 6xx means partial successful.
         SgtnClient.logger.warn "#{ERROR_BUSINESS_ERROR} #{parsedbody['response']}" if b_code > 600
       rescue TypeError, ArgumentError, NoMethodError => e
-        raise SgtnClient::SingletonError, "#{ERROR_ILLEGAL_DATA} #{e}. Body is: #{parsedbody}"
+        raise SingletonError, "#{ERROR_ILLEGAL_DATA} #{e}. Body is: #{parsedbody}"
       end
     end
   end

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

@@ -2,12 +2,7 @@
 # SPDX-License-Identifier: EPL-2.0
 
 module SgtnClient
-  autoload :SingleOperation, 'sgtn-client/common/single_operation'
-  autoload :CacheUtil, 'sgtn-client/util/cache-util'
-
   module TranslationLoader
-    autoload :CONSTS, 'sgtn-client/loader/consts'
-
     module SingleLoader
       def load_bundle(component, locale)
         SgtnClient.logger.debug "[#{__FILE__}][#{__callee__}] component=#{component}, locale=#{locale}"
@@ -41,7 +36,7 @@ module SgtnClient
           end
         end
 
-        loader = SgtnClient::SingleOperation.new(none_alive, &creator)
+        loader = SingleOperation.new(none_alive, &creator)
       end
     end
   end

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

@@ -2,16 +2,11 @@
 # SPDX-License-Identifier: EPL-2.0
 
 require 'pathname'
-require 'psych/simple'
+require 'set'
+require 'yaml'
 
 module SgtnClient
-  module Common
-    autoload :BundleID, 'sgtn-client/common/data'
-  end
-
   module TranslationLoader
-    autoload :CONSTS, 'sgtn-client/loader/consts'
-
     class Source
       def initialize(config)
         @source_bundle_path = Pathname.new(config['source_bundle'])
@@ -25,7 +20,7 @@ module SgtnClient
         total_messages = {}
 
         (@source_bundle_path + component).glob('**/*.{yml, yaml}') do |f|
-          bundle = Psych.simple_load(File.read(f))
+          bundle = YAML.load(File.read(f))
           messages = bundle&.first&.last # TODO: Warn about inconsistent source locale
           if messages.is_a?(Hash)
             total_messages.merge!(messages)
@@ -34,7 +29,7 @@ module SgtnClient
           end
         end
 
-        raise SgtnClient::SingletonError, "no local source messages for component #{component}" if total_messages.empty?
+        raise SingletonError, "no local source messages for component #{component}" if total_messages.empty?
 
         total_messages
       end
@@ -45,7 +40,7 @@ module SgtnClient
         @available_bundles ||= begin
           @source_bundle_path.children.select(&:directory?).reduce(Set.new) do |bundles, component|
             component.glob('**/*.{yml, yaml}') do |_|
-              bundles << Common::BundleID.new(component.basename.to_s, SgtnClient::LocaleUtil.get_source_locale)
+              bundles << Common::BundleID.new(component.basename.to_s, LocaleUtil.get_source_locale)
               break bundles
             end || bundles
           end

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

@@ -2,12 +2,7 @@
 # SPDX-License-Identifier: EPL-2.0
 
 module SgtnClient
-  autoload :StringUtil, 'sgtn-client/util/string-util'
-  autoload :LocaleUtil, 'sgtn-client/util/locale-util'
-
   module TranslationLoader
-    autoload :CONSTS, 'sgtn-client/loader/consts'
-
     module SourceComparer
       def load_bundle(component, locale)
         SgtnClient.logger.debug "[#{__FILE__}][#{__callee__}] component=#{component}, locale=#{locale}"

data/lib/sgtn-client/loader.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+#  Copyright 2022 VMware, Inc.
+#  SPDX-License-Identifier: EPL-2.0
+
+module SgtnClient
+  module TranslationLoader # :nodoc:
+    autoload :Cache, 'sgtn-client/loader/cache'
+    autoload :Chain, 'sgtn-client/loader/chain_loader'
+    autoload :CONSTS, 'sgtn-client/loader/consts'
+    autoload :LoaderFactory, 'sgtn-client/loader/loader_factory'
+    autoload :LocalTranslation, 'sgtn-client/loader/local_translation'
+    autoload :SgtnServer, 'sgtn-client/loader/server'
+    autoload :SingleLoader, 'sgtn-client/loader/single_loader'
+    autoload :SourceComparer, 'sgtn-client/loader/source_comparer'
+    autoload :Source, 'sgtn-client/loader/source'
+  end
+end

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

@@ -4,6 +4,10 @@
 module SgtnClient
       LOGFILE_SHIFT_AGE = 4
 
+      autoload :Common,             'sgtn-client/common'
+      autoload :TranslationLoader,  'sgtn-client/loader'
+      autoload :SingleOperation,    'sgtn-client/common/single_operation'
+
       module Core
             autoload :Cache,        "sgtn-client/core/cache"
       end
@@ -16,8 +20,10 @@ 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"
       autoload :CacheUtil,          "sgtn-client/util/cache-util"
+      autoload :StringUtil,         "sgtn-client/util/string-util"
+      autoload :SingletonError,     'sgtn-client/exceptions'
+      autoload :I18nBackend,        "sgtn-client/i18n_backend"
 
       module Formatters
             autoload :PluralFormatter,    "sgtn-client/formatters/plurals/plural_formatter"
@@ -26,15 +32,15 @@ module SgtnClient
 
       class << self
             def configure(options = {}, &block)
-            SgtnClient::Config.configure(options, &block)
+            Config.configure(options, &block)
             end
 
             include Logging
             def load(*args)
                   # load configuration file
                   begin
-                    SgtnClient::Config.load(args[0], args[1])
-                    SgtnClient::ValidateUtil.validate_config()
+                    Config.load(args[0], args[1])
+                    ValidateUtil.validate_config()
                   rescue => exception
                     file = File.open('./error.log', 'a')
                     file.sync = true
@@ -44,40 +50,40 @@ module SgtnClient
 
                   # create log file
                   file = './sgtnclient_d.log'
-                  SgtnClient.logger.debug "[Client][load]create log file=#{file}"
+                  logger.debug "[Client][load]create log file=#{file}"
                   if args[2] != nil
                         file = args[2]
                   end
                   file = File.open(file, 'a')
                   file.sync = true
-                  SgtnClient.logger = Logger.new(file, LOGFILE_SHIFT_AGE)
+                  logger = Logger.new(file, LOGFILE_SHIFT_AGE)
 
                   # Set log level for sandbox mode
-                  env = SgtnClient::Config.default_environment
-                  mode = SgtnClient::Config.configurations[env]["mode"]
-                  SgtnClient.logger.debug "[Client][load]set log level, mode=#{mode}"
+                  env = Config.default_environment
+                  mode = Config.configurations[env]["mode"]
+                  logger.debug "[Client][load]set log level, mode=#{mode}"
                   if mode == 'sandbox'
-                        SgtnClient.logger.level = Logger::DEBUG
+                        logger.level = Logger::DEBUG
                   else 
-                        SgtnClient.logger.level = Logger::INFO
+                        logger.level = Logger::INFO
                   end
 
                   # initialize cache
-                  disable_cache = SgtnClient::Config.configurations[env]["disable_cache"]
-                  SgtnClient.logger.debug "[Client][load]cache initialize, disable_cache=#{disable_cache}"
+                  disable_cache = Config.configurations[env]["disable_cache"]
+                  logger.debug "[Client][load]cache initialize, disable_cache=#{disable_cache}"
                   if disable_cache != nil
-                        SgtnClient::Core::Cache.initialize(disable_cache)
+                        Core::Cache.initialize(disable_cache)
                   else
-                        SgtnClient::Core::Cache.initialize()
+                        Core::Cache.initialize()
                   end
             end
 
             def logger
-                  SgtnClient::Config.logger
+                  Config.logger
             end
 
             def logger=(log)
-                  SgtnClient::Config.logger = log
+                  Config.logger = log
             end           
       end
   

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

@@ -1,34 +1,32 @@
 # Copyright 2022 VMware, Inc.
 # SPDX-License-Identifier: EPL-2.0
 
-module SgtnClient
-  module Core
-    autoload :Cache, 'sgtn-client/core/cache'
-  end
+require 'time'
 
+module SgtnClient
   class CacheUtil
     def self.get_cache(cache_key)
-      SgtnClient::Core::Cache.get(cache_key)
+      Core::Cache.get(cache_key)
     end
 
     def self.clear_cache
-      SgtnClient::Core::Cache.clear
+      Core::Cache.clear
     end
 
     def self.write_cache(cache_key, items)
       return nil if items.nil? || items.empty?
 
-      env = SgtnClient::Config.default_environment
-      cache_expiry_period = SgtnClient::Config.configurations[env]['cache_expiry_period']
+      env = Config.default_environment
+      cache_expiry_period = Config.configurations[env]['cache_expiry_period']
       # expired after 24 hours
       cache_expiry_period = 24 * 60 if cache_expiry_period.nil?
-      SgtnClient::Core::Cache.put(cache_key, items, cache_expiry_period)
+      Core::Cache.put(cache_key, items, cache_expiry_period)
     end
 
     def self.get_cachekey(component, locale)
-      env = SgtnClient::Config.default_environment
-      product_name = SgtnClient::Config.configurations[env]['product_name']
-      version = SgtnClient::Config.configurations[env]['version'].to_s
+      env = Config.default_environment
+      product_name = Config.configurations[env]['product_name']
+      version = Config.configurations[env]['version'].to_s
       product_name + '_' + version + '_' + component + '_' + locale
     end
 

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

@@ -3,8 +3,6 @@
 # Copyright 2022 VMware, Inc.
 # SPDX-License-Identifier: EPL-2.0
 
-require 'set'
-
 module SgtnClient
   class LocaleUtil
     MAP_LOCALES = {
@@ -45,8 +43,8 @@ module SgtnClient
     end
 
     def self.get_default_locale
-      env = SgtnClient::Config.default_environment
-      SgtnClient::Config.configurations[env]['default_language']
+      env = Config.default_environment
+      Config.configurations[env]['default_language']
     end
 
     def self.get_fallback_locale
@@ -63,7 +61,7 @@ module SgtnClient
       @lowercase_locales_map = nil if type == :available_locales
     end
 
-    SgtnClient::Config.add_observer(self, :reset_available_locales)
+    Config.add_observer(self, :reset_available_locales)
 
     private_class_method :get_best_match, :lowercase_locales_map, :reset_available_locales
   end

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

@@ -6,32 +6,32 @@ module SgtnClient
   class ValidateUtil
 
       def self.validate_config()
-        env = SgtnClient::Config.default_environment
+        env = Config.default_environment
         SgtnClient.logger.debug "[ValidateUtil][validate_config] env = #{env}"
         messages = "\n"
 
-        mode = SgtnClient::Config.configurations[env]["mode"]
+        mode = Config.configurations[env]["mode"]
         if mode != 'sandbox' && mode != 'live'
           messages =  messages + "Configuration[mode] has to be 'sandbox' or 'live'!\n"
         end
 
-        #version = SgtnClient::Config.configurations[env]["version"]
+        #version = Config.configurations[env]["version"]
         #if version.is_a? Integer
           #messages = messages +  "Configuration[version] has to be standard as '#.#.#, e.g '1.0.0'!\n"
         #end
         
-        cache_expiry_period = SgtnClient::Config.configurations[env]["cache_expiry_period"]
+        cache_expiry_period = Config.configurations[env]["cache_expiry_period"]
         if cache_expiry_period != nil && (cache_expiry_period.is_a? Integer) == false
           messages = messages +  "Configuration[cache_expiry_period] has to be a number!\n"
         end
         
-        disable_cache = SgtnClient::Config.configurations[env]["disable_cache"]
+        disable_cache = Config.configurations[env]["disable_cache"]
         if disable_cache != nil && disable_cache != false && disable_cache != true
           messages = messages +  "Configuration[disable_cache] has to be a 'true' or 'false'!\n"
         end
         
         if messages != "\n"
-          raise SgtnClient::Exceptions::MissingConfig.new(messages)
+          raise Exceptions::MissingConfig.new(messages)
         end
       end
 

data/lib/singleton-client.rb

@@ -1,15 +1,15 @@
 # Copyright 2022 VMware, Inc.
 # SPDX-License-Identifier: EPL-2.0
 
+require 'forwardable'
 require_relative 'singleton-ruby'
 
 module Sgtn # :nodoc:
-  # load configuration from a file
-  def self.load_config(*args)
-    SgtnClient.load(*args)
+  class << self
+    extend Forwardable
+    def_delegator SgtnClient, :load, :load_config
+    def_delegators SgtnClient::Translation, :translate, :t, :get_translations, :locale, :locale=
   end
 
-  extend SgtnClient::Translation::Implementation
-
-  private_class_method :getString, :getString_p, :getString_f, :getStrings
+  I18nBackend = SgtnClient::I18nBackend
 end

data/lib/singleton-ruby.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singleton-client-test
 version: !ruby/object:Gem::Version
-  version: 0.7.0.37
+  version: 0.7.7.1
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -48,16 +48,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -143,19 +143,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.6'
 - !ruby/object:Gem::Dependency
-  name: psych-simple
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 description: Singleton Ruby client
 email: g11n-vip-project@vmware.com
 executables: []
@@ -172,6 +172,7 @@ files:
 - lib/sgtn-client/cldr/localized_datetime.rb
 - lib/sgtn-client/cldr/localized_str.rb
 - lib/sgtn-client/cldr/localized_time.rb
+- lib/sgtn-client/common.rb
 - lib/sgtn-client/common/data.rb
 - lib/sgtn-client/common/single_operation.rb
 - lib/sgtn-client/core/cache.rb
@@ -180,6 +181,8 @@ files:
 - lib/sgtn-client/core/logging.rb
 - lib/sgtn-client/exceptions.rb
 - lib/sgtn-client/formatters/plurals/plural_formatter.rb
+- lib/sgtn-client/i18n_backend.rb
+- lib/sgtn-client/loader.rb
 - lib/sgtn-client/loader/cache.rb
 - lib/sgtn-client/loader/chain_loader.rb
 - lib/sgtn-client/loader/consts.rb