countries 7.1.1 → 8.0.0

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

@@ -2,7 +2,8 @@
 '01':
   name: Western
   code: '01'
-  unofficial_names: Western
+  unofficial_names:
+  - Western
   geo:
     latitude: -15.9454906
     longitude: 23.3823545
@@ -62,12 +63,12 @@
     fa: استان غربی (زامبیا)
     he: מחוז המערב
     zu: Western Province, Zambiya
-  comments:
   type: province
 '02':
   name: Central
   code: '02'
-  unofficial_names: Central
+  unofficial_names:
+  - Central
   geo:
     latitude: -14.3112263
     longitude: 28.299435
@@ -125,12 +126,12 @@
     cs: Centrální provincie (Zambie)
     'no': Central
     fa: استان مرکزی، زامبیا
-  comments:
   type: province
 '03':
   name: Eastern
   code: '03'
-  unofficial_names: Eastern
+  unofficial_names:
+  - Eastern
   geo:
     latitude: -13.8056187
     longitude: 31.99280779999999
@@ -182,17 +183,17 @@
     lv: Austrumu province
     ceb: Eastern Province (lalawigan sa Zambia)
     zh: 东方省
-    ccp: "\U0001111B\U0001112A\U00011107\U00011134\U0001111F\U0001112C\U00011107\U00011134\U00011108\U0001112C"
+    ccp: "𑄛𑄪𑄇𑄴𑄟𑄬𑄇𑄴𑄈𑄬"
     'no': Eastern
     ca: Província de l’Est
     fa: استان شرقی (زامبیا)
     he: האזור המזרחי
-  comments:
   type: province
 '04':
   name: Luapula
   code: '04'
-  unofficial_names: Luapula
+  unofficial_names:
+  - Luapula
   geo:
     latitude: -11.564831
     longitude: 29.0459927
@@ -244,18 +245,18 @@
     lv: Luapalas province
     ceb: Luapula Province
     zh: 卢阿普拉省
-    ccp: "\U00011123\U0001112A\U00011120\U0001111B\U0001112A\U00011123"
+    ccp: "𑄣𑄪𑄠𑄛𑄪𑄣"
     ca: província de Luapula
     'no': Luapula
     cs: Provincie Luapula
     fa: استان لوآپولا
     hu: Luapula
-  comments:
   type: province
 '05':
   name: Northern
   code: '05'
-  unofficial_names: Northern
+  unofficial_names:
+  - Northern
   geo:
     latitude: -9.7670177
     longitude: 30.8958242
@@ -306,16 +307,16 @@
     lv: Ziemeļu province
     ceb: Northern Province
     zh: 北方省
-    ccp: "\U00011105\U0001112A\U00011116\U00011133\U00011126\U00011127\U00011122\U00011134\U0001111F\U0001112C\U00011107\U00011134\U00011108\U0001112C"
+    ccp: "𑄅𑄪𑄖𑄳𑄦𑄧𑄢𑄴𑄟𑄬𑄇𑄴𑄈𑄬"
     'no': Northern
     fa: استان شمالی (زامبیا)
     he: אזור הצפון
-  comments:
   type: province
 '06':
   name: North-Western
   code: '06'
-  unofficial_names: North-Western
+  unofficial_names:
+  - North-Western
   geo:
     latitude: -13.0050258
     longitude: 24.9042208
@@ -368,17 +369,17 @@
     ceb: North-Western Province
     zh: 西北省
     yue_Hans: 西北省
-    ccp: "\U00011105\U0001112A\U00011116\U00011133\U00011126\U00011127\U00011122\U00011134-\U0001111B\U00011127\U0001110F\U00011128\U0001111F\U00011134\U0001111F\U0001112C\U00011107\U00011134\U00011108\U0001112C"
+    ccp: "𑄅𑄪𑄖𑄳𑄦𑄧𑄢𑄴-𑄛𑄧𑄏𑄨𑄟𑄴𑄟𑄬𑄇𑄴𑄈𑄬"
     yue: 西北省
     'no': North-Western
     ca: Província del Nord-oest
     fa: استان شمال غربی (زامبیا)
-  comments:
   type: province
 '07':
   name: Southern
   code: '07'
-  unofficial_names: Southern
+  unofficial_names:
+  - Southern
   geo:
     latitude: -16.9620634
     longitude: 26.419389
@@ -431,17 +432,17 @@
     lv: Dienvidu province
     ceb: Southern Province
     zh: 南部省
-    ccp: "\U00011118\U00011127\U0001110A\U00011128\U0001111A\U00011134\U0001111F\U0001112C\U00011107\U00011134\U00011108\U0001112C"
+    ccp: "𑄘𑄧𑄊𑄨𑄚𑄴𑄟𑄬𑄇𑄴𑄈𑄬"
     'no': Southern
     ca: Província Meridional
     fa: استان جنوبی (زامبیا)
     ga: Cúige an Deiscirt
-  comments:
   type: province
 '08':
   name: Copperbelt
   code: '08'
-  unofficial_names: Copperbelt
+  unofficial_names:
+  - Copperbelt
   geo:
     latitude: -13.0570073
     longitude: 27.5495846
@@ -495,16 +496,16 @@
     lv: Koperbeltas province
     ceb: Copperbelt Province
     zh: 铜带省
-    ccp: "\U00011107\U0001112E\U0001111B\U0001112C\U00011122\U00011134\U0001111D\U0001112C\U00011123\U00011134\U00011111\U00011134"
+    ccp: "𑄇𑄮𑄛𑄬𑄢𑄴𑄝𑄬𑄣𑄴𑄑𑄴"
     ca: província de Copperbelt
     'no': Copperbelt
     he: מחוז קופרבלט
-  comments:
   type: province
 '09':
   name: Lusaka
   code: '09'
-  unofficial_names: Lusaka
+  unofficial_names:
+  - Lusaka
   geo:
     latitude: -15.416667
     longitude: 28.283333
@@ -555,24 +556,15 @@
     lv: Lusakas province
     ceb: Lusaka Province
     zh: 卢萨卡省
-    ccp: "\U00011123\U0001112A\U00011125\U00011107"
+    ccp: "𑄣𑄪𑄥𑄇"
     'no': Lusaka
     ca: Lusaka
     cy: Talaith Lusaka
     fa: استان لوساکا
-  comments:
   type: province
 '10':
   name: Muchinga
   code: '10'
-  unofficial_names:
-  geo:
-    latitude:
-    longitude:
-    min_latitude:
-    min_longitude:
-    max_latitude:
-    max_longitude:
   translations:
     ar: محافظة موتشينغا
     bn: মোসিঙ্গা প্রদেশ
@@ -611,9 +603,8 @@
     ceb: Muchinga Province
     lt: Mučingos provincija
     zh: 穆欽加省
-    ccp: "\U0001111F\U0001112A\U0001110C\U00011128\U00011101\U00011109"
+    ccp: "𑄟𑄪𑄌𑄨𑄁𑄉"
     'no': Muchinga
     cy: Talaith Muchinga
     fa: استان موچینگا
-  comments:
   type: province

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

@@ -2,7 +2,8 @@
 BU:
   name: Bulawayo
   code: BU
-  unofficial_names: Bulawayo
+  unofficial_names:
+  - Bulawayo
   geo:
     latitude: -20.1325066
     longitude: 28.626479
@@ -16,17 +17,17 @@ BU:
     ceb: Bulawayo Province
     ar: إقليم بولاوايو
     ja: ブラワヨ
-    ccp: "\U0001111D\U0001112A\U00011123\U00011124\U00011103\U0001112E"
+    ccp: "𑄝𑄪𑄣𑄤𑄃𑄮"
     be: Булавая
     cy: Talaith Bulawayo
     fr: province de Bulawayo
     zh: 布拉瓦约省
-  comments:
   type: province
 HA:
   name: Harare
   code: HA
-  unofficial_names: Harare
+  unofficial_names:
+  - Harare
   geo:
     latitude: -17.863889
     longitude: 31.029722
@@ -41,7 +42,7 @@ HA:
     ceb: Harare Province
     ar: إقليم هراري
     ja: ハラレ州
-    ccp: "\U00011126\U00011122\U00011122\U0001112C"
+    ccp: "𑄦𑄢𑄢𑄬"
     ko: 하라레주
     pt: Harare
     nb: Harare Province
@@ -53,12 +54,12 @@ HA:
     uk: Хараре
     zh: 哈拉雷省
     zu: Harare, Isifundazwe
-  comments:
   type: province
 MA:
   name: Manicaland
   code: MA
-  unofficial_names: Manicaland
+  unofficial_names:
+  - Manicaland
   geo:
     latitude: -18.9216386
     longitude: 32.174605
@@ -114,15 +115,15 @@ MA:
     lv: Manikalandes province
     ceb: Manicaland Province
     sr_Latn: Manikalend
-    ccp: "\U0001111F\U00011127\U0001111A\U00011128\U00011107\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134"
+    ccp: "𑄟𑄧𑄚𑄨𑄇𑄣𑄳𑄠𑄚𑄳𑄓𑄴"
     'no': Manicaland
     zu: Manicaland
-  comments:
   type: province
 MC:
   name: Mashonaland Central
   code: MC
-  unofficial_names: Mashonaland Central
+  unofficial_names:
+  - Mashonaland Central
   geo:
     latitude: -16.7644295
     longitude: 31.0793705
@@ -177,16 +178,15 @@ MC:
     lv: Centrālās Mašonalendas province
     ceb: Mashonaland Central Province
     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"
+    ccp: "𑄟𑄥𑄮𑄚𑄣𑄳𑄠𑄚𑄳𑄓𑄴 𑄥𑄬𑄚𑄴𑄑𑄳𑄢𑄣𑄴"
     'no': Mashonaland Central
     zu: Mashonaland Central
-  comments:
   type: province
 ME:
   name: Mashonaland East
   code: ME
-  unofficial_names: Mashonaland East
+  unofficial_names:
+  - Mashonaland East
   geo:
     latitude: -18.5871642
     longitude: 31.2626366
@@ -241,17 +241,16 @@ ME:
     lv: Austrummašonalendas province
     ceb: Mashonaland East Province
     sr_Latn: Mašonalend Istok
-    ccp: "\U0001111F\U00011125\U0001112E\U0001111A\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134
-      \U0001111B\U0001112A\U00011107\U00011134"
+    ccp: "𑄟𑄥𑄮𑄚𑄣𑄳𑄠𑄚𑄳𑄓𑄴 𑄛𑄪𑄇𑄴"
     he: משונאלנד מזרח פרובינציה
     'no': Mashonaland East
     zu: Mashonaland East
-  comments:
   type: province
 MI:
   name: Midlands
   code: MI
-  unofficial_names: Midlands
+  unofficial_names:
+  - Midlands
   geo:
     latitude: -19.0552009
     longitude: 29.6035495
@@ -306,15 +305,15 @@ MI:
     lv: Midlendsas province
     ceb: Midlands Province
     sr_Latn: Midlends
-    ccp: "\U0001111F\U00011128\U00011116\U00011134\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134\U00011125\U00011134"
+    ccp: "𑄟𑄨𑄖𑄴𑄣𑄳𑄠𑄚𑄳𑄓𑄴𑄥𑄴"
     'no': Midlands
     zu: Midlands (Isifundazwe)
-  comments:
   type: province
 MN:
   name: Matabeleland North
   code: MN
-  unofficial_names: Matabeleland North
+  unofficial_names:
+  - Matabeleland North
   geo:
     latitude: -18.5331566
     longitude: 27.5495846
@@ -370,16 +369,15 @@ MN:
     lv: Ziemeļmatabelelendas province
     ceb: Matabeleland North Province
     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"
+    ccp: "𑄟𑄑𑄝𑄨𑄣𑄨𑄣𑄳𑄠𑄚𑄳𑄓𑄴 𑄅𑄪𑄖𑄳𑄦𑄧𑄢𑄴"
     'no': Matabeleland North
     zu: Matabeleland North
-  comments:
   type: province
 MS:
   name: Matabeleland South
   code: MS
-  unofficial_names: Matabeleland South
+  unofficial_names:
+  - Matabeleland South
   geo:
     latitude: -21.052337
     longitude: 29.0459927
@@ -434,17 +432,16 @@ MS:
     lv: Dienvidmatabelelendas province
     ceb: Matabeleland South Province
     sr_Latn: Matabelelend Jug
-    ccp: "\U0001111F\U00011111\U0001111D\U00011128\U00011123\U00011128\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134
-      \U00011118\U00011127\U0001110A\U00011128\U0001111A\U00011134"
+    ccp: "𑄟𑄑𑄝𑄨𑄣𑄨𑄣𑄳𑄠𑄚𑄳𑄓𑄴 𑄘𑄧𑄊𑄨𑄚𑄴"
     'no': Matabeleland South
     hy: Հարավային Մատաբելելենդ
     zu: Matabeleland South
-  comments:
   type: province
 MV:
   name: Masvingo
   code: MV
-  unofficial_names: Masvingo
+  unofficial_names:
+  - Masvingo
   geo:
     latitude: -20.074444
     longitude: 30.83277799999999
@@ -499,16 +496,16 @@ MV:
     lv: Masvingo province
     ceb: Masvingo Province
     sr_Latn: Mašvingo
-    ccp: "\U0001111F\U0001110C\U00011134\U0001111E\U00011128\U00011101\U00011109\U0001112E"
+    ccp: "𑄟𑄌𑄴𑄞𑄨𑄁𑄉𑄮"
     'no': Masvingo
     hy: Մասվինգո
     zu: Masvingo (Isifundazwe)
-  comments:
   type: province
 MW:
   name: Mashonaland West
   code: MW
-  unofficial_names: Mashonaland West
+  unofficial_names:
+  - Mashonaland West
   geo:
     latitude: -17.4851029
     longitude: 29.7889248
@@ -563,10 +560,8 @@ MW:
     lv: Rietummašonalendas province
     ceb: Mashonaland West Province
     sr_Latn: Mašonalend Zapad
-    ccp: "\U0001111F\U00011125\U0001112E\U0001111A\U00011123\U00011133\U00011120\U0001111A\U00011133\U00011113\U00011134
-      \U0001111B\U00011127\U0001110F\U00011128\U0001111F\U00011134"
+    ccp: "𑄟𑄥𑄮𑄚𑄣𑄳𑄠𑄚𑄳𑄓𑄴 𑄛𑄧𑄏𑄨𑄟𑄴"
     'no': Mashonaland West
     he: משונלנד-מערב
     zu: Mashonaland West
-  comments:
   type: province

data/lib/countries/data/translations/countries-es.yaml

@@ -64,7 +64,7 @@ DJ: Yibuti
 DK: Dinamarca
 DM: Dominica
 DO: República Dominicana
-DZ: Algeria
+DZ: Argelia
 EC: Ecuador
 EE: Estonia
 EG: Egipto

data/lib/countries/data/translations/countries-pt_BR.yaml

@@ -200,7 +200,7 @@ SB: Ilhas Salomão
 SC: Seychelles
 SD: Sudão
 SE: Suécia
-SG: Cingapura
+SG: Singapura
 SH: Santa Helena, Ascensão e Tristão da Cunha
 SI: Eslovênia
 SJ: Svalbard e a Ilha de Jan Mayen

data/lib/countries/data.rb

@@ -14,7 +14,10 @@ module ISO3166
     @subdivisions = {}
 
     def initialize(alpha2)
-      @alpha2 = alpha2.to_s.upcase
+      alpha2 = alpha2.to_s if alpha2.is_a?(Symbol)
+      alpha2 = alpha2.upcase if alpha2.match?(/[a-z]/)
+
+      @alpha2 = alpha2
     end
 
     def call
@@ -27,8 +30,10 @@ module ISO3166
       # 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] = deep_stringify_keys(data.except('translations', :translations))
+        translations = data['translations'] || data[:translations] || {}
+        translations.transform_keys!(&:to_sym)
+        @registered_data[alpha2]['translations'] = Translations.new.merge(translations)
         @cache = cache.merge(@registered_data)
       end
 
@@ -156,7 +161,7 @@ module ISO3166
 
       def deep_stringify_keys(data)
         data.transform_keys!(&:to_s)
-        data.transform_values! { |v| v.is_a?(Hash) ? deep_stringify_keys(v) : v }
+        data.transform_values! { |value| value.is_a?(Hash) ? deep_stringify_keys(value) : value }
 
         data
       end

data/lib/countries/mongoid.rb

@@ -8,6 +8,7 @@ module ISO3166
 
     class << self
       # Convert an +ISO3166::Country+ to the data that is stored by Mongoid.
+      # :reek:NilCheck
       def mongoize(country)
         if country.is_a?(self) && !country.data.nil?
           country.alpha2
@@ -28,6 +29,7 @@ module ISO3166
 
       private
 
+      # :reek:NilCheck
       def valid_alpha2?(country)
         country.is_a?(String) && !ISO3166::Country.new(country).nil?
       end

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

@@ -26,9 +26,9 @@ module Sources
         path_listing.each do |path|
           next unless path['name'] =~ /\.xml$/
 
-          File.open(File.join(folder, path['name']), 'w') do |f|
+          File.open(File.join(folder, path['name']), 'w') do |file|
             raw_url = URI.parse(path['download_url'])
-            f.write(Net::HTTP.get_response(raw_url).body)
+            file.write(Net::HTTP.get_response(raw_url).body)
           end
         end
       end

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

@@ -10,9 +10,9 @@ module Sources
     # Updates local subdivision files with data from the Unicode CLDR repository
     class SubdivisionUpdater
       def call
-        d = Dir['./tmp/cldr/trunk/common/subdivisions/*.xml']
+        dirs = Dir['./tmp/cldr/trunk/common/subdivisions/*.xml']
         @loader = Sources::Local::CachedLoader.new(Sources::Local::Subdivision)
-        d.each { |file_path| update_locale(file_path) }
+        dirs.each { |file_path| update_locale(file_path) }
       end
 
       def update_locale(file_path)

data/lib/countries/subdivision.rb

@@ -11,8 +11,8 @@ module ISO3166
                   :type
 
     def initialize(attrs)
-      attrs.each_pair do |k, v|
-        send "#{k}=", v
+      attrs.each_pair do |key, value|
+        send "#{key}=", value
       end
     end
 
@@ -24,5 +24,10 @@ module ISO3166
     def code_with_translations
       { code => translations }
     end
+
+    def match?(subdivision_str)
+      name == subdivision_str ||
+        translations.values.include?(subdivision_str)
+    end
   end
 end

data/lib/countries/translations.rb

@@ -5,9 +5,14 @@ module ISO3166
   #
   # E.g. if a country has translations for +pt+, and the user looks up +pt-br+ fallback
   # to +pt+ to prevent from showing nil values
+  #
+  # Also allows "indifferent access" to the hash, so you can use strings or symbols
   class Translations < Hash
     def [](locale)
-      super || super(locale.to_s.sub(/-.*/, ''))
+      translations = locale.is_a?(String) ? super(locale.to_sym) : super
+      return translations if translations
+
+      super(locale.to_s.sub(/-.*/, '').to_sym)
     end
   end
 end

data/lib/countries/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Countries
-  VERSION = '7.1.1'
+  VERSION = '8.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: countries
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 8.0.0
 platform: ruby
 authors:
 - Josh Robinson
@@ -10,7 +10,7 @@ authors:
 - Pedro Moreira
 bindir: bin
 cert_chain: []
-date: 2025-02-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unaccent
@@ -33,6 +33,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -40,6 +43,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -848,14 +854,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.8
 specification_version: 4
 summary: Gives you a country object full of all sorts of useful information.
 test_files: []