singleton-client-test 0.7.0.31 → 0.7.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d36c7df9764afccdd5c3e9ca3dac5123bd9feaedd3ada0a38e386836860f8885
-  data.tar.gz: 9cc9248d0b25744fa3168711040e740f9c07124e60a55a9f0b73150a630ca1c4
+  metadata.gz: 6722a7f77f8f9ee4fbf2f481d0c66e30b818c61746a9c7e8471fc1b225079f72
+  data.tar.gz: ba0e6acade9bc655f97a731cf760e15097b713e99000cf8f2612e4975a357d2d
 SHA512:
-  metadata.gz: f7d9c3d03d862fa00b6e75ad17e3d6ebf6382750bdf41630708136439980ee0ee9cbb07768f19f71f0b23ba2c2f3c2dba5e50e4d9afc136b26aa96f326076d89
-  data.tar.gz: 0c3b4dbe2f24634090f997b3d980aa7b0a85c41485bd553020fd3e41e196947a3f2a0b27a12da3d87439ecaaee7b903542df4fbbbb4b23ee0021d01ceda96eb5
+  metadata.gz: 27e3c13e20185a08049c2d634bc11e3a6d4e05095802e3c76026b74c34acd3a327b2e49c79020b9143479747e9d25fbfe5eaf4c859621afdc23f512859efd0fc
+  data.tar.gz: bed85d6578397cd90e0823574f552d7f7e98e19a0f49e35e12963eecc32d5f87d85b8c0a8ab2c50c5c66b3ea81e630334194f8d4600fdc4a0eec2bf391b2decb

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

@@ -1,71 +1,15 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
+require 'sgtn-client/loader/source'
 
 module SgtnClient
-  
-  autoload :CacheUtil,       "sgtn-client/util/cache-util"
+  autoload :CacheUtil, 'sgtn-client/util/cache-util'
 
   class Source
-
-      def self.getSource(component, key, locale)
-        SgtnClient.logger.debug "[Source][getSource]component=#{component}, key=#{key}, locale=#{locale}"
-        cache_key = SgtnClient::CacheUtil.get_cachekey(component, locale)
-        expired, items = SgtnClient::CacheUtil.get_cache(cache_key)
-        if items.nil?
-          items = getBundle(component, locale)    
-          SgtnClient::CacheUtil.write_cache(cache_key, items)
-        else
-          SgtnClient.logger.debug "[Source][getSource]getting sources from cache with key: " + cache_key
-        end
-        s = items.nil?? nil : items[locale][key]
-        if items.nil? || s.nil?
-          SgtnClient.logger.debug "[Source][getSource]source not found, return key: " + key
-          #return key
-          return nil
-        else
-          return s
-        end
-      end
-
-      def self.getSources(component, locale)
-        SgtnClient.logger.debug "[Source][getSources]component=#{component}, locale=#{locale}"
-        cache_key = SgtnClient::CacheUtil.get_cachekey(component, locale)
-        expired, items = SgtnClient::CacheUtil.get_cache(cache_key)
-        if items.nil? || expired
-          items = getBundle(component, locale)
-          SgtnClient::CacheUtil.write_cache(cache_key, items)
-        else
-          SgtnClient.logger.debug "[Source][getSources]getting sources from cache with key: " + cache_key
-        end
-        return items
-      end
-
-      def self.loadBundles(locale)
-        SgtnClient.logger.debug "[Source][loadBundles]locale=#{locale}"
-        env = SgtnClient::Config.default_environment
-        SgtnClient::Config.configurations.default = locale
-        source_bundle = SgtnClient::Config.configurations[env]["source_bundle"]
-        Dir.foreach(source_bundle) do |component|
-          next if component == '.' || component == '..'
-          yamlfile = File.join(source_bundle, component + "/" + locale + ".yml")
-          bundle = SgtnClient::FileUtil.read_yml(yamlfile)
-          cachekey = SgtnClient::CacheUtil.get_cachekey(component, locale)
-          SgtnClient::CacheUtil.write_cache(cachekey,bundle)
-        end
-      end
-
-      private
-      def self.getBundle(component, locale)
-        SgtnClient.logger.debug "[Source][getBundle]component=#{component}, locale=#{locale}"
-        env = SgtnClient::Config.default_environment
-        source_bundle = SgtnClient::Config.configurations[env]["source_bundle"]
-        bundlepath = source_bundle  + "/" + component + "/" + locale + ".yml"
-        begin
-          bundle = SgtnClient::FileUtil.read_yml(bundlepath)
-        rescue => exception
-          SgtnClient.logger.error exception.message
-        end
-        return bundle
-      end
-
+    def self.loadBundles(locale)
+      SgtnClient.logger.debug "[Source][loadBundles]locale=#{locale}"
+      SgtnClient::Config.configurations.default = locale
+    end
   end
-
-end
+end

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

@@ -1,22 +1,24 @@
-module SgtnClient
-    class T < Translation
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
 
-        def self.s(key)
-            locale = RequestStore.store[:locale]
-            component = RequestStore.store[:component]
-            return getString(component, key, locale)
-        end
+module SgtnClient
+  class T
+    def self.s(key)
+      locale = RequestStore.store[:locale]
+      component = RequestStore.store[:component]
+      Translation.getString(component, key, locale)
+    end
 
-        def self.s_f(key, args)
-            locale = RequestStore.store[:locale]
-            component = RequestStore.store[:component]
-            return getString_f(component, key, args, locale)
-        end
+    def self.s_f(key, args)
+      locale = RequestStore.store[:locale]
+      component = RequestStore.store[:component]
+      Translation.getString_f(component, key, args, locale)
+    end
 
-        def self.c()
-            locale = RequestStore.store[:locale]
-            component = RequestStore.store[:component]
-            return getStrings(component, locale)
-        end
+    def self.c
+      locale = RequestStore.store[:locale]
+      component = RequestStore.store[:component]
+      Translation.getStrings(component, locale)
     end
-end
+  end
+end

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

@@ -1,148 +1,113 @@
-require 'multi_json'
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
 
-module SgtnClient
-
-  module Core
-    autoload :Request,     "sgtn-client/core/request"
-    autoload :Cache,       "sgtn-client/core/cache"
-    autoload :CacheUtil,   "sgtn-client/util/cache-util"
-    autoload :LocaleUtil,   "sgtn-client/util/locale-util"
-  end
-  
-  class Translation
+require 'request_store'
 
-      def self.getString(component, key, locale)
+module SgtnClient
+  module Translation
+    module Implementation
+      # <b>DEPRECATED:</b> Please use <tt>Singleton:translate</tt> instead.
+      def getString(component, key, locale)
         SgtnClient.logger.debug "[Translation.getString]component: #{component}, key: #{key}, locale: #{locale}"
-        str = getTranslation(component, key, locale)
-        if str.nil?
-          str = SgtnClient::Source.getSource(component, key, SgtnClient::Config.configurations.default)
-          if str.nil?
-            SgtnClient.logger.debug "[Translation][getString] Missing source string with key: #{key}, component: #{component}, locale: #{locale}"
-          end
-        end
-        str
+        translate(key, component, locale) { nil }
       end
 
-      def self.getString_p(component, key, plural_args, locale)
+      # <b>DEPRECATED:</b> Please use <tt>Singleton:translate</tt> instead.
+      def getString_p(component, key, plural_args, locale)
         SgtnClient.logger.debug "[Translation][getString_p]component=#{component}, key=#{key}, locale=#{locale}"
-        str = getTranslation(component, key, locale)
-        if str.nil?
-          str = SgtnClient::Source.getSource(component, key, SgtnClient::Config.configurations.default)
-          if str.nil?
-            SgtnClient.logger.debug "[Translation][getString_p] Missing source string with key: #{key}, component: #{component}, locale: #{locale}"
-            return nil
-          end
-          str.to_plural_s(:en, plural_args)
-        else
-          str.to_plural_s(locale, plural_args)
-        end
+        translate(key, component, locale, **plural_args) { nil }
       end
 
-      def self.getString_f(component, key, args, locale, *optionals)
-         SgtnClient.logger.debug "[Translation][getString_f]component=#{component}, key=#{key}, locale=#{locale}"
-         s = getString(component, key, locale, *optionals)
-         if s.nil?
-          return nil
-         end
-         if args.is_a?(Hash)
+      # <b>DEPRECATED:</b> Please use <tt>Singleton:translate</tt> instead.
+      def getString_f(component, key, args, locale, *_optionals)
+        SgtnClient.logger.debug "[Translation][getString_f]component=#{component}, key=#{key}, locale=#{locale}"
+        s = translate(key, component, locale) { nil }
+        return nil if s.nil?
+
+        if args.is_a?(Hash)
           args.each do |source, arg|
             s.gsub! "{#{source}}", arg
           end
-         elsif args.is_a?(Array)
-          s = sprintf s % args
-         end
-         return s
+        elsif args.is_a?(Array)
+          s = s % args
+        end
+        s
       end
 
-      def self.getStrings(component, locale)
-        SgtnClient.logger.debug "[Translation][getStrings]component=#{component}, locale=#{locale}"
-        items = get_cs(component, locale)
-        default = SgtnClient::Config.configurations.default
-        if items.nil? || items["messages"] == nil
-          items = {}
-          s = SgtnClient::Source.getSources(component, default)
-          if s.nil?
-            SgtnClient.logger.error "[Translation][getStrings] Missing component: #{component}, locale: #{locale}"
-          else
-            default_component, value = s.first
-            items["component"] = component
-            items["messages"] = value
-            items["locale"] = 'source'
-          end
+      # <b>DEPRECATED:</b> Please use <tt>Singleton:get_translations</tt> instead.
+      def getStrings(component, locale)
+        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 : SgtnClient::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)
         end
-        return items
-       end
 
+        if result.nil?
+          return key unless block_given?
 
-      private
+          result = yield
+          return if result.nil?
+        end
 
-      def self.getTranslation(component, key, locale)
-        items = get_cs(component, locale)
-        if items.nil? || items["messages"] == nil
-          nil
+        if kwargs.empty?
+          result
         else
-          items["messages"][key]
+          locale = result.locale if result.is_a?(SgtnClient::StringUtil)
+          result.localize(locale) % kwargs
         end
       end
+      alias t translate
 
-      def self.get_cs(component, locale)
-        locale = SgtnClient::LocaleUtil.process_locale(locale)
-        flocale = SgtnClient::LocaleUtil.fallback(locale)
-        cache_key = SgtnClient::CacheUtil.get_cachekey(component, flocale)
-        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)
-          if items.nil?
-            items = SgtnClient::Source.getSources(component, SgtnClient::Config.configurations.default)
-            SgtnClient::Core::Cache.put(cache_key, items, 60)
-          else
-            SgtnClient::CacheUtil.write_cache(cache_key, items)
-          end
-        else
-          SgtnClient.logger.debug "[Translation]get translations from cache with key: " + cache_key
+      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)
+        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
 
-        return items
-       end
+        { 'component' => component, 'locale' => locale, 'messages' => items || {} } if items
+      end
 
-      def self.load(component, locale)
-        env = SgtnClient::Config.default_environment
-        mode = SgtnClient::Config.configurations[env]["bundle_mode"]
-        SgtnClient.logger.debug "[Translation][load]mode=#{mode}"
-        if mode == 'offline'
-          return load_o(component, locale)
-        else
-          return load_s(component, locale)
-        end
+      def locale
+        RequestStore.store[:locale] ||= SgtnClient::LocaleUtil.get_fallback_locale
       end
 
-      def self.load_o(component, locale)
-        env = SgtnClient::Config.default_environment
-        product_name = SgtnClient::Config.configurations[env]["product_name"]
-        version = SgtnClient::Config.configurations[env]["version"].to_s
-        translation_bundle = SgtnClient::Config.configurations[env]["translation_bundle"]
-        bundlepath = translation_bundle + "/" + product_name + "/" + version + "/" + component + "/messages_" + locale + ".json"
-        SgtnClient::FileUtil.read_json(bundlepath)
+      def locale=(value)
+        RequestStore.store[:locale] = SgtnClient::LocaleUtil.get_best_locale(value)
       end
 
-      def self.load_s(component, locale)
-        env = SgtnClient::Config.default_environment
-        product_name = SgtnClient::Config.configurations[env]["product_name"]
-        vip_server = SgtnClient::Config.configurations[env]["vip_server"]
-        version = SgtnClient::Config.configurations[env]["version"].to_s
-        url = vip_server + "/i18n/api/v2/translation/products/" + product_name + "/versions/" + version + "/locales/" + locale + "/components/" + component+ "?checkTranslationStatus=false&machineTranslation=false&pseudo=false"
-        begin
-          obj = SgtnClient::Core::Request.get(url)
-        rescue => exception
-          SgtnClient.logger.error exception.message
-        end
-        if obj != nil
-          obj = obj["data"]
-        end
-        return obj
+      private
+
+      def get_bundle(component, locale)
+        get_bundle!(component, locale)
+      rescue StandardError => e
+        SgtnClient.logger.error "[#{method(__callee__).owner}.#{__callee__}] failed to get a bundle. component: #{component}, locale: #{locale}"
+        SgtnClient.logger.error e
+        nil
       end
 
-  end
+      def get_bundle!(component, locale)
+        id = SgtnClient::Common::BundleID.new(component, locale)
+        bundles = SgtnClient::Config.available_bundles
+        unless bundles.nil? || bundles.empty? || bundles.include?(id)
+          raise SgtnClient::SingletonError, 'bundle is unavailable.'
+        end
 
-end
+        SgtnClient::Config.loader.get_bundle(component, locale)
+      end
+    end
+    extend Implementation
+  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/common/data.rb

@@ -0,0 +1,30 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
+module SgtnClient
+  module Common
+    class BundleID
+      attr_reader :locale, :component
+
+      def initialize(component, locale)
+        @locale = locale
+        @component = component
+        @key = [@component, @locale].hash
+      end
+
+      def hash
+        @key
+      end
+
+      def ==(other)
+       (other.is_a? self.class) && @locale == other.locale && @component == other.component
+      end
+
+      alias eql? ==
+
+      def to_s
+        "locale=#{@locale}, component=#{@component}}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
+module SgtnClient
+  class SingleOperation
+    def initialize(*conditions, &block)
+      raise 'no way to create a new obj' unless block
+
+      @lock = Mutex.new
+      @hash = {}
+
+      @conditions = conditions
+      @creator = block
+    end
+
+    # return new created object
+    def operate(id, *args)
+      @lock.synchronize do
+        obj = @hash[id]
+        @conditions.each do |con|
+          return obj unless con.call(id, obj, *args)
+        end
+        # TODO: whatif returning nil
+        @hash[id] = @creator.call(id, obj, *args)
+      end
+    end
+
+    def remove_object(id)
+      @lock.synchronize do
+        @hash.delete(id)
+      end
+    end
+  end
+end

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

@@ -1,99 +1,33 @@
+# Copyright 2022 VMware, Inc.
+# SPDX-License-Identifier: EPL-2.0
+
 require 'date'
 
 module SgtnClient::Core
         class Cache
-            Entry = Struct.new(:expiry, :value)
+            Entry = Struct.new(:expiry, :items)
 
             def self.initialize(disabled=false, opts={})
                 @@opts = opts
-                @mutex = Mutex.new
-                if disabled == false
-                    @@data = Hash.new
-                    SgtnClient.logger.debug "[Cache][initialize]cache is enabled!"
-                else
-                    @@data = nil
-                    SgtnClient.logger.debug "[Cache][initialize]cache is disabled!"
-                end
-            end
-
-            def self.keys
-                if @@data == nil
-                    return nil
-                end
-                SgtnClient.logger.debug "[Cache][keys]get cache keys"
-                @@data.keys
+                SgtnClient.logger.debug "[Cache][initialize] Disable cache? #{disabled}"
+                @@data = Hash.new
             end
 
             def self.get(key)
-                if @@data == nil
-                    return nil, nil
-                end
                 SgtnClient.logger.debug "[Cache][get]get cache for key: " + key
-                invalidate(key)
-            end
-
-            def self.has(key)
-                if @@data == nil
-                    return nil
-                end
-                SgtnClient.logger.debug "[Cache][has]check if the cache has key: #{(@@data.has_key? key)}"
-                @@data.has_key? key
+                return @@data&.dig(key)
             end
 
-            def self.put(key, value, ttl=nil)
-                @mutex.synchronize do
-                    if @@data == nil || value == nil
-                        return nil
-                    end
-                    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, value)
-                end
-            end
-
-            def self.delete(key)
-                @mutex.synchronize do
-                    if @@data == nil
-                        return nil
-                    end
-                    SgtnClient.logger.debug "[Cache][delete]delete cache for key: " + key
-                    @@data.delete 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
-                @mutex.synchronize do
-                    if @@data == nil
-                        return nil
-                    end
-                    SgtnClient.logger.debug "[Cache][clear]clear cache!"
-                    @@data = Hash.new
-                end
-            end
-
-            def self.invalidate(key)
-                @mutex.synchronize do
-                    if @@data == nil
-                        return nil, nil
-                    end
-                    SgtnClient.logger.debug "[Cache][invalidate]invalidate expired cache......"
-                    now = Time.now
-                    if has(key)
-                        v = @@data[key]
-                        expired = false
-                        SgtnClient.logger.debug "[Cache][invalidate]check cache: key=#{key}, expiredtime=#{v[:expiry]}, now=#{now}, expired=#{(v[:expiry] < now)}"
-                        if v[:expiry] < now
-                            SgtnClient.logger.debug "[Cache][invalidate]before deleting the cache: data=#{@@data}"
-                            @@data.delete(key)
-                            SgtnClient.logger.debug "[Cache][invalidate]after deleting the cache: data=#{@@data}"
-                            expired = true
-                        end
-                        return expired, v[:value]
-                    else
-                        return nil, nil
-                    end
-                end
+                SgtnClient.logger.debug "[Cache][clear]clear cache!"
+                @@data = Hash.new
             end
         end