twitter_cldr 2.2.0 → 2.4.0

data/resources/unicode_data/blocks/supplemental_mathematical_operators.yml

@@ -197,7 +197,7 @@
 - Sm
 - '0'
 - 'ON'
-- <compat> 222B 222B 222B 222B
+- "<compat> 222B 222B 222B 222B"
 - ''
 - ''
 - ''
@@ -1861,7 +1861,7 @@
 - Sm
 - '0'
 - 'ON'
-- <compat> 003A 003A 003D
+- "<compat> 003A 003A 003D"
 - ''
 - ''
 - ''
@@ -1877,7 +1877,7 @@
 - Sm
 - '0'
 - 'ON'
-- <compat> 003D 003D
+- "<compat> 003D 003D"
 - ''
 - ''
 - ''
@@ -1893,7 +1893,7 @@
 - Sm
 - '0'
 - 'ON'
-- <compat> 003D 003D 003D
+- "<compat> 003D 003D 003D"
 - ''
 - ''
 - ''

data/resources/unicode_data/blocks/supplementary_private_use_area_a.yml

@@ -1,7 +1,7 @@
 ---
 983040:
 - 983040
-- <Plane 15 Private Use, First>
+- "<Plane 15 Private Use, First>"
 - Co
 - '0'
 - L
@@ -17,7 +17,7 @@
 - ''
 1048573:
 - 1048573
-- <Plane 15 Private Use, Last>
+- "<Plane 15 Private Use, Last>"
 - Co
 - '0'
 - L

data/resources/unicode_data/blocks/supplementary_private_use_area_b.yml

@@ -1,7 +1,7 @@
 ---
 1048576:
 - 1048576
-- <Plane 16 Private Use, First>
+- "<Plane 16 Private Use, First>"
 - Co
 - '0'
 - L
@@ -17,7 +17,7 @@
 - ''
 1114109:
 - 1114109
-- <Plane 16 Private Use, Last>
+- "<Plane 16 Private Use, Last>"
 - Co
 - '0'
 - L

data/resources/unicode_data/blocks/thai.yml

@@ -805,7 +805,7 @@
 - Lo
 - '0'
 - L
-- <compat> 0E4D 0E32
+- "<compat> 0E4D 0E32"
 - ''
 - ''
 - ''

data/resources/unicode_data/blocks/tibetan.yml

@@ -197,7 +197,7 @@
 - Po
 - '0'
 - L
-- <noBreak> 0F0B
+- "<noBreak> 0F0B"
 - ''
 - ''
 - ''
@@ -824,7 +824,7 @@
 - ''
 - ''
 - ''
-- -1/2
+- "-1/2"
 - N
 - ''
 - ''
@@ -1829,7 +1829,7 @@
 - Mn
 - '0'
 - NSM
-- <compat> 0FB2 0F81
+- "<compat> 0FB2 0F81"
 - ''
 - ''
 - ''
@@ -1861,7 +1861,7 @@
 - Mn
 - '0'
 - NSM
-- <compat> 0FB3 0F81
+- "<compat> 0FB3 0F81"
 - ''
 - ''
 - ''

data/resources/unicode_data/blocks/tifinagh.yml

@@ -901,7 +901,7 @@
 - Lm
 - '0'
 - L
-- <super> 2D61
+- "<super> 2D61"
 - ''
 - ''
 - ''

data/resources/unicode_data/blocks/vertical_forms.yml

@@ -5,7 +5,7 @@
 - Po
 - '0'
 - 'ON'
-- <vertical> 002C
+- "<vertical> 002C"
 - ''
 - ''
 - ''
@@ -21,7 +21,7 @@
 - Po
 - '0'
 - 'ON'
-- <vertical> 3001
+- "<vertical> 3001"
 - ''
 - ''
 - ''
@@ -37,7 +37,7 @@
 - Po
 - '0'
 - 'ON'
-- <vertical> 3002
+- "<vertical> 3002"
 - ''
 - ''
 - ''
@@ -53,7 +53,7 @@
 - Po
 - '0'
 - 'ON'
-- <vertical> 003A
+- "<vertical> 003A"
 - ''
 - ''
 - ''
@@ -69,7 +69,7 @@
 - Po
 - '0'
 - 'ON'
-- <vertical> 003B
+- "<vertical> 003B"
 - ''
 - ''
 - ''
@@ -85,7 +85,7 @@
 - Po
 - '0'
 - 'ON'
-- <vertical> 0021
+- "<vertical> 0021"
 - ''
 - ''
 - ''
@@ -101,7 +101,7 @@
 - Po
 - '0'
 - 'ON'
-- <vertical> 003F
+- "<vertical> 003F"
 - ''
 - ''
 - ''
@@ -117,7 +117,7 @@
 - Ps
 - '0'
 - 'ON'
-- <vertical> 3016
+- "<vertical> 3016"
 - ''
 - ''
 - ''
@@ -133,7 +133,7 @@
 - Pe
 - '0'
 - 'ON'
-- <vertical> 3017
+- "<vertical> 3017"
 - ''
 - ''
 - ''
@@ -149,7 +149,7 @@
 - Po
 - '0'
 - 'ON'
-- <vertical> 2026
+- "<vertical> 2026"
 - ''
 - ''
 - ''

data/spec/collation/trie_dumps_spec.rb

@@ -9,7 +9,7 @@ include TwitterCldr::Collation
 
 describe 'trie dumps', :slow => true do
   let(:default_trie) { TrieBuilder.load_default_trie }
-  let(:error_message)    { 'expected trie dump to be up-to-date.' }
+  let(:error_message) { 'expected trie dump to be up-to-date.' }
 
   it 'has a valid default Fractional Collation Elements trie dump' do
     TrieLoader.load_default_trie.to_hash.should(eq(default_trie.to_hash), error_message)

data/spec/core_ext_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 
 describe 'Core classes localization' do
 
-  [Array, Bignum, Date, DateTime, Fixnum, Float, String, Symbol, Time].each do |klass|
+  [Array, Bignum, DateTime, Fixnum, Float, String, Symbol, Time].each do |klass|
     describe klass do
       it 'has public instance method #localize' do
         # convert methods names to symbols (they're strings in 1.8)

data/spec/formatters/calendars/datetime_formatter_spec.rb

@@ -346,7 +346,7 @@ describe DateTimeFormatter do
       @formatter.send(:timezone, Time.gm(2000, 1, 1, 1, 1, 1), 'z', 1).should == 'UTC'
       @formatter.send(:timezone, Time.gm(2000, 1, 1, 1, 1, 1), 'zz', 2).should == 'UTC'
       @formatter.send(:timezone, Time.gm(2000, 1, 1, 1, 1, 1), 'zzz', 3).should == 'UTC'
-      @formatter.send(:timezone, Time.gm(2000, 1, 1, 1, 1, 1), 'zzzz', 4).should =~ /^UTC (-|\+)\d{4}$/
+      @formatter.send(:timezone, Time.gm(2000, 1, 1, 1, 1, 1), 'zzzz', 4).should =~ /^UTC (-|\+)\d{2}:\d{2}$/
     end
   end
 

data/spec/formatters/numbers/abbreviated/long_decimal_formatter_spec.rb

@@ -34,4 +34,8 @@ describe LongDecimalFormatter do
   it "formats the number as if it were a straight decimal if it's less than 1000" do
     @formatter.format(500).should == "500"
   end
+
+  it "respects the :precision option" do
+    @formatter.format(12345, :precision => 3).should match_normalized("12.345 thousand")
+  end
 end

data/spec/formatters/numbers/abbreviated/short_decimal_formatter_spec.rb

@@ -34,4 +34,8 @@ describe ShortDecimalFormatter do
   it "formats the number as if it were a straight decimal if it's less than 1000" do
     @formatter.format(500).should == "500"
   end
+
+  it "respects the :precision option" do
+    @formatter.format(12345, :precision => 3).should match_normalized("12.345K")
+  end
 end

data/spec/formatters/numbers/currency_formatter_spec.rb

@@ -48,9 +48,11 @@ describe CurrencyFormatter do
       @formatter.format(12, :currency => "TND").should == "TND12.000"
     end
 
-    it "should use the currency rounding" do
-      @formatter.format(12.03, :currency => "CHF").should == "CHF12.05"
-      @formatter.format(12.02, :currency => "CHF").should == "CHF12.00"
+    it "should use the currency rounding for the currency code" do
+      # The rounding value for CHF changed from 5 to 0 in CLDR 23, so we have to pass
+      # :rounding explicitly to test its effects.
+      @formatter.format(12.03, :currency => "CHF", :rounding => 5).should == "CHF12.05"
+      @formatter.format(12.02, :currency => "CHF", :rounding => 5).should == "CHF12.00"
     end
   end
 end

data/spec/localized/localized_date_spec.rb

@@ -9,42 +9,42 @@ include TwitterCldr::Localized
 
 describe LocalizedDate do
 
-  let(:date) { Date.today }
+  let(:date_time) { DateTime.now }
 
   describe "#ago" do
-    let(:date) { Date.new(2010, 7, 6) }
+    let(:date_time) { DateTime.new(2010, 7, 6, 12, 12, 30) }
     let(:base_time) { Time.gm(2010, 8, 6, 12, 12, 30) }
 
     it "should ago-ify from now when no base_time given" do
       stub(Time).now { Time.gm(2010, 8, 6, 12, 12, 30) }
-      loc_date = date.localize(:ko)
+      loc_date = date_time.localize(:ko).to_date
       loc_date.ago.to_s(:unit => :hour).should match_normalized("744시간 전")
     end
 
     it "should ago-ify with appropriate unit when no unit given" do
-      loc_date = date.localize(:en)
+      loc_date = date_time.localize(:en).to_date
       loc_date.ago(:base_time => base_time).to_s.should match_normalized("1 month ago")
       loc_date.ago(:base_time => Time.gm(2010, 12, 6, 12, 12, 30)).to_s.should match_normalized("5 months ago")
       loc_date.ago(:base_time => Time.gm(2010, 7, 7, 12, 12, 30)).to_s.should match_normalized("1 day ago")
     end
 
     it "should ago-ify with strings regardless of variable's placement or existence" do
-      loc_date = date.localize(:ar)
+      loc_date = date_time.localize(:ar).to_date
       loc_date.ago(:base_time => base_time).to_s(:unit => :hour).should match_normalized("قبل 744 ساعة")
       loc_date.ago(:base_time => base_time).to_s(:unit => :day).should match_normalized("قبل 31 يومًا")
       loc_date.ago(:base_time => base_time).to_s(:unit => :month).should match_normalized("قبل 1 من الشهور")
       loc_date.ago(:base_time => base_time).to_s(:unit => :year).should match_normalized("قبل 0 من السنوات")
 
-      loc_date = date.localize(:fa)
+      loc_date = date_time.localize(:fa).to_date
       loc_date.ago(:base_time => base_time).to_s(:unit => :day).should match_normalized("31 روز پیش")
 
-      loc_date = date.localize(:en)
+      loc_date = date_time.localize(:en).to_date
       loc_date.ago(:base_time => base_time).to_s(:unit => :day).should match_normalized("31 days ago")
     end
 
     it "should ago-ify a date with a number of different units" do
-      date = Date.new(2010, 6, 6)
-      loc_date = date.localize(:de)
+      date_time = DateTime.new(2010, 6, 6, 12, 12, 30)
+      loc_date = date_time.localize(:de).to_date
       loc_date.ago(:base_time => base_time).to_s(:unit => :second).should match_normalized("Vor 5270400 Sekunden")
       loc_date.ago(:base_time => base_time).to_s(:unit => :minute).should match_normalized("Vor 87840 Minuten")
       loc_date.ago(:base_time => base_time).to_s(:unit => :hour).should match_normalized("Vor 1464 Stunden")
@@ -54,8 +54,8 @@ describe LocalizedDate do
     end
 
     it "should return an error if called on a date in the future" do
-      date = Date.new(2010, 10, 10)
-      loc_date = date.localize(:de)
+      date_time = DateTime.new(2010, 10, 10, 12, 12, 30)
+      loc_date = date_time.localize(:de).to_date
       lambda { loc_date.ago(base_time, :second)}.should raise_error(ArgumentError)
     end
   end
@@ -64,8 +64,8 @@ describe LocalizedDate do
     let(:base_time) { Time.gm(2010, 8, 6, 12, 12, 30) }
 
     it "should until-ify with a number of different units" do
-      date = Date.new(2010, 10, 10)
-      loc_date = date.localize(:de)
+      date_time = DateTime.new(2010, 10, 10, 12, 12, 30)
+      loc_date = date_time.localize(:de).to_date
       loc_date.until(:base_time => base_time).to_s(:unit => :second).should match_normalized("In 5616000 Sekunden")
       loc_date.until(:base_time => base_time).to_s(:unit => :minute).should match_normalized("In 93600 Minuten")
       loc_date.until(:base_time => base_time).to_s(:unit => :hour).should match_normalized("In 1560 Stunden")
@@ -75,8 +75,8 @@ describe LocalizedDate do
     end
 
     it "should return an error if called on a date in the past" do
-      date = Date.new(2010,4,4)
-      loc_date = date.localize(:de)
+      date_time = DateTime.new(2010, 4, 4, 12, 12, 30)
+      loc_date = date_time.localize(:de).to_date
       lambda { loc_date.until(base_time, :second)}.should raise_error(ArgumentError)
     end
   end
@@ -84,37 +84,37 @@ describe LocalizedDate do
   describe "stringify" do
     it "should stringify with a default calendar" do
       #date.localize(:th, :calendar_type => :buddhist).to_full_s # It doesn't support era
-      date.localize(:th).to_long_s
-      date.localize(:th).to_medium_s
-      date.localize(:th).to_short_s
+      date_time.localize(:th).to_date.to_long_s
+      date_time.localize(:th).to_date.to_medium_s
+      date_time.localize(:th).to_date.to_short_s
     end
 
     it "should stringify with buddhist calendar" do
       # Ensure that buddhist calendar data is present in th locale.
       TwitterCldr.get_locale_resource(:th, :calendars)[:th][:calendars][:buddhist].should_not(
-          be_nil, 'buddhist calendar is missing for :th locale (check resources/locales/th/calendars.yml)'
+        be_nil, 'buddhist calendar is missing for :th locale (check resources/locales/th/calendars.yml)'
       )
 
       #date.localize(:th, :calendar_type => :buddhist).to_full_s # It doesn't support era
-      date.localize(:th, :calendar_type => :buddhist).to_long_s
-      date.localize(:th, :calendar_type => :buddhist).to_medium_s
-      date.localize(:th, :calendar_type => :buddhist).to_short_s
+      date_time.localize(:th, :calendar_type => :buddhist).to_date.to_long_s
+      date_time.localize(:th, :calendar_type => :buddhist).to_date.to_medium_s
+      date_time.localize(:th, :calendar_type => :buddhist).to_date.to_short_s
     end
   end
 
   describe "#to_datetime" do
     it "should combine a date and a time object into a datetime" do
-      date = Date.new(1987, 9, 20)
+      date_time = DateTime.new(1987, 9, 20, 0, 0, 0)
       time = Time.local(2000, 5, 12, 22, 5)
-      datetime = date.localize.to_datetime(time)
+      datetime = date_time.localize.to_date.to_datetime(time)
       datetime.should be_a(LocalizedDateTime)
       datetime.base_obj.strftime("%Y-%m-%d %H:%M:%S").should == "1987-09-20 22:05:00"
     end
 
     it "should work with an instance of LocalizedTime too" do
-      date = Date.new(1987, 9, 20)
+      date_time = DateTime.new(1987, 9, 20, 0, 0, 0)
       time = Time.local(2000, 5, 12, 22, 5).localize
-      datetime = date.localize.to_datetime(time)
+      datetime = date_time.localize.to_date.to_datetime(time)
       datetime.should be_a(LocalizedDateTime)
       datetime.base_obj.strftime("%Y-%m-%d %H:%M:%S").should == "1987-09-20 22:05:00"
     end
@@ -124,10 +124,19 @@ describe LocalizedDate do
     it "don't raise errors for any locale" do
       TwitterCldr.supported_locales.each do |locale|
         (TwitterCldr::Tokenizers::DateTimeTokenizer::VALID_TYPES - [:additional]).each do |type|
-          lambda { Date.today.localize(locale).send(:"to_#{type}_s") }.should_not raise_error
+          lambda { DateTime.now.localize(locale).to_date.send(:"to_#{type}_s") }.should_not raise_error
         end
       end
     end
   end
 
+  describe "#with_timezone" do
+    it "calculates the right day depending on the timezone" do
+      loc_date = DateTime.new(1987, 9, 20, 0, 0, 0).localize.to_date
+      loc_date.to_s.should == "Sep 20, 1987"
+      loc_date.with_timezone("America/Los_Angeles").to_s.should == "Sep 19, 1987"
+      loc_date.with_timezone("Asia/Tokyo").to_s.should == "Sep 20, 1987"
+    end
+  end
+
 end

data/spec/localized/localized_datetime_spec.rb

@@ -92,7 +92,7 @@ describe LocalizedDateTime do
     it "uses the default format if no :format is given" do
       loc_date = date_time.localize
       mock.proxy(loc_date).to_default_s
-      loc_date.to_s.should == "Sep 20, 1987, 10:05:00 p.m."
+      loc_date.to_s.should == "Sep 20, 1987, 10:05:00 PM"
     end
 
     it "uses the given format instead of the default when specified" do
@@ -102,4 +102,13 @@ describe LocalizedDateTime do
     end
   end
 
+  describe "#with_timezone" do
+    it "calculates the right time depending on the timezone" do
+      loc_date = date_time.localize
+      loc_date.to_s.should == "Sep 20, 1987, 10:05:00 PM"
+      loc_date.with_timezone("America/Los_Angeles").to_s.should == "Sep 20, 1987, 3:05:00 PM"
+      loc_date.with_timezone("America/New_York").to_s.should == "Sep 20, 1987, 6:05:00 PM"
+    end
+  end
+
 end