countries 4.0.0 → 4.1.2

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

@@ -1,7 +1,7 @@
 ---
-BU: 
+BU:
   name: Bulawayo
-  code: 
+  code:
   unofficial_names: Bulawayo
   geo:
     latitude: -20.1325066
@@ -17,10 +17,10 @@ BU:
     ar: إقليم بولاوايو
     ccp: "\U0001111D\U0001112A\U00011123\U00011124\U00011103\U0001112E"
     be: Булавая
-  comments: 
-HA: 
+  comments:
+HA:
   name: Harare
-  code: 
+  code:
   unofficial_names: Harare
   geo:
     latitude: -17.863889
@@ -41,10 +41,11 @@ HA:
     pt: Harare
     nb: Harare Province
     ne: हरारे प्रदेश
-  comments: 
-MA: 
+    'no': Harare Province
+  comments:
+MA:
   name: Manicaland
-  code: 
+  code:
   unofficial_names: Manicaland
   geo:
     latitude: -18.9216386
@@ -102,10 +103,11 @@ MA:
     ceb: Manicaland Province
     sr_Latn: Manikalend
     ccp: "\U0001111F\U00011127\U0001111A\U00011128\U00011107\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134"
-  comments: 
-MC: 
+    'no': Manicaland
+  comments:
+MC:
   name: Mashonaland Central
-  code: 
+  code:
   unofficial_names: Mashonaland Central
   geo:
     latitude: -16.7644295
@@ -163,10 +165,11 @@ MC:
     sr_Latn: Mašonalend Central
     ccp: "\U0001111F\U00011125\U0001112E\U0001111A\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134
       \U00011125\U0001112C\U0001111A\U00011134\U00011111\U00011133\U00011122\U00011123\U00011134"
-  comments: 
-ME: 
+    'no': Mashonaland Central
+  comments:
+ME:
   name: Mashonaland East
-  code: 
+  code:
   unofficial_names: Mashonaland East
   geo:
     latitude: -18.5871642
@@ -225,10 +228,11 @@ ME:
     ccp: "\U0001111F\U00011125\U0001112E\U0001111A\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134
       \U0001111B\U0001112A\U00011107\U00011134"
     he: משונאלנד מזרח פרובינציה
-  comments: 
-MI: 
+    'no': Mashonaland East
+  comments:
+MI:
   name: Midlands
-  code: 
+  code:
   unofficial_names: Midlands
   geo:
     latitude: -19.0552009
@@ -285,10 +289,11 @@ MI:
     ceb: Midlands Province
     sr_Latn: Midlends
     ccp: "\U0001111F\U00011128\U00011116\U00011134\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134\U00011125\U00011134"
-  comments: 
-MN: 
+    'no': Midlands
+  comments:
+MN:
   name: Matabeleland North
-  code: 
+  code:
   unofficial_names: Matabeleland North
   geo:
     latitude: -18.5331566
@@ -347,10 +352,11 @@ MN:
     sr_Latn: Matabelelend Sever
     ccp: "\U0001111F\U00011111\U0001111D\U00011128\U00011123\U00011128\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134
       \U00011105\U0001112A\U00011116\U00011133\U00011126\U00011127\U00011122\U00011134"
-  comments: 
-MS: 
+    'no': Matabeleland North
+  comments:
+MS:
   name: Matabeleland South
-  code: 
+  code:
   unofficial_names: Matabeleland South
   geo:
     latitude: -21.052337
@@ -408,10 +414,11 @@ MS:
     sr_Latn: Matabelelend Jug
     ccp: "\U0001111F\U00011111\U0001111D\U00011128\U00011123\U00011128\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134
       \U00011118\U00011127\U0001110A\U00011128\U0001111A\U00011134"
-  comments: 
-MV: 
+    'no': Matabeleland South
+  comments:
+MV:
   name: Masvingo
-  code: 
+  code:
   unofficial_names: Masvingo
   geo:
     latitude: -20.074444
@@ -468,10 +475,11 @@ MV:
     ceb: Masvingo Province
     sr_Latn: Mašvingo
     ccp: "\U0001111F\U0001110C\U00011134\U0001111E\U00011128\U00011101\U00011109\U0001112E"
-  comments: 
-MW: 
+    'no': Masvingo
+  comments:
+MW:
   name: Mashonaland West
-  code: 
+  code:
   unofficial_names: Mashonaland West
   geo:
     latitude: -17.4851029
@@ -529,4 +537,5 @@ MW:
     sr_Latn: Mašonalend Zapad
     ccp: "\U0001111F\U00011125\U0001112E\U0001111A\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134
       \U0001111B\U00011127\U0001110F\U00011128\U0001111F\U00011134"
-  comments: 
+    'no': Mashonaland West
+  comments:

data/lib/countries/data/translation_corrections.yaml

@@ -11,7 +11,9 @@
 #
 ---
 oc:
-  US: USA
+  US: Estats Units
+  UM: Islas perifericas Menores dels Estats Units
+  MK: Macedònia del Nòrd
 ar:
   PS: "فلسطين"
   SA: "السعودية"
@@ -32,6 +34,8 @@ fa:
 he:
   PS: "פלסטין, מדינת"
   VI: "איי הבתולה (ארה)"
+mk:
+  MK: "Северна Македонија"
 sv:
   GB: "Storbritannien"
   RU: "Ryssland"

data/lib/countries/translations.rb

@@ -6,7 +6,7 @@ module ISO3166
   # to `pt` to prevent from showing nil values
   class Translations < Hash
     def [](locale)
-      super(locale) || super(locale.sub(/-.*/, ''))
+      super(locale) || super(locale.to_s.sub(/-.*/, ''))
     end
   end
 end

data/lib/countries/version.rb

@@ -1,3 +1,3 @@
 module Countries
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.1.2'.freeze
 end

data/spec/country_spec.rb

@@ -248,6 +248,10 @@ describe ISO3166::Country 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
@@ -800,6 +804,45 @@ 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_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::Data.cache.map do |_k, v|
@@ -968,4 +1011,24 @@ describe ISO3166::Country do
       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 name" do
+      let(:args) { [:alpha2, :alpha3, :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

data/spec/data_spec.rb

@@ -116,8 +116,8 @@ describe ISO3166::Data do
       expect(subject.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'}),
-                                         'CYI' => ISO3166::Subdivision.new({name: 'New Municipality'}))
+      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
 
@@ -143,8 +143,8 @@ describe ISO3166::Data do
       data = ISO3166::Data.new('LOL').call
       expect(data['name']).to eq 'Happy Country'
       expect(subject.name).to eq 'Happy Country'
-      expect(subject.subdivisions).to eq('LOL1' => ISO3166::Subdivision.new({name: 'Happy sub1'}),
-                                         'LOL2' => ISO3166::Subdivision.new({name: 'Happy sub2'}))
+      expect(subject.subdivisions).to eq('LOL1' => ISO3166::Subdivision.new({name: 'Happy sub1', code: 'LOL1'}),
+                                         'LOL2' => ISO3166::Subdivision.new({name: 'Happy sub2', code: 'LOL2'}))
     end
 
     it 'detect a stale cache' do

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: countries
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.2
 platform: ruby
 authors:
 - Josh Robinson
 - Joe Corcoran
 - Russell Osborne
 - Pedro Moreira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n_data
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: sixarm_ruby_unaccent
   requirement: !ruby/object:Gem::Requirement
@@ -768,7 +768,7 @@ metadata:
   changelog_uri: https://github.com/countries/countries/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/countries/countries
   wiki_uri: https://github.com/countries/countries/wiki
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -776,15 +776,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Gives you a country object full of all sorts of useful information.
 test_files: