twitter_cldr 2.2.0 → 2.4.0

data/spec/localized/localized_time_spec.rb

@@ -50,7 +50,7 @@ describe LocalizedTime do
     end
 
     it "should work with an instance of LocalizedDate too" do
-      date = Date.new(1987, 9, 20).localize
+      date = DateTime.new(1987, 9, 20, 0, 0, 0).localize.to_date
       time = Time.local(2000, 5, 12, 22, 5)
       datetime = time.localize.to_datetime(date)
       datetime.should be_a(LocalizedDateTime)
@@ -67,4 +67,14 @@ describe LocalizedTime do
       end
     end
   end
+
+  describe "#with_timezone" do
+    it "calculates the right time depending on the timezone" do
+      time = Time.utc(2000, 5, 12, 22, 5).localize
+      time.to_s.should == "10:05:00 PM"
+      time.with_timezone("America/Los_Angeles").to_s.should == "3:05:00 PM"
+      time.with_timezone("America/New_York").to_s.should == "6:05:00 PM"
+    end
+  end
+
 end

data/spec/readme_spec.rb

@@ -57,21 +57,20 @@ describe "README" do
   end
 
   it "verifies dates" do
-    date_time = DateTime.new(2011, 12, 12, 21, 44, 57, -8.0 / 24.0)
-    date = date_time.localize.to_date.base_obj
-    time = Time.at(date_time.localize.to_time.base_obj.utc - (8 * 60 * 60))
+    date_time = DateTime.new(2011, 12, 12, 21, 44, 57, 0.0)
+    time = Time.at(date_time.localize.to_time.base_obj.utc)
 
-    date_time.localize(:es).to_full_s.should == "lunes, 12 de diciembre de 2011 21:44:57 UTC -0800"
-    date_time.localize(:es).to_long_s.should == "12 de diciembre de 2011 21:44:57 -08:00"
+    date_time.localize(:es).to_full_s.should == "lunes, 12 de diciembre de 2011 21:44:57 UTC +00:00"
+    date_time.localize(:es).to_long_s.should == "12 de diciembre de 2011 21:44:57 UTC"
     date_time.localize(:es).to_medium_s.should == "12/12/2011 21:44:57"
     date_time.localize(:es).to_short_s.should == "12/12/11 21:44"
 
-    date.localize(:es).to_full_s.should == "lunes, 12 de diciembre de 2011"
-    date.localize(:es).to_long_s.should == "12 de diciembre de 2011"
-    date.localize(:es).to_medium_s.should == "12/12/2011"
-    date.localize(:es).to_short_s.should == "12/12/11"
+    date_time.localize(:es).to_date.to_full_s.should == "lunes, 12 de diciembre de 2011"
+    date_time.localize(:es).to_date.to_long_s.should == "12 de diciembre de 2011"
+    date_time.localize(:es).to_date.to_medium_s.should == "12/12/2011"
+    date_time.localize(:es).to_date.to_short_s.should == "12/12/11"
 
-    time.localize(:es).to_full_s.should match(/21:44:57 UTC [-+]\d{4}/)
+    time.localize(:es).to_full_s.should match(/21:44:57 UTC [-+]\d{2}:\d{2}/)
     time.localize(:es).to_long_s.should == "21:44:57 UTC"
     time.localize(:es).to_medium_s.should == "21:44:57"
     time.localize(:es).to_short_s.should == "21:44"
@@ -81,7 +80,7 @@ describe "README" do
   end
 
   it "verifies additional date formats" do
-    date_time = DateTime.new(2011, 12, 12, 21, 44, 57, -8.0 / 24.0)
+    date_time = DateTime.new(2011, 12, 12, 21, 44, 57, 0.0)
     TwitterCldr::Formatters::DateTimeFormatter.additional_formats_for(:ja).should be_a(Array)
     date_time.localize(:ja).to_s.should == "2011/12/12 21:44:57"
     date_time.localize(:ja).to_s(:format => "EEEEd").should == "12日月曜日"

data/spec/resources/loader_spec.rb

@@ -49,16 +49,26 @@ describe Loader do
         loader.get_resource(:foo, :bar).should == { :foo => "bar" }
       end
 
-      it 'merges the given file with its corresponding custom resource if it exists' do
-        mock(loader).read_resource_file('foo/bar.yml') { ":foo: bar" }
-        mock(loader).resource_exists?('custom/foo/bar.yml') { true }
-        mock(loader).read_resource_file('custom/foo/bar.yml') { ":bar: baz" }
+      context 'with a custom resource' do
+        before(:each) do
+          stub(loader).read_resource_file('foo/bar.yml') { ":foo: bar" }
+          stub(loader).resource_exists?('custom/foo/bar.yml') { true }
+          stub(loader).read_resource_file('custom/foo/bar.yml') { ":bar: baz" }
+        end
 
-        # make sure load_resource is called with custom = false the second time
-        mock.proxy(loader).load_resource("foo/bar.yml")
-        mock.proxy(loader).load_resource("custom/foo/bar.yml", false)
+        it 'merges the given file with its corresponding custom resource if it exists' do
+          # make sure load_resource is called with custom = false the second time
+          mock.proxy(loader).load_resource("foo/bar.yml")
+          mock.proxy(loader).load_resource("custom/foo/bar.yml", false)
 
-        loader.get_resource(:foo, :bar).should == { :foo => "bar", :bar => "baz" }
+          loader.get_resource(:foo, :bar).should == { :foo => "bar", :bar => "baz" }
+        end
+
+        it 'does not merge the custom resource if custom resources are disabled' do
+          TwitterCldr.disable_custom_locale_resources = true
+          loader.get_resource(:foo, :bar).should == { :foo => "bar" }
+          TwitterCldr.disable_custom_locale_resources = false
+        end
       end
     end
   end

data/spec/shared/currencies_spec.rb

@@ -15,7 +15,7 @@ describe Currencies do
     it "should list all supported country codes" do
       codes = Currencies.currency_codes
 
-      codes.size.should == 296
+      codes.size.should == 297
       codes.should include(*TEST_CODES)
     end
   end

data/spec/tokenizers/calendars/datetime_tokenizer_spec.rb

@@ -26,8 +26,8 @@ describe DateTimeTokenizer do
   end
 
   describe "#tokens" do
-    it "should choose the default date time path if no other type is specified" do
-      mock.proxy(tokenizer.paths)[:default]
+    it "as of CLDR 23, should choose the medium date time path if no other type is specified" do
+      mock.proxy(tokenizer.paths)[:medium]
       tokenizer.tokens
     end
 

data/twitter_cldr.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.summary  = "Ruby implementation of the ICU (International Components for Unicode) that uses the Common Locale Data Repository to format dates, plurals, and more."
 
   s.add_dependency 'json'
+  s.add_dependency 'tzinfo'
 
   s.require_path = 'lib'
 

metadata

@@ -1,46 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: twitter_cldr
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 2.4.0
   prerelease: 
-  segments: 
-  - 2
-  - 2
-  - 0
-  version: 2.2.0
 platform: ruby
-authors: 
+authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: Ruby implementation of the ICU (International Components for Unicode) that uses the Common Locale Data Repository to format dates, plurals, and more.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Ruby implementation of the ICU (International Components for Unicode)
+  that uses the Common Locale Data Repository to format dates, plurals, and more.
+email:
 - cdutro@twitter.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/twitter_cldr/collation/collator.rb
 - lib/twitter_cldr/collation/implicit_collation_elements.rb
 - lib/twitter_cldr/collation/sort_key_builder.rb
@@ -1069,36 +1079,33 @@ files:
 - twitter_cldr.gemspec
 homepage: http://twitter.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -108096074697232559
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -108096074697232559
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Ruby implementation of the ICU (International Components for Unicode) that uses the Common Locale Data Repository to format dates, plurals, and more.
+summary: Ruby implementation of the ICU (International Components for Unicode) that
+  uses the Common Locale Data Repository to format dates, plurals, and more.
 test_files: []
-