singleton-cldr-rb 0.0.3 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9e5a95bd8f2da82b53bba5cf8ea787617bcbfc70663ebb124cd5a16e50973f9
-  data.tar.gz: 4d3180e5294edcb8c72fbe05a8630459a3442e36433e00a56952ef382d7f8319
+  metadata.gz: d25719965f417362efd0275285f560fa415a2a879c77d5304406a27d2e87d030
+  data.tar.gz: bc7983ea4c2f89241b5fac24a4aec217872d290cbba26a1e032a80ebd5e44105
 SHA512:
-  metadata.gz: 66765a0919f7ef76981ca5928e0f924ba2028dbe78cfb7dae28eb5c3cd4a10db5ec0a2361cb09e2d25c15394a7847dd6f444ff30951d1eff0301bfbf8e9e488b
-  data.tar.gz: edd68a4545d3cda9774b05eba0fa1d26151024d1304462bd9f22fc9cf884930d7474bf5c648bb4796cf1dc37b078f04340508417b63657ba56b21402bfef965d
+  metadata.gz: 013c74b43588bbb2246c7231d9dae919775df89607f7489489c5a87d7e1bc3549c931e3b52cfdba8e7c65d8eb42f170cadc835ff86d674a0d8401b03422740b9
+  data.tar.gz: c55dedf91585fad5915d1c60dfd042f07611ff3944227de62c3c4ae535e302dd0303850dc2719156fbe30b5cc4c5601b5f9d8f768b1038ec93e4f2535fe87188

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(arg)
-            self.localize % arg
+          def to_plural_s(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,64 @@
+require 'json'
+
+module SgtnCldr
+    module Formatters
+        class PluralFormatter
+
+            attr_reader :locale
+
+            def initialize(locale = TwitterCldr.locale)
+              @locale = TwitterCldr.convert_locale(locale)
+            end
+
+            def deep_symbolize_keys(arg)
+              #puts 3221
+              case arg
+                when Array
+                 # puts 44
+                  arg.map { |elem| deep_symbolize_keys(elem) }
+                when Hash
+                 # puts 77
+                 # puts arg
+                 # Hash[arg.map { |k, v| [k.is_a?(String) ? k.to_sym : k, deep_symbolize_keys(v)] }]
+                #  puts arg
+                  Hash[arg.map { |k, v| [k.is_a?(String) ? k.to_sym : k, deep_symbolize_keys(v)] }]
+                else
+                 # puts 99
+                 # puts arg
+                  arg
+              end
+            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
+                  puts 11
+                  puts count
+                  puts patterns
+                  puts deep_symbolize_keys(patterns)[count.to_sym]
+                  puts 0
+                  puts locale
+                  puts TwitterCldr::Formatters::Plurals::Rules.rule_for(count, locale)
+                  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, 3].freeze
+    VERSION_INFO = [0, 0, 7].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

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'twitter_cldr'
 
 describe SgtnCldr do
   describe "Plural" do
@@ -6,12 +7,21 @@ describe SgtnCldr do
     before :each do
 
     end
-
-    it "Plural_num" do
-      str = 'there %<{ "cat_count": { "one": "is one cat", "other": "are %{cat_count} cats" } }> in the room'
-      expect(str.to_plural_s({ :cat_count => 1 })).to eq 'there is one cat in the room'
-      expect(str.to_plural_s({ :cat_count => 3 })).to eq 'there are 3 cats in the room'
+    
+    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'
+      puts 0
+      puts "5" + s.to_plural_s(:pt, { :count => 0 })
+      puts TwitterCldr::Formatters::Plurals::Rules.all_for(:pt_PT) 
+      puts 0.localize("it").plural_rule 
+      puts (0).floor
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singleton-cldr-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.7
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-08 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