singleton-ruby 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0abd7a01826bb75e0b2d1c652f8245992a31000d1e6da052e3ddd444aa56554
-  data.tar.gz: 8c7424f2b42ea4d16556111541f275998a09892967581269ef15ad66557a183c
+  metadata.gz: e74b238c58ac91cb373e48cd664ef4c8115bbb811b8ceb0427a82979b5d6bdfe
+  data.tar.gz: ae96f56fd84a59d82ce60d9aceea55baac70bc2004c1d87d00f94dee6a9ff2a0
 SHA512:
-  metadata.gz: c8cf069e94dd35cd61b6ba833c2b3b7253eb214343deaeb036de2c8cdb1608154123ef38eddd14b1d515f3dbf085fa6ca3a06e924e94a2a61392b6c3ff8e1fce
-  data.tar.gz: 61d39ee45bb285a598fd67358be529541b32a79f55ec3c66e9e25e6dc730b8ceb89c9f0fbef1347233e7728abfd627afcb61c733dc0e7c572478788ee28de118
+  metadata.gz: bae2bb630c92a26d5fc84141fda89193d48d373fefa8c1a48090cac524fc485cc0a80ee1de0076ca56e577a69e3774ace36d1ede442828a4025294a113c88223
+  data.tar.gz: 713f0b37a528eb1c1f5e1c50519985d7821b2fac1182912194a3f7ef17e09671a38ec34c073109d46edbe939e3ade572d1ef433a642e1dcbffdd79cd45b48116

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

@@ -17,11 +17,13 @@ module SgtnClient
         else
           SgtnClient.logger.debug "Getting sources from cache with key: " + cache_key
         end
-        if items.nil?
-          return key
+        if items.nil? || items[locale][key].nil?
+          SgtnClient.logger.debug "Source not found, return key: " + key
+          #return key
+          return nil
+        else
+          return items[locale][key]
         end
-        str = items[locale][key]
-        return str
       end
 
       def self.getSources(component, locale)

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

@@ -36,11 +36,10 @@ module SgtnClient
 
       def self.getString_f(component, key, args, locale)
          s = getString(component, key, locale)
-         if is_json?(args)
-            jsonstr = MultiJson.load(args)
-            jsonstr.each do |source, arg|
-              s.gsub! "{#{source}}", arg
-            end
+         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
@@ -60,7 +59,12 @@ module SgtnClient
 
         default = SgtnClient::Config.configurations.default
         if items.nil? || items["messages"] == nil
-          items = SgtnClient::Source.getSources(component, default)
+          items = {}
+          s = SgtnClient::Source.getSources(component, default)
+          default_component, value = s.first
+          items["component"] = default_component
+          items["messages"] = value
+          items["locale"] = 'source'
         end
         return items
        end
@@ -113,13 +117,6 @@ module SgtnClient
         return obj
       end
 
-      def self.is_json?(value)
-        result = MultiJson.load(value)
-        result.is_a?(Hash) || result.is_a?(Array)
-      rescue => exception
-        false
-      end
-
   end
 
 end

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

@@ -0,0 +1,4 @@
+require 'sgtn-client/cldr/localized_datetime'
+require 'sgtn-client/cldr/localized_date'
+require 'sgtn-client/cldr/localized_time'
+require 'sgtn-client/cldr/localized_str'

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

@@ -0,0 +1,27 @@
+require 'date'
+require 'time'
+
+Date.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_full_s(locale = TwitterCldr.locale)
+             self.to_datetime().localize(locale).to_date().to_full_s
+          end
+        LOCALIZE
+
+Date.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_long_s(locale = TwitterCldr.locale)
+            self.to_datetime().localize(locale).to_date().to_long_s
+          end
+        LOCALIZE
+
+Date.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_medium_s(locale = TwitterCldr.locale)
+            self.to_datetime().localize(locale).to_date().to_medium_s
+          end
+        LOCALIZE
+
+
+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

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

@@ -0,0 +1,63 @@
+require 'date'
+require 'time'
+
+DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 2
+          def l_full_s(locale = TwitterCldr.locale, *args)
+            timezone = args[0]
+            display_name = args[1]
+            if timezone.nil?
+               self.localize(locale).to_full_s
+            elsif display_name.nil?
+               self.localize(locale).with_timezone(timezone).to_full_s
+            else
+               tz = TwitterCldr::Timezones::Timezone.instance(timezone, locale)
+               tz.display_name_for(self, display_name)
+            end
+          end
+        LOCALIZE
+
+DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_long_s(locale = TwitterCldr.locale, *args)
+             timezone = args[0]
+             display_name = args[1]
+             if timezone.nil?
+                self.localize(locale).to_long_s
+             elsif display_name.nil?
+                self.localize(locale).with_timezone(timezone).to_long_s
+             else
+                tz = TwitterCldr::Timezones::Timezone.instance(timezone, locale)
+                tz.display_name_for(self, display_name)
+             end
+          end
+        LOCALIZE
+
+DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_medium_s(locale = TwitterCldr.locale, *args)
+             timezone = args[0]
+             display_name = args[1]
+             if timezone.nil?
+                self.localize(locale).to_medium_s
+             elsif display_name.nil?
+                self.localize(locale).with_timezone(timezone).to_medium_s
+             else
+                tz = TwitterCldr::Timezones::Timezone.instance(timezone, locale)
+                tz.display_name_for(self, display_name)
+             end
+          end
+        LOCALIZE
+
+
+DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+        def l_short_s(locale = TwitterCldr.locale, *args)
+           timezone = args[0]
+           display_name = args[1]
+           if timezone.nil?
+              self.localize(locale).to_short_s
+           elsif display_name.nil?
+              self.localize(locale).with_timezone(timezone).to_short_s
+           else
+              tz = TwitterCldr::Timezones::Timezone.instance(timezone, locale)
+              tz.display_name_for(self, display_name)
+           end
+        end
+      LOCALIZE

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

@@ -0,0 +1,11 @@
+
+String.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def to_plural_s(locale, arg)
+            num_str = SgtnClient::Formatters::PluralFormatter.new(locale).num_s(self, arg)
+            if num_str.nil? || num_str.empty?
+              self.localize(locale) % arg
+            else
+              num_str
+            end
+          end
+        LOCALIZE

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

@@ -0,0 +1,27 @@
+require 'date'
+require 'time'
+
+Time.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_full_s(locale = TwitterCldr.locale)
+             self.localize(locale).to_full_s
+          end
+        LOCALIZE
+
+Time.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_long_s(locale = TwitterCldr.locale)
+             self.localize(locale).to_long_s
+          end
+        LOCALIZE
+
+Time.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_medium_s(locale = TwitterCldr.locale)
+             self.localize(locale).to_medium_s
+          end
+        LOCALIZE
+
+
+Time.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+        def l_short_s(locale = TwitterCldr.locale)
+           self.localize(locale).to_short_s
+        end
+      LOCALIZE

data/lib/sgtn-client/formatters/plurals/plural_formatter.rb

@@ -0,0 +1,38 @@
+require 'json'
+
+module SgtnClient
+    module Formatters
+        class PluralFormatter
+
+            attr_reader :locale
+
+            def initialize(locale = TwitterCldr.locale)
+              @locale = TwitterCldr.convert_locale(locale)
+            end
+
+            def num_s(string, replacements)
+                reg = Regexp.union(
+                  /%<(\{.*?\})>/
+                )
+                string.gsub(reg) do
+                  count_placeholder, patterns = if $1
+                    pluralization_hash = JSON.parse($1)
+                    if pluralization_hash.is_a?(Hash) && pluralization_hash.size == 1
+                      pluralization_hash.first
+                    else
+                      raise ArgumentError.new('expected a Hash with a single key')
+                    end
+                  else
+                    raise ArgumentError.new('invalide format')
+                  end
+                  count  = replacements[count_placeholder.to_sym].to_s
+                  if patterns.is_a?(Hash)
+                    return TwitterCldr::Utils.deep_symbolize_keys(patterns)[count.to_sym]
+                  else
+                    raise ArgumentError.new('expected patterns to be a Hash')
+                  end
+                end
+              end
+        end
+    end
+end

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

@@ -12,6 +12,11 @@ module SgtnClient
       autoload :ValidateUtil,       "sgtn-client/util/validate-util"
       autoload :LocaleUtil,         "sgtn-client/util/locale-util"
 
+      module Formatters
+            autoload :PluralFormatter,    "sgtn-client/formatters/plurals/plural_formatter"
+      end
+
+
       class << self
             def configure(options = {}, &block)
             SgtnClient::Config.configure(options, &block)

data/lib/singleton-ruby.rb

@@ -1,2 +1,3 @@
 require "sgtn-client/sgtn-client"
-
+require 'sgtn-client/cldr/core_ext'
+require 'twitter_cldr'

data/lib/version.rb

@@ -1,3 +1,3 @@
 
-    VERSION_INFO = [0, 1, 6].freeze
+    VERSION_INFO = [0, 2, 0].freeze
     VERSION = VERSION_INFO.map(&:to_s).join('.').freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singleton-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-08 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: twitter_cldr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.6'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +244,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: twitter_cldr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.6'
 description: Singleton Ruby client
 email: g11n-vip-project@vmware.com
 executables: []
@@ -241,11 +269,17 @@ files:
 - lib/sgtn-client/api/source.rb
 - lib/sgtn-client/api/t.rb
 - lib/sgtn-client/api/translation.rb
+- lib/sgtn-client/cldr/core_ext.rb
+- lib/sgtn-client/cldr/localized_date.rb
+- lib/sgtn-client/cldr/localized_datetime.rb
+- lib/sgtn-client/cldr/localized_str.rb
+- lib/sgtn-client/cldr/localized_time.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/core/request.rb
+- lib/sgtn-client/formatters/plurals/plural_formatter.rb
 - lib/sgtn-client/sgtn-client.rb
 - lib/sgtn-client/util/cache-util.rb
 - lib/sgtn-client/util/locale-util.rb
@@ -271,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Singleton Ruby client