twitter_cldr 1.5.0 → 1.6.0

data/spec/tokenizers/calendars/timespan_tokenizer_spec.rb

@@ -13,7 +13,7 @@ describe TimespanTokenizer do
 
     it "should return the correct list of tokens" do
       tokenizer = TimespanTokenizer.new(:locale => :es)
-      got       = tokenizer.tokens(:unit => :minute, :direction => :ago, :number => 7659)
+      got       = tokenizer.tokens(:unit => :minute, :direction => :ago, :number => 7659, :type => :default)
 
       got[0].should == { :value => "Hace ", :type => :plaintext }
       got[1].should == { :value => "{0}", :type => :placeholder }

data/spec/twitter_cldr_spec.rb

@@ -78,14 +78,14 @@ describe TwitterCldr do
 
   describe '#resources' do
     it 'returns @resources' do
-      resources = TwitterCldr::Shared::Resources.new
-      TwitterCldr.send :instance_variable_set, :@resources, resources
+      resources = TwitterCldr::Resources::Loader.new
+      TwitterCldr.instance_variable_set(:@resources, resources)
 
       TwitterCldr.resources.should == resources
     end
   end
 
-  let(:resources) { TwitterCldr::Shared::Resources.new }
+  let(:resources) { TwitterCldr::Resources::Loader.new }
 
   describe '#get_resource' do
     it 'delegates to resources' do

data/spec/utils_spec.rb

@@ -30,6 +30,44 @@ describe TwitterCldr::Utils do
 
   end
 
+  describe "#deep_merge!" do
+    it "combines two non-nested hashes with different keys" do
+      first = { :foo => "bar" }
+      TwitterCldr::Utils.deep_merge!(first, { :bar => "baz" }).should == { :foo => "bar", :bar => "baz" }
+    end
+
+    it "combines two non-nested hashes with the same keys" do
+      first = { :foo => "bar" }
+      TwitterCldr::Utils.deep_merge!(first, { :foo => "baz" }).should == { :foo => "baz" }
+    end
+
+    it "combines two nested hashes" do
+      first = { :foo => "bar", :second => { :bar => "baz", :twitter => "rocks" } }
+      second = { :foo => "baz", :third => { :whassup => "cool" }, :second => { :twitter => "rules" } }
+      TwitterCldr::Utils.deep_merge!(first, second)
+      first.should == { :foo => "baz", :second => { :bar => "baz", :twitter => "rules" }, :third => { :whassup => "cool" } }
+    end
+
+    it "replaces arrays with simple types" do
+      first = [1, 2, 3]
+      TwitterCldr::Utils.deep_merge!(first, [4, 5, 6]).should == [4, 5, 6]
+    end
+
+    it "merges a nested hash with a few simple array replacements" do
+      first = { :foo => "bar", :second => { :bar => "baz", :twitter => [1, 2, 3] } }
+      second = { :foo => [18], :third => { :whassup => "cool" }, :second => { :twitter => [4, 5, 6] } }
+      TwitterCldr::Utils.deep_merge!(first, second)
+      first.should == { :foo => [18], :second => { :bar => "baz", :twitter => [4, 5, 6] }, :third => { :whassup => "cool" } }
+    end
+
+    it "merges hashes within arrays" do
+      first = [1, { :foo => "bar" }, { :bar => "baz" }, 8]
+      second = [2, { :foo => "bar2" }, { :bar => "baz2", :twitter => "rules" }, 8, 9]
+      TwitterCldr::Utils.deep_merge!(first, second)
+      first.should == [2, { :foo => "bar2" }, { :bar => "baz2", :twitter => "rules" }, 8, 9]
+    end
+  end
+
   describe "#compute_cache_key" do
     it "returns a ruby hash of all the pieces concatenated with pipe characters" do
       TwitterCldr::Utils.compute_cache_key("space", "the", "final", "frontier").should == "space|the|final|frontier".hash

data/twitter_cldr.gemspec

@@ -0,0 +1,25 @@
+require File.join(File.dirname(__FILE__), 'lib', 'twitter_cldr', 'version')
+
+Gem::Specification.new do |s|
+  s.name     = "twitter_cldr"
+  s.version  = ::TwitterCldr::VERSION
+  s.authors  = ["Cameron Dutro"]
+  s.email    = ["cdutro@twitter.com"]
+  s.homepage = "http://twitter.com"
+
+  s.description = s.summary = "Provides date, time, number, and list formatting functionality for various Twitter-supported locales in Ruby and Javascript."
+
+  s.platform = Gem::Platform::RUBY
+  s.has_rdoc = true
+  s.summary  = "Text formatting using data from Unicode's Common Locale Data Repository (CLDR)."
+
+  s.add_dependency 'json', '>= 1.1.9'
+
+  s.require_path = 'lib'
+
+  gem_files       = Dir["{js,lib,spec,resources}/**/*", "Gemfile", "History.txt", "LICENSE", "NOTICE", "README.md", "Rakefile", "twitter_cldr.gemspec"]
+  excluded_files  = %w[spec/collation/CollationTest_CLDR_NON_IGNORABLE.txt spec/normalization/NormalizationTest.txt]
+  versioned_files = `git ls-files`.split("\n")
+
+  s.files = (gem_files - excluded_files) & versioned_files
+end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitter_cldr
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
-  version: 1.5.0
+  segments: 
+  - 1
+  - 6
+  - 0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Cameron Dutro
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-28 00:00:00 Z
+date: 2012-07-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -20,108 +25,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 1
+        - 9
         version: 1.1.9
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mustache
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.99.4
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.9.0
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rr
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.4
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.2
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: jasmine-headless-webkit
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.0.rc1
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: therubyracer
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.10
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: uglifier
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.2.4
-  type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: coffee-script
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.2.0
-  type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: zip
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id010
 description: Provides date, time, number, and list formatting functionality for various Twitter-supported locales in Ruby and Javascript.
 email: 
 - cdutro@twitter.com
@@ -132,15 +43,30 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- LICENSE
-- README.md
-- NOTICE
-- Rakefile
+- js/lib/compiler.rb
+- js/lib/mustache/bundle.coffee
+- js/lib/mustache/calendars/datetime.coffee
+- js/lib/mustache/calendars/timespan.coffee
+- js/lib/mustache/plurals/rules.coffee
+- js/lib/renderers/base.rb
+- js/lib/renderers/bundle.rb
+- js/lib/renderers/calendars/datetime_renderer.rb
+- js/lib/renderers/calendars/timespan_renderer.rb
+- js/lib/renderers/plurals/rules/plural_rules_compiler.rb
+- js/lib/renderers/plurals/rules/plural_rules_renderer.rb
+- js/lib/twitter_cldr_js.rb
+- js/spec/js/calendars/datetime_spec.js
+- js/spec/js/calendars/timespan_spec.js
+- js/spec/js/plurals/plural_rules_spec.js
+- js/spec/js/support/jasmine.yml
+- js/spec/rb/renderers/plurals/plural_rules_compiler_spec.rb
+- js/spec/rb/spec_helper.rb
 - lib/twitter_cldr/collation/collator.rb
 - lib/twitter_cldr/collation/implicit_collation_elements.rb
-- lib/twitter_cldr/collation/sort_key.rb
+- lib/twitter_cldr/collation/sort_key_builder.rb
 - lib/twitter_cldr/collation/trie.rb
 - lib/twitter_cldr/collation/trie_builder.rb
+- lib/twitter_cldr/collation/trie_with_fallback.rb
 - lib/twitter_cldr/collation.rb
 - lib/twitter_cldr/core_ext/array.rb
 - lib/twitter_cldr/core_ext/calendars/date.rb
@@ -179,12 +105,15 @@ files:
 - lib/twitter_cldr/normalization/nfkc.rb
 - lib/twitter_cldr/normalization/nfkd.rb
 - lib/twitter_cldr/normalization.rb
+- lib/twitter_cldr/resources/import/tailoring.rb
+- lib/twitter_cldr/resources/import.rb
+- lib/twitter_cldr/resources/loader.rb
+- lib/twitter_cldr/resources.rb
 - lib/twitter_cldr/shared/calendar.rb
 - lib/twitter_cldr/shared/code_point.rb
 - lib/twitter_cldr/shared/currencies.rb
 - lib/twitter_cldr/shared/languages.rb
 - lib/twitter_cldr/shared/numbers.rb
-- lib/twitter_cldr/shared/resources.rb
 - lib/twitter_cldr/shared/timezones.rb
 - lib/twitter_cldr/shared.rb
 - lib/twitter_cldr/tokenizers/base.rb
@@ -205,9 +134,45 @@ files:
 - spec/collation/CollationTest_CLDR_NON_IGNORABLE_Short.txt
 - spec/collation/collator_spec.rb
 - spec/collation/implicit_collation_elements_spec.rb
-- spec/collation/sort_key_spec.rb
+- spec/collation/sort_key_builder_spec.rb
+- spec/collation/tailoring_spec.rb
+- spec/collation/tailoring_tests/af.txt
+- spec/collation/tailoring_tests/ar.txt
+- spec/collation/tailoring_tests/ca.txt
+- spec/collation/tailoring_tests/cs.txt
+- spec/collation/tailoring_tests/da.txt
+- spec/collation/tailoring_tests/de.txt
+- spec/collation/tailoring_tests/el.txt
+- spec/collation/tailoring_tests/en.txt
+- spec/collation/tailoring_tests/es.txt
+- spec/collation/tailoring_tests/eu.txt
+- spec/collation/tailoring_tests/fa.txt
+- spec/collation/tailoring_tests/fi.txt
+- spec/collation/tailoring_tests/fil.txt
+- spec/collation/tailoring_tests/fr.txt
+- spec/collation/tailoring_tests/he.txt
+- spec/collation/tailoring_tests/hi.txt
+- spec/collation/tailoring_tests/hu.txt
+- spec/collation/tailoring_tests/id.txt
+- spec/collation/tailoring_tests/it.txt
+- spec/collation/tailoring_tests/ja.txt
+- spec/collation/tailoring_tests/ko.txt
+- spec/collation/tailoring_tests/ms.txt
+- spec/collation/tailoring_tests/nb.txt
+- spec/collation/tailoring_tests/nl.txt
+- spec/collation/tailoring_tests/pl.txt
+- spec/collation/tailoring_tests/pt.txt
+- spec/collation/tailoring_tests/ru.txt
+- spec/collation/tailoring_tests/sv.txt
+- spec/collation/tailoring_tests/th.txt
+- spec/collation/tailoring_tests/tr.txt
+- spec/collation/tailoring_tests/uk.txt
+- spec/collation/tailoring_tests/ur.txt
+- spec/collation/tailoring_tests/zh-Hant.txt
+- spec/collation/tailoring_tests/zh.txt
 - spec/collation/trie_builder_spec.rb
 - spec/collation/trie_spec.rb
+- spec/collation/trie_with_fallback_spec.rb
 - spec/core_ext/array_spec.rb
 - spec/core_ext/calendars/date_spec.rb
 - spec/core_ext/calendars/datetime_spec.rb
@@ -236,12 +201,12 @@ files:
 - spec/normalization/normalization_spec.rb
 - spec/normalization/NormalizationTestShort.txt
 - spec/readme_spec.rb
+- spec/resources/loader_spec.rb
 - spec/shared/calendar_spec.rb
 - spec/shared/code_point_spec.rb
 - spec/shared/currencies_spec.rb
 - spec/shared/languages_spec.rb
 - spec/shared/numbers_spec.rb
-- spec/shared/resources_spec.rb
 - spec/spec_helper.rb
 - spec/tokenizers/base_spec.rb
 - spec/tokenizers/calendars/date_tokenizer_spec.rb
@@ -256,6 +221,74 @@ files:
 - spec/utils/interpolation_spec.rb
 - spec/utils_spec.rb
 - resources/collation/FractionalUCA_SHORT.txt
+- resources/collation/tailoring/af.yml
+- resources/collation/tailoring/ar.yml
+- resources/collation/tailoring/ca.yml
+- resources/collation/tailoring/cs.yml
+- resources/collation/tailoring/da.yml
+- resources/collation/tailoring/de.yml
+- resources/collation/tailoring/el.yml
+- resources/collation/tailoring/en.yml
+- resources/collation/tailoring/es.yml
+- resources/collation/tailoring/eu.yml
+- resources/collation/tailoring/fa.yml
+- resources/collation/tailoring/fi.yml
+- resources/collation/tailoring/fil.yml
+- resources/collation/tailoring/fr.yml
+- resources/collation/tailoring/he.yml
+- resources/collation/tailoring/hi.yml
+- resources/collation/tailoring/hu.yml
+- resources/collation/tailoring/id.yml
+- resources/collation/tailoring/it.yml
+- resources/collation/tailoring/ja.yml
+- resources/collation/tailoring/ko.yml
+- resources/collation/tailoring/ms.yml
+- resources/collation/tailoring/nb.yml
+- resources/collation/tailoring/nl.yml
+- resources/collation/tailoring/pl.yml
+- resources/collation/tailoring/pt.yml
+- resources/collation/tailoring/ru.yml
+- resources/collation/tailoring/sv.yml
+- resources/collation/tailoring/th.yml
+- resources/collation/tailoring/tr.yml
+- resources/collation/tailoring/uk.yml
+- resources/collation/tailoring/ur.yml
+- resources/collation/tailoring/zh-Hant.yml
+- resources/collation/tailoring/zh.yml
+- resources/custom/locales/af/units.yml
+- resources/custom/locales/ar/units.yml
+- resources/custom/locales/ca/units.yml
+- resources/custom/locales/cs/units.yml
+- resources/custom/locales/da/units.yml
+- resources/custom/locales/de/units.yml
+- resources/custom/locales/el/units.yml
+- resources/custom/locales/en/units.yml
+- resources/custom/locales/es/units.yml
+- resources/custom/locales/eu/units.yml
+- resources/custom/locales/fa/units.yml
+- resources/custom/locales/fi/units.yml
+- resources/custom/locales/fil/units.yml
+- resources/custom/locales/fr/units.yml
+- resources/custom/locales/he/units.yml
+- resources/custom/locales/hi/units.yml
+- resources/custom/locales/hu/units.yml
+- resources/custom/locales/id/units.yml
+- resources/custom/locales/it/units.yml
+- resources/custom/locales/ja/units.yml
+- resources/custom/locales/ko/units.yml
+- resources/custom/locales/ms/units.yml
+- resources/custom/locales/nb/units.yml
+- resources/custom/locales/nl/units.yml
+- resources/custom/locales/pl/units.yml
+- resources/custom/locales/pt/units.yml
+- resources/custom/locales/ru/units.yml
+- resources/custom/locales/sv/units.yml
+- resources/custom/locales/th/units.yml
+- resources/custom/locales/tr/units.yml
+- resources/custom/locales/uk/units.yml
+- resources/custom/locales/ur/units.yml
+- resources/custom/locales/zh/units.yml
+- resources/custom/locales/zh-Hant/units.yml
 - resources/locales/af/calendars.yml
 - resources/locales/af/languages.yml
 - resources/locales/af/numbers.yml
@@ -651,6 +684,13 @@ files:
 - resources/unicode_data/yi_radicals.yml
 - resources/unicode_data/yi_syllables.yml
 - resources/unicode_data/yijing_hexagram_symbols.yml
+- Gemfile
+- History.txt
+- LICENSE
+- NOTICE
+- README.md
+- Rakefile
+- twitter_cldr.gemspec
 homepage: http://twitter.com
 licenses: []
 
@@ -664,17 +704,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Text formatting using data from Unicode's Common Locale Data Repository (CLDR).