singleton-cldr-rb 0.0.4 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b91a001d0788be280f84945bac1f5e6327efa6bf9c67accac2f8df6664060c6d
-  data.tar.gz: 48d1baad50a6c75ea35e400a784b60b526127725fed925bc25855049821906f7
+  metadata.gz: a11b0c87eda1d838bda30a9593ab573a6317ece76f64301866cf19b14c2e419c
+  data.tar.gz: 9ab8fe0d1d31b8cdfea5b24e67e7cdce6f600a27e3e9921662812a77e99e3af5
 SHA512:
-  metadata.gz: 65c39bd1bb3735b8fb190461632643275ae3710d32fdb5c6a9501153166ec699663b81d73a320a6f653a663815c87844ad6cb2e10562e907bff306c87c8005e1
-  data.tar.gz: 730ae2390565731df54c5333f03bd158728ae4c9399e2d288a401b16d64bb5a6549f8ea2eac53c9cc7fb7129149f2943c325e128b4cd04a9c12ceab6c4a9ad3d
+  metadata.gz: fe7c170760798d22d64ac439b129a317c039af91d4027927124d4c60203d673ff5c4a5c401f22950ca7866f7fb7ef851c7acedb8eb48e7d7bbe87cb094365320
+  data.tar.gz: 4166be54ecc061b529c9ad21351815bf9c58be9998af2f712bfde006e7efa3b5ea11ea5cda5279a7866150fd20eb16026f498366518afd963013c0206e152d20

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

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

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

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

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

@@ -1,6 +1,11 @@
 
 String.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
           def to_plural_s(locale, arg)
-            self.localize(locale) % arg
+            num_str = SgtnCldr::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-cldr/cldr/localized_time.rb

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

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

@@ -0,0 +1,38 @@
+require 'json'
+
+module SgtnCldr
+    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-cldr/sgtn-cldr.rb

@@ -3,12 +3,14 @@ module SgtnCldr
             autoload :Cache,        "sgtn-cldr/core/cache"
       end
 
-      autoload :Translation,        "sgtn-cldr/api/translation"
-      autoload :Source,             "sgtn-cldr/api/source"
       autoload :Config,             "sgtn-cldr/core/config"
       autoload :Logging,            "sgtn-cldr/core/logging"
       autoload :Exceptions,         "sgtn-cldr/core/exceptions"
       autoload :ValidateUtil,       "sgtn-cldr/util/validate-util"
+      
+      module Formatters
+            autoload :PluralFormatter,    "sgtn-cldr/formatters/plurals/plural_formatter"
+      end
 
       class << self
             def configure(options = {}, &block)

data/lib/version.rb

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

data/spec/unit/datetime_spec.rb

@@ -9,34 +9,34 @@ describe SgtnCldr do
 
     it "DateTime" do
       d = DateTime.new(2007,11,19,8,37,48,"-06:00")
-      expect(d.to_full_s(:es)).to eq 'lunes, 19 de noviembre de 2007, 14:37:48 (tiempo universal coordinado)'
-      expect(d.to_long_s(:es)).to eq '19 de noviembre de 2007, 14:37:48 UTC'
-      expect(d.to_medium_s(:es)).to eq '19 nov 2007 14:37:48'
-      expect(d.to_short_s(:es)).to eq '19/11/07 14:37'
+      expect(d.l_full_s(:es)).to eq 'lunes, 19 de noviembre de 2007, 14:37:48 (tiempo universal coordinado)'
+      expect(d.l_long_s(:es)).to eq '19 de noviembre de 2007, 14:37:48 UTC'
+      expect(d.l_medium_s(:es)).to eq '19 nov 2007 14:37:48'
+      expect(d.l_short_s(:es)).to eq '19/11/07 14:37'
     end
 
-    it "Date0" do
+    it "Date" do
       d = Date.new(2001,2,3)
-      expect(d.to_full_s(:es)).to eq 'Saturday, February 3, 2001'
-      expect(d.to_long_s(:es)).to eq 'February 3, 2001'
-      expect(d.to_medium_s(:es)).to eq 'Feb 3, 2001'
-      expect(d.to_short_s(:es)).to eq '2/3/01'
+      expect(d.l_full_s(:es)).to eq 'sábado, 3 de febrero de 2001'
+      expect(d.l_long_s(:es)).to eq '3 de febrero de 2001'
+      expect(d.l_medium_s(:es)).to eq '3 feb 2001'
+      expect(d.l_short_s(:es)).to eq '3/2/01'
     end
 
-    it "Date" do
+    it "DateOfDateTime" do
       d = DateTime.new(2007,11,19,8,37,48,"-06:00")
-      expect(d.to_date(:es).to_full_s).to eq 'lunes, 19 de noviembre de 2007'
-      expect(d.to_date(:es).to_long_s).to eq '19 de noviembre de 2007'
-      expect(d.to_date(:es).to_medium_s).to eq '19 nov 2007'
-      expect(d.to_date(:es).to_short_s).to eq '19/11/07'
+      expect(d.to_date.l_full_s(:es)).to eq 'lunes, 19 de noviembre de 2007'
+      expect(d.to_date.l_long_s(:es)).to eq '19 de noviembre de 2007'
+      expect(d.to_date.l_medium_s(:es)).to eq '19 nov 2007'
+      expect(d.to_date.l_short_s(:es)).to eq '19/11/07'
     end
 
     it "time" do
       d = Time.new(2007,11,1,15,25,0, "+09:00")
-      expect(d.to_full_s(:es)).to eq '6:25:00 (tiempo universal coordinado)'
-      expect(d.to_long_s(:es)).to eq '6:25:00 UTC'
-      expect(d.to_medium_s(:es)).to eq '6:25:00'
-      expect(d.to_short_s(:es)).to eq '6:25'
+      expect(d.l_full_s(:es)).to eq '6:25:00 (tiempo universal coordinado)'
+      expect(d.l_long_s(:es)).to eq '6:25:00 UTC'
+      expect(d.l_medium_s(:es)).to eq '6:25:00'
+      expect(d.l_short_s(:es)).to eq '6:25'
     end
   end
 

data/spec/unit/plural_spec.rb

@@ -7,13 +7,16 @@ describe SgtnCldr do
     before :each do
 
     end
-
-    it "Plural_num" do
-      str = 'there %<{ "cat_count": { "one": "is one cat", "few": "aaa", "many": "are many %{cat_count} cats", "other": "are %{cat_count} cats" } }> in the room'
-      expect(str.to_plural_s(:en, { :cat_count => 1 })).to eq 'there is one cat in the room'
-      expect(str.to_plural_s(:en, { :cat_count => 3 })).to eq 'there are 3 cats in the room'
-      puts str.to_plural_s(:ru, { :cat_count => 3 })
+    
+    it "plural" do
+      str = 'there %<{ "cat_count": { "one": "is one cat", "zero":"is no cat", "two": "are two cats", "few": "are some cats", "many": "are many cats", "other": "are %{cat_count} cats" } }> in the room'
+      expect(str.to_plural_s(:cy, { :cat_count => 1 })).to eq 'there is one cat in the room'
+      expect(str.to_plural_s(:cy, { :cat_count => 0 })).to eq 'there is no cat in the room'
+      expect(str.to_plural_s(:cy, { :cat_count => 5 })).to eq 'there are 5 cats in the room'
+      expect(str.to_plural_s(:cy, { :cat_count => 3 })).to eq 'there are some cats in the room'
+      expect(str.to_plural_s(:cy, { :cat_count => 2 })).to eq 'there are two cats in the room'
+      s = '%<{"count": {"0": "no horse", "one": "one horse", "other": "%{count} horses"}}>'
+      expect(s.to_plural_s(:cy, { :count => 0 })).to eq 'no horse'
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singleton-cldr-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.8
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-14 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -250,6 +250,7 @@ files:
 - lib/sgtn-cldr/core/exceptions.rb
 - lib/sgtn-cldr/core/logging.rb
 - lib/sgtn-cldr/core/request.rb
+- lib/sgtn-cldr/formatters/plurals/plural_formatter.rb
 - lib/sgtn-cldr/sgtn-cldr.rb
 - lib/sgtn-cldr/util/cache-util.rb
 - lib/sgtn-cldr/util/validate-util.rb
@@ -280,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Singleton cldr for L2 support