twitter_cldr 2.4.3 → 3.0.0.beta1

data/spec/collation/collator_spec.rb

@@ -107,7 +107,7 @@ describe Collator do
     before(:each) { mock(TrieLoader).load_default_trie { trie } }
 
     describe 'calculating sort key' do
-      before(:each) { mock(TwitterCldr::Collation::SortKeyBuilder).build(collation_elements, nil) { sort_key } }
+      before(:each) { mock(TwitterCldr::Collation::SortKeyBuilder).build(collation_elements, :case_first => nil, :maximum_level => nil) { sort_key } }
 
       it 'calculates sort key for a string' do
         mock(collator).get_collation_elements(string) { collation_elements }
@@ -121,9 +121,10 @@ describe Collator do
     end
 
     describe 'uses tailoring options' do
-      let(:case_first) { :upper }
-      let(:locale)     { :uk }
-
+      let(:case_first)    { :upper }
+      let(:locale)        { :uk }
+      let(:maximum_level) { 2 }
+      
       it 'passes case-first sort option to sort key builder' do
         mock(TwitterCldr::Collation::TrieLoader).load_tailored_trie(locale, trie) { Trie.new }
         mock(TwitterCldr::Collation::TrieBuilder).tailoring_data(locale) { { :collator_options => { :case_first => case_first } } }
@@ -131,10 +132,23 @@ describe Collator do
         collator = Collator.new(locale)
 
         mock(collator).get_collation_elements(code_points) { collation_elements }
-        mock(TwitterCldr::Collation::SortKeyBuilder).build(collation_elements, case_first) { sort_key }
+        mock(TwitterCldr::Collation::SortKeyBuilder).build(collation_elements, :case_first => case_first, :maximum_level => nil) { sort_key }
 
         collator.get_sort_key(code_points).should == sort_key
       end
+
+      it 'passes maximum_level option to sort key builder' do 
+        mock(TwitterCldr::Collation::TrieLoader).load_tailored_trie(locale, trie) { Trie.new }
+        mock(TwitterCldr::Collation::TrieBuilder).tailoring_data(locale) { { :collator_options => { :case_first => case_first } } }
+
+        collator = Collator.new(locale)
+
+        mock(collator).get_collation_elements(code_points) { collation_elements }
+        mock(TwitterCldr::Collation::SortKeyBuilder).build(collation_elements, :case_first => case_first, :maximum_level => maximum_level) { sort_key }
+
+        collator.get_sort_key(code_points, :maximum_level => maximum_level).should == sort_key
+      end
+
     end
   end
 

data/spec/collation/sort_key_builder_spec.rb

@@ -29,14 +29,22 @@ describe SortKeyBuilder do
       SortKeyBuilder.new(collation_elements).collation_elements.should == collation_elements
     end
 
-    it 'accepts case-first option as the second argument' do
+    it 'accepts case-first option as an option' do
       SortKeyBuilder::VALID_CASE_FIRST_OPTIONS.each do |case_first|
-        lambda { SortKeyBuilder.new([], case_first) }.should_not raise_error
+        lambda { SortKeyBuilder.new([], :case_first => case_first) }.should_not raise_error
       end
     end
 
     it 'raises an ArgumentError for invalid case-first option' do
-      lambda { SortKeyBuilder.new([], :wat) }.should raise_error(ArgumentError)
+      lambda { SortKeyBuilder.new([], :case_first => :wat) }.should raise_error(ArgumentError)
+    end
+
+    it 'raises an ArgumentError for an invalid maximum_level option' do
+      lambda { SortKeyBuilder.new([], :maximum_level => :wat) }.should raise_error(ArgumentError)
+    end
+
+    it 'raises an ArgumentError for non-hash second argument' do
+      lambda { SortKeyBuilder.new([], :upper) }.should raise_error(ArgumentError)
     end
   end
 
@@ -103,32 +111,46 @@ describe SortKeyBuilder do
 
       context 'when case_first is :upper' do
         it 'inverts case bits and subtract bottom addition from bytes that are smaller than common' do
-          SortKeyBuilder.new([[0, 0, 9], [0, 0, 80], [0, 0, 143]], :upper).bytes_array.should == [1, 1, 201, 80, 15]
+          SortKeyBuilder.new([[0, 0, 9], [0, 0, 80], [0, 0, 143]], :case_first => :upper).bytes_array.should == [1, 1, 201, 80, 15]
         end
 
         it 'compresses tertiary weights' do
-          SortKeyBuilder.new([[0, 0, 5], [0, 0, 5], [0, 0, 39], [0, 0, 5], [0, 0, 5]], :upper).bytes_array.should == [1, 1, 0xC4, 0xE7, 0xC3]
+          SortKeyBuilder.new([[0, 0, 5], [0, 0, 5], [0, 0, 39], [0, 0, 5], [0, 0, 5]], :case_first => :upper).bytes_array.should == [1, 1, 0xC4, 0xE7, 0xC3]
         end
 
         it 'compresses tertiary weights into multiple bytes if necessary' do
-          SortKeyBuilder.new([[0, 0, 5]] * 100, :upper).bytes_array.should == [1, 1, 0x9C, 0x9C, 0xB3]
+          SortKeyBuilder.new([[0, 0, 5]] * 100, :case_first => :upper).bytes_array.should == [1, 1, 0x9C, 0x9C, 0xB3]
         end
       end
 
       context 'when case_first is :lower' do
         it 'leaves case bits and adds top addition to bytes that are greater than common' do
-          SortKeyBuilder.new([[0, 0, 9], [0, 0, 80], [0, 0, 143]], :lower).bytes_array.should == [1, 1, 73, 144, 207]
+          SortKeyBuilder.new([[0, 0, 9], [0, 0, 80], [0, 0, 143]], :case_first => :lower).bytes_array.should == [1, 1, 73, 144, 207]
         end
 
         it 'compresses tertiary weights' do
-          SortKeyBuilder.new([[0, 0, 5], [0, 0, 5], [0, 0, 39], [0, 0, 5], [0, 0, 5]], :lower).bytes_array.should == [1, 1, 0x44, 0x67, 6]
+          SortKeyBuilder.new([[0, 0, 5], [0, 0, 5], [0, 0, 39], [0, 0, 5], [0, 0, 5]], :case_first => :lower).bytes_array.should == [1, 1, 0x44, 0x67, 6]
         end
 
         it 'compresses tertiary weights into multiple bytes if necessary' do
-          SortKeyBuilder.new([[0, 0, 5]] * 100, :lower).bytes_array.should == [1, 1, 0x1A, 0x1A, 0x1A, 0x1A, 0x14]
+          SortKeyBuilder.new([[0, 0, 5]] * 100, :case_first => :lower).bytes_array.should == [1, 1, 0x1A, 0x1A, 0x1A, 0x1A, 0x14]
         end
       end
     end
+
+    describe ":maximum_level option" do
+      context "when :maximum_level is 2" do
+        it 'does not include tertiary weights' do
+          SortKeyBuilder.new([[63, 13, 149], [66, 81, 143]], :maximum_level => 2).bytes_array.should == [63, 66, 1, 13, 81]
+        end
+      end
+      context "when :maximum_level is 1" do
+        it 'only includes primary weights' do
+          SortKeyBuilder.new([[63, 13, 149], [66, 81, 143]], :maximum_level => 1).bytes_array.should == [63, 66]
+        end
+      end
+    end
+
   end
 
 end

data/spec/normalization/normalization_spec.rb

@@ -17,6 +17,10 @@ describe 'Unicode Normalization Algorithms' do
   FULL_NORMALIZATION_TEST_URL = 'http://unicode.org/Public/UNIDATA/NormalizationTest.txt'
 
   shared_examples_for 'a normalization algorithm' do
+    before(:each) do
+      TwitterCldr::Shared::CodePoint.send(:block_cache).clear
+    end
+
     it 'passes all the tests in NormalizationTestShort.txt' do
       run_test(described_class, invariants, SHORT_NORMALIZATION_TEST_PATH)
     end

data/spec/shared/code_point_spec.rb

@@ -144,12 +144,13 @@ describe CodePoint do
 
   describe "#hangul_type" do
     before(:each) do
+      # CodePoint.instance_variable_set(:'@hangul_type_cache', {})
       stub(CodePoint).hangul_blocks {
         {
-            :lparts       => [1..10],
-            :vparts       => [21..30],
-            :tparts       => [41..50],
-            :compositions => [1..50]
+          :lparts       => [1..10],
+          :vparts       => [21..30],
+          :tparts       => [41..50],
+          :compositions => [1..50]
         }
       }
     end
@@ -182,6 +183,10 @@ describe CodePoint do
   end
 
   describe "#get_block" do
+    before(:each) do
+      CodePoint.send(:block_cache).clear
+    end
+
     it "finds the block that corresponds to the code point" do
       stub(TwitterCldr).get_resource(:unicode_data, :blocks) { [[:klingon, 122..307], [:hirogen, 1337..2200]] }
       CodePoint.send(:get_block, 200).should  == [:klingon, 122..307]

data/spec/utils/yaml/yaml_spec.rb

@@ -183,40 +183,38 @@ describe TwitterCldr::Utils do
     end
 
     it "tests successful roundtrip of multi-byte characters" do
-      if RUBY_VERSION < "2.0.0" && RUBY_PLATFORM != "java"
-        [
-          0x80,
-          0x85,
-          0xa0,
-          0x07ff,
-          0x0800,
-          0x0fff,
-          0x1000,
-          0x2028,
-          0x2029,
-          0xcfff,
-          0xd000,
-          0xd7ff,
-          0xe000,
-          0xfffd,
-          0x10000,
-          0x3ffff,
-          0x40000,
-          0xfffff,
-          0x100000,
-          0x10ffff,
-        ].each do |ucs_code|
-          [-1, 0, 1].each do |ofs|
-            (c = [ucs_code + ofs].pack('U'))
-            next unless c.valid_encoding? if c.respond_to? :valid_encoding?
-            y = c.localize.to_yaml(
-              :escape_b_specific => true,
-              :escape_as_utf8    => true
-            )
-
-            r = YAML.load(y)
-            (c == "\xc2\x85" ? "\n" : c).should == r  # "\N" is normalized as "\n"
-          end
+      [
+        0x80,
+        0x85,
+        0xa0,
+        0x07ff,
+        0x0800,
+        0x0fff,
+        0x1000,
+        0x2028,
+        0x2029,
+        0xcfff,
+        0xd000,
+        0xd7ff,
+        0xe000,
+        0xfffd,
+        0x10000,
+        0x3ffff,
+        0x40000,
+        0xfffff,
+        0x100000,
+        0x10ffff,
+      ].each do |ucs_code|
+        [-1, 0, 1].each do |ofs|
+          (c = [ucs_code + ofs].pack('U'))
+          next unless c.valid_encoding? if c.respond_to? :valid_encoding?
+          c_hex = c.unpack('H8')
+          y = c.localize.to_yaml(
+            :escape_b_specific => true,
+            :escape_as_utf8    => true
+          )
+          r = YAML.load(y)
+          (c == "\xc2\x85" ? "\n" : c).should == r  # "\N" is normalized as "\n"
         end
       end
     end
@@ -285,34 +283,27 @@ describe TwitterCldr::Utils do
           src = (c.class == String) ? (c + ext) : c
           y = TwitterCldr::Utils::YAML.dump(src, :escape_as_utf8 => true)
           r = YAML.load(y)
-
-          if (RUBY_VERSION >= "2.0.0" || RUBY_PLATFORM == "java") && c.is_a?(String) && c.downcase == "null"
-            src.should == c + ext
-          else
-            src.should == r
-          end
+          src.should == r
         end
       end
     end
 
     it "tests successfull roundtrip for a few special characters" do
-      if RUBY_VERSION < "2.0.0" && RUBY_PLATFORM != "java"
-        chars = "aあ\t\-\?,\[\{\#&\*!\|>'\"\%\@\`.\\ \n\xc2\xa0\xe2\x80\xa8".split('')
-
-        chars.each do |i|
-          chars.each do |j|
-            chars.each do |k|
-              src = [i, j, k].join
-              y = TwitterCldr::Utils::YAML.dump(src,
-                :printable_with_syck => true,
-                :escape_b_specific   => true,
-                :escape_as_utf8      => true
-              )
-              r = YAML.load(y)
-              src.should == r
-            end
-          end
-        end
+      chars = "aあ\t\-\?,\[\{\#&\*!\|>'\"\%\@\`.\\ \n\xc2\xa0\xe2\x80\xa8".split('')
+
+      chars.each do |i|
+	chars.each do |j|
+	  chars.each do |k|
+	    src = [i, j, k].join
+	    y = TwitterCldr::Utils::YAML.dump(src,
+	      :printable_with_syck => true,
+	      :escape_b_specific   => true,
+	      :escape_as_utf8      => true
+	    )
+	    r = YAML.load(y)
+	    src.should == r
+	  end
+	end
       end
     end
 
@@ -422,11 +413,9 @@ describe TwitterCldr::Utils do
     end
 
     it "guards against circular references" do
-      if RUBY_PLATFORM != "java"
-        a = []
-        a << a
-        lambda { TwitterCldr::Utils::YAML.dump(a) }.should raise_error(ArgumentError)
-      end
+      a = []
+      a << a
+      lambda { TwitterCldr::Utils::YAML.dump(a) }.should raise_error(ArgumentError)
     end
 
     it "tests binary dumps" do
@@ -442,4 +431,4 @@ describe TwitterCldr::Utils do
     end
 
   end
-end
+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 'hamster'
   s.add_dependency 'tzinfo'
 
   s.require_path = 'lib'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter_cldr
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 3.0.0.beta1
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hamster
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -46,14 +60,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- History.txt
-- LICENSE
-- NOTICE
-- README.md
-- Rakefile
-- lib/twitter_cldr.rb
-- lib/twitter_cldr/collation.rb
 - lib/twitter_cldr/collation/collator.rb
 - lib/twitter_cldr/collation/implicit_collation_elements.rb
 - lib/twitter_cldr/collation/sort_key_builder.rb
@@ -61,15 +67,14 @@ files:
 - lib/twitter_cldr/collation/trie_builder.rb
 - lib/twitter_cldr/collation/trie_loader.rb
 - lib/twitter_cldr/collation/trie_with_fallback.rb
+- lib/twitter_cldr/collation.rb
 - lib/twitter_cldr/core_ext.rb
-- lib/twitter_cldr/formatters.rb
 - lib/twitter_cldr/formatters/base.rb
 - lib/twitter_cldr/formatters/calendars/date_formatter.rb
 - lib/twitter_cldr/formatters/calendars/datetime_formatter.rb
 - lib/twitter_cldr/formatters/calendars/time_formatter.rb
 - lib/twitter_cldr/formatters/calendars/timespan_formatter.rb
 - lib/twitter_cldr/formatters/list_formatter.rb
-- lib/twitter_cldr/formatters/numbers.rb
 - lib/twitter_cldr/formatters/numbers/abbreviated/abbreviated_number_formatter.rb
 - lib/twitter_cldr/formatters/numbers/abbreviated/long_decimal_formatter.rb
 - lib/twitter_cldr/formatters/numbers/abbreviated/short_decimal_formatter.rb
@@ -80,10 +85,11 @@ files:
 - lib/twitter_cldr/formatters/numbers/helpers/integer.rb
 - lib/twitter_cldr/formatters/numbers/number_formatter.rb
 - lib/twitter_cldr/formatters/numbers/percent_formatter.rb
-- lib/twitter_cldr/formatters/plurals.rb
+- lib/twitter_cldr/formatters/numbers.rb
 - lib/twitter_cldr/formatters/plurals/plural_formatter.rb
 - lib/twitter_cldr/formatters/plurals/rules.rb
-- lib/twitter_cldr/localized.rb
+- lib/twitter_cldr/formatters/plurals.rb
+- lib/twitter_cldr/formatters.rb
 - lib/twitter_cldr/localized/localized_array.rb
 - lib/twitter_cldr/localized/localized_date.rb
 - lib/twitter_cldr/localized/localized_datetime.rb
@@ -94,16 +100,17 @@ files:
 - lib/twitter_cldr/localized/localized_symbol.rb
 - lib/twitter_cldr/localized/localized_time.rb
 - lib/twitter_cldr/localized/localized_timespan.rb
-- lib/twitter_cldr/normalization.rb
+- lib/twitter_cldr/localized.rb
 - lib/twitter_cldr/normalization/base.rb
 - lib/twitter_cldr/normalization/hangul.rb
 - lib/twitter_cldr/normalization/nfc.rb
 - lib/twitter_cldr/normalization/nfd.rb
 - lib/twitter_cldr/normalization/nfkc.rb
 - lib/twitter_cldr/normalization/nfkd.rb
-- lib/twitter_cldr/parsers.rb
+- lib/twitter_cldr/normalization/quick_check.rb
+- lib/twitter_cldr/normalization.rb
 - lib/twitter_cldr/parsers/number_parser.rb
-- lib/twitter_cldr/resources.rb
+- lib/twitter_cldr/parsers.rb
 - lib/twitter_cldr/resources/bidi_test_importer.rb
 - lib/twitter_cldr/resources/canonical_compositions_updater.rb
 - lib/twitter_cldr/resources/collation_tries_dumper.rb
@@ -113,11 +120,12 @@ files:
 - lib/twitter_cldr/resources/language_codes_importer.rb
 - lib/twitter_cldr/resources/loader.rb
 - lib/twitter_cldr/resources/locales_resources_importer.rb
+- lib/twitter_cldr/resources/normalization_quick_check_importer.rb
 - lib/twitter_cldr/resources/phone_codes_importer.rb
 - lib/twitter_cldr/resources/postal_codes_importer.rb
 - lib/twitter_cldr/resources/tailoring_importer.rb
 - lib/twitter_cldr/resources/unicode_data_importer.rb
-- lib/twitter_cldr/shared.rb
+- lib/twitter_cldr/resources.rb
 - lib/twitter_cldr/shared/bidi.rb
 - lib/twitter_cldr/shared/calendar.rb
 - lib/twitter_cldr/shared/code_point.rb
@@ -129,7 +137,7 @@ files:
 - lib/twitter_cldr/shared/postal_codes.rb
 - lib/twitter_cldr/shared/territories.rb
 - lib/twitter_cldr/shared/timezones.rb
-- lib/twitter_cldr/tokenizers.rb
+- lib/twitter_cldr/shared.rb
 - lib/twitter_cldr/tokenizers/base.rb
 - lib/twitter_cldr/tokenizers/calendars/additional_date_format_selector.rb
 - lib/twitter_cldr/tokenizers/calendars/date_tokenizer.rb
@@ -139,12 +147,121 @@ files:
 - lib/twitter_cldr/tokenizers/composite_token.rb
 - lib/twitter_cldr/tokenizers/numbers/number_tokenizer.rb
 - lib/twitter_cldr/tokenizers/token.rb
-- lib/twitter_cldr/utils.rb
+- lib/twitter_cldr/tokenizers.rb
 - lib/twitter_cldr/utils/code_points.rb
 - lib/twitter_cldr/utils/interpolation.rb
 - lib/twitter_cldr/utils/territories.rb
 - lib/twitter_cldr/utils/yaml.rb
+- lib/twitter_cldr/utils.rb
 - lib/twitter_cldr/version.rb
+- lib/twitter_cldr.rb
+- spec/bidi/bidi_spec.rb
+- spec/bidi/classpath_bidi_test.txt
+- spec/collation/collation_spec.rb
+- spec/collation/CollationTest_CLDR_NON_IGNORABLE_Short.txt
+- spec/collation/collator_spec.rb
+- spec/collation/implicit_collation_elements_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_dumps_spec.rb
+- spec/collation/trie_loader_spec.rb
+- spec/collation/trie_spec.rb
+- spec/collation/trie_with_fallback_spec.rb
+- spec/core_ext_spec.rb
+- spec/formatters/base_spec.rb
+- spec/formatters/calendars/datetime_formatter_spec.rb
+- spec/formatters/calendars/timespan_formatter_spec.rb
+- spec/formatters/list_formatter_spec.rb
+- spec/formatters/numbers/abbreviated/abbreviated_number_formatter_spec.rb
+- spec/formatters/numbers/abbreviated/long_decimal_formatter_spec.rb
+- spec/formatters/numbers/abbreviated/short_decimal_formatter_spec.rb
+- spec/formatters/numbers/currency_formatter_spec.rb
+- spec/formatters/numbers/decimal_formatter_spec.rb
+- spec/formatters/numbers/helpers/fraction_spec.rb
+- spec/formatters/numbers/helpers/integer_spec.rb
+- spec/formatters/numbers/number_formatter_spec.rb
+- spec/formatters/numbers/percent_formatter_spec.rb
+- spec/formatters/plurals/plural_formatter_spec.rb
+- spec/formatters/plurals/rules_spec.rb
+- spec/localized/localized_array_spec.rb
+- spec/localized/localized_date_spec.rb
+- spec/localized/localized_datetime_spec.rb
+- spec/localized/localized_hash_spec.rb
+- spec/localized/localized_number_spec.rb
+- spec/localized/localized_object_spec.rb
+- spec/localized/localized_string_spec.rb
+- spec/localized/localized_symbol_spec.rb
+- spec/localized/localized_time_spec.rb
+- spec/normalization/base_spec.rb
+- spec/normalization/hangul_spec.rb
+- spec/normalization/normalization_spec.rb
+- spec/normalization/NormalizationTestShort.txt
+- spec/normalization_spec.rb
+- spec/parsers/number_parser_spec.rb
+- 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/language_codes_spec.rb
+- spec/shared/languages_spec.rb
+- spec/shared/numbers_spec.rb
+- spec/shared/phone_codes_spec.rb
+- spec/shared/postal_codes_spec.rb
+- spec/shared/territories_spec.rb
+- spec/spec_helper.rb
+- spec/tokenizers/base_spec.rb
+- spec/tokenizers/calendars/additional_date_format_selector_spec.rb
+- spec/tokenizers/calendars/date_tokenizer_spec.rb
+- spec/tokenizers/calendars/datetime_tokenizer_spec.rb
+- spec/tokenizers/calendars/time_tokenizer_spec.rb
+- spec/tokenizers/calendars/timespan_tokenizer_spec.rb
+- spec/tokenizers/composite_token_spec.rb
+- spec/tokenizers/numbers/number_tokenizer_spec.rb
+- spec/tokenizers/token_spec.rb
+- spec/twitter_cldr_spec.rb
+- spec/utils/code_points_spec.rb
+- spec/utils/interpolation_spec.rb
+- spec/utils/territories_spec.rb
+- spec/utils/yaml/t.gif
+- spec/utils/yaml/t.yaml
+- spec/utils/yaml/yaml_spec.rb
+- spec/utils_spec.rb
 - resources/collation/FractionalUCA_SHORT.txt
 - resources/collation/tailoring/af.yml
 - resources/collation/tailoring/ar.yml
@@ -258,8 +375,8 @@ files:
 - resources/custom/locales/da/units.yml
 - resources/custom/locales/de/units.yml
 - resources/custom/locales/el/units.yml
-- resources/custom/locales/en-GB/units.yml
 - resources/custom/locales/en/units.yml
+- resources/custom/locales/en-GB/units.yml
 - resources/custom/locales/es/units.yml
 - resources/custom/locales/eu/units.yml
 - resources/custom/locales/fa/units.yml
@@ -295,8 +412,8 @@ files:
 - resources/custom/locales/uk/units.yml
 - resources/custom/locales/ur/units.yml
 - resources/custom/locales/vi/units.yml
-- resources/custom/locales/zh-Hant/units.yml
 - resources/custom/locales/zh/units.yml
+- resources/custom/locales/zh-Hant/units.yml
 - resources/locales/af/calendars.yml
 - resources/locales/af/currencies.yml
 - resources/locales/af/languages.yml
@@ -396,15 +513,6 @@ files:
 - resources/locales/el/plurals.yml
 - resources/locales/el/territories.yml
 - resources/locales/el/units.yml
-- resources/locales/en-GB/calendars.yml
-- resources/locales/en-GB/currencies.yml
-- resources/locales/en-GB/languages.yml
-- resources/locales/en-GB/layout.yml
-- resources/locales/en-GB/lists.yml
-- resources/locales/en-GB/numbers.yml
-- resources/locales/en-GB/plurals.yml
-- resources/locales/en-GB/territories.yml
-- resources/locales/en-GB/units.yml
 - resources/locales/en/calendars.yml
 - resources/locales/en/currencies.yml
 - resources/locales/en/languages.yml
@@ -414,6 +522,15 @@ files:
 - resources/locales/en/plurals.yml
 - resources/locales/en/territories.yml
 - resources/locales/en/units.yml
+- resources/locales/en-GB/calendars.yml
+- resources/locales/en-GB/currencies.yml
+- resources/locales/en-GB/languages.yml
+- resources/locales/en-GB/layout.yml
+- resources/locales/en-GB/lists.yml
+- resources/locales/en-GB/numbers.yml
+- resources/locales/en-GB/plurals.yml
+- resources/locales/en-GB/territories.yml
+- resources/locales/en-GB/units.yml
 - resources/locales/es/calendars.yml
 - resources/locales/es/currencies.yml
 - resources/locales/es/languages.yml
@@ -729,15 +846,6 @@ files:
 - resources/locales/vi/plurals.yml
 - resources/locales/vi/territories.yml
 - resources/locales/vi/units.yml
-- resources/locales/zh-Hant/calendars.yml
-- resources/locales/zh-Hant/currencies.yml
-- resources/locales/zh-Hant/languages.yml
-- resources/locales/zh-Hant/layout.yml
-- resources/locales/zh-Hant/lists.yml
-- resources/locales/zh-Hant/numbers.yml
-- resources/locales/zh-Hant/plurals.yml
-- resources/locales/zh-Hant/territories.yml
-- resources/locales/zh-Hant/units.yml
 - resources/locales/zh/calendars.yml
 - resources/locales/zh/currencies.yml
 - resources/locales/zh/languages.yml
@@ -747,12 +855,20 @@ files:
 - resources/locales/zh/plurals.yml
 - resources/locales/zh/territories.yml
 - resources/locales/zh/units.yml
+- resources/locales/zh-Hant/calendars.yml
+- resources/locales/zh-Hant/currencies.yml
+- resources/locales/zh-Hant/languages.yml
+- resources/locales/zh-Hant/layout.yml
+- resources/locales/zh-Hant/lists.yml
+- resources/locales/zh-Hant/numbers.yml
+- resources/locales/zh-Hant/plurals.yml
+- resources/locales/zh-Hant/territories.yml
+- resources/locales/zh-Hant/units.yml
 - resources/shared/currency_digits_and_rounding.yml
 - resources/shared/iso_currency_symbols.yml
 - resources/shared/language_codes_table.dump
 - resources/shared/phone_codes.yml
 - resources/shared/postal_codes.yml
-- resources/unicode_data/blocks.yml
 - resources/unicode_data/blocks/aegean_numbers.yml
 - resources/unicode_data/blocks/alchemical_symbols.yml
 - resources/unicode_data/blocks/alphabetic_presentation_forms.yml
@@ -973,116 +1089,20 @@ files:
 - resources/unicode_data/blocks/yi_radicals.yml
 - resources/unicode_data/blocks/yi_syllables.yml
 - resources/unicode_data/blocks/yijing_hexagram_symbols.yml
+- resources/unicode_data/blocks.yml
 - resources/unicode_data/canonical_compositions.yml
 - resources/unicode_data/composition_exclusions.yml
 - resources/unicode_data/hangul_blocks.yml
-- spec/bidi/bidi_spec.rb
-- spec/bidi/classpath_bidi_test.txt
-- spec/collation/CollationTest_CLDR_NON_IGNORABLE_Short.txt
-- spec/collation/collation_spec.rb
-- spec/collation/collator_spec.rb
-- spec/collation/implicit_collation_elements_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_dumps_spec.rb
-- spec/collation/trie_loader_spec.rb
-- spec/collation/trie_spec.rb
-- spec/collation/trie_with_fallback_spec.rb
-- spec/core_ext_spec.rb
-- spec/formatters/base_spec.rb
-- spec/formatters/calendars/datetime_formatter_spec.rb
-- spec/formatters/calendars/timespan_formatter_spec.rb
-- spec/formatters/list_formatter_spec.rb
-- spec/formatters/numbers/abbreviated/abbreviated_number_formatter_spec.rb
-- spec/formatters/numbers/abbreviated/long_decimal_formatter_spec.rb
-- spec/formatters/numbers/abbreviated/short_decimal_formatter_spec.rb
-- spec/formatters/numbers/currency_formatter_spec.rb
-- spec/formatters/numbers/decimal_formatter_spec.rb
-- spec/formatters/numbers/helpers/fraction_spec.rb
-- spec/formatters/numbers/helpers/integer_spec.rb
-- spec/formatters/numbers/number_formatter_spec.rb
-- spec/formatters/numbers/percent_formatter_spec.rb
-- spec/formatters/plurals/plural_formatter_spec.rb
-- spec/formatters/plurals/rules_spec.rb
-- spec/localized/localized_array_spec.rb
-- spec/localized/localized_date_spec.rb
-- spec/localized/localized_datetime_spec.rb
-- spec/localized/localized_hash_spec.rb
-- spec/localized/localized_number_spec.rb
-- spec/localized/localized_object_spec.rb
-- spec/localized/localized_string_spec.rb
-- spec/localized/localized_symbol_spec.rb
-- spec/localized/localized_time_spec.rb
-- spec/normalization/NormalizationTestShort.txt
-- spec/normalization/base_spec.rb
-- spec/normalization/hangul_spec.rb
-- spec/normalization/normalization_spec.rb
-- spec/normalization_spec.rb
-- spec/parsers/number_parser_spec.rb
-- 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/language_codes_spec.rb
-- spec/shared/languages_spec.rb
-- spec/shared/numbers_spec.rb
-- spec/shared/phone_codes_spec.rb
-- spec/shared/postal_codes_spec.rb
-- spec/shared/territories_spec.rb
-- spec/spec_helper.rb
-- spec/tokenizers/base_spec.rb
-- spec/tokenizers/calendars/additional_date_format_selector_spec.rb
-- spec/tokenizers/calendars/date_tokenizer_spec.rb
-- spec/tokenizers/calendars/datetime_tokenizer_spec.rb
-- spec/tokenizers/calendars/time_tokenizer_spec.rb
-- spec/tokenizers/calendars/timespan_tokenizer_spec.rb
-- spec/tokenizers/composite_token_spec.rb
-- spec/tokenizers/numbers/number_tokenizer_spec.rb
-- spec/tokenizers/token_spec.rb
-- spec/twitter_cldr_spec.rb
-- spec/utils/code_points_spec.rb
-- spec/utils/interpolation_spec.rb
-- spec/utils/territories_spec.rb
-- spec/utils/yaml/t.gif
-- spec/utils/yaml/t.yaml
-- spec/utils/yaml/yaml_spec.rb
-- spec/utils_spec.rb
+- resources/unicode_data/nfc_quick_check.yml
+- resources/unicode_data/nfd_quick_check.yml
+- resources/unicode_data/nfkc_quick_check.yml
+- resources/unicode_data/nfkd_quick_check.yml
+- Gemfile
+- History.txt
+- LICENSE
+- NOTICE
+- README.md
+- Rakefile
 - twitter_cldr.gemspec
 homepage: http://twitter.com
 licenses: []
@@ -1098,12 +1118,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of the ICU (International Components for Unicode) that