countries 5.4.0 → 5.6.0

data/lib/countries/data/subdivisions/ZA.yaml

@@ -161,6 +161,7 @@ FS:
     mk: Фристејт
     'no': Free State
     yo_BJ: Free State
+    ga: an Saorstát Oráisteach
   comments:
   type: province
 GP:
@@ -241,6 +242,7 @@ GP:
     mk: Гаутенг
     'no': Gauteng
     yo_BJ: Gauteng
+    hu: Gauteng
   comments:
   type: province
 LP:
@@ -320,6 +322,7 @@ LP:
     mk: Лимпопо
     'no': Limpopo
     yo_BJ: Limpopo
+    hu: Limpopo (tartomány)
   comments:
   type: province
 MP:
@@ -399,6 +402,7 @@ MP:
     mk: Мпумаланга
     'no': Mpumalanga
     yo_BJ: Mpumalanga
+    hu: Mpumalanga
   comments:
   type: province
 NC:
@@ -478,6 +482,7 @@ NC:
     mk: Северен Кејп
     'no': Northern Cape
     yo_BJ: Northern Cape
+    gl: Cabo Setentrional
   comments:
   type: province
 NW:

data/lib/countries/data/subdivisions/ZM.yaml

@@ -58,6 +58,10 @@
     ccp: Western
     hy: Արևմտյան պրովինցիա
     'no': Western
+    ca: Província Occidental
+    fa: استان غربی (زامبیا)
+    he: מחוז המערב
+    zu: Western Province, Zambiya
   comments:
   type: province
 '02':
@@ -120,6 +124,7 @@
     ccp: Central
     cs: Centrální provincie (Zambie)
     'no': Central
+    fa: استان مرکزی، زامبیا
   comments:
   type: province
 '03':
@@ -179,6 +184,9 @@
     zh: 东方省
     ccp: "\U0001111B\U0001112A\U00011107\U00011134\U0001111F\U0001112C\U00011107\U00011134\U00011108\U0001112C"
     'no': Eastern
+    ca: Província de l’Est
+    fa: استان شرقی (زامبیا)
+    he: האזור המזרחי
   comments:
   type: province
 '04':
@@ -239,6 +247,9 @@
     ccp: "\U00011123\U0001112A\U00011120\U0001111B\U0001112A\U00011123"
     ca: província de Luapula
     'no': Luapula
+    cs: Provincie Luapula
+    fa: استان لوآپولا
+    hu: Luapula
   comments:
   type: province
 '05':
@@ -297,6 +308,8 @@
     zh: 北方省
     ccp: "\U00011105\U0001112A\U00011116\U00011133\U00011126\U00011127\U00011122\U00011134\U0001111F\U0001112C\U00011107\U00011134\U00011108\U0001112C"
     'no': Northern
+    fa: استان شمالی (زامبیا)
+    he: אזור הצפון
   comments:
   type: province
 '06':
@@ -358,6 +371,8 @@
     ccp: "\U00011105\U0001112A\U00011116\U00011133\U00011126\U00011127\U00011122\U00011134-\U0001111B\U00011127\U0001110F\U00011128\U0001111F\U00011134\U0001111F\U0001112C\U00011107\U00011134\U00011108\U0001112C"
     yue: 西北省
     'no': North-Western
+    ca: Província del Nord-oest
+    fa: استان شمال غربی (زامبیا)
   comments:
   type: province
 '07':
@@ -418,6 +433,9 @@
     zh: 南部省
     ccp: "\U00011118\U00011127\U0001110A\U00011128\U0001111A\U00011134\U0001111F\U0001112C\U00011107\U00011134\U00011108\U0001112C"
     'no': Southern
+    ca: Província Meridional
+    fa: استان جنوبی (زامبیا)
+    ga: Cúige an Deiscirt
   comments:
   type: province
 '08':
@@ -480,6 +498,7 @@
     ccp: "\U00011107\U0001112E\U0001111B\U0001112C\U00011122\U00011134\U0001111D\U0001112C\U00011123\U00011134\U00011111\U00011134"
     ca: província de Copperbelt
     'no': Copperbelt
+    he: מחוז קופרבלט
   comments:
   type: province
 '09':
@@ -538,6 +557,9 @@
     zh: 卢萨卡省
     ccp: "\U00011123\U0001112A\U00011125\U00011107"
     'no': Lusaka
+    ca: Lusaka
+    cy: Talaith Lusaka
+    fa: استان لوساکا
   comments:
   type: province
 '10':
@@ -591,5 +613,7 @@
     zh: 穆欽加省
     ccp: "\U0001111F\U0001112A\U0001110C\U00011128\U00011101\U00011109"
     'no': Muchinga
+    cy: Talaith Muchinga
+    fa: استان موچینگا
   comments:
   type: province

data/lib/countries/data/subdivisions/ZW.yaml

@@ -15,8 +15,12 @@ BU:
     ru: Булавайо
     ceb: Bulawayo Province
     ar: إقليم بولاوايو
+    ja: ブラワヨ
     ccp: "\U0001111D\U0001112A\U00011123\U00011124\U00011103\U0001112E"
     be: Булавая
+    cy: Talaith Bulawayo
+    fr: province de Bulawayo
+    zh: 布拉瓦约省
   comments:
   type: province
 HA:
@@ -43,6 +47,12 @@ HA:
     nb: Harare Province
     ne: हरारे प्रदेश
     'no': Harare Province
+    cy: Talaith Harare
+    fa: استان هراره
+    lv: Harare
+    uk: Хараре
+    zh: 哈拉雷省
+    zu: Harare, Isifundazwe
   comments:
   type: province
 MA:
@@ -106,6 +116,7 @@ MA:
     sr_Latn: Manikalend
     ccp: "\U0001111F\U00011127\U0001111A\U00011128\U00011107\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134"
     'no': Manicaland
+    zu: Manicaland
   comments:
   type: province
 MC:
@@ -169,6 +180,7 @@ MC:
     ccp: "\U0001111F\U00011125\U0001112E\U0001111A\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134
       \U00011125\U0001112C\U0001111A\U00011134\U00011111\U00011133\U00011122\U00011123\U00011134"
     'no': Mashonaland Central
+    zu: Mashonaland Central
   comments:
   type: province
 ME:
@@ -233,6 +245,7 @@ ME:
       \U0001111B\U0001112A\U00011107\U00011134"
     he: משונאלנד מזרח פרובינציה
     'no': Mashonaland East
+    zu: Mashonaland East
   comments:
   type: province
 MI:
@@ -295,6 +308,7 @@ MI:
     sr_Latn: Midlends
     ccp: "\U0001111F\U00011128\U00011116\U00011134\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134\U00011125\U00011134"
     'no': Midlands
+    zu: Midlands (Isifundazwe)
   comments:
   type: province
 MN:
@@ -359,6 +373,7 @@ MN:
     ccp: "\U0001111F\U00011111\U0001111D\U00011128\U00011123\U00011128\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134
       \U00011105\U0001112A\U00011116\U00011133\U00011126\U00011127\U00011122\U00011134"
     'no': Matabeleland North
+    zu: Matabeleland North
   comments:
   type: province
 MS:
@@ -422,6 +437,8 @@ MS:
     ccp: "\U0001111F\U00011111\U0001111D\U00011128\U00011123\U00011128\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134
       \U00011118\U00011127\U0001110A\U00011128\U0001111A\U00011134"
     'no': Matabeleland South
+    hy: Հարավային Մատաբելելենդ
+    zu: Matabeleland South
   comments:
   type: province
 MV:
@@ -484,6 +501,8 @@ MV:
     sr_Latn: Mašvingo
     ccp: "\U0001111F\U0001110C\U00011134\U0001111E\U00011128\U00011101\U00011109\U0001112E"
     'no': Masvingo
+    hy: Մասվինգո
+    zu: Masvingo (Isifundazwe)
   comments:
   type: province
 MW:
@@ -547,5 +566,7 @@ MW:
     ccp: "\U0001111F\U00011125\U0001112E\U0001111A\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134
       \U0001111B\U00011127\U0001110F\U00011128\U0001111F\U00011134"
     'no': Mashonaland West
+    he: משונלנד-מערב
+    zu: Mashonaland West
   comments:
   type: province

data/lib/countries/data.rb

@@ -3,6 +3,9 @@
 module ISO3166
   # Handles building the in memory store of countries data
   class Data
+    extend SubdivisionMethods
+    extend LocalesMethods
+
     @cache_dir = [File.dirname(__FILE__), 'cache']
     @cache = {}
     @loaded_country_codes = []
@@ -19,15 +22,13 @@ module ISO3166
     end
 
     class << self
-
       # Registers a new Country with custom data.
       # If you are overriding an existing country, this does not perform a deep merge so you will need to __bring in all data you wish to be available__.
       # Overriding an existing country will also remove it from the internal management of translations.
       def register(data)
         alpha2 = data[:alpha2].upcase
         @registered_data[alpha2] = deep_stringify_keys(data)
-        @registered_data[alpha2]['translations'] = \
-          Translations.new.merge(data['translations'] || {})
+        @registered_data[alpha2]['translations'] = Translations.new.merge(data['translations'] || {})
         @cache = cache.merge(@registered_data)
       end
 
@@ -70,26 +71,6 @@ module ISO3166
         File.join([@cache_dir] + file_array)
       end
 
-      def subdivision_data(alpha2)
-        file = subdivision_file_path(alpha2)
-        data = File.exist?(file) ? YAML.load_file(file) : {}
-        locales = ISO3166.configuration.locales.map(&:to_s)
-        data.each_value{ |v| v['translations'] = v['translations'].slice(*locales)}
-
-        return data
-      end
-
-      def subdivisions(alpha2)
-        @subdivisions ||= {}
-        @subdivisions[alpha2] ||= create_subdivisions(ISO3166::Data.subdivision_data(alpha2))
-      end
-
-      def create_subdivisions(subdivision_data)
-        subdivision_data.each_with_object({}) do |(k, v), hash|
-          hash[k] = Subdivision.new(v)
-        end
-      end
-
       private
 
       def load_data!
@@ -129,9 +110,7 @@ module ISO3166
       end
 
       def load_required?
-        synchronized do
-          @cache.empty?
-        end
+        synchronized { @cache.empty? }
       end
 
       def cached_codes
@@ -147,44 +126,36 @@ module ISO3166
         !locales_to_load.empty? || !locales_to_remove.empty?
       end
 
-      def locales_to_load
-        requested_locales - loaded_locales
-      end
-
-      def locales_to_remove
-        loaded_locales - requested_locales
-      end
-
-      def requested_locales
-        ISO3166.configuration.locales.map { |l| l.to_s.downcase }
-      end
-
-      def loaded_locales
-        ISO3166.configuration.loaded_locales.map { |l| l.to_s.downcase }
-      end
-
       def load_translations(locale)
         synchronized do
           locale_names = load_cache(['locales', "#{locale}.json"])
           internal_codes.each do |alpha2|
-            @cache[alpha2]['translations'] ||= Translations.new
-            @cache[alpha2]['translations'][locale] = locale_names[alpha2].freeze
-            @cache[alpha2]['translated_names'] = @cache[alpha2]['translations'].values.freeze
+            load_alpha2_translation_for_locale(alpha2, locale, locale_names)
           end
           ISO3166.configuration.loaded_locales << locale
         end
       end
 
+      def load_alpha2_translation_for_locale(alpha2, locale, locale_names)
+        @cache[alpha2]['translations'] ||= Translations.new
+        @cache[alpha2]['translations'][locale] = locale_names[alpha2].freeze
+        @cache[alpha2]['translated_names'] = @cache[alpha2]['translations'].values.freeze
+      end
+
       def unload_translations(locale)
         synchronized do
           internal_codes.each do |alpha2|
-            @cache[alpha2]['translations'].delete(locale)
-            @cache[alpha2]['translated_names'] = @cache[alpha2]['translations'].values.freeze
+            unload_alpha2_translation_for_locale(alpha2, locale)
           end
           ISO3166.configuration.loaded_locales.delete(locale)
         end
       end
 
+      def unload_alpha2_translation_for_locale(alpha2, locale)
+        @cache[alpha2]['translations'].delete(locale)
+        @cache[alpha2]['translated_names'] = @cache[alpha2]['translations'].values.freeze
+      end
+
       def load_cache(file_array)
         file_path = datafile_path(file_array)
         File.exist?(file_path) ? JSON.parse(File.binread(file_path)) : {}
@@ -192,9 +163,7 @@ module ISO3166
 
       def deep_stringify_keys(data)
         data.transform_keys!(&:to_s)
-        data.transform_values! do |v|
-          v.is_a?(Hash) ? deep_stringify_keys(v) : v
-        end
+        data.transform_values! { |v| v.is_a?(Hash) ? deep_stringify_keys(v) : v }
 
         data
       end

data/lib/countries/global.rb

@@ -15,5 +15,4 @@ require 'countries'
 #   gem 'countries', require: 'countries/global'
 #
 class Country < ISO3166::Country
-
 end

data/lib/countries/iso3166.rb

@@ -4,9 +4,12 @@ require 'yaml'
 require 'json'
 
 require 'countries/configuration'
+require 'countries/data/locales_methods'
+require 'countries/data/subdivision_methods'
 require 'countries/data'
 require 'countries/structure'
 require 'countries/translations'
+require 'countries/country/country_subdivision_methods'
 require 'countries/country/class_methods'
 require 'countries/country/finder_methods'
 require 'countries/country/emoji'

data/lib/countries/sources/cldr/subdivision.rb

@@ -20,7 +20,7 @@ module Sources
       end
 
       def code
-        type[2..-1].upcase
+        type[2..].upcase
       end
 
       def type

data/lib/countries/subdivision.rb

@@ -19,5 +19,10 @@ module ISO3166
     def [](attr_name)
       send attr_name
     end
+
+    # @return [Hash] A hash with the subdivision code as key and the hash of translated subdivision names ( locale => name ) as value.
+    def code_with_translations
+      { code => translations }
+    end
   end
 end

data/lib/countries/tasks/postal_codes.rake

@@ -19,7 +19,11 @@ namespace :postal_codes do
       postal_code_format_index = data.find_index { |d| d[0] == 'postal_code_format' }
 
       response = URI.open("https://chromium-i18n.appspot.com/ssl-address/data/#{country_code}").read
-      json = JSON.parse(response) rescue {}
+      json = begin
+        JSON.parse(response)
+      rescue StandardError
+        {}
+      end
       puts ' - Returned empty data. Skipping ' and next if json.empty?
 
       postal_code = ['postal_code', !json['zip'].nil?]

data/lib/countries/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Countries
-  VERSION = '5.4.0'.freeze
+  VERSION = '5.6.0'
 end

data/spec/country_spec.rb

@@ -3,7 +3,11 @@
 require 'spec_helper'
 NUM_OF_COUNTRIES = 249
 describe ISO3166::Country do
-  before { ISO3166.configuration.enable_currency_extension! }
+  before do
+    ISO3166::Data.reset
+    ISO3166.configuration.enable_currency_extension!
+  end
+
   let(:country) { ISO3166::Country.search('US') }
 
   it 'allows to create a country object from a symbol representation of the alpha2 code' do
@@ -48,11 +52,11 @@ describe ISO3166::Country do
   end
 
   it 'should return alternate names' do
-    expect(country.unofficial_names).to eq(["United States", "USA",
-                                            "Vereinigte Staaten von Amerika",
-                                            "États-Unis", "Estados Unidos",
-                                            "アメリカ合衆国", "Verenigde Staten",
-                                            "Соединенные Штаты Америки"])
+    expect(country.unofficial_names).to eq(['United States', 'USA',
+                                            'Vereinigte Staaten von Amerika',
+                                            'États-Unis', 'Estados Unidos',
+                                            'アメリカ合衆国', 'Verenigde Staten',
+                                            'Соединенные Штаты Америки'])
   end
 
   it 'should return translations' do
@@ -90,6 +94,7 @@ describe ISO3166::Country do
 
     regex = Regexp.new(country.postal_code_format)
     expect(regex).to match('12345-6789')
+    expect(regex).not_to match('12345-67890')
 
     antarctica = ISO3166::Country.search('AQ')
     expect(antarctica.postal_code_format).to be_nil
@@ -149,7 +154,7 @@ describe ISO3166::Country do
         ISO3166::Data.register(
           alpha2: 'BR2',
           iso_short_name: 'Brazil',
-          languages_official: %w(pt-BR),
+          languages_official: %w[pt-BR],
           translations: {
             'pt-BR' => 'Translation for pt-BR',
             'pt' => 'Translation for pt'
@@ -173,7 +178,7 @@ describe ISO3166::Country do
         ISO3166::Data.register(
           alpha2: 'BR2',
           iso_short_name: 'Brazil',
-          languages_official: %w(pt-BR),
+          languages_official: %w[pt-BR],
           translations: {
             'pt' => 'Translation for pt'
           }
@@ -241,7 +246,7 @@ describe ISO3166::Country do
     end
 
     it '#states should be deprecated' do
-      expect {country.states}.to output.to_stderr
+      expect { country.states }.to output.to_stderr
     end
 
     it 'should be a subdivision object' do
@@ -262,54 +267,54 @@ describe ISO3166::Country do
   end
 
   describe 'subdivision_types' do
-    it "should return an array of subdivision types" do
+    it 'should return an array of subdivision types' do
       expect(country.subdivision_types).to contain_exactly('district', 'state', 'outlying_area')
     end
 
-    it "should return an array of subdivision types even if there is only a single type" do
+    it 'should return an array of subdivision types even if there is only a single type' do
       expect(ISO3166::Country['LI'].subdivision_types).to contain_exactly('commune')
     end
 
-    it "should return an empty array if country has no subdivisions" do
+    it 'should return an empty array if country has no subdivisions' do
       expect(ISO3166::Country['AS'].subdivisions?).to be_falsey
       expect(ISO3166::Country['AS'].subdivision_types).to eq([])
     end
   end
 
   describe 'subdivisions_of_types' do
-    it "given a single type, should return an array of subdivisions that match the type" do
+    it 'given a single type, should return an array of subdivisions that match the type' do
       us_states = country.subdivisions_of_types(%w[state])
       expect(us_states.size).to eq(50)
       dc = country.subdivisions_of_types(%w[district])
       expect(dc.size).to eq(1)
     end
 
-    it "given multiple types, should return an array of subdivisions matching the types" do
+    it 'given multiple types, should return an array of subdivisions matching the types' do
       us_states_plus_dc = country.subdivisions_of_types(%w[state district])
       expect(us_states_plus_dc.size).to eq(51)
     end
 
-    it "given multiple types where at least one does not exist for that country, should work without issue" do
+    it 'given multiple types where at least one does not exist for that country, should work without issue' do
       us_states_plus_dc = country.subdivisions_of_types(%w[state district governorate])
       expect(us_states_plus_dc.size).to eq(51)
     end
 
-    it "given only types that do not exist for that country, should return an empty collection" do
+    it 'given only types that do not exist for that country, should return an empty collection' do
       should_be_empty = ISO3166::Country['PT'].subdivisions_of_types(%w[state county])
       expect(should_be_empty).to be_empty
     end
   end
 
   describe 'humanized_subdivision_types' do
-    it "should return an array of humanized subdivision types" do
+    it 'should return an array of humanized subdivision types' do
       expect(country.humanized_subdivision_types).to contain_exactly('District', 'State', 'Outlying area')
     end
 
-    it "should return an array of subdivision types even if there is only a single type" do
+    it 'should return an array of subdivision types even if there is only a single type' do
       expect(ISO3166::Country['LI'].humanized_subdivision_types).to contain_exactly('Commune')
     end
 
-    it "should return an empty array if country has no subdivisions" do
+    it 'should return an empty array if country has no subdivisions' do
       expect(ISO3166::Country['AS'].subdivisions?).to be_falsey
       expect(ISO3166::Country['AS'].humanized_subdivision_types).to eq([])
     end
@@ -878,7 +883,12 @@ describe ISO3166::Country do
     context 'regression test for #388/#746/#776' do
       before do
         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
       end
 
@@ -1071,6 +1081,24 @@ describe ISO3166::Country do
     end
   end
 
+  describe 'gdpr_compliant?' do
+    let(:united_kigndom) { ISO3166::Country.search('GB') }
+    let(:france) { ISO3166::Country.search('FR') }
+    let(:mexico) { ISO3166::Country.search('MX') }
+
+    it 'should return false for countries without eea_member flag' do
+      expect(mexico.gdpr_compliant?).to be_falsey
+    end
+
+    it 'should return true for countries with eea_member flag set to true' do
+      expect(france.gdpr_compliant?).to be_truthy
+    end
+
+    it 'should return true for UK' do
+      expect(united_kigndom.gdpr_compliant?).to be_truthy
+    end
+  end
+
   describe 'in_esm?' do
     let(:netherlands) { ISO3166::Country.search('NL') }
     let(:switzerland) { ISO3166::Country.search('CH') }
@@ -1214,13 +1242,82 @@ describe ISO3166::Country do
       expect(subject.last).to be_empty
     end
 
-    context "when asking for alpha2, alpha3 and iso_short_name" do
-      let(:args) { [:alpha2, :alpha3, :iso_short_name] }
+    context 'when asking for alpha2, alpha3 and iso_short_name' do
+      let(:args) { %i[alpha2 alpha3 iso_short_name] }
 
       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
+
+    context 'with invalid attributes' do
+      let(:args) { %i[alpha2 bad_attribute] }
+
+      it 'should raise an error' do
+        expect { subject }.to(
+          raise_error(KeyError, 'key not found: "bad_attribute"')
+        )
+      end
+    end
+  end
+
+  describe 'find_subdivision_by_name' do
+    let(:italy) { ISO3166::Country.new('IT') }
+    let(:napoli) { italy.subdivisions['NA'] }
+
+    before do
+      ISO3166.configuration.locales = %i[pt]
+    end
+
+    it 'should find a subdivision using the official name' do
+      expect(ISO3166::Country.new('IT').find_subdivision_by_name('Napoli')).to eq napoli
+    end
+
+    it 'should find a subdivision using the code' do
+      expect(ISO3166::Country.new('IT').find_subdivision_by_name('NA')).to eq napoli
+    end
+
+    it 'should find a subdivision using a translated name' do
+      expect(ISO3166::Country.new('IT').find_subdivision_by_name('Nápoles')).to eq napoli
+    end
+  end
+
+  describe 'collect_countries_with' do
+    let(:italy) { ISO3166::Country.new('IT') }
+    let(:vatican) { ISO3166::Country.new('VA') }
+    let(:san_marino) { ISO3166::Country.new('SM') }
+    let(:switzerland) { ISO3166::Country.new('CH') }
+    let(:seychelles) { ISO3166::Country.new('SC') }
+
+    it 'defaults to querying alpha2 and returning the countries' do
+      expect(ISO3166::Country.collect_countries_with('IT')).to eq [italy]
+    end
+
+    it 'allows querying by other attributes' do
+      expect(ISO3166::Country.collect_countries_with('🇸🇨', :emoji_flag)).to eq [seychelles]
+      expect(ISO3166::Country.collect_countries_with('it',
+                                                     :languages_spoken)).to eq [switzerland, italy, san_marino, vatican]
+    end
+
+    it 'allows applying a method to the result set' do
+      expect(ISO3166::Country.collect_countries_with('Caribbean', :subregion,
+                                                     :languages_spoken).flatten.uniq).to eq %w[en nl fr es ht]
+    end
+  end
+
+  describe 'collect_likely_countries_by_subdivision_name' do
+    let(:costa_rica) { ISO3166::Country.new('CR') }
+    let(:uruguay) { ISO3166::Country.new('UY') }
+
+    it 'defaults to returning the countries' do
+      expect(ISO3166::Country.collect_likely_countries_by_subdivision_name('San José')).to eq [costa_rica, uruguay]
+    end
+
+    it 'allows applying a method to the result set' do
+      expect(ISO3166::Country.collect_likely_countries_by_subdivision_name('San José',
+                                                                           :iso_short_name)).to eq ['Costa Rica',
+                                                                                                    'Uruguay']
+    end
   end
 end