singleton-client-test 0.7.7.1 → 0.7.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66531dc1471879c17d807694ff65b64e60bfd35a093d7eb739b728d7e0ae3321
-  data.tar.gz: 200e2f4b3ab09a0cfeefe1131ed61494fbec0a1f63974d36a9ce9379d117d066
+  metadata.gz: 2b1a0ab0b7bfa8a2fef42c229aae91032941499667f0885882f924d6a3f75694
+  data.tar.gz: be51ed5dbdf30cbc7f67353b5d96ba49e4e20a5de61ea9bd7d99d4f27785e1a9
 SHA512:
-  metadata.gz: d85cd8e706659abb1ec1a6e1364b5fcddf2b2c14bca9d616e49d0d28a7657984e26752e48b310763e51f536cbaefb56d99585fe09d46a68cc8cc75f1504e784b
-  data.tar.gz: 924846467b0707fb90b95f77a604546822e2e1ae3dbbc79cb3541fdbd1dcc99fd17df0b00762dd5ee2073a08a8f2044cbb260f986ded95e6ca42ce089cf35046
+  metadata.gz: d3a9b167165b5d6f6726ed8be0b07fadc7ef4aeb0c8ecb8f941bc77e5ff7ada988557f97098c33d1907fb7f24b1cac17f7df4fa3de3b96cce2e64a4240633c58
+  data.tar.gz: 44e84a38eb2e592793546c812817b751b0366b5af2ed0591eeaed1e4dd5b014af70b33674b7da69cac2873e16fb9ab3b47ff85d7d5f463b3a3bcfd987930ee7e

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

@@ -7,7 +7,6 @@ module SgtnClient
   class Source
     def self.loadBundles(locale)
       SgtnClient.logger.debug "[Source][loadBundles]locale=#{locale}"
-      Config.configurations.default = locale
     end
   end
 end

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

@@ -8,19 +8,19 @@ module SgtnClient
     module Implementation
       # <b>DEPRECATED:</b> Please use <tt>Sgtn:translate</tt> instead.
       def getString(component, key, locale)
-        SgtnClient.logger.debug "[Translation.getString]component: #{component}, key: #{key}, locale: #{locale}"
+        SgtnClient.logger.debug { "[Translation.getString]component: #{component}, key: #{key}, locale: #{locale}" }
         translate(key, component, locale) { nil }
       end
 
       # <b>DEPRECATED:</b> Please use <tt>Sgtn:translate</tt> instead.
       def getString_p(component, key, plural_args, locale)
-        SgtnClient.logger.debug "[Translation][getString_p]component=#{component}, key=#{key}, locale=#{locale}"
+        SgtnClient.logger.debug { "[Translation][getString_p]component=#{component}, key=#{key}, locale=#{locale}" }
         translate(key, component, locale, **plural_args) { nil }
       end
 
       # <b>DEPRECATED:</b> Please use <tt>Sgtn:translate</tt> instead.
       def getString_f(component, key, args, locale, *_optionals)
-        SgtnClient.logger.debug "[Translation][getString_f]component=#{component}, key=#{key}, locale=#{locale}"
+        SgtnClient.logger.debug { "[Translation][getString_f]component=#{component}, key=#{key}, locale=#{locale}" }
         s = translate(key, component, locale) { nil }
         return nil if s.nil?
 
@@ -39,16 +39,16 @@ module SgtnClient
         get_translations(component, locale)
       end
 
-      # raise error when translation is not found
       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 : LocaleUtil.get_best_locale(locale)
-
-        result = get_bundle(component, locale)&.fetch(key, nil)
-        if result.nil? && !LocaleUtil.is_source_locale(locale)
-          locale = LocaleUtil.get_source_locale
-          result = get_bundle(component, locale)&.fetch(key, nil)
+        SgtnClient.logger.debug { "[#{method(__callee__).owner}.#{__callee__}] key: #{key}, component: #{component}, locale: #{locale}, args: #{kwargs}" }
+
+        begin
+          best_match_locale = LocaleUtil.get_best_locale(locale || self.locale, component)
+          messages, actual_locale = get_bundle_with_fallback(component, best_match_locale)
+          result = messages&.fetch(key, nil)
+        rescue StandardError => e
+          SgtnClient.logger.debug { "[#{method(__callee__).owner}.#{__callee__}] translation is missing. {#{key}, #{component}, #{locale}}. #{e}" }
+          result = nil
         end
 
         if result.nil?
@@ -61,23 +61,21 @@ module SgtnClient
         if kwargs.empty?
           result
         else
-          locale = result.locale if result.is_a?(StringUtil)
-          result.localize(locale) % kwargs
+          result.localize(actual_locale) % kwargs
         end
       end
       alias t translate
 
       def get_translations(component, locale = nil)
-        SgtnClient.logger.debug "[#{method(__callee__).owner}.#{__callee__}] component: #{component}, locale: #{locale}"
+        SgtnClient.logger.debug { "[#{method(__callee__).owner}.#{__callee__}] component: #{component}, 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)
-          locale = LocaleUtil.get_source_locale
-        end
+        best_match_locale = LocaleUtil.get_best_locale(locale || self.locale, component)
+        messages, actual_locale = get_bundle_with_fallback(component, best_match_locale)
 
-        { 'component' => component, 'locale' => locale, 'messages' => items || {} } if items
+        { 'component' => component, 'locale' => actual_locale, 'messages' => messages } if messages
+      rescue StandardError => e
+        SgtnClient.logger.error "[#{method(__callee__).owner}.#{__callee__}] translations are missing. {#{component}, #{locale}}. #{e}"
+        nil
       end
 
       def locale
@@ -85,7 +83,7 @@ module SgtnClient
       end
 
       def locale=(value)
-        RequestStore.store[:locale] = LocaleUtil.get_best_locale(value)
+        RequestStore.store[:locale] = value
       end
 
       private
@@ -99,15 +97,29 @@ module SgtnClient
       end
 
       def get_bundle!(component, locale)
-        id = Common::BundleID.new(component, locale)
-        bundles = Config.available_bundles
-        unless bundles.nil? || bundles.empty? || bundles.include?(id)
-          raise SingletonError, 'bundle is unavailable.'
-        end
+        SgtnClient.config.loader.get_bundle(component, locale)
+      rescue StandardError
+        # delete the locale from the available_bundles of component to avoid repeated calls to server
+        SgtnClient.config.available_bundles.delete(Common::BundleID.new(component, locale))
+        SgtnClient.config.available_locales(component)&.delete(locale)
+        SgtnClient.config.changed
+        SgtnClient.config.notify_observers(:available_locales, component)
+        raise
+      end
+
+      def get_bundle_with_fallback(component, locale)
+        messages = get_bundle(component, locale)
+        return messages, locale if messages
+
+        LocaleUtil.locale_fallbacks.each do |l|
+          next if l == locale
 
-        Config.loader.get_bundle(component, locale)
+          messages = get_bundle(component, l)
+          return messages, l if messages
+        end
       end
     end
+
     extend Implementation
   end
 end

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

@@ -23,7 +23,7 @@ module SgtnClient
       alias eql? ==
 
       def to_s
-        "locale=#{@locale}, component=#{@component}}"
+        "{component: #{@component}, locale: #{@locale}}"
       end
     end
   end

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

@@ -3,25 +3,24 @@
 
 module SgtnClient
   class SingleOperation
-    def initialize(*conditions, &block)
-      raise 'no way to create a new obj' unless block
+    def initialize(*conditions, &creator)
+      raise 'no way to create a new obj' unless creator
 
       @lock = Mutex.new
       @hash = {}
 
       @conditions = conditions
-      @creator = block
+      @creator = creator
     end
 
-    # return new created object
-    def operate(id, *args)
+    # return new created object (return nil possibly)
+    def operate(id, &block)
       @lock.synchronize do
         obj = @hash[id]
         @conditions.each do |con|
-          return obj unless con.call(id, obj, *args)
+          return obj unless con.call(id, obj)
         end
-        # TODO: whatif returning nil
-        @hash[id] = @creator.call(id, obj, *args)
+        @hash[id] = @creator.call(id, &block)
       end
     end
 

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

@@ -7,27 +7,24 @@ module SgtnClient::Core
         class Cache
             Entry = Struct.new(:expiry, :items)
 
-            def self.initialize(disabled=false, opts={})
-                @@opts = opts
-                SgtnClient.logger.debug "[Cache][initialize] Disable cache? #{disabled}"
-                @@data = Hash.new
-            end
-
             def self.get(key)
-                SgtnClient.logger.debug "[Cache][get]get cache for key: " + key
-                return @@data&.dig(key)
+                SgtnClient.logger.debug { "[Cache][get]get cache for key: #{key}" }
+                return data&.dig(key)
             end
 
-            def self.put(key, items, ttl=nil)
-                ttl ||= @@opts[:ttl]
+            def self.put(key, items, 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, items)
+                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, items)
             end
 
             def self.clear
-                SgtnClient.logger.debug "[Cache][clear]clear cache!"
-                @@data = Hash.new
+                SgtnClient.logger.debug { "[Cache][clear]clear cache!" }
+                @data = {}
+            end
+
+            def self.data
+                @data ||= {}
             end
         end
 

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

@@ -1,200 +1,86 @@
 # Copyright 2022 VMware, Inc.
 # SPDX-License-Identifier: EPL-2.0
 
-require 'erb'
-require 'yaml'
-require 'set'
+require 'concurrent/map'
 require 'observer'
+require 'set'
+require 'singleton'
 
 module SgtnClient
-  module Configuration
+  class Config # :nodoc:
+    include Observable
+    include Singleton
+
+    attr_accessor :product_name, :version, :vip_server, :translation_bundle, :source_bundle, :cache_expiry_period, :log_file, :log_level
+
+    attr_writer :logger
+
+    def logger
+      @logger ||= if log_file
+                    puts "create log file: '#{log_file}', level: #{log_level}"
+                    require 'lumberjack'
+                    Lumberjack::Logger.new(log_file, level: log_level, max_size: '1M', keep: 4)
+                  else
+                    require 'logger'
+                    Logger.new(STDOUT, level: log_level || Logger::INFO)
+                  end
+    end
 
-    def config
-        @config ||= Config.config
+    def loader
+      @loader ||= TranslationLoader::LoaderFactory.create(self)
     end
 
-    def set_config(env, override_configurations = {})
-      @config =
-        case env
-        when Config
-          env
-        when Hash
-          begin
-            config.dup.merge!(env)
-          rescue Errno::ENOENT => error
-            Config.new(env)
-          end
-        else
-          Config.config(env, override_configurations)
-        end
+    def available_bundles
+      loader.available_bundles
+    rescue StandardError => e
+      SgtnClient.logger.error 'failed to get available bundles'
+      SgtnClient.logger.error e
+      Set.new
     end
 
-    alias_method :config=, :set_config
+    def available_components
+      bundles = available_bundles
+      return Set.new if bundles.nil? || bundles.empty?
 
-  end
-  
-
-  class Config
-    extend Observable
-
-    attr_accessor :username, :password, :signature, :app_id, :cert_path,
-    :token, :token_secret, :subject,
-    :http_timeout, :http_proxy,
-    :device_ipaddress, :sandbox_email_address,
-    :mode, :endpoint, :merchant_endpoint, :platform_endpoint, :ipn_endpoint,
-    :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,
-    :translation_bundle, :source_bundle, :cache_expiry_period, :disable_cache, :default_language
-
-
-    # Create Config object
-    # === Options(Hash)
-    # * <tt>username</tt>   -- Username
-    # * <tt>password</tt>   -- Password
-    # * <tt>signature</tt> (Optional if certificate present) -- Signature
-    # * <tt>app_id</tt>     -- Application ID
-    # * <tt>cert_path</tt> (Optional if signature present)  -- Certificate file path
-    def initialize(options)
-      merge!(options)
+      define_bundles_methods(bundles) unless bundles.respond_to?(:components)
+      bundles.components
+    end
+
+    def available_locales(component)
+      bundles = available_bundles
+      return Set.new if bundles.nil? || bundles.empty?
+
+      define_bundles_methods(bundles) unless bundles.respond_to?(:locales)
+      bundles.locales(component)
     end
 
-    # Override configurations
-    def merge!(options)
+    def update(options)
       options.each do |key, value|
         send("#{key}=", value)
       end
-      self
     end
-    
-    class << self
-
-        @@config_cache = {}
-        def load(file_name, default_env = default_environment)
-          @@config_cache        = {}
-          @@configurations      = read_configurations(file_name)
-          @@default_environment = default_env
-          config
-        end
-
-
-        # Get default environment name
-        def default_environment
-          @@default_environment ||= ENV['SGTN_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV'] || "development"
-        end
-
-
-        # Set default environment
-        def default_environment=(env)
-          @@default_environment = env.to_s
-        end
-
-        def configure(options = {}, &block)
-          begin
-            self.config.merge!(options)
-          rescue Errno::ENOENT
-            self.configurations = { default_environment => options }
-          end
-          block.call(self.config) if block
-          self.config
-        end
-        alias_method :set_config, :configure
-
-        # Create or Load Config object based on given environment and configurations.
-        # === Attributes
-        # * <tt>env</tt> (Optional) -- Environment name
-        # * <tt>override_configuration</tt> (Optional) -- Override the configuration given in file.
-        # === Example
-        #   Config.config
-        #   Config.config(:development)
-        #   Config.config(:development, { :app_id => "XYZ" })
-        def config(env = default_environment, override_configuration = {})
-          if env.is_a? Hash
-            override_configuration = env
-            env = default_environment
-          end
-          if override_configuration.nil? or override_configuration.empty?
-            default_config(env)
-          else
-            default_config(env).dup.merge!(override_configuration)
-          end
-        end
-  
-        def default_config(env = nil)
-          env = (env || default_environment).to_s
-          if configurations[env]
-            @@config_cache[env] ||= new(configurations[env])
-          else
-            raise Exceptions::MissingConfig.new("Configuration[#{env}] NotFound")
-          end
-        end
-        
-        # Get raw configurations in Hash format.
-        def configurations
-          @@configurations ||= read_configurations
-        end
-  
-        # Set configuration
-        def configurations=(configs)
-          @@config_cache   = {}
-          @@configurations = configs && Hash[configs.map{|k,v| [k.to_s, v] }]
-        end
-
-        # Set logger
-        def logger=(logger)
-          Logging.logger = logger
-        end
 
-        # Get logger
-        def logger
-          if @@configurations[:mode] == 'live' and Logging.logger.level == Logger::DEBUG
-            Logging.logger.warn "DEBUG log level not allowed in live mode for security of confidential information. Changing log level to INFO..."
-            Logging.logger.level = Logger::INFO
-          end
-          Logging.logger
-        end
+    private
 
+    def define_bundles_methods(bundles)
+      bundles.instance_eval do |_|
+        @component_locales ||= Concurrent::Map.new
 
-        def loader
-          @loader ||= begin
-            config = Config.configurations[Config.default_environment]
-            TranslationLoader::LoaderFactory.create(config)
-          end
+        def components
+          @components ||= reduce(Set.new) { |components, id| components << id.component }
         end
 
-        def available_bundles
-          loader.available_bundles
-        rescue StandardError => e
-          SgtnClient.logger.error 'failed to get available bundles'
-          SgtnClient.logger.error e
-          Set.new
-        end
+        def locales(component)
+          @component_locales[component] ||= begin
+            return Set.new unless components.include?(component)
 
-        def available_locales
-          bundles = available_bundles
-          return Set.new if bundles.nil? || bundles.empty?
-
-          unless bundles.respond_to?(:locales)
-            def bundles.locales
-              @locales ||= reduce(Set.new) { |locales, id| locales << id.locale }
-            end
-            changed
-            notify_observers(:available_locales)
+            each_with_object(Set.new) { |id, locales| locales << id.locale if id.component == component }
           end
-          bundles.locales
         end
+      end
 
-        private
-        # Read configurations from the given file name
-        # === Arguments
-        # * <tt>file_name</tt> (Optional) -- Configuration file path
-        def read_configurations(file_name = "config/sgtnclient.yml")
-          erb = ERB.new(File.read(file_name))
-          erb.filename = file_name
-          YAML.load(erb.result)
-        end       
-
+      changed
+      notify_observers(:available_locales)
     end
   end
-
 end

data/lib/sgtn-client/i18n_backend.rb

@@ -16,7 +16,7 @@ module SgtnClient # :nodoc:
     end
 
     def initialized?
-      @initialized = true
+      @initialized ||= true
     end
 
     def load_translations(*) end
@@ -24,7 +24,7 @@ module SgtnClient # :nodoc:
     def store_translations(*) end
 
     def available_locales
-      SgtnClient::Config.available_locales.to_a
+      SgtnClient.config.available_locales(@component).to_a
     end
 
     def reload!; end
@@ -33,14 +33,16 @@ module SgtnClient # :nodoc:
 
     def translations; end
 
-    def exists?(locale, key)
-      !!(translate(locale, key) { nil })
+    def exists?(locale, key, options)
+      !!(translate(locale, key, options) { 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 }
+      Translation.translate(flat_key, @component, locale, **values) { nil }
     end
+
+    def localize(locale, object, format, options) end
   end
 end

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

@@ -8,58 +8,45 @@ module SgtnClient
     module Cache # :nodoc:
       # get from cache, return expired data immediately
       def get_bundle(component, locale)
-        SgtnClient.logger.debug "[#{__FILE__}][#{__callee__}] component=#{component}, locale=#{locale}"
+        SgtnClient.logger.debug { "[#{__FILE__}][#{__callee__}] component=#{component}, locale=#{locale}" }
 
-        key = CacheUtil.get_cachekey(component, locale)
+        key = Common::BundleID.new(component, locale)
         cache_item = CacheUtil.get_cache(key)
         if cache_item
-          if CacheUtil.is_expired(cache_item)
-            Thread.new do # TODO: Use one thread # refresh in background
-              begin
-                load_bundle(component, locale)
-              rescue StandardError => e
-                SgtnClient.logger.error "an error occured while loading bundle: component=#{component}, locale=#{locale}"
-                SgtnClient.logger.error e
-              end
-            end
-          end
-          return cache_item.dig(:items)
+          load_bundle(component, locale, sync: false) if CacheUtil.is_expired(cache_item)
+          cache_item[:items]
+        else
+          load_bundle(component, locale)
         end
+      end
+
+      def available_bundles
+        SgtnClient.logger.debug { "[#{__FILE__}][#{__callee__}]" }
 
-        load_bundle(component, locale) # refresh synchronously if not in cache
+        cache_item = CacheUtil.get_cache(CONSTS::AVAILABLE_BUNDLES_KEY)
+        if cache_item
+          super(sync: false) if CacheUtil.is_expired(cache_item)
+          cache_item[:items]
+        else
+          super
+        end
       end
+    end
 
-      # load and save to cache
+    module CacheFiller
       def load_bundle(component, locale)
-        SgtnClient.logger.debug "[#{__FILE__}][#{__callee__}] component=#{component}, locale=#{locale}"
+        SgtnClient.logger.debug { "[#{__FILE__}][#{__callee__}] component=#{component}, locale=#{locale}" }
 
-        key = CacheUtil.get_cachekey(component, locale)
         item = super
-        CacheUtil.write_cache(key, item) if item
+        CacheUtil.write_cache(Common::BundleID.new(component, locale), item) if item
         item
       end
 
       def available_bundles
-        SgtnClient.logger.debug "[#{__FILE__}][#{__callee__}]"
-
-        cache_item = CacheUtil.get_cache(CONSTS::AVAILABLE_BUNDLES_KEY)
-        if cache_item
-          if CacheUtil.is_expired(cache_item)
-            Thread.new do # TODO: Use one thread
-              begin
-                item = super
-                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
-              end
-            end
-          end
-          return cache_item.dig(:items)
-        end
+        SgtnClient.logger.debug { "[#{__FILE__}][#{__callee__}]" }
 
         item = super
-        CacheUtil.write_cache(CONSTS::AVAILABLE_BUNDLES_KEY, item) if item
+        CacheUtil.write_cache(CONSTS::AVAILABLE_BUNDLES_KEY, item) if item # TODO: don't save when empty
         item
       end
     end

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

@@ -5,16 +5,17 @@ module SgtnClient
   module TranslationLoader
     module LoaderFactory
       def self.create(config)
-        SgtnClient.logger.info "[#{method(__callee__).owner}.#{__callee__}] config=#{config}"
+        SgtnClient.logger.info "[#{method(__callee__).owner}.#{__callee__}] config=#{config.inspect}"
 
         loaders = []
-        loaders << Source.new(config) if config['source_bundle']
-        loaders << SgtnServer.new(config) if config['vip_server']
-        loaders << LocalTranslation.new(config) if config['translation_bundle']
+        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 SingletonError, 'no translation is available!' if loaders.empty?
 
         chain_loader = Class.new(Chain)
         chain_loader.include SourceComparer
+        chain_loader.include CacheFiller
         chain_loader.include SingleLoader
         chain_loader.include Cache
 

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

@@ -12,11 +12,11 @@ module SgtnClient
       BUNDLE_SUFFIX = '.json'.freeze
 
       def initialize(config)
-        @base_path = Pathname.new(config['translation_bundle']) + config['product_name'] + config['version'].to_s
+        @base_path = Pathname.new(config.translation_bundle) + config.product_name + config.version.to_s
       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}" }
 
         file_name = BUNDLE_PREFIX + locale + BUNDLE_SUFFIX
         file_path = @base_path + component + file_name
@@ -30,7 +30,7 @@ module SgtnClient
       end
 
       def available_bundles
-        SgtnClient.logger.debug "[#{method(__callee__).owner}.#{__callee__}]"
+        SgtnClient.logger.debug { "[#{method(__callee__).owner}.#{__callee__}]" }
 
         @available_bundles ||= begin
           @base_path.glob('*/*.json').reduce(Set.new) do |bundles, f|