singleton-ruby 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a1123e189882d4867128d6933adccda07f53b44ff5b9206ef4d90d6210cc8d7
-  data.tar.gz: fa5d43b9fb1b15aab4008cf0d3fa6138137d96eed5eacb8b92c26c79d75f46a8
+  metadata.gz: 8b9a86b24b35f77b5d2abea8686d2ab8a9819ea5e5b4957e6997234262d4cc24
+  data.tar.gz: 9328b24f10c0a97a77cc6b7168fdadedc9b3a935b7c54409b260d9c03440d7fc
 SHA512:
-  metadata.gz: fe0b2657ce521442d0987728ce63993f27b928d618a55e8a9e0b020a632ae797c37fc8ad3316295c08292dc08b3d8a2a8f57a4581e2a8e143e10ecf312182e2d
-  data.tar.gz: 2fe5be7449a0e5bcd2fa5b9264a35bd625e8987518539f78498ba07da09c6c3269eba4bdfe703b56a932b426c9ac68ac36ad43654866970944923ee097065eb2
+  metadata.gz: cec4722423baf395e872eef3e07c444ec4c3001e6b86b50fab653782ed460e3504fd2145445970fedf3f62332c0f4c8384cd54794eeb8069f91bcf9baf16b29e
+  data.tar.gz: ce55d5ee39549d7137b095e3541200d6d26c2fd26ae0fdaf594bf2aaacf3cfca8b11c680be2973d9bda1fff1ba5416fa5a8a0d21544439f5fdc4b92451cdc581

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

@@ -17,11 +17,12 @@ module SgtnClient
         else
           SgtnClient.logger.debug "Getting sources from cache with key: " + cache_key
         end
-        if items.nil?
+        if items.nil? || items[locale][key].nil?
+          SgtnClient.logger.debug "Source not found, return key: " + key
           return key
+        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,7 +36,14 @@ module SgtnClient
 
       def self.getString_f(component, key, args, locale)
          s = getString(component, key, locale)
-         return sprintf s % args
+         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
       end
 
       def self.getStrings(component, locale)
@@ -52,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

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,27 @@
+require 'date'
+require 'time'
+
+DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_full_s(locale = TwitterCldr.locale)
+             self.localize(locale).to_full_s
+          end
+        LOCALIZE
+
+DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_long_s(locale = TwitterCldr.locale)
+             self.localize(locale).to_long_s
+          end
+        LOCALIZE
+
+DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
+          def l_medium_s(locale = TwitterCldr.locale)
+             self.localize(locale).to_medium_s
+          end
+        LOCALIZE
+
+
+DateTime.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/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, 5].freeze
+    VERSION_INFO = [0, 1, 9].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.5
+  version: 0.1.9
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2021-11-18 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