singleton-client-test 0.7.0.36 → 0.7.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf77c54658953532871e1efcaeefdd2eeafe82d79d45de57341bc1f36faef8c7
-  data.tar.gz: '031790359ed9af74295e1679aae41a486da96104ae3a02421494c1a6a3593fd4'
+  metadata.gz: 365e6be5a17d3f95f2529789f8632092e859c793c96d67b4f8ddd6492f3e3687
+  data.tar.gz: a2df815daeda06f52484e61ef7c64e2c5bc6ce5d46332a10b60187bbc2440a59
 SHA512:
-  metadata.gz: 48113ab44d513f63789e7821340fc2de03e8f0c2a73063354ea7fc35b378b8d1f48b22ac3fc4d444c95a810e95a80cee02d8a44866153c82fa39300c1cf142ca
-  data.tar.gz: 05ba491346a1079a8d4b793d3d7d727aaec7ced066d7410df3b11e8a602700ba46a2fee5504649877db567ee5adaa492ab0bc0702925bad230bd6771b4aeb002
+  metadata.gz: 64ef532c3de19ee72c7b0c28661c1192856eb9ebdef0a335d7d702d98b0d7bf56411691cd3ce2c8ceeae829d0d8d8eaad53981cde88721b49e606c657f053028
+  data.tar.gz: 27d63abbf9b7df87e20997664eebc97853ae1837f5f3c3853c1f77ce1ace43000d25482ae6f261a3d18788fbba9f026ca75374e1a14c078aa068dbdfec8a532a

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

@@ -3,7 +3,7 @@
 
 require 'erb'
 require 'yaml'
-
+require 'observer'
 
 module SgtnClient
   #include Exceptions
@@ -40,6 +40,7 @@ module SgtnClient
   
 
   class Config
+    extend Observable
 
     attr_accessor :username, :password, :signature, :app_id, :cert_path,
     :token, :token_secret, :subject,
@@ -182,6 +183,8 @@ module SgtnClient
             def bundles.locales
               @locales ||= reduce(Set.new) { |locales, id| locales << id.locale }
             end
+            changed
+            notify_observers(:available_locales)
           end
           bundles.locales
         end

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

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

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

@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: EPL-2.0
 
 require 'pathname'
+require 'psych/simple'
 
 module SgtnClient
   module Common
@@ -24,7 +25,7 @@ module SgtnClient
         total_messages = {}
 
         (@source_bundle_path + component).glob('**/*.{yml, yaml}') do |f|
-          bundle = YAML.safe_load(File.read(f))
+          bundle = Psych.simple_load(File.read(f))
           messages = bundle&.first&.last # TODO: Warn about inconsistent source locale
           if messages.is_a?(Hash)
             total_messages.merge!(messages)

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

@@ -1,23 +1,29 @@
+# frozen_string_literal: true
+
 # Copyright 2022 VMware, Inc.
 # SPDX-License-Identifier: EPL-2.0
+
 require 'set'
 
 module SgtnClient
   class LocaleUtil
     MAP_LOCALES = {
-      'zh-CN' => 'zh-Hans',
-      'zh-TW' => 'zh-Hant',
-      'zh-Hans-CN' => 'zh-Hans',
-      'zh-Hant-TW' => 'zh-Hant'
+      'zh-cn' => 'zh-hans',
+      'zh-tw' => 'zh-hant',
+      'zh-hans-cn' => 'zh-hans',
+      'zh-hant-tw' => 'zh-hant'
     }.freeze
+    LOCALE_SEPARATOR = '-'
 
     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('_', '-'))
+      get_best_match(locale.gsub('_', LOCALE_SEPARATOR).downcase)
     end
 
     def self.is_source_locale(locale = nil)
@@ -26,12 +32,12 @@ module SgtnClient
 
     def self.get_best_match(locale)
       locale = MAP_LOCALES[locale] || locale
-      return locale if Config.available_locales.include?(locale)
-
-      index = locale.rindex('-')
-      return get_fallback_locale if index.nil?
+      lowercase_locales_map[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])
+      end
     end
 
     def self.get_source_locale
@@ -47,6 +53,18 @@ module SgtnClient
       @fallback_locale ||= get_default_locale || get_source_locale || 'en'
     end
 
-    private_class_method :get_best_match
+    def self.lowercase_locales_map
+      @lowercase_locales_map ||= Config.available_locales.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
+    end
+
+    SgtnClient::Config.add_observer(self, :reset_available_locales)
+
+    private_class_method :get_best_match, :lowercase_locales_map, :reset_available_locales
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singleton-client-test
 version: !ruby/object:Gem::Version
-  version: 0.7.0.36
+  version: 0.7.0.37
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-11 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -142,6 +142,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.6'
+- !ruby/object:Gem::Dependency
+  name: psych-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Singleton Ruby client
 email: g11n-vip-project@vmware.com
 executables: []