countries 4.2.1 → 5.0.0

data/spec/country_spec.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'spec_helper'
 NUM_OF_COUNTRIES = 249
@@ -48,7 +48,9 @@ describe ISO3166::Country do
   end
 
   it 'should return alternate names' do
-    expect(country.unofficial_names).to eq(['United States', 'USA', 'Murica', 'Vereinigte Staaten von Amerika', 'États-Unis', 'Estados Unidos', 'アメリカ合衆国', 'Verenigde Staten'])
+    expect(country.unofficial_names).to eq(['United States', 'USA', 'Murica',
+                                 'Vereinigte Staaten von Amerika', 'États-Unis',
+                                 'Estados Unidos', 'アメリカ合衆国', 'Verenigde Staten'])
   end
 
   it 'should return translations' do
@@ -85,7 +87,7 @@ describe ISO3166::Country do
     expect(country.postal_code_format).to_not be_nil
 
     regex = Regexp.new(country.postal_code_format)
-    expect(regex).to match("12345-6789")
+    expect(regex).to match('12345-6789')
 
     antarctica = ISO3166::Country.search('AQ')
     expect(antarctica.postal_code_format).to be_nil
@@ -123,7 +125,7 @@ describe ISO3166::Country do
     let(:country) { ISO3166::Country.search('BE') }
 
     it 'should return its local names based on its languages' do
-      expect(country.local_names).to match_array(%w(België Belgique Belgien))
+      expect(country.local_names).to match_array(%w[België Belgique Belgien])
     end
 
     it 'should return its first local name' do
@@ -259,7 +261,7 @@ describe ISO3166::Country do
     end
 
     it 'should return an alphabetized list of subdivision names translated to current locale with codes' do
-      ISO3166.configuration.locales = [:es, :de, :en]
+      ISO3166.configuration.locales = %i[es de en]
 
       subdivisions = ISO3166::Country.search('EG').subdivision_names_with_codes(:es)
       expect(subdivisions).to be_an(Array)
@@ -371,11 +373,11 @@ describe ISO3166::Country do
       expect(countries.first[0]).to be_a(String)
       expect(countries.first[0]).to eq('Afghanistan')
       expect(countries.size).to eq(NUM_OF_COUNTRIES)
-      expect(countries.any?{|pair| !pair[0].html_safe?}).to eq(false)
+      expect(countries.any? { |pair| !pair[0].html_safe? }).to eq(false)
     end
 
     it 'should return an alphabetized list of all country names translated to current locale with ISOCODE alpha2' do
-      ISO3166.configuration.locales = [:es, :de, :en]
+      ISO3166.configuration.locales = %i[es de en]
 
       countries = ISO3166::Country.all_names_with_codes(:es)
       expect(countries).to be_an(Array)
@@ -395,7 +397,7 @@ describe ISO3166::Country do
     end
 
     it 'should return an alphabetized list of all country names translated to current locale with ISOCODE alpha2' do
-      ISO3166.configuration.locales = [:es, :de, :en]
+      ISO3166.configuration.locales = %i[es de en]
 
       countries = ISO3166::Country.all_names_with_codes(:es)
       expect(countries).to be_an(Array)
@@ -407,7 +409,7 @@ describe ISO3166::Country do
 
   describe 'translation' do
     it 'should return the localized name for a country to the selected locale' do
-      ISO3166.configuration.locales = [:es, :de, :en]
+      ISO3166.configuration.locales = %i[es de en]
       countries = ISO3166::Country.new(:de).translation('de')
       expect(countries).to be_an(String)
       expect(countries).to eq('Deutschland')
@@ -426,7 +428,7 @@ describe ISO3166::Country do
 
     context 'should return variant locales' do
       it 'should return different value for Chinese variants' do
-        ISO3166.configuration.locales = [:'zh-cn', :'zh-hk', :'zh-tw']
+        ISO3166.configuration.locales = %i[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')
@@ -434,7 +436,7 @@ describe ISO3166::Country do
       end
 
       it 'should return different value for Portuguese variants' do
-        ISO3166.configuration.locales = [:pt, :'pt-br']
+        ISO3166.configuration.locales = %i[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
@@ -447,7 +449,7 @@ describe ISO3166::Country do
       countries = ISO3166::Country.translations('fr')
       expect(countries).to be_an(Hash)
       expect(countries.first[0]).to eq('AW')
-      expect(countries.first).to eq(%w(AW Aruba))
+      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)
@@ -457,7 +459,7 @@ describe ISO3166::Country do
       countries = ISO3166::Country.translations
       expect(countries).to be_an(Hash)
       expect(countries.first[0]).to eq('AW')
-      expect(countries.first).to eq(%w(AW Aruba))
+      expect(countries.first).to eq(%w[AW Aruba])
       expect(countries.size).to eq(NUM_OF_COUNTRIES)
     end
   end
@@ -648,7 +650,9 @@ describe ISO3166::Country do
 
     context 'when finding by invalid attribute' do
       it 'should raise an error' do
-        expect { ISO3166::Country.find_by_invalid('invalid') }.to raise_error(RuntimeError, "Invalid attribute name 'invalid'")
+        expect { ISO3166::Country.find_by_invalid('invalid') }.to(
+          raise_error(RuntimeError, "Invalid attribute name 'invalid'")
+        )
       end
     end
 
@@ -713,6 +717,49 @@ describe ISO3166::Country do
       end
     end
 
+    describe '#find_country_by_any_name' do
+      context 'when search name found' do
+        let(:uk) { ISO3166::Country.find_country_by_any_name('United Kingdom') }
+
+        it 'should be a country instance' do
+          expect(uk).to be_a(ISO3166::Country)
+          expect(uk.alpha2).to eq('GB')
+        end
+      end
+
+      context 'when search lowercase name found' do
+        let(:uk) { ISO3166::Country.find_country_by_any_name('united kingdom') }
+
+        it 'should be a country instance' do
+          expect(uk).to be_a(ISO3166::Country)
+          expect(uk.alpha2).to eq('GB')
+        end
+      end
+
+      context 'when the search term contains comma' do
+        let(:korea) { ISO3166::Country.find_country_by_any_name('Korea, Republic of') }
+
+        it 'should be a country instance' do
+          expect(korea).to be_a(ISO3166::Country)
+          expect(korea.alpha2).to eq('KR')
+        end
+      end
+
+      context 'when search translation found' do
+        before do
+          ISO3166.configure do |config|
+            config.locales = [:bs]
+          end
+        end
+        let(:uk) { ISO3166::Country.find_country_by_any_name('Velika Britanija') }
+
+        it 'should be a country instance' do
+          expect(uk).to be_a(ISO3166::Country)
+          expect(uk.alpha2).to eq('GB')
+        end
+      end
+    end
+
     context 'regression test for #388' do
       let(:no_country) { ISO3166::Country.find_country_by_translated_names(nil) }
 
@@ -729,6 +776,7 @@ describe ISO3166::Country do
         expect { uk }.to raise_error(RuntimeError)
       end
     end
+
     context 'when search name not found' do
       let(:bogus) { ISO3166::Country.find_country_by_unofficial_names('Does not exist') }
 
@@ -785,8 +833,9 @@ describe ISO3166::Country do
 
     context 'when finding by invalid attribute' do
       it 'should raise an error' do
-        expect { ISO3166::Country.find_country_by_invalid('invalid') }.to raise_error(RuntimeError,
-                                                                                      "Invalid attribute name 'invalid'")
+        expect { ISO3166::Country.find_country_by_invalid('invalid') }.to(
+          raise_error(RuntimeError, "Invalid attribute name 'invalid'")
+        )
       end
     end
 
@@ -848,7 +897,7 @@ describe ISO3166::Country do
   end
 
   describe 'names in Data' do
-    it 'should be unique (to allow .find_by_name work properly)' do
+    it 'should be unique (to allow .find_by_any_name work properly)' do
       names = ISO3166::Data.cache.map do |_k, v|
         [v['iso_short_name'], v['unofficial_names']].flatten.uniq
       end.flatten
@@ -947,7 +996,7 @@ describe ISO3166::Country do
 
     it 'should contain all keys for vat_rates' do
       expect(belgium.vat_rates).to be_a(Hash)
-      expect(belgium.vat_rates.keys).to eq(%w(standard reduced super_reduced parking))
+      expect(belgium.vat_rates.keys).to eq(%w[standard reduced super_reduced parking])
     end
 
     it 'should return an array of reduced vat rates' do
@@ -1021,7 +1070,7 @@ describe ISO3166::Country do
 
     subject { ISO3166::Country.pluck(*args) }
 
-    it "returns empty arrays" do
+    it 'returns empty arrays' do
       expect(subject.first).to be_empty
       expect(subject.last).to be_empty
     end
@@ -1029,9 +1078,9 @@ describe ISO3166::Country do
     context "when asking for alpha2, alpha3 and iso_short_name" do
       let(:args) { [:alpha2, :alpha3, :iso_short_name] }
 
-      it "returns the correct values" do
-        expect(subject.first).to eq(["AD", "AND", "Andorra"])
-        expect(subject.last).to eq(["ZW", "ZWE", "Zimbabwe"])
+      it 'returns the correct values' do
+        expect(subject.first).to eq(%w[AD AND Andorra])
+        expect(subject.last).to eq(%w[ZW ZWE Zimbabwe])
       end
     end
   end

data/spec/data_spec.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'benchmark'
 
@@ -10,13 +11,13 @@ describe ISO3166::Data do
 
   it 'can load selective locales' do
     # ISO3166::Data.update_cache
-    ISO3166.configuration.locales = [:es, :de, :en]
+    ISO3166.configuration.locales = %i[es de en]
     data = ISO3166::Data.new('US').call
     expect(data['translated_names'].size).to eq 3
   end
 
   it 'can load selective locales and reload efficiently' do
-    ISO3166.configuration.locales = [:es, :de, :en]
+    ISO3166.configuration.locales = %i[es de en]
     data = ISO3166::Data.new('US').call
     expect(data['translations']).to eq('de' => 'Vereinigte Staaten', 'es' => 'Estados Unidos', 'en' => 'United States')
     expect(data['translated_names'].sort).to eq ['Vereinigte Staaten', 'Estados Unidos', 'United States'].sort
@@ -35,7 +36,7 @@ describe ISO3166::Data do
 
   it 'locales will load prior to return results' do
     # require 'memory_profiler'
-    ISO3166.configuration.locales = [:es, :de, :en]
+    ISO3166.configuration.locales = %i[es de en]
     # report = MemoryProfiler.report do
     ISO3166::Data.update_cache
     # end
@@ -44,7 +45,12 @@ describe ISO3166::Data do
     ISO3166::Data.update_cache
 
     ISO3166.configure do |config|
-      config.locales = [:af, :am, :ar, :as, :az, :be, :bg, :bn, :br, :bs, :ca, :cs, :cy, :da, :de, :dz, :el, :en, :eo, :es, :et, :eu, :fa, :fi, :fo, :fr, :ga, :gl, :gu, :he, :hi, :hr, :hu, :hy, :ia, :id, :is, :it, :ja, :ka, :kk, :km, :kn, :ko, :ku, :lt, :lv, :mi, :mk, :ml, :mn, :mr, :ms, :mt, :nb, :ne, :nl, :nn, :oc, :or, :pa, :pl, :ps, :pt, :ro, :ru, :rw, :si, :sk, :sl, :so, :sq, :sr, :sv, :sw, :ta, :te, :th, :ti, :tk, :tl, :tr, :tt, :ug, :uk, :ve, :vi, :wa, :wo, :xh, :zh, :zu]
+      config.locales = %i[af am ar as az be bg bn br bs ca cs cy da de dz el en
+                          eo es et eu fa fi fo fr ga gl gu he hi hr hu hy ia id
+                          is it ja ka kk km kn ko ku lt lv mi mk ml mn mr ms mt
+                          nb ne nl nn oc or pa pl ps pt ro ru rw si sk sl so sq
+                          sr sv sw ta te th ti tk tl tr tt ug uk ve vi wa wo xh
+                          zh zu]
     end
     # puts Benchmark.measure {ISO3166::Data.update_cache}
 
@@ -61,32 +67,32 @@ describe ISO3166::Data do
 
   it 'locales will load prior and be cached' do
     ISO3166.reset
-    ISO3166.configuration.locales = [:es, :de, :en]
-    expect(ISO3166::Data.send(:locales_to_load)).to eql(%w(es de en))
+    ISO3166.configuration.locales = %i[es de en]
+    expect(ISO3166::Data.send(:locales_to_load)).to eql(%w[es de en])
     ISO3166::Data.update_cache
-    ISO3166.configuration.locales = [:es, :de, :en]
+    ISO3166.configuration.locales = %i[es de en]
     expect(ISO3166::Data.send(:locales_to_load)).to eql([])
   end
 
   it 'locales will load prior and be cached' do
     ISO3166.reset
-    ISO3166.configuration.locales = [:es, :de, :en]
+    ISO3166.configuration.locales = %i[es de en]
     expect(ISO3166::Data.send(:locales_to_remove)).to eql([])
     expect(ISO3166::Country.new('DE').translation('de')).to eq 'Deutschland'
     ISO3166::Data.update_cache
-    ISO3166.configuration.locales = [:es, :en]
+    ISO3166.configuration.locales = %i[es en]
     expect(ISO3166::Data.send(:locales_to_remove)).to eql(['de'])
     expect(ISO3166::Country.new('DE').translation('de')).to eq nil
   end
 
   describe '#load_cache' do
     it 'will return an empty hash for an unsupported locale' do
-      file_array = %w(locales unsupported.json)
+      file_array = %w[locales unsupported.json]
       expect(ISO3166::Data.send(:load_cache, file_array)).to eql({})
     end
 
     it 'will return json for a supported locale' do
-      file_array = %w(locales en.json)
+      file_array = %w[locales en.json]
       expect(ISO3166::Data.send(:load_cache, file_array)).not_to be_empty
     end
   end
@@ -97,8 +103,8 @@ describe ISO3166::Data do
         alpha2: 'TW',
         iso_short_name: 'NEW Taiwan',
         subdivisions: {
-          CHA: {name: 'New Changhua'},
-          CYI: {name: 'New Municipality'}
+          CHA: { name: 'New Changhua' },
+          CYI: { name: 'New Municipality' }
         },
         translations: {
           'en' => 'NEW Taiwan',
@@ -116,8 +122,8 @@ describe ISO3166::Data do
       expect(subject.iso_short_name).to eq 'NEW Taiwan'
       expect(subject.translations).to eq('en' => 'NEW Taiwan',
                                          'de' => 'NEW Taiwan')
-      expect(subject.subdivisions).to eq('CHA' => ISO3166::Subdivision.new({name: 'New Changhua', code: 'CHA'}),
-                                         'CYI' => ISO3166::Subdivision.new({name: 'New Municipality', code: 'CYI'}))
+      expect(subject.subdivisions).to eq('CHA' => ISO3166::Subdivision.new({ name: 'New Changhua', code: 'CHA' }),
+                                         'CYI' => ISO3166::Subdivision.new({ name: 'New Municipality', code: 'CYI' }))
     end
   end
 
@@ -127,8 +133,8 @@ describe ISO3166::Data do
         alpha2: 'LOL',
         iso_short_name: 'Happy Country',
         subdivisions: {
-          LOL1: {name: 'Happy sub1'},
-          LOL2: {name: 'Happy sub2'}
+          LOL1: { name: 'Happy sub1' },
+          LOL2: { name: 'Happy sub2' }
         },
         translations: {
           'en' => 'Happy Country',

data/spec/mongoid_spec.rb

@@ -1,7 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'spec_helper'
-require File.expand_path('../../lib/countries/mongoid', __FILE__)
+require File.expand_path('../lib/countries/mongoid', __dir__)
 
 describe 'Mongoid support' do
   let(:britain) { ISO3166::Country.new('GB') }

data/spec/perf_spec.rb

@@ -1,18 +1,18 @@
-# encoding: utf-8
-require 'spec_helper'
+# frozen_string_literal: true
 
-describe ISO3166::Data, perf: true, order: :defined do
+require 'spec_helper'
 
-  ALL_LOCALES = [
-    :af, :am, :ar, :as, :az, :be, :bg, :bn, :br, :bs, :ca, :cs, :cy, :da, :de,
-    :dz, :el, :en, :eo, :es, :et, :eu, :fa, :fi, :fo, :fr, :ga, :gl, :gu, :he,
-    :hi, :hr, :hu, :hy, :ia, :id, :is, :it, :ja, :ka, :kk, :km, :kn, :ko, :ku,
-    :lt, :lv, :mi, :mk, :ml, :mn, :mr, :ms, :mt, :nb, :ne, :nl, :nn, :oc, :or,
-    :pa, :pl, :ps, :pt, :ro, :ru, :rw, :si, :sk, :sl, :so, :sq, :sr, :sv, :sw,
-    :ta, :te, :th, :ti, :tk, :tl, :tr, :tt, :ug, :uk, :ve, :vi, :wa, :wo, :xh,
-    :zh, :zu
-  ].freeze
+ALL_LOCALES = %i[
+  af am ar as az be bg bn br bs ca cs cy da de
+  dz el en eo es et eu fa fi fo fr ga gl gu he
+  hi hr hu hy ia id is it ja ka kk km kn ko ku
+  lt lv mi mk ml mn mr ms mt nb ne nl nn oc or
+  pa pl ps pt ro ru rw si sk sl so sq sr sv sw
+  ta te th ti tk tl tr tt ug uk ve vi wa wo xh
+  zh zu
+].freeze
 
+describe ISO3166::Data, perf: true, order: :defined do
   def perf_report(_name)
     require 'benchmark'
     require 'memory_profiler'
@@ -28,7 +28,7 @@ describe ISO3166::Data, perf: true, order: :defined do
 
     # print a flat profile to text
     printer = RubyProf::FlatPrinter.new(result)
-    printer.print(STDOUT)
+    printer.print($stdout)
   end
 
   it 'responds to call' do
@@ -40,12 +40,12 @@ describe ISO3166::Data, perf: true, order: :defined do
   end
 
   it 'locales will load prior to return results' do
-    ISO3166.configuration.locales = [:es, :de, :en]
+    ISO3166.configuration.locales = %i[es de en]
     report = MemoryProfiler.report do
       ISO3166::Data.update_cache
     end
 
-    report.pretty_print(to_file: 'tmp/memory/3_locales')
+    report.pretty_print(to_file: 'tmp/3_locales.txt')
     puts Benchmark.measure { ISO3166::Data.update_cache }
 
     ISO3166.configure do |config|
@@ -57,7 +57,7 @@ describe ISO3166::Data, perf: true, order: :defined do
       ISO3166::Data.update_cache
     end
 
-    report.pretty_print(to_file: 'tmp/memory/all_locales')
+    report.pretty_print(to_file: 'tmp/all_locales.txt')
   end
 
   it 'loades a specfic country quickly' do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'countries'
 RSpec.configure do |config|
   config.filter_run :focus

data/spec/subdivision_spec.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'spec_helper'
 
@@ -23,9 +23,11 @@ describe ISO3166::Subdivision do
   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}"
+        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

data/spec/thread_safety_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe 'Accessing ISO3166::Country instances data in multiple threads' do
   before do
     if Thread.respond_to?(:report_on_exception)
@@ -12,7 +14,7 @@ describe 'Accessing ISO3166::Country instances data in multiple threads' do
     nthreads = 100
     threads = []
 
-    alpha2_codes = ['us', 'es', 'nl', 'ca', 'de', 'fr', 'mx', 'ru', 'ch', 'jp']
+    alpha2_codes = %w[us es nl ca de fr mx ru ch jp]
 
     nthreads.times do
       threads << Thread.new do
@@ -31,7 +33,7 @@ describe 'Accessing ISO3166::Country instances data in multiple threads' do
     expect { create_countries_threaded }.to_not raise_error
   end
 
-  it "raises NoMethodError when not using a mutex" do
+  it 'raises NoMethodError when not using a mutex' do
     allow(ISO3166::Data).to receive(:use_mutex?).and_return(false)
 
     expect { create_countries_threaded }.to raise_error(NoMethodError)
@@ -43,4 +45,3 @@ describe 'Accessing ISO3166::Country instances data in multiple threads' do
     end
   end
 end
-

data/spec/timezone_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe 'timezone Country class' do
   context "when loaded via 'timezone'" do
     require 'tzinfo'