twitter_cldr 4.3.1 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 524211c9e2e79788806d06b9870faa9e58d58684
-  data.tar.gz: a9f37c86fe27129ccd15a24b5eed9f80e105d5af
+  metadata.gz: 674bc5569896b716d19543ec3a2c058f88faedcc
+  data.tar.gz: daf46a0df8f0ec0fd81e76ab9df42b2fed7c7052
 SHA512:
-  metadata.gz: 92754882211fd1b7067ea2e9936fb6a8a77c77fd2009ec1d8544cf8576e6908c0767297f2a5643238de6649d70c193b9e785e0a21c1d00e9cbc2263bae73501f
-  data.tar.gz: 3bf352dc1a9163b2d39a92498b5732448b4ed57817ae6a50eebeac7d18dba25fd78b1031630c7300251df4557abae43bf322a4603c44bcc9b084b6d552b8a7b8
+  metadata.gz: 2d41beee2102492e1a31260584c407391a4559d52b2b6e92807753681cce4d83ecdae4c52c431f1e29cc5b12d2d5bb61ca35577a76d47dd20d4b22f553888b41
+  data.tar.gz: c6eb67cc82b5f9a38d914e8459a0c366b6eb7f3ea3cc35508e1df0b4f9623aacc0d0a48cc76cbca7e160d9503af149c20aeddc8471c54243c5c0de85a66336b6

data/Gemfile

@@ -7,6 +7,8 @@ group :development, :test do
   gem 'pry-nav'
   gem 'ruby-prof' unless RUBY_PLATFORM == 'java'
   gem 'regexp_parser', '~> 0.1'
+  gem 'benchmark-ips'
+  gem 'rubyzip', '~> 1.0'
 end
 
 group :development do
@@ -20,8 +22,7 @@ group :development do
 end
 
 group :test do
-  gem 'rspec', '~> 2.14.0'
-  gem 'rr',    '~> 1.1.2'
+  gem 'rspec', '~> 3.0'
 
   gem 'term-ansicolor', '~> 1.3.0'        # 1.4 breaks ruby 1.9 support
   gem 'coveralls', require: false
@@ -31,8 +32,3 @@ group :test do
   gem 'launchy'
   gem 'addressable', '~> 2.4.0'           # 2.5 breaks ruby 1.9 support
 end
-
-group :development, :test do
-  gem 'rubyzip', '~> 1.0'
-  gem 'benchmark-ips'
-end

data/README.md

@@ -29,11 +29,11 @@ TwitterCldr.supported_locale?(:xx)        # false
 ```
 
 
-TwitterCldr patches core Ruby objects like `Fixnum` and `Date` to make localization as straightforward as possible.
+TwitterCldr patches core Ruby objects like `Integer` and `Date` to make localization as straightforward as possible.
 
 ### Numbers
 
-`Fixnum`, `Bignum`, and `Float` objects are supported.  Here are some examples:
+`Integer` and `Float` objects are supported (as well as `Fixnum` and `Bignum` for Ruby versions < 2.4).  Here are some examples:
 
 ```ruby
 # default formatting with to_s
@@ -554,7 +554,7 @@ postal_code.regexp  # /(\d{5})(?:[ \-](\d{4}))?/
 Get a sample of valid postal codes with the `#sample` method:
 
 ```ruby
-postal_code.sample(5)  # ["88435-2482", "19400", "34845-8011", "73815-5785", "43520-3829"]
+postal_code.sample(5)  # ["10781", "69079-7159", "79836-3996", "79771", "61093"]
 ```
 
 ### Phone Codes
@@ -984,7 +984,7 @@ bidi.to_s
 
 ### Unicode YAML Support
 
-The Psych gem that is the default YAML engine inRuby 1.9 doesn't handle Unicode characters perfectly.  To mitigate this problem, TwitterCLDR contains an adaptation of the [ya2yaml](https://github.com/afunai/ya2yaml) gem by Akira Funai.  Our changes specifically add better dumping of Ruby symbols.  If you can get Mr. Funai's attention, please gently remind him to merge @camertron's pull request so we can use his gem and not have to maintain a separate version :)  Fortunately, YAML parsing can still be done with the usual `YAML.load` or `YAML.load_file`.
+The Psych gem that is the default YAML engine in Ruby 1.9 doesn't handle Unicode characters perfectly.  To mitigate this problem, TwitterCLDR contains an adaptation of the [ya2yaml](https://github.com/afunai/ya2yaml) gem by Akira Funai.  Our changes specifically add better dumping of Ruby symbols.  If you can get Mr. Funai's attention, please gently remind him to merge @camertron's pull request so we can use his gem and not have to maintain a separate version :)  Fortunately, YAML parsing can still be done with the usual `YAML.load` or `YAML.load_file`.
 
 You can make use of TwitterCLDR's YAML dumper by calling `localize` and then `to_yaml` on an `Array`, `Hash`, or `String`:
 
@@ -1078,6 +1078,6 @@ TwitterCLDR currently supports localization of certain textual objects in JavaSc
 
 ## License
 
-Copyright 2016 Twitter, Inc.
+Copyright 2017 Twitter, Inc.
 
 Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0

data/lib/twitter_cldr/collation/sort_key_builder.rb

@@ -81,7 +81,7 @@ module TwitterCldr
         @last_leading_byte = nil
 
         @collation_elements.each do |collation_element|
-          bytes = fixnum_to_bytes_array(level_weight(collation_element, PRIMARY_LEVEL))
+          bytes = integer_to_bytes_array(level_weight(collation_element, PRIMARY_LEVEL))
 
           unless bytes.empty?
             leading_byte = bytes.shift
@@ -108,7 +108,7 @@ module TwitterCldr
         @common_count = 0
 
         @collation_elements.each do |collation_element|
-          fixnum_to_bytes_array(level_weight(collation_element, SECONDARY_LEVEL)).each do |byte|
+          integer_to_bytes_array(level_weight(collation_element, SECONDARY_LEVEL)).each do |byte|
             append_secondary_byte(byte)
           end
         end
@@ -123,7 +123,7 @@ module TwitterCldr
         @common_count = 0
 
         @collation_elements.each do |collation_element|
-          fixnum_to_bytes_array(tertiary_weight(collation_element)).each do |byte|
+          integer_to_bytes_array(tertiary_weight(collation_element)).each do |byte|
             append_tertiary_byte(byte)
           end
         end
@@ -199,7 +199,7 @@ module TwitterCldr
         collation_element[level] || 0
       end
 
-      def fixnum_to_bytes_array(number)
+      def integer_to_bytes_array(number)
         bytes = []
 
         while number > 0
@@ -315,4 +315,4 @@ module TwitterCldr
     end
 
   end
-end
+end

data/lib/twitter_cldr/core_ext.rb

@@ -3,14 +3,8 @@
 # Copyright 2012 Twitter, Inc
 # http://www.apache.org/licenses/LICENSE-2.0
 
-if RUBY_VERSION >= '2.4.0'
-  [Integer, Float].each do |klass|
-    TwitterCldr::Localized::LocalizedNumber.localize(klass)
-  end
-else
-  [Bignum, Fixnum, Float].each do |klass|
-    TwitterCldr::Localized::LocalizedNumber.localize(klass)
-  end
+[Integer, Float].each do |klass|
+  TwitterCldr::Localized::LocalizedNumber.localize(klass)
 end
 
 [Array, Date, DateTime, String, Symbol, Time, Hash].each do |klass|

data/lib/twitter_cldr/parsers/parser.rb

@@ -21,6 +21,10 @@ module TwitterCldr
         @token_index = 0
       end
 
+      def eof?
+        @token_index >= @tokens.size
+      end
+
       private
 
       def next_token(type)
@@ -44,10 +48,6 @@ module TwitterCldr
       def current_token
         @tokens[@token_index]
       end
-
-      def eof?
-        @token_index >= @tokens.size
-      end
     end
 
   end

data/lib/twitter_cldr/utils/range_set.rb

@@ -203,7 +203,7 @@ module TwitterCldr
       end
 
       def includes_range?(range)
-        bsearch do |cur_range|
+        result = bsearch do |cur_range|
           fo = front_overlap?(cur_range, range)
           ro = rear_overlap?(cur_range, range)
 
@@ -217,6 +217,8 @@ module TwitterCldr
             1
           end
         end
+
+        !!result
       end
 
       def bsearch

data/lib/twitter_cldr/utils/yaml.rb

@@ -7,23 +7,23 @@
 # https://github.com/afunai/ya2yaml
 
 # Copyright (c) 2006 Akira FUNAI <funai.akira@gmail.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a 
-# copy of this software and associated documentation files (the "Software"), 
-# to deal in the Software without restriction, including without limitation 
-# the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-# and/or sell copies of the Software, and to permit persons to whom the 
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
 # Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in 
+#
+# The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
 
@@ -193,7 +193,7 @@ module TwitterCldr
               emit_string(obj, level)
             when TrueClass, FalseClass
               obj.to_s
-            when Fixnum, Bignum, Float
+            when Integer, Float
               obj.to_s
             when Date
               obj.to_s
@@ -390,4 +390,4 @@ module TwitterCldr
     end
 
   end
-end
+end

data/lib/twitter_cldr/version.rb

@@ -4,5 +4,5 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 module TwitterCldr
-  VERSION = '4.3.1'
+  VERSION = '4.4.0'
 end

data/spec/collation/collator_spec.rb

@@ -17,7 +17,7 @@ describe Collator do
   describe '.default_trie' do
     before(:each) do
       clear_default_trie_cache
-      mock(TrieLoader).load_default_trie { trie }
+      expect(TrieLoader).to receive(:load_default_trie).and_return(trie)
     end
 
     it 'returns default fractional collation elements trie' do
@@ -38,8 +38,12 @@ describe Collator do
 
     before(:each) do
       clear_tailored_tries_cache
-      stub(Collator).default_trie { trie }
-      mock(TrieLoader).load_tailored_trie(locale, Collator.default_trie) { trie }
+      allow(Collator).to receive(:default_trie).and_return(trie)
+      expect(TrieLoader).to(
+        receive(:load_tailored_trie)
+          .with(locale, Collator.default_trie)
+          .and_return(trie)
+      )
     end
 
     it 'returns default fractional collation elements trie' do
@@ -57,7 +61,12 @@ describe Collator do
 
   describe '#initialize' do
     before :each do
-      any_instance_of(Collator) { |c| stub(c).load_trie { trie } }
+      allow(Collator).to receive(:new) do |*args|
+        Collator.allocate.tap do |c|
+          allow(c).to receive(:load_trie).and_return(trie)
+          c.send(:initialize, *args)
+        end
+      end
     end
 
     context 'without locale' do
@@ -84,9 +93,9 @@ describe Collator do
     let(:collation_elements) { [[39, 5, 5], [41, 5, 5], [43, 5, 5]] }
 
     before :each do
-      any_instance_of(TwitterCldr::Shared::CodePoint) do |instance|
-        stub(instance).combining_class_for { 0 }
-      end
+      allow_any_instance_of(TwitterCldr::Shared::CodePoint).to(
+        receive(:combining_class_for).and_return(0)
+      )
     end
 
     it 'returns collation elements for a string' do
@@ -116,18 +125,24 @@ describe Collator do
     let(:sort_key)           { [39, 41, 43, 1, 7, 1, 7] }
 
     context 'with a loaded trie' do
-      before(:each) { mock(TrieLoader).load_default_trie { trie } }
+      before(:each) { expect(TrieLoader).to receive(:load_default_trie).and_return(trie) }
 
       describe 'calculating sort key' do
-        before(:each) { mock(TwitterCldr::Collation::SortKeyBuilder).build(collation_elements, case_first: nil, maximum_level: nil) { sort_key } }
+        before(:each) do
+          expect(TwitterCldr::Collation::SortKeyBuilder).to(
+            receive(:build)
+              .with(collation_elements, case_first: nil, maximum_level: nil)
+              .and_return(sort_key)
+          )
+        end
 
         it 'calculates sort key for a string' do
-          mock(collator).get_collation_elements(string) { collation_elements }
+          expect(collator).to receive(:get_collation_elements).with(string).and_return(collation_elements)
           expect(collator.get_sort_key(string)).to eq(sort_key)
         end
 
         it 'calculates sort key for an array of code points (represented as hex strings)' do
-          mock(collator).get_collation_elements(code_points) { collation_elements }
+          expect(collator).to receive(:get_collation_elements).with(code_points).and_return(collation_elements)
           expect(collator.get_sort_key(code_points)).to eq(sort_key)
         end
       end
@@ -138,25 +153,25 @@ describe Collator do
         let(:maximum_level) { 2 }
 
         it 'passes case-first sort option to sort key builder' do
-          mock(TwitterCldr::Collation::TrieLoader).load_tailored_trie(locale, trie) { TwitterCldr::Utils::Trie.new }
-          mock(TwitterCldr::Collation::TrieBuilder).tailoring_data(locale) { { collator_options: { case_first: case_first } } }
+          expect(TwitterCldr::Collation::TrieLoader).to receive(:load_tailored_trie).with(locale, trie).and_return(TwitterCldr::Utils::Trie.new)
+          expect(TwitterCldr::Collation::TrieBuilder).to receive(:tailoring_data).with(locale).and_return(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: nil) { sort_key }
+          expect(collator).to receive(:get_collation_elements).with(code_points).and_return(collation_elements)
+          expect(TwitterCldr::Collation::SortKeyBuilder).to receive(:build).with(collation_elements, case_first: case_first, maximum_level: nil).and_return(sort_key)
 
           expect(collator.get_sort_key(code_points)).to eq(sort_key)
         end
 
         it 'passes maximum_level option to sort key builder' do
-          mock(TwitterCldr::Collation::TrieLoader).load_tailored_trie(locale, trie) { TwitterCldr::Utils::Trie.new }
-          mock(TwitterCldr::Collation::TrieBuilder).tailoring_data(locale) { { collator_options: { case_first: case_first } } }
+          expect(TwitterCldr::Collation::TrieLoader).to receive(:load_tailored_trie).with(locale, trie).and_return(TwitterCldr::Utils::Trie.new)
+          expect(TwitterCldr::Collation::TrieBuilder).to receive(:tailoring_data).with(locale).and_return(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 }
+          expect(collator).to receive(:get_collation_elements).with(code_points).and_return(collation_elements)
+          expect(TwitterCldr::Collation::SortKeyBuilder).to receive(:build).with(collation_elements, case_first: case_first, maximum_level: maximum_level).and_return(sort_key)
 
           expect(collator.get_sort_key(code_points, maximum_level: maximum_level)).to eq(sort_key)
         end
@@ -179,7 +194,7 @@ describe Collator do
     let(:sort_key)         { [1, 3, 8, 9] }
     let(:another_sort_key) { [6, 8, 9, 2] }
 
-    before(:each) { stub(Collator).default_trie { trie } }
+    before(:each) { allow(Collator).to receive(:default_trie).and_return(trie) }
 
     it 'compares strings by sort keys' do
       stub_sort_key(collator, 'foo', sort_key)
@@ -190,7 +205,7 @@ describe Collator do
     end
 
     it 'returns 0 without computing sort keys if the strings are equal' do
-      dont_allow(collator).get_sort_key
+      expect(collator).to_not receive(:get_sort_key)
 
       expect(collator.compare('foo', 'foo')).to eq(0)
     end
@@ -203,7 +218,7 @@ describe Collator do
     let(:sorted)    { %w[aaa abc bca] }
 
     before :each do
-      stub(Collator).default_trie { trie }
+      allow(Collator).to receive(:default_trie).and_return(trie)
       sort_keys.each { |s, key| mock_sort_key(collator, s, key) }
     end
 
@@ -227,16 +242,22 @@ describe Collator do
 
   describe 'tailoring support' do
     before(:each) do
-      stub(TwitterCldr).get_resource(:collation, :tailoring, locale) { YAML.load(tailoring_resource_stub) }
-
-      mock(File).open(TrieBuilder::FRACTIONAL_UCA_SHORT_PATH, 'r') do |*args|
-        args.last.call(fractional_uca_short_stub)
-      end
-
-      mock(TrieLoader).load_default_trie { TrieBuilder.load_default_trie }
-      mock(TrieLoader).load_tailored_trie.with_any_args { |*args| TrieBuilder.load_tailored_trie(*args) }
-
-      stub(TwitterCldr::Normalization).normalize_code_points { |code_points| code_points }
+      allow(TwitterCldr).to(
+        receive(:get_resource)
+          .with(:collation, :tailoring, locale)
+          .and_return(YAML.load(tailoring_resource_stub))
+      )
+
+      expect(File).to(
+        receive(:open)
+          .with(TrieBuilder::FRACTIONAL_UCA_SHORT_PATH, 'r')
+          .and_yield(fractional_uca_short_stub)
+      )
+
+      expect(TrieLoader).to receive(:load_default_trie) { TrieBuilder.load_default_trie }
+      expect(TrieLoader).to receive(:load_tailored_trie) { |*args| TrieBuilder.load_tailored_trie(*args) }
+
+      allow(TwitterCldr::Normalization).to receive(:normalize_code_points) { |code_points| code_points }
     end
 
     let(:locale)            { :some_locale }
@@ -309,11 +330,11 @@ END
   end
 
   def mock_sort_key(collator, string, sort_key)
-    mock(collator).get_sort_key(string) { sort_key }
+    expect(collator).to receive(:get_sort_key).with(string).and_return(sort_key)
   end
 
   def stub_sort_key(collator, string, sort_key)
-    stub(collator).get_sort_key(string) { sort_key }
+    allow(collator).to receive(:get_sort_key).with(string).and_return(sort_key)
   end
 
   def clear_tries_cache

data/spec/collation/sort_key_builder_spec.rb

@@ -17,8 +17,8 @@ describe SortKeyBuilder do
     it 'returns a sort key for a given array of collation elements' do
       sort_key = SortKeyBuilder.new(collation_elements)
 
-      mock(SortKeyBuilder).new(collation_elements, nil) { sort_key }
-      mock(sort_key).bytes_array { sort_key_bytes }
+      expect(SortKeyBuilder).to receive(:new).with(collation_elements, nil).and_return(sort_key)
+      expect(sort_key).to receive(:bytes_array).and_return(sort_key_bytes)
 
       expect(SortKeyBuilder.build(collation_elements)).to eq(sort_key_bytes)
     end
@@ -54,7 +54,7 @@ describe SortKeyBuilder do
     end
 
     it 'builds bytes array only once' do
-      mock(sort_key).build_bytes_array { sort_key_bytes }
+      expect(sort_key).to receive(:build_bytes_array).and_return(sort_key_bytes)
       sort_key.bytes_array.object_id == sort_key.bytes_array.object_id
     end
 

data/spec/collation/trie_builder_spec.rb

@@ -120,7 +120,7 @@ END
 
     before :each do
       mock_default_table
-      mock(TrieBuilder).tailoring_data(locale) { tailoring_data }
+      expect(TrieBuilder).to receive(:tailoring_data).with(locale).and_return(tailoring_data)
     end
 
     it 'returns a TrieWithFallback' do
@@ -186,15 +186,17 @@ END
     let(:locale) { :fu }
 
     it 'loads tailoring data' do
-      mock(TwitterCldr).get_resource(:collation, :tailoring, locale) { tailoring_data }
+      expect(TwitterCldr).to receive(:get_resource).with(:collation, :tailoring, locale).and_return(tailoring_data)
       expect(TrieBuilder.tailoring_data(locale)).to eq(tailoring_data)
     end
   end
 
   def mock_default_table
-    mock(File).open(TrieBuilder::FRACTIONAL_UCA_SHORT_PATH, 'r') do |*args|
-      args.last.call(fractional_uca_short_stub)
-    end
+    expect(File).to(
+      receive(:open)
+        .with(TrieBuilder::FRACTIONAL_UCA_SHORT_PATH, 'r')
+        .and_yield(fractional_uca_short_stub)
+    )
   end
 
 end