countries 1.2.2 → 4.2.3

data/spec/country_spec.rb

@@ -1,8 +1,9 @@
 # encoding: utf-8
 
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
+require 'spec_helper'
+NUM_OF_COUNTRIES = 249
 describe ISO3166::Country do
+  before { ISO3166.configuration.enable_currency_extension! }
   let(:country) { ISO3166::Country.search('US') }
 
   it 'allows to create a country object from a symbol representation of the alpha2 code' do
@@ -15,6 +16,21 @@ describe ISO3166::Country do
     expect(country.data).not_to be_nil
   end
 
+  it 'allows countries to be compared' do
+    c1 = ISO3166::Country.new('US')
+    c2 = ISO3166::Country.new('US')
+    c3 = ISO3166::Country.new('AU')
+    expect(c1).to eq(c2)
+    expect(c1).to_not eq(nil)
+    expect(c1.hash).to eq(c2.hash)
+    expect(c3.hash).to_not eq(c2.hash)
+
+    hsh = {}
+    hsh[c1] = 1
+    hsh[c2] = 2
+    expect(hsh.keys.count).to eq 1
+  end
+
   it 'should return 3166 number' do
     expect(country.number).to eq('840')
   end
@@ -27,12 +43,12 @@ describe ISO3166::Country do
     expect(country.alpha3).to eq('USA')
   end
 
-  it 'should return 3166 name' do
-    expect(country.name).to eq('United States')
+  it 'should return 3166 iso_short_name' do
+    expect(country.iso_short_name).to eq('United States of America')
   end
 
   it 'should return alternate names' do
-    expect(country.names).to eq(['United States of America', '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
@@ -41,19 +57,15 @@ describe ISO3166::Country do
   end
 
   it 'should return latitude' do
-    expect(country.latitude).to eq('38 00 N')
+    expect(country.latitude).to eq(37.09024)
   end
 
   it 'should return longitude' do
-    expect(country.longitude).to eq('97 00 W')
+    expect(country.longitude).to eq(-95.712891)
   end
 
-  it 'should return the decimal Latitude' do
-    expect(country.latitude_dec).to eq('39.44325637817383')
-  end
-
-  it 'should return the decimal Longitude' do
-    expect(country.longitude_dec).to eq('-98.95733642578125')
+  it 'should return bounds' do
+    expect(country.bounds['northeast']['lat']).to eq(71.3577635769)
   end
 
   it 'should return continent' do
@@ -65,8 +77,18 @@ describe ISO3166::Country do
   end
 
   it 'knows when a country does not require postal codes' do
-    ireland = ISO3166::Country.search('IE')
-    expect(ireland.postal_code).to eq(false)
+    antarctica = ISO3166::Country.search('AQ')
+    expect(antarctica.postal_code).to eq(false)
+  end
+
+  it 'knows about the country postal code format' do
+    expect(country.postal_code_format).to_not be_nil
+
+    regex = Regexp.new(country.postal_code_format)
+    expect(regex).to match("12345-6789")
+
+    antarctica = ISO3166::Country.search('AQ')
+    expect(antarctica.postal_code_format).to be_nil
   end
 
   it 'should return region' do
@@ -109,6 +131,55 @@ describe ISO3166::Country do
     end
   end
 
+  context 'with Brazil' do
+    context 'with pt-BR translation' do
+      before do
+        ISO3166::Data.register(
+          alpha2: 'BR2',
+          iso_short_name: 'Brazil',
+          languages_official: %w(pt-BR),
+          translations: {
+            'pt-BR' => 'Translation for pt-BR',
+            'pt' => 'Translation for pt'
+          }
+        )
+      end
+
+      let(:country) { ISO3166::Country.search('BR2') }
+
+      it 'should return its local name based on its language' do
+        expect(country.local_names).to match_array(['Translation for pt-BR'])
+      end
+
+      after do
+        ISO3166::Data.unregister('BR2')
+      end
+    end
+
+    context 'without pt-BR translation' do
+      before do
+        ISO3166::Data.register(
+          alpha2: 'BR2',
+          iso_short_name: 'Brazil',
+          languages_official: %w(pt-BR),
+          translations: {
+            'pt' => 'Translation for pt'
+          }
+        )
+      end
+
+      let(:country) { ISO3166::Country.search('BR2') }
+
+      it 'should return its local name based on its language' do
+        expect(country.local_names).to match_array(['Translation for pt'])
+      end
+
+      after do
+        ISO3166::Data.unregister('BR2')
+      end
+    end
+  end
+
   it 'should return ioc code' do
     expect(country.ioc).to eq('USA')
   end
@@ -148,16 +219,53 @@ describe ISO3166::Country do
   end
 
   describe 'subdivisions' do
+    let(:virginia) { country.states['VA'] }
     it 'should return an empty hash for a country with no ISO3166-2' do
       expect(ISO3166::Country.search('VA').subdivisions.size).to eq(0)
     end
 
     it 'should return a hash with all sub divisions' do
-      expect(country.subdivisions.size).to eq(60)
+      expect(country.subdivisions.size).to eq(57)
     end
 
     it 'should be available through states' do
-      expect(country.states.size).to eq(60)
+      expect(country.states.size).to eq(57)
+    end
+
+    it 'should be a subdivision object' do
+      expect(virginia).to be_a(ISO3166::Subdivision)
+    end
+
+    it 'should have a name' do
+      expect(virginia.name).to eq('Virginia')
+    end
+
+    it 'should have a code' do
+      expect(virginia.code).to eq('VA')
+    end
+
+    it 'should behave like a hash' do
+      expect(virginia['name']).to eq('Virginia')
+    end
+  end
+
+  describe 'subdivision_names_with_codes' do
+    it 'should return an alphabetized list of all subdivisions names with codes' do
+      subdivisions = ISO3166::Country.search('EG').subdivision_names_with_codes
+      expect(subdivisions).to be_an(Array)
+      expect(subdivisions.first[0]).to be_a(String)
+      expect(subdivisions.size).to eq(27)
+      expect(subdivisions.first[0]).to eq('Alexandria')
+    end
+
+    it 'should return an alphabetized list of subdivision names translated to current locale with codes' do
+      ISO3166.configuration.locales = [:es, :de, :en]
+
+      subdivisions = ISO3166::Country.search('EG').subdivision_names_with_codes(:es)
+      expect(subdivisions).to be_an(Array)
+      expect(subdivisions.first[0]).to be_a(String)
+      expect(subdivisions.size).to eq(27)
+      expect(subdivisions.first[0]).to eq('Al Iskandariyah')
     end
   end
 
@@ -203,15 +311,15 @@ describe ISO3166::Country do
       countries = ISO3166::Country.all
       expect(countries).to be_an(Array)
       expect(countries.first).to be_an(ISO3166::Country)
-      expect(countries.size).to eq(250)
+      expect(countries.size).to eq(NUM_OF_COUNTRIES)
     end
 
     it 'should allow to customize each country representation passing a block to the method' do
-      countries = ISO3166::Country.all { |country, data| [data['name'], country, data['country_code']] }
+      countries = ISO3166::Country.all { |country, data| [data['iso_short_name'], country, data['country_code']] }
       expect(countries).to be_an(Array)
       expect(countries.first).to be_an(Array)
       expect(countries.first.size).to eq(3)
-      expect(countries.size).to eq(250)
+      expect(countries.size).to eq(NUM_OF_COUNTRIES)
     end
   end
 
@@ -220,18 +328,38 @@ 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(249)
+      expect(countries.size).to eq(NUM_OF_COUNTRIES)
     end
 
     it 'should return an alphabetized list of all country names in English if no locale is passed' 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.size).to eq(249)
+      expect(countries.first).to eq('Aruba')
+      expect(countries.size).to eq(NUM_OF_COUNTRIES)
+    end
+
+    context 'with custom countries' do
+      before do
+        ISO3166::Data.register(
+          alpha2: 'XX',
+          iso_short_name: 'Custom Country',
+          translations: { 'en' => 'Custom Country' }
+        )
+      end
+
+      it 'should include custom registered countries' do
+        custom_country = ISO3166::Country.find_by_alpha2('XX')[1]
+        countries = ISO3166::Country.all_translated
+        expect(countries).to include(custom_country['iso_short_name'])
+      end
+
+      after do
+        ISO3166::Data.unregister('XX')
+      end
     end
   end
 
@@ -242,12 +370,44 @@ describe ISO3166::Country do
       expect(countries).to be_an(Array)
       expect(countries.first[0]).to be_a(String)
       expect(countries.first[0]).to eq('Afghanistan')
-      expect(countries.size).to eq(250)
+      expect(countries.size).to eq(NUM_OF_COUNTRIES)
+      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]
+
+      countries = ISO3166::Country.all_names_with_codes(:es)
+      expect(countries).to be_an(Array)
+      expect(countries.first[0]).to be_a(String)
+      expect(countries.first[0]).to eq('Afganistán')
+      expect(countries.size).to eq(NUM_OF_COUNTRIES)
+    end
+  end
+
+  describe 'all_names_with_codes_without_active_support' do
+    it 'should return an alphabetized list of all country names with ISOCODE alpha2' do
+      countries = ISO3166::Country.all_names_with_codes
+      expect(countries).to be_an(Array)
+      expect(countries.first[0]).to be_a(String)
+      expect(countries.first[0]).to eq('Afghanistan')
+      expect(countries.size).to eq(NUM_OF_COUNTRIES)
+    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]
+
+      countries = ISO3166::Country.all_names_with_codes(:es)
+      expect(countries).to be_an(Array)
+      expect(countries.first[0]).to be_a(String)
+      expect(countries.first[0]).to eq('Afganistán')
+      expect(countries.size).to eq(NUM_OF_COUNTRIES)
     end
   end
 
   describe 'translation' do
     it 'should return the localized name for a country to the selected locale' do
+      ISO3166.configuration.locales = [:es, :de, :en]
       countries = ISO3166::Country.new(:de).translation('de')
       expect(countries).to be_an(String)
       expect(countries).to eq('Deutschland')
@@ -263,25 +423,42 @@ 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(249)
+      expect(countries.size).to eq(NUM_OF_COUNTRIES)
     end
 
     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.size).to eq(249)
+      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
 
@@ -311,48 +488,18 @@ describe ISO3166::Country do
 
   describe 'currency' do
     it 'should return an instance of Currency' do
-      expect(country.currency).to be_a(ISO4217::Currency)
+      expect(country.currency).to be_a(Money::Currency)
     end
 
     it 'should allow access to symbol' do
-      expect(country.currency[:symbol]).to eq('$')
-    end
-  end
-
-  describe 'Country class' do
-    context "when loaded via 'iso3166' existance" do
-      subject { defined?(Country) }
-
-      it { is_expected.to be_falsey }
-    end
-
-    context "when loaded via 'global'" do
-      before { require 'countries/global' }
-
-      describe 'existance' do
-        subject { defined?(Country) }
-
-        it { is_expected.to be_truthy }
-      end
-
-      describe 'superclass' do
-        subject { Country.superclass }
-
-        it { is_expected.to eq(ISO3166::Country) }
-      end
-
-      describe 'to_s' do
-        it 'should return the country name' do
-          expect(Country.new('GB').to_s).to eq('United Kingdom')
-        end
-      end
+      expect(country.currency.symbol).to eq('$')
     end
   end
 
   describe 'codes' do
     it 'returns a hash with the data of the country' do
       expect(ISO3166::Country.codes).to be_a Array
-      expect(ISO3166::Country.codes.size).to eq(250)
+      expect(ISO3166::Country.codes.size).to eq(NUM_OF_COUNTRIES)
     end
   end
 
@@ -394,29 +541,106 @@ describe ISO3166::Country do
     end
 
     it 'also performs searches with regexps and forces it to ignore case' do
-      spain_data = ISO3166::Country.find_all_by(:names, /Españ/)
+      spain_data = ISO3166::Country.find_all_by(:unofficial_names, /Españ/)
       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(:iso_short_name, lookup)
+        end
+      end
+      expect(Time.now - start).to be < 1
+    end
   end
 
   describe 'hash finder methods' do
-    context "when search name in 'name'" do
-      subject { ISO3166::Country.find_by_name('Poland') }
+    context "when search name in 'iso_short_name'" do
+      subject { ISO3166::Country.find_by_iso_short_name('Poland') }
+      it 'should return' do
+        expect(subject.first).to eq('PL')
+      end
+    end
+
+    context "when search lowercase name in 'iso_short_name'" do
+      subject { ISO3166::Country.find_by_iso_short_name('poland') }
       it 'should return' do
         expect(subject.first).to eq('PL')
       end
     end
 
-    context "when search lowercase name in 'name'" do
-      subject { ISO3166::Country.find_by_name('poland') }
+    context "when search name with comma in 'iso_short_name'" do
+      subject { ISO3166::Country.find_by_iso_short_name(country_name) }
+
+      context 'with Republic of Korea' do
+        let(:country_name) { 'Korea, Republic of' }
+        it 'should return' do
+          expect(subject.first).to eq('KR')
+        end
+      end
+
+      context 'with Bolivia' do
+        let(:country_name) { 'Bolivia, Plurinational State of' }
+        it 'should return' do
+          expect(subject.first).to eq('BO')
+        end
+      end
+
+      context 'with Bonaire' do
+        let(:country_name) { 'Bonaire, Sint Eustatius and Saba' }
+        it 'should return' do
+          expect(subject.first).to eq('BQ')
+        end
+      end
+    end
+
+    context 'when search lowercase multibyte name found' do
+      subject { ISO3166::Country.find_country_by_unofficial_names('россия') }
+
+      it 'should be a country instance' do
+        expect(subject).to be_a(ISO3166::Country)
+        expect(subject.alpha2).to eq('RU')
+      end
+    end
+
+    context 'when search lowercase multibyte name found' do
+      subject { ISO3166::Country.find_country_by_unofficial_names(/россия/) }
+
+      it 'should be a country instance' do
+        expect(subject).to be_a(ISO3166::Country)
+        expect(subject.alpha2).to eq('RU')
+      end
+    end
+
+    context 'when accents are not used' do
+      subject { ISO3166::Country.find_country_by_unofficial_names('emirats Arabes Unis') }
+
+      it 'should be a country instance' do
+        expect(subject).to be_a(ISO3166::Country)
+        expect(subject.alpha2).to eq('AE')
+      end
+    end
+
+    context "when search name in 'unofficial_names'" do
+      subject { ISO3166::Country.find_by_unofficial_names('Polonia') }
       it 'should return' do
         expect(subject.first).to eq('PL')
       end
     end
 
-    context "when search name in 'names'" do
-      subject { ISO3166::Country.find_by_name('Polonia') }
+    context "when search name in 'translated_names'" do
+      before do
+        ISO3166.configure do |config|
+          config.locales = [:bs]
+        end
+      end
+      subject { ISO3166::Country.find_by_translated_names('Poljska') }
       it 'should return' do
         expect(subject.first).to eq('PL')
       end
@@ -449,7 +673,7 @@ describe ISO3166::Country do
 
   describe 'country finder methods' do
     context 'when search name found' do
-      let(:uk) { ISO3166::Country.find_country_by_name('United Kingdom') }
+      let(:uk) { ISO3166::Country.find_country_by_unofficial_names('United Kingdom') }
 
       it 'should be a country instance' do
         expect(uk).to be_a(ISO3166::Country)
@@ -458,7 +682,7 @@ describe ISO3166::Country do
     end
 
     context 'when search lowercase name found' do
-      let(:uk) { ISO3166::Country.find_country_by_name('united kingdom') }
+      let(:uk) { ISO3166::Country.find_country_by_unofficial_names('united kingdom') }
 
       it 'should be a country instance' do
         expect(uk).to be_a(ISO3166::Country)
@@ -466,7 +690,21 @@ describe ISO3166::Country do
       end
     end
 
+    context 'when the search term contains comma' do
+      let(:korea) { ISO3166::Country.find_country_by_unofficial_names('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_translated_names('Velika Britanija') }
 
       it 'should be a country instance' do
@@ -475,8 +713,24 @@ describe ISO3166::Country do
       end
     end
 
+    context 'regression test for #388' do
+      let(:no_country) { ISO3166::Country.find_country_by_translated_names(nil) }
+
+      it 'should be a country instance' do
+        expect(no_country).to_not be_a(ISO3166::Country)
+        expect(no_country).to eq nil
+      end
+    end
+
+    context 'when attempting to search by translations hash' do
+      let(:uk) { ISO3166::Country.find_country_by_translations({}) }
+
+      it 'should be a country instance' do
+        expect { uk }.to raise_error(RuntimeError)
+      end
+    end
     context 'when search name not found' do
-      let(:bogus) { ISO3166::Country.find_country_by_name('Does not exist') }
+      let(:bogus) { ISO3166::Country.find_country_by_unofficial_names('Does not exist') }
 
       it 'should be a country instance' do
         expect(bogus).to eq(nil)
@@ -485,7 +739,7 @@ describe ISO3166::Country do
 
     # Spot checks #243
     context 'when search name not found' do
-      let(:belgium) { ISO3166::Country.find_country_by_name('Belgium') }
+      let(:belgium) { ISO3166::Country.find_country_by_unofficial_names('Belgium') }
 
       it 'should be a country instance' do
         expect(belgium.alpha2).to eq('BE')
@@ -494,7 +748,7 @@ describe ISO3166::Country do
 
     # Spot checks #240
     context 'when search name not found' do
-      let(:canada) { ISO3166::Country.find_country_by_name('Canada') }
+      let(:canada) { ISO3166::Country.find_country_by_unofficial_names('Canada') }
 
       it 'should be a country instance' do
         expect(canada.alpha2).to eq('CA')
@@ -503,7 +757,7 @@ describe ISO3166::Country do
 
     # Spot checks #241
     context 'when search name not found' do
-      let(:israel) { ISO3166::Country.find_country_by_name('Israel') }
+      let(:israel) { ISO3166::Country.find_country_by_unofficial_names('Israel') }
 
       it 'should be a country instance' do
         expect(israel.alpha2).to eq('IL')
@@ -512,7 +766,7 @@ describe ISO3166::Country do
 
     # Spot checks #241
     context 'when search name not found' do
-      let(:israel) { ISO3166::Country.find_by_name('Israel') }
+      let(:israel) { ISO3166::Country.find_by_iso_short_name('Israel') }
 
       it 'should be a country instance' do
         expect(israel[0]).to eq('IL')
@@ -521,7 +775,7 @@ describe ISO3166::Country do
 
     # Spot checks #241
     context 'when search name not found' do
-      let(:israel) { ISO3166::Country.find_all_by(:name, 'Israel') }
+      let(:israel) { ISO3166::Country.find_all_by(:iso_short_name, 'Israel') }
 
       it 'should be a country instance' do
         expect(israel.size).to eq(1)
@@ -554,10 +808,49 @@ describe ISO3166::Country do
     end
   end
 
+  describe 'finder methods respond_to_missing?' do
+    subject { ISO3166::Country.respond_to?(method_name) }
+    describe 'find_all_by' do
+      context 'find by a valid Country attribute' do
+        let(:method_name) { :find_all_by_currency }
+        it { is_expected.to be true }
+      end
+
+      context 'find by an invalid attribute' do
+        let(:method_name) { :find_all_by_invalid }
+        it { is_expected.to be false }
+      end
+    end
+
+    describe 'hash finder methods' do
+      context 'find by a valid Country attribute' do
+        let(:method_name) { :find_by_iso_short_name }
+        it { is_expected.to be true }
+      end
+
+      context 'find by an invalid attribute' do
+        let(:method_name) { :find_by_invalid }
+        it { is_expected.to be false }
+      end
+    end
+
+    describe 'country finder methods' do
+      context 'find country by a valid Country attribute' do
+        let(:method_name) { :find_country_by_alpha3 }
+        it { is_expected.to be true }
+      end
+
+      context 'find by an invalid attribute' do
+        let(:method_name) { :find_country_by_invalid }
+        it { is_expected.to be false }
+      end
+    end
+  end
+
   describe 'names in Data' do
     it 'should be unique (to allow .find_by_name work properly)' do
-      names = ISO3166::Country::Setup.data.map do |_k, v|
-        [v['name'], v['names']].flatten.uniq
+      names = ISO3166::Data.cache.map do |_k, v|
+        [v['iso_short_name'], v['unofficial_names']].flatten.uniq
       end.flatten
 
       expect(names.size).to eq(names.uniq.size)
@@ -568,7 +861,7 @@ describe ISO3166::Country do
     let(:norway) { ISO3166::Country.search('NO') }
 
     it 'should have a currency' do
-      expect(norway.currency).to be_a(ISO4217::Currency)
+      expect(norway.currency).to be_a(Money::Currency)
     end
   end
 
@@ -576,7 +869,7 @@ describe ISO3166::Country do
     let(:guernsey) { ISO3166::Country.search('GG') }
 
     it 'should have a currency' do
-      expect(guernsey.currency.code).to eq('GBP')
+      expect(guernsey.currency.iso_code).to eq('GBP')
     end
   end
 
@@ -600,19 +893,48 @@ describe ISO3166::Country do
     end
   end
 
+  describe 'in_eea?' do
+    let(:netherlands) { ISO3166::Country.search('NL') }
+
+    it 'should return false for countries without eea_member flag' do
+      expect(country.in_eea?).to be_falsey
+    end
+
+    it 'should return true for countries with eea_member flag set to true' do
+      expect(netherlands.in_eea?).to be_truthy
+    end
+  end
+
+  describe 'in_esm?' do
+    let(:netherlands) { ISO3166::Country.search('NL') }
+    let(:switzerland) { ISO3166::Country.search('CH') }
+
+    it 'should return false for countries without esm_member or eea_member flag' do
+      expect(country.in_esm?).to be_falsey
+    end
+
+    it 'should return true for countries with eea_member flag set to true' do
+      expect(netherlands.in_esm?).to be_truthy
+    end
+
+    it 'should return true for countries with esm_member flag set to true' do
+      expect(switzerland.in_esm?).to be_truthy
+    end
+  end
+
   describe 'gec' do
     it 'should return the country\'s GEC code' do
       expect(ISO3166::Country.new('NA').gec).to eql 'WA'
     end
 
     it 'should return nil if the country does not have a GEC code' do
-      expect(ISO3166::Country.new('AN').gec).to eql nil
+      expect(ISO3166::Country.new('UM').gec).to eql nil
     end
   end
 
   describe 'to_s' do
-    it 'should return the country name' do
-      expect(ISO3166::Country.new('GB').to_s).to eq('United Kingdom')
+    it 'should return the country iso_short_name' do
+      expect(ISO3166::Country.new('GB').to_s).to eq('United Kingdom of Great Britain and Northern Ireland')
     end
   end
 
@@ -646,7 +968,71 @@ describe ISO3166::Country do
     it 'should return country if not convertable input given' do
       expect do
         ISO3166::Country(42)
-      end.to raise_error(TypeError, "can't convert Fixnum into ISO3166::Country")
+      end.to raise_error(TypeError, /can't convert ([A-z]+) into ISO3166::Country/)
+    end
+  end
+
+  describe 'Added country names to search by' do
+    it 'should return country code for Democratic Republic of the Congo' do
+      expect(ISO3166::Country.find_country_by_unofficial_names('Democratic Republic of the Congo').alpha2).to eq 'CD'
+    end
+    it 'should return country code for Ivory Coast' do
+      expect(ISO3166::Country.find_country_by_unofficial_names('Ivory Coast').alpha2).to eq 'CI'
+    end
+    it 'should return Pakistan code for Guinea Bissau' do
+      expect(ISO3166::Country.find_country_by_unofficial_names('Guinea Bissau').alpha2).to eq 'GW'
+    end
+    it 'should return Pakistan code for St Kitts and Nevis' do
+      expect(ISO3166::Country.find_country_by_unofficial_names('St Kitts and Nevis').alpha2).to eq 'KN'
+    end
+    it 'should return Pakistan code for St Lucia' do
+      expect(ISO3166::Country.find_country_by_unofficial_names('St Lucia').alpha2).to eq 'LC'
+      expect(ISO3166::Country.find_country_by_unofficial_names('St. Lucia').alpha2).to eq 'LC'
+    end
+    it 'should return Pakistan code for Turks and Caicos' do
+      expect(ISO3166::Country.find_country_by_unofficial_names('Turks and Caicos').alpha2).to eq 'TC'
+    end
+    it 'should return Pakistan code for St Vincent Grenadines' do
+      expect(ISO3166::Country.find_country_by_unofficial_names('St Vincent Grenadines').alpha2).to eq 'VC'
+      expect(ISO3166::Country.find_country_by_unofficial_names('St. Vincent Grenadines').alpha2).to eq 'VC'
+    end
+    it 'should return country code for Palestinian Authority' do
+      expect(ISO3166::Country.find_country_by_unofficial_names('Palestinian Authority').alpha2).to eq 'PS'
+    end
+  end
+
+  describe 'Emoji' do
+    it 'has an emoji flag' do
+      expect(country.emoji_flag).to eq '🇺🇸'
+    end
+  end
+
+  describe '#un_locode' do
+    let(:countries) { ISO3166::Country.all }
+
+    it 'should have two letter un_locode for each country' do
+      expect(countries.all? { |country| !country.un_locode.nil? }).to be
+      expect(countries.all? { |country| country.un_locode.length == 2 }).to be
+    end
+  end
+
+  describe '.pluck' do
+    let(:args) { [] }
+
+    subject { ISO3166::Country.pluck(*args) }
+
+    it "returns empty arrays" do
+      expect(subject.first).to be_empty
+      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] }
+
+      it "returns the correct values" do
+        expect(subject.first).to eq(["AD", "AND", "Andorra"])
+        expect(subject.last).to eq(["ZW", "ZWE", "Zimbabwe"])
+      end
     end
   end
 end