RubyGems - countries - Versions diffs - 3.0.0 → 3.0.1 - Mend

countries 3.0.0 → 3.0.1

Files changed (157) hide show

checksums.yaml +4 -4
data/.travis.yml +0 -1
data/CHANGELOG.md +38 -0
data/README.markdown +5 -5
data/Rakefile +3 -2
data/countries.gemspec +1 -2
data/lib/countries/cache/countries.json +1 -1
data/lib/countries/cache/locales/ab.json +1 -0
data/lib/countries/cache/locales/af.json +1 -1
data/lib/countries/cache/locales/ak.json +1 -0
data/lib/countries/cache/locales/am.json +1 -1
data/lib/countries/cache/locales/an.json +1 -0
data/lib/countries/cache/locales/ar.json +1 -1
data/lib/countries/cache/locales/as.json +1 -1
data/lib/countries/cache/locales/ay.json +1 -0
data/lib/countries/cache/locales/az.json +1 -1
data/lib/countries/cache/locales/ba.json +1 -0
data/lib/countries/cache/locales/be.json +1 -1
data/lib/countries/cache/locales/bg.json +1 -1
data/lib/countries/cache/locales/bi.json +1 -0
data/lib/countries/cache/locales/bn-in.json +1 -0
data/lib/countries/cache/locales/bn.json +1 -1
data/lib/countries/cache/locales/br.json +1 -1
data/lib/countries/cache/locales/bs.json +1 -1
data/lib/countries/cache/locales/ca.json +1 -1
data/lib/countries/cache/locales/ce.json +1 -0
data/lib/countries/cache/locales/ch.json +1 -0
data/lib/countries/cache/locales/cs.json +1 -1
data/lib/countries/cache/locales/cv.json +1 -0
data/lib/countries/cache/locales/cy.json +1 -1
data/lib/countries/cache/locales/da.json +1 -1
data/lib/countries/cache/locales/de.json +1 -1
data/lib/countries/cache/locales/dv.json +1 -0
data/lib/countries/cache/locales/dz.json +1 -1
data/lib/countries/cache/locales/ee.json +1 -0
data/lib/countries/cache/locales/el.json +1 -1
data/lib/countries/cache/locales/en.json +1 -1
data/lib/countries/cache/locales/eo.json +1 -1
data/lib/countries/cache/locales/es.json +1 -1
data/lib/countries/cache/locales/et.json +1 -1
data/lib/countries/cache/locales/eu.json +1 -1
data/lib/countries/cache/locales/fa.json +1 -1
data/lib/countries/cache/locales/ff.json +1 -0
data/lib/countries/cache/locales/fi.json +1 -1
data/lib/countries/cache/locales/fo.json +1 -1
data/lib/countries/cache/locales/fr.json +1 -1
data/lib/countries/cache/locales/fy.json +1 -0
data/lib/countries/cache/locales/ga.json +1 -1
data/lib/countries/cache/locales/gl.json +1 -1
data/lib/countries/cache/locales/gn.json +1 -0
data/lib/countries/cache/locales/gu.json +1 -1
data/lib/countries/cache/locales/gv.json +1 -0
data/lib/countries/cache/locales/ha.json +1 -0
data/lib/countries/cache/locales/he.json +1 -1
data/lib/countries/cache/locales/hi.json +1 -1
data/lib/countries/cache/locales/hr.json +1 -1
data/lib/countries/cache/locales/ht.json +1 -0
data/lib/countries/cache/locales/hu.json +1 -1
data/lib/countries/cache/locales/hy.json +1 -1
data/lib/countries/cache/locales/ia.json +1 -1
data/lib/countries/cache/locales/id.json +1 -1
data/lib/countries/cache/locales/io.json +1 -0
data/lib/countries/cache/locales/is.json +1 -1
data/lib/countries/cache/locales/it.json +1 -1
data/lib/countries/cache/locales/iu.json +1 -0
data/lib/countries/cache/locales/ja.json +1 -1
data/lib/countries/cache/locales/ka.json +1 -1
data/lib/countries/cache/locales/ki.json +1 -0
data/lib/countries/cache/locales/kk.json +1 -1
data/lib/countries/cache/locales/kl.json +1 -0
data/lib/countries/cache/locales/km.json +1 -1
data/lib/countries/cache/locales/kn.json +1 -1
data/lib/countries/cache/locales/ko.json +1 -1
data/lib/countries/cache/locales/ku.json +1 -1
data/lib/countries/cache/locales/kv.json +1 -0
data/lib/countries/cache/locales/kw.json +1 -0
data/lib/countries/cache/locales/ky.json +1 -0
data/lib/countries/cache/locales/lo.json +1 -0
data/lib/countries/cache/locales/lt.json +1 -1
data/lib/countries/cache/locales/lv.json +1 -1
data/lib/countries/cache/locales/mi.json +1 -1
data/lib/countries/cache/locales/mk.json +1 -1
data/lib/countries/cache/locales/ml.json +1 -1
data/lib/countries/cache/locales/mn.json +1 -1
data/lib/countries/cache/locales/mr.json +1 -1
data/lib/countries/cache/locales/ms.json +1 -1
data/lib/countries/cache/locales/mt.json +1 -1
data/lib/countries/cache/locales/my.json +1 -0
data/lib/countries/cache/locales/na.json +1 -0
data/lib/countries/cache/locales/nb.json +1 -1
data/lib/countries/cache/locales/ne.json +1 -1
data/lib/countries/cache/locales/nl.json +1 -1
data/lib/countries/cache/locales/nn.json +1 -1
data/lib/countries/cache/locales/nv.json +1 -0
data/lib/countries/cache/locales/oc.json +1 -1
data/lib/countries/cache/locales/or.json +1 -1
data/lib/countries/cache/locales/pa.json +1 -1
data/lib/countries/cache/locales/pi.json +1 -0
data/lib/countries/cache/locales/pl.json +1 -1
data/lib/countries/cache/locales/ps.json +1 -1
data/lib/countries/cache/locales/pt-br.json +1 -0
data/lib/countries/cache/locales/pt.json +1 -1
data/lib/countries/cache/locales/ro.json +1 -1
data/lib/countries/cache/locales/ru.json +1 -1
data/lib/countries/cache/locales/rw.json +1 -1
data/lib/countries/cache/locales/sc.json +1 -0
data/lib/countries/cache/locales/sd.json +1 -0
data/lib/countries/cache/locales/si.json +1 -1
data/lib/countries/cache/locales/sk.json +1 -1
data/lib/countries/cache/locales/sl.json +1 -1
data/lib/countries/cache/locales/so.json +1 -1
data/lib/countries/cache/locales/sq.json +1 -1
data/lib/countries/cache/locales/sr.json +1 -1
data/lib/countries/cache/locales/sv.json +1 -1
data/lib/countries/cache/locales/sw.json +1 -1
data/lib/countries/cache/locales/ta.json +1 -1
data/lib/countries/cache/locales/te.json +1 -1
data/lib/countries/cache/locales/tg.json +1 -0
data/lib/countries/cache/locales/th.json +1 -1
data/lib/countries/cache/locales/ti.json +1 -1
data/lib/countries/cache/locales/tk.json +1 -1
data/lib/countries/cache/locales/tl.json +1 -1
data/lib/countries/cache/locales/tr.json +1 -1
data/lib/countries/cache/locales/tt.json +1 -1
data/lib/countries/cache/locales/ug.json +1 -1
data/lib/countries/cache/locales/uk.json +1 -1
data/lib/countries/cache/locales/ur.json +1 -0
data/lib/countries/cache/locales/uz.json +1 -0
data/lib/countries/cache/locales/ve.json +1 -1
data/lib/countries/cache/locales/vi.json +1 -1
data/lib/countries/cache/locales/wa.json +1 -1
data/lib/countries/cache/locales/wo.json +1 -1
data/lib/countries/cache/locales/xh.json +1 -1
data/lib/countries/cache/locales/yo.json +1 -0
data/lib/countries/cache/locales/zh-cn.json +1 -0
data/lib/countries/cache/locales/zh-hk.json +1 -0
data/lib/countries/cache/locales/zh-tw.json +1 -0
data/lib/countries/cache/locales/zh.json +1 -1
data/lib/countries/cache/locales/zu.json +1 -1
data/lib/countries/country/class_methods.rb +21 -1
data/lib/countries/data/countries/CZ.yaml +1 -0
data/lib/countries/data/countries/GB.yaml +2 -2
data/lib/countries/data/countries/MK.yaml +2 -1
data/lib/countries/data/countries/MR.yaml +1 -1
data/lib/countries/data/countries/NL.yaml +1 -0
data/lib/countries/data/countries/SZ.yaml +1 -1
data/lib/countries/data/countries/US.yaml +1 -0
data/lib/countries/data/countries/WS.yaml +1 -1
data/lib/countries/data/subdivisions/CL.yaml +37 -0
data/lib/countries/data/subdivisions/FO.yaml +1 -1
data/lib/countries/data/subdivisions/IE.yaml +85 -50
data/lib/countries/data/subdivisions/SD.yaml +1 -1
data/lib/countries/data/translation_corrections.yaml +2 -0
data/lib/countries/version.rb +1 -1
data/spec/country_spec.rb +37 -7
data/spec/subdivision_spec.rb +14 -0
metadata +46 -8

data/lib/countries/data/subdivisions/SD.yaml CHANGED

@@ -351,7 +351,7 @@ NB:
     ur: نیل ازرق (ریاست)
     vi: Nin Xanh
   comments:
-NO:
+"NO":
   name: Ash Shamālīyah
   geo:
     latitude: 18.4448963

data/lib/countries/data/translation_corrections.yaml CHANGED

@@ -23,6 +23,8 @@ ar:
   CW: "كوراساو"
 zh:
   KH: '柬埔寨'
+zh_cn:
+  KH: '柬埔寨'
 fa:
   IR: "ایران"
 he:

data/lib/countries/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Countries
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.1'.freeze
 end

data/spec/country_spec.rb CHANGED

@@ -48,7 +48,7 @@ describe ISO3166::Country do
   end
   it 'should return alternate names' do
-    expect(country.names).to eq(['United States', 'Vereinigte Staaten von Amerika', 'États-Unis', 'Estados Unidos', 'アメリカ合衆国', 'Verenigde Staten'])
+    expect(country.names).to eq(['United States', 'Murica', 'Vereinigte Staaten von Amerika', 'États-Unis', 'Estados Unidos', 'アメリカ合衆国', 'Verenigde Staten'])
   end
   it 'should return translations' do
@@ -322,7 +322,7 @@ describe ISO3166::Country do
       countries = ISO3166::Country.all_translated('fr')
       expect(countries).to be_an(Array)
       expect(countries.first).to be_a(String)
-      expect(countries.first).to eq('Afghanistan')
+      expect(countries.first).to eq('Aruba')
       # countries missing the desired locale will not be added to the list
       # so all 250 countries may not be returned, 'fr' returns 249, for example
       expect(countries.size).to eq(NUM_OF_COUNTRIES)
@@ -332,7 +332,7 @@ describe ISO3166::Country do
       countries = ISO3166::Country.all_translated
       expect(countries).to be_an(Array)
       expect(countries.first).to be_a(String)
-      expect(countries.first).to eq('Afghanistan')
+      expect(countries.first).to eq('Aruba')
       expect(countries.size).to eq(NUM_OF_COUNTRIES)
     end
   end
@@ -397,14 +397,31 @@ describe ISO3166::Country do
       countries = ISO3166::Country.new(:de).translation('xxx')
       expect(countries).to be_nil
     end
+    context 'should return variant locales' do
+      it 'should return different value for Chinese variants' do
+        ISO3166.configuration.locales = [:'zh-cn', :'zh-hk', :'zh-tw']
+        name_cn = ISO3166::Country['TW'].translation('zh-cn')
+        name_hk = ISO3166::Country['TW'].translation('zh-hk')
+        name_tw = ISO3166::Country['TW'].translation('zh-tw')
+        expect([name_cn, name_hk, name_tw].uniq.size).to eql 3
+      end
+      it 'should return different value for Portuguese variants' do
+        ISO3166.configuration.locales = [:pt, :'pt-br']
+        name_pt = ISO3166::Country['SG'].translation('pt')
+        name_br = ISO3166::Country['SG'].translation('pt-br')
+        expect([name_pt, name_br].uniq.size).to eql 2
+      end
+    end
   end
   describe 'translations' do
     it 'should return an hash of all country names translated to the selected locale' do
       countries = ISO3166::Country.translations('fr')
       expect(countries).to be_an(Hash)
-      expect(countries.first[0]).to eq('AF')
-      expect(countries.first).to eq(%w(AF Afghanistan))
+      expect(countries.first[0]).to eq('AW')
+      expect(countries.first).to eq(%w(AW Aruba))
       # countries missing the desired locale will not be added to the list
       # so all 250 countries may not be returned, 'fr' returns 249, for example
       expect(countries.size).to eq(NUM_OF_COUNTRIES)
@@ -413,8 +430,8 @@ describe ISO3166::Country do
     it 'should return an hash of all country names in English if no locale is passed' do
       countries = ISO3166::Country.translations
       expect(countries).to be_an(Hash)
-      expect(countries.first[0]).to eq('AF')
-      expect(countries.first).to eq(%w(AF Afghanistan))
+      expect(countries.first[0]).to eq('AW')
+      expect(countries.first).to eq(%w(AW Aruba))
       expect(countries.size).to eq(NUM_OF_COUNTRIES)
     end
   end
@@ -502,6 +519,19 @@ describe ISO3166::Country do
       expect(spain_data).to be_a Hash
       expect(spain_data.keys).to eq(['ES'])
     end
+    it 'performs reasonably' do
+      start = Time.now
+      250.times do
+        lookup = ['ZM', 'ZMB', 'Zambia', 'US', 'USA', 'United States'].sample
+        case lookup.length
+        when 2 then ISO3166::Country.find_all_by(:alpha2, lookup)
+        when 3 then ISO3166::Country.find_all_by(:alpha3, lookup)
+        else ISO3166::Country.find_all_by(:name, lookup)
+        end
+      end
+      expect(Time.now - start).to be < 1
+    end
   end
   describe 'hash finder methods' do

data/spec/subdivision_spec.rb CHANGED

@@ -3,6 +3,10 @@
 require 'spec_helper'
 describe ISO3166::Subdivision do
+  before do
+    ISO3166::Data.reset
+  end
   let(:countries) { ISO3166::Country.all }
   let(:available_types) { [Hash, NilClass] }
@@ -15,4 +19,14 @@ describe ISO3166::Subdivision do
       end
     end
   end
+  describe 'state codes' do
+    it 'should all be strings' do
+      countries.each do |country|
+        expect(country.subdivisions.keys).to all(be_a(String)), \
+          "Expected #{country.alpha2.inspect} to have string subdivision" \
+          "codes but had #{country.subdivisions.keys.inspect}"
+      end
+    end
+  end
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: countries
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Josh Robinson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n_data
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: unicode_utils
   requirement: !ruby/object:Gem::Requirement
@@ -101,8 +101,7 @@ description: All sorts of useful information about every country packaged as pre
 email:
 - hexorx@gmail.com
 - russell@burningpony.com
-executables:
-- console
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -120,22 +119,34 @@ files:
 - countries.gemspec
 - lib/countries.rb
 - lib/countries/cache/countries.json
+- lib/countries/cache/locales/ab.json
 - lib/countries/cache/locales/af.json
+- lib/countries/cache/locales/ak.json
 - lib/countries/cache/locales/am.json
+- lib/countries/cache/locales/an.json
 - lib/countries/cache/locales/ar.json
 - lib/countries/cache/locales/as.json
+- lib/countries/cache/locales/ay.json
 - lib/countries/cache/locales/az.json
+- lib/countries/cache/locales/ba.json
 - lib/countries/cache/locales/be.json
 - lib/countries/cache/locales/bg.json
+- lib/countries/cache/locales/bi.json
+- lib/countries/cache/locales/bn-in.json
 - lib/countries/cache/locales/bn.json
 - lib/countries/cache/locales/br.json
 - lib/countries/cache/locales/bs.json
 - lib/countries/cache/locales/ca.json
+- lib/countries/cache/locales/ce.json
+- lib/countries/cache/locales/ch.json
 - lib/countries/cache/locales/cs.json
+- lib/countries/cache/locales/cv.json
 - lib/countries/cache/locales/cy.json
 - lib/countries/cache/locales/da.json
 - lib/countries/cache/locales/de.json
+- lib/countries/cache/locales/dv.json
 - lib/countries/cache/locales/dz.json
+- lib/countries/cache/locales/ee.json
 - lib/countries/cache/locales/el.json
 - lib/countries/cache/locales/en.json
 - lib/countries/cache/locales/eo.json
@@ -143,28 +154,42 @@ files:
 - lib/countries/cache/locales/et.json
 - lib/countries/cache/locales/eu.json
 - lib/countries/cache/locales/fa.json
+- lib/countries/cache/locales/ff.json
 - lib/countries/cache/locales/fi.json
 - lib/countries/cache/locales/fo.json
 - lib/countries/cache/locales/fr.json
+- lib/countries/cache/locales/fy.json
 - lib/countries/cache/locales/ga.json
 - lib/countries/cache/locales/gl.json
+- lib/countries/cache/locales/gn.json
 - lib/countries/cache/locales/gu.json
+- lib/countries/cache/locales/gv.json
+- lib/countries/cache/locales/ha.json
 - lib/countries/cache/locales/he.json
 - lib/countries/cache/locales/hi.json
 - lib/countries/cache/locales/hr.json
+- lib/countries/cache/locales/ht.json
 - lib/countries/cache/locales/hu.json
 - lib/countries/cache/locales/hy.json
 - lib/countries/cache/locales/ia.json
 - lib/countries/cache/locales/id.json
+- lib/countries/cache/locales/io.json
 - lib/countries/cache/locales/is.json
 - lib/countries/cache/locales/it.json
+- lib/countries/cache/locales/iu.json
 - lib/countries/cache/locales/ja.json
 - lib/countries/cache/locales/ka.json
+- lib/countries/cache/locales/ki.json
 - lib/countries/cache/locales/kk.json
+- lib/countries/cache/locales/kl.json
 - lib/countries/cache/locales/km.json
 - lib/countries/cache/locales/kn.json
 - lib/countries/cache/locales/ko.json
 - lib/countries/cache/locales/ku.json
+- lib/countries/cache/locales/kv.json
+- lib/countries/cache/locales/kw.json
+- lib/countries/cache/locales/ky.json
+- lib/countries/cache/locales/lo.json
 - lib/countries/cache/locales/lt.json
 - lib/countries/cache/locales/lv.json
 - lib/countries/cache/locales/mi.json
@@ -174,19 +199,26 @@ files:
 - lib/countries/cache/locales/mr.json
 - lib/countries/cache/locales/ms.json
 - lib/countries/cache/locales/mt.json
+- lib/countries/cache/locales/my.json
+- lib/countries/cache/locales/na.json
 - lib/countries/cache/locales/nb.json
 - lib/countries/cache/locales/ne.json
 - lib/countries/cache/locales/nl.json
 - lib/countries/cache/locales/nn.json
+- lib/countries/cache/locales/nv.json
 - lib/countries/cache/locales/oc.json
 - lib/countries/cache/locales/or.json
 - lib/countries/cache/locales/pa.json
+- lib/countries/cache/locales/pi.json
 - lib/countries/cache/locales/pl.json
 - lib/countries/cache/locales/ps.json
+- lib/countries/cache/locales/pt-br.json
 - lib/countries/cache/locales/pt.json
 - lib/countries/cache/locales/ro.json
 - lib/countries/cache/locales/ru.json
 - lib/countries/cache/locales/rw.json
+- lib/countries/cache/locales/sc.json
+- lib/countries/cache/locales/sd.json
 - lib/countries/cache/locales/si.json
 - lib/countries/cache/locales/sk.json
 - lib/countries/cache/locales/sl.json
@@ -197,6 +229,7 @@ files:
 - lib/countries/cache/locales/sw.json
 - lib/countries/cache/locales/ta.json
 - lib/countries/cache/locales/te.json
+- lib/countries/cache/locales/tg.json
 - lib/countries/cache/locales/th.json
 - lib/countries/cache/locales/ti.json
 - lib/countries/cache/locales/tk.json
@@ -205,11 +238,17 @@ files:
 - lib/countries/cache/locales/tt.json
 - lib/countries/cache/locales/ug.json
 - lib/countries/cache/locales/uk.json
+- lib/countries/cache/locales/ur.json
+- lib/countries/cache/locales/uz.json
 - lib/countries/cache/locales/ve.json
 - lib/countries/cache/locales/vi.json
 - lib/countries/cache/locales/wa.json
 - lib/countries/cache/locales/wo.json
 - lib/countries/cache/locales/xh.json
+- lib/countries/cache/locales/yo.json
+- lib/countries/cache/locales/zh-cn.json
+- lib/countries/cache/locales/zh-hk.json
+- lib/countries/cache/locales/zh-tw.json
 - lib/countries/cache/locales/zh.json
 - lib/countries/cache/locales/zu.json
 - lib/countries/configuration.rb
@@ -737,8 +776,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Gives you a country object full of all sorts of useful information.