singleton-client-test 0.7.7.3 → 0.7.7.6

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

@@ -6,32 +6,22 @@ module SgtnClient
   class ValidateUtil
 
       def self.validate_config()
-        env = SgtnClient::Config.default_environment
-        SgtnClient.logger.debug "[ValidateUtil][validate_config] env = #{env}"
-        messages = "\n"
+        puts "validating config..."
+        messages = ""
 
-        mode = SgtnClient::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 = SgtnClient::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 = 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 = SgtnClient::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)
+
+        if messages != ""
+          raise Exceptions::MissingConfig.new(messages)
         end
       end
 

data/lib/singleton-client.rb

@@ -1,15 +1,40 @@
 # 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)
-  end
+  class << self
+    extend Forwardable
+
+    # load configurations from a file
+    def load_config(config_file, env)
+      SgtnClient.load(config_file, env)
+    end
 
-  extend SgtnClient::Translation::Implementation
+    def_delegator SgtnClient::Config, :instance, :config
+    delegate %i[translate t get_translations] => SgtnClient::Translation,
+             %i[locale locale=] => SgtnClient,
+             %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
+
+    def with_locale(tmp_locale = nil)
+      if tmp_locale.nil?
+        yield
+      else
+        current_locale = locale
+        self.locale = tmp_locale
+        begin
+          yield
+        ensure
+          self.locale = current_locale
+        end
+      end
+    end
+  end
 
-  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,79 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: singleton-client-test
 version: !ruby/object:Gem::Version
-  version: 0.7.7.3
+  version: 0.7.7.6
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-08-30 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'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
-  type: :development
+        version: '1.10'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '1.10'
 - !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: logging
   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
@@ -158,14 +138,15 @@ 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
 - 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
+- lib/sgtn-client/loader.rb
 - lib/sgtn-client/loader/cache.rb
 - lib/sgtn-client/loader/chain_loader.rb
 - lib/sgtn-client/loader/consts.rb
@@ -176,7 +157,6 @@ files:
 - lib/sgtn-client/loader/source.rb
 - lib/sgtn-client/loader/source_comparer.rb
 - lib/sgtn-client/sgtn-client.rb
-- lib/sgtn-client/util/cache-util.rb
 - lib/sgtn-client/util/locale-util.rb
 - lib/sgtn-client/util/string-util.rb
 - lib/sgtn-client/util/validate-util.rb

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

@@ -1,34 +0,0 @@
-# Copyright 2022 VMware, Inc.
-# SPDX-License-Identifier: EPL-2.0
-
-require 'date'
-
-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)
-            end
-
-            def self.put(key, items, ttl=nil)
-                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, items)
-            end
-
-            def self.clear
-                SgtnClient.logger.debug "[Cache][clear]clear cache!"
-                @@data = Hash.new
-            end
-        end
-
-end

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

@@ -1,52 +0,0 @@
-# Copyright 2022 VMware, Inc.
-# SPDX-License-Identifier: EPL-2.0
-
-require 'logger'
-
-module SgtnClient
-
-  # Include Logging module to provide logger functionality.
-  # == Configure logger
-  #   Logging.logger = Logger.new(STDERR)
-  #
-  # == Example
-  #   include Logger
-  #   logger.info "Debug message"
-  module Logging
-
-    # Get logger object
-    def logger
-      @logger ||= Logging.logger
-    end
-
-    def log_event(message, &block)
-      start_time = Time.now
-      block.call
-    ensure
-      logger.info sprintf("[%.3fs] %s", Time.now - start_time, message)
-    end
-
-    class << self
-
-      # Get or Create configured logger based on the default environment configuration
-      def logger
-        @logger ||= Logger.new(STDERR)
-      end
-
-      # Set logger directly and clear the loggers cache.
-      # === Attributes
-      # * <tt>logger</tt> -- Logger object
-      # === Example
-      #   Logging.logger = Logger.new(STDERR)
-      def logger=(logger)
-        @logger = logger
-        if Config.config.mode.eql? 'live' and @logger.level == Logger::DEBUG
-          @logger.warn "DEBUG log level not allowed in live mode for security of confidential information. Changing log level to INFO..."
-          @logger.level = Logger::INFO
-        end
-      end
-
-    end
-  end
-
-end

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

@@ -1,40 +0,0 @@
-# Copyright 2022 VMware, Inc.
-# SPDX-License-Identifier: EPL-2.0
-
-module SgtnClient
-  module Core
-    autoload :Cache, 'sgtn-client/core/cache'
-  end
-
-  class CacheUtil
-    def self.get_cache(cache_key)
-      SgtnClient::Core::Cache.get(cache_key)
-    end
-
-    def self.clear_cache
-      SgtnClient::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']
-      # expired after 24 hours
-      cache_expiry_period = 24 * 60 if cache_expiry_period.nil?
-      SgtnClient::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
-      product_name + '_' + version + '_' + component + '_' + locale
-    end
-
-    def self.is_expired(cache_item)
-      cache_item[:expiry] < Time.now
-    end
-
-  end
-end