singleton-client-test 0.7.7.1 → 0.7.7.4

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

@@ -16,9 +16,9 @@ module SgtnClient
       REQUEST_ARGUMENTS = { timeout: 10 }.freeze
 
       def initialize(config)
-        @server_url = config['vip_server']
+        @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"
@@ -26,14 +26,14 @@ module SgtnClient
       end
 
       def load_bundle(component, locale)
-        SgtnClient.logger.debug "[#{method(__callee__).owner}.#{__callee__}] component=#{component}, locale=#{locale}"
+        SgtnClient.logger.debug { "[#{method(__callee__).owner}.#{__callee__}] component=#{component}, locale=#{locale}" }
 
         messages = query_server(format(@bundle_url, locale, component), ['messages'])
         messages
       end
 
       def available_bundles
-        SgtnClient.logger.debug "[#{method(__callee__).owner}.#{__callee__}]"
+        SgtnClient.logger.debug { "[#{method(__callee__).owner}.#{__callee__}]" }
 
         components_thread = Thread.new { available_components }
         available_locales.reduce(Set.new) do |bundles, locale|

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

@@ -4,39 +4,42 @@
 module SgtnClient
   module TranslationLoader
     module SingleLoader
-      def load_bundle(component, locale)
-        SgtnClient.logger.debug "[#{__FILE__}][#{__callee__}] component=#{component}, locale=#{locale}"
+      def load_bundle(component, locale, sync: true)
+        SgtnClient.logger.debug { "[#{__FILE__}][#{__callee__}] component=#{component}, locale=#{locale}" }
 
-        @single_bundle_loader ||= single_loader { |c, l| super(c, l) }
-        id = CacheUtil.get_cachekey(component, locale)
-        @single_bundle_loader.operate(id, component, locale)&.value
+        do_single_load(Common::BundleID.new(component, locale), sync) { super(component, locale) }
       end
 
-      def available_bundles
-        SgtnClient.logger.debug "[#{__FILE__}][#{__callee__}]"
+      def available_bundles(sync: true)
+        SgtnClient.logger.debug { "[#{__FILE__}][#{__callee__}]" }
 
-        @single_available_bundles_loader ||= single_loader { super }
-        @single_available_bundles_loader.operate(CONSTS::AVAILABLE_BUNDLES_KEY)&.value
+        do_single_load(CONSTS::AVAILABLE_BUNDLES_KEY, sync) { super() }
       end
 
-      private
-
-      def single_loader(&block)
-        loader = nil
-        none_alive = proc { |_, thread| thread.nil? }
-        creator = proc do |id, _, *args|
+      def initialize(*args)
+        none_alive = proc { |_, thread| thread.nil? || thread.alive? == false }
+        creator = proc do |id, &block|
           Thread.new do
-            SgtnClient.logger.debug "start single loading #{id}"
+            SgtnClient.logger.debug { "start single loading #{id}" }
             begin
-              block.call(*args)
+              block.call
             ensure
               # delete thread from hash after finish
-              loader.remove_object(id)
+              @single_loader.remove_object(id)
             end
           end
         end
 
-        loader = SingleOperation.new(none_alive, &creator)
+        @single_loader = SingleOperation.new(none_alive, &creator)
+
+        super
+      end
+
+      private
+
+      def do_single_load(id, sync, &block)
+        thread = @single_loader.operate(id, &block)
+        thread&.value if sync
       end
     end
   end

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

@@ -9,13 +9,13 @@ module SgtnClient
   module TranslationLoader
     class Source
       def initialize(config)
-        @source_bundle_path = Pathname.new(config['source_bundle'])
+        @source_bundle_path = Pathname.new(config.source_bundle)
       end
 
       def load_bundle(component, locale = nil)
         return if locale && locale != CONSTS::REAL_SOURCE_LOCALE # return when NOT querying source
 
-        SgtnClient.logger.debug "[#{method(__callee__).owner}.#{__callee__}] component=#{component}"
+        SgtnClient.logger.debug { "[#{method(__callee__).owner}.#{__callee__}] component=#{component}" }
 
         total_messages = {}
 
@@ -35,7 +35,7 @@ module SgtnClient
       end
 
       def available_bundles
-        SgtnClient.logger.debug "[#{method(__callee__).owner}.#{__callee__}]"
+        SgtnClient.logger.debug { "[#{method(__callee__).owner}.#{__callee__}]" }
 
         @available_bundles ||= begin
           @source_bundle_path.children.select(&:directory?).reduce(Set.new) do |bundles, component|

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

@@ -5,7 +5,7 @@ module SgtnClient
   module TranslationLoader
     module SourceComparer
       def load_bundle(component, locale)
-        SgtnClient.logger.debug "[#{__FILE__}][#{__callee__}] component=#{component}, locale=#{locale}"
+        SgtnClient.logger.debug { "[#{__FILE__}][#{__callee__}] component=#{component}, locale=#{locale}" }
 
         # source locale and old source locale don't need comparison because they are bases of comparison
         real_locale = cache_to_real_map[locale]

data/lib/sgtn-client/loader.rb

@@ -6,6 +6,7 @@
 module SgtnClient
   module TranslationLoader # :nodoc:
     autoload :Cache, 'sgtn-client/loader/cache'
+    autoload :CacheFiller, 'sgtn-client/loader/cache'
     autoload :Chain, 'sgtn-client/loader/chain_loader'
     autoload :CONSTS, 'sgtn-client/loader/consts'
     autoload :LoaderFactory, 'sgtn-client/loader/loader_factory'

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

@@ -1,90 +1,48 @@
 # Copyright 2022 VMware, Inc.
 # SPDX-License-Identifier: EPL-2.0
 
-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
-
-      autoload :Translation,        "sgtn-client/api/translation"
-      autoload :T,                  "sgtn-client/api/t"
-      autoload :Source,             "sgtn-client/api/source"
-      autoload :Config,             "sgtn-client/core/config"
-      autoload :Logging,            "sgtn-client/core/logging"
-      autoload :Exceptions,         "sgtn-client/core/exceptions"
-      autoload :ValidateUtil,       "sgtn-client/util/validate-util"
-      autoload :LocaleUtil,         "sgtn-client/util/locale-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"
-      end
-
-
-      class << self
-            def configure(options = {}, &block)
-            Config.configure(options, &block)
-            end
-
-            include Logging
-            def load(*args)
-                  # load configuration file
-                  begin
-                    Config.load(args[0], args[1])
-                    ValidateUtil.validate_config()
-                  rescue => exception
-                    file = File.open('./error.log', 'a')
-                    file.sync = true
-                    log = Logger.new(file)
-                    log.error exception.message
-                  end
-
-                  # create log file
-                  file = './sgtnclient_d.log'
-                  logger.debug "[Client][load]create log file=#{file}"
-                  if args[2] != nil
-                        file = args[2]
-                  end
-                  file = File.open(file, 'a')
-                  file.sync = true
-                  logger = Logger.new(file, LOGFILE_SHIFT_AGE)
-
-                  # Set log level for sandbox mode
-                  env = Config.default_environment
-                  mode = Config.configurations[env]["mode"]
-                  logger.debug "[Client][load]set log level, mode=#{mode}"
-                  if mode == 'sandbox'
-                        logger.level = Logger::DEBUG
-                  else 
-                        logger.level = Logger::INFO
-                  end
-
-                  # initialize cache
-                  disable_cache = Config.configurations[env]["disable_cache"]
-                  logger.debug "[Client][load]cache initialize, disable_cache=#{disable_cache}"
-                  if disable_cache != nil
-                        Core::Cache.initialize(disable_cache)
-                  else
-                        Core::Cache.initialize()
-                  end
-            end
-
-            def logger
-                  Config.logger
-            end
-
-            def logger=(log)
-                  Config.logger = log
-            end           
-      end
-  
+require 'forwardable'
+require 'yaml'
+
+module SgtnClient # :nodoc:
+  autoload :Common,             'sgtn-client/common'
+  autoload :TranslationLoader,  'sgtn-client/loader'
+  autoload :SingleOperation,    'sgtn-client/common/single_operation'
+
+  module Core # :nodoc:
+    autoload :Cache, 'sgtn-client/core/cache'
+  end
+
+  autoload :Translation,        'sgtn-client/api/translation'
+  autoload :T,                  'sgtn-client/api/t'
+  autoload :Source,             'sgtn-client/api/source'
+  autoload :Config,             'sgtn-client/core/config'
+  autoload :Exceptions,         'sgtn-client/core/exceptions'
+  autoload :ValidateUtil,       'sgtn-client/util/validate-util'
+  autoload :LocaleUtil,         'sgtn-client/util/locale-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 # :nodoc:
+    autoload :PluralFormatter, 'sgtn-client/formatters/plurals/plural_formatter'
+  end
+
+  class << self
+    extend Forwardable
+
+    def_delegator Config, :instance, :config
+    def_delegators :config, :logger, :logger=
+
+    def load(config_file, env, log_file = nil)
+      configurations = YAML.load(File.read(config_file))
+      config_hash = configurations[env]
+      raise "Configuration[#{env}] NotFound" unless config_hash
+
+      config_hash['log_file'] = log_file if log_file
+      config.update(config_hash)
+      ValidateUtil.validate_config
+    end
+  end
 end

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

@@ -16,20 +16,12 @@ module SgtnClient
     def self.write_cache(cache_key, items)
       return nil if items.nil? || items.empty?
 
-      env = Config.default_environment
-      cache_expiry_period = Config.configurations[env]['cache_expiry_period']
+      cache_expiry_period = SgtnClient.config.cache_expiry_period
       # expired after 24 hours
       cache_expiry_period = 24 * 60 if cache_expiry_period.nil?
       Core::Cache.put(cache_key, items, cache_expiry_period)
     end
 
-    def self.get_cachekey(component, locale)
-      env = Config.default_environment
-      product_name = Config.configurations[env]['product_name']
-      version = Config.configurations[env]['version'].to_s
-      product_name + '_' + version + '_' + component + '_' + locale
-    end
-
     def self.is_expired(cache_item)
       cache_item[:expiry] < Time.now
     end

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

@@ -3,8 +3,10 @@
 # Copyright 2022 VMware, Inc.
 # SPDX-License-Identifier: EPL-2.0
 
+require 'concurrent/map'
+
 module SgtnClient
-  class LocaleUtil
+  class LocaleUtil # :nodoc:
     MAP_LOCALES = {
       'zh-cn' => 'zh-hans',
       'zh-tw' => 'zh-hant',
@@ -12,57 +14,88 @@ module SgtnClient
       'zh-hant-tw' => 'zh-hant'
     }.freeze
     LOCALE_SEPARATOR = '-'
+    EN_LOCALE = 'en'
+    @locale_match_results = Concurrent::Map.new
+    @lowercase_locales_map = Concurrent::Map.new
+
+    def self.get_best_locale(locale, component)
+      component_result = @locale_match_results[component] ||= begin
+        components = SgtnClient.config.available_components
+        unless components.empty? || components.include?(component)
+          raise SingletonError, "component '#{component}' doesn't exist!"
+        end
+
+        Concurrent::Map.new
+      end
 
-    def self.get_best_locale(locale)
-      return locale if Config.available_locales.include?(locale)
-
-      return get_fallback_locale if locale.nil?
-
-      locale = locale.to_s
-      return get_fallback_locale if locale.empty?
-
-      get_best_match(locale.gsub('_', LOCALE_SEPARATOR).downcase)
-    end
-
-    def self.is_source_locale(locale = nil)
-      locale == get_source_locale
+      component_result[locale] ||= begin
+                # component_result.shift if component_result.size >= 50
+                if SgtnClient.config.available_locales(component).include?(locale)
+                  locale
+                elsif locale.nil?
+                  get_fallback_locale
+                else
+                  locale = locale.to_s
+                  if locale.empty?
+                    get_fallback_locale
+                  else
+                    candidates = lowercase_locales_map(component)
+                    if candidates.empty?
+                      locale
+                    else
+                      get_best_match(locale.gsub('_', LOCALE_SEPARATOR).downcase, candidates)
+                    end
+                  end
+                end
+              end
     end
 
-    def self.get_best_match(locale)
+    def self.get_best_match(locale, candidates)
       locale = MAP_LOCALES[locale] || locale
-      lowercase_locales_map[locale] or begin
+      candidates[locale] or begin
         index = locale.rindex(LOCALE_SEPARATOR)
         return get_fallback_locale if index.nil?
 
-        get_best_match(locale[0...index])
+        get_best_match(locale[0...index], candidates)
       end
     end
 
     def self.get_source_locale
-      'en'
+      EN_LOCALE
     end
 
     def self.get_default_locale
-      env = Config.default_environment
-      Config.configurations[env]['default_language']
+      EN_LOCALE
     end
 
     def self.get_fallback_locale
-      @fallback_locale ||= get_default_locale || get_source_locale || 'en'
+      locale_fallbacks[0]
+    end
+
+    def self.locale_fallbacks
+      @locale_fallbacks ||= [get_default_locale, get_source_locale, EN_LOCALE].uniq(&:to_s) - [nil, '']
     end
 
-    def self.lowercase_locales_map
-      @lowercase_locales_map ||= Config.available_locales.each_with_object({}) do |locale, memo|
+    def self.lowercase_locales_map(component)
+      @lowercase_locales_map[component] ||= SgtnClient.config.available_locales(component).each_with_object({}) do |locale, memo|
         memo[locale.to_s.downcase] = locale
       end
     end
 
-    def self.reset_available_locales(type)
-      @lowercase_locales_map = nil if type == :available_locales
+    def self.reset_locale_data(type, component = nil)
+      return unless type == :available_locales
+
+      if component.nil?
+        @locale_match_results.clear
+        @lowercase_locales_map.clear
+      else
+        @locale_match_results.delete(component)
+        @lowercase_locales_map.delete(component)
+      end
     end
 
-    Config.add_observer(self, :reset_available_locales)
+    SgtnClient.config.add_observer(self, :reset_locale_data)
 
-    private_class_method :get_best_match, :lowercase_locales_map, :reset_available_locales
+    private_class_method :get_best_match, :lowercase_locales_map, :reset_locale_data
   end
 end

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

@@ -7,6 +7,9 @@ module SgtnClient
       super(str)
       @locale = locale
     end
-    attr_accessor :locale
+
+    def localize(locale)
+      super(@locale || locale)
+    end
   end
-end 
+end

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

@@ -6,31 +6,21 @@ module SgtnClient
   class ValidateUtil
 
       def self.validate_config()
-        env = Config.default_environment
-        SgtnClient.logger.debug "[ValidateUtil][validate_config] env = #{env}"
-        messages = "\n"
+        puts "validating config..."
+        messages = ""
 
-        mode = Config.configurations[env]["mode"]
-        if mode != 'sandbox' && mode != 'live'
-          messages =  messages + "Configuration[mode] has to be 'sandbox' or 'live'!\n"
+        version = SgtnClient.config.version
+        SgtnClient.config.version = version.to_s
+        if version.to_s !~ /\A(\d+\.)*\d+\z/
+          messages = messages +  "Configuration[version] has to be standard as '#.#.#, e.g '1.0.0'!\n"
         end
-
-        #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 = Config.configurations[env]["cache_expiry_period"]
+        cache_expiry_period = SgtnClient.config.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 = 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"
+
+        if messages != ""
           raise Exceptions::MissingConfig.new(messages)
         end
       end

data/lib/singleton-client.rb

@@ -7,8 +7,18 @@ require_relative 'singleton-ruby'
 module Sgtn # :nodoc:
   class << self
     extend Forwardable
-    def_delegator SgtnClient, :load, :load_config
-    def_delegators SgtnClient::Translation, :translate, :t, :get_translations, :locale, :locale=
+
+    # load configurations from a file
+    def load_config(config_file, env)
+      SgtnClient.load(config_file, env)
+    end
+
+    def_delegator SgtnClient::Config, :instance, :config
+    delegate %i[translate t get_translations locale locale=] => SgtnClient::Translation,
+             %i[logger product_name version vip_server translation_bundle
+                source_bundle cache_expiry_period log_file log_level].flat_map { |m|
+               [m, "#{m}=".to_sym]
+             } => :config
   end
 
   I18nBackend = SgtnClient::I18nBackend

metadata

@@ -1,79 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: singleton-client-test
 version: !ruby/object:Gem::Version
-  version: 0.7.7.1
+  version: 0.7.7.4
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+        version: '1.10'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: '1.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: lumberjack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -118,16 +98,16 @@ dependencies:
   name: request_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
@@ -142,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.6'
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Singleton Ruby client
 email: g11n-vip-project@vmware.com
 executables: []
@@ -178,7 +144,6 @@ files:
 - 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/exceptions.rb
 - lib/sgtn-client/formatters/plurals/plural_formatter.rb
 - lib/sgtn-client/i18n_backend.rb