singleton-ruby 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce278f87ad2d126f157bd01f73dfde7261d130151ca8b434880b81fd963059e5
-  data.tar.gz: 42ebbf6d9e61acce392a64a7be42d423e2608ec5068ce5960bec9c58077aa7ae
+  metadata.gz: c8b76321098ddc3fbe0600be0b766f3e1162d546bf162ca564e896cf570cbbfe
+  data.tar.gz: 8a87437293352085857b30878de95c74e2d9de24066c659e86ccd38fab7e811d
 SHA512:
-  metadata.gz: 2c1470e61f1f06b84057b72003a285fdfed9daefefe39adf2e0f9d0f090a210531223d47e83ee081e903f7f1c545082683f306172fc5ccec03500796abbf9cf5
-  data.tar.gz: b7b17bcee21fbce9b639cf94ef4491ad6e9cc9a85ce9884ea9cc5cbefd51ae7b437c8bb3a7f83b6f20371c973e56283ef6653ec85259aa3ac289e14a336981c2
+  metadata.gz: d5230c379270046dd49f65164dbe68d71620944bebb09b338522e9b2753c858ad2a40dc7ed0a26c71468ea5ed6de02874217d1fe7542ca584b803fd7c1cada8e
+  data.tar.gz: cbbffd1ea904726238bdf5ef8662d82fcba89cca29416ac4424210ebd10077bcb5fbd7f1a152bf7157426634258c98b0a6143aef7462e85bbdd4db97e79d7e40

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
@@ -62,8 +61,8 @@ module SgtnClient
         if items.nil? || items["messages"] == nil
           items = {}
           s = SgtnClient::Source.getSources(component, default)
-          key, value = s.first
-          items["component"] = key
+          default_component, value = s.first
+          items["component"] = default_component
           items["messages"] = value
           items["locale"] = 'source'
         end
@@ -118,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,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 |match|
+                  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, 7].freeze
+    VERSION_INFO = [0, 1, 8].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.7
+  version: 0.1.8
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2021-11-10 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