countries 4.2.3 → 5.0.2

data/lib/countries/cache/locales/en.json

@@ -1 +1 @@
-{"AW":"Aruba","AF":"Afghanistan","AO":"Angola","AI":"Anguilla","AX":"Åland Islands","AL":"Albania","AD":"Andorra","AE":"United Arab Emirates","AR":"Argentina","AM":"Armenia","AS":"American Samoa","AQ":"Antarctica","TF":"French Southern Territories","AG":"Antigua and Barbuda","AU":"Australia","AT":"Austria","AZ":"Azerbaijan","BI":"Burundi","BE":"Belgium","BJ":"Benin","BQ":"Bonaire, Sint Eustatius and Saba","BF":"Burkina Faso","BD":"Bangladesh","BG":"Bulgaria","BH":"Bahrain","BS":"Bahamas","BA":"Bosnia and Herzegovina","BL":"Saint Barthélemy","BY":"Belarus","BZ":"Belize","BM":"Bermuda","BO":"Bolivia","BR":"Brazil","BB":"Barbados","BN":"Brunei Darussalam","BT":"Bhutan","BV":"Bouvet Island","BW":"Botswana","CF":"Central African Republic","CA":"Canada","CC":"Cocos (Keeling) Islands","CH":"Switzerland","CL":"Chile","CN":"China","CI":"Côte d'Ivoire","CM":"Cameroon","CD":"Congo, The Democratic Republic of the","CG":"Congo","CK":"Cook Islands","CO":"Colombia","KM":"Comoros","CV":"Cabo Verde","CR":"Costa Rica","CU":"Cuba","CW":"Curaçao","CX":"Christmas Island","KY":"Cayman Islands","CY":"Cyprus","CZ":"Czechia","DE":"Germany","DJ":"Djibouti","DM":"Dominica","DK":"Denmark","DO":"Dominican Republic","DZ":"Algeria","EC":"Ecuador","EG":"Egypt","ER":"Eritrea","EH":"Western Sahara","ES":"Spain","EE":"Estonia","ET":"Ethiopia","FI":"Finland","FJ":"Fiji","FK":"Falkland Islands (Malvinas)","FR":"France","FO":"Faroe Islands","FM":"Micronesia, Federated States of","GA":"Gabon","GB":"United Kingdom","GE":"Georgia","GG":"Guernsey","GH":"Ghana","GI":"Gibraltar","GN":"Guinea","GP":"Guadeloupe","GM":"Gambia","GW":"Guinea-Bissau","GQ":"Equatorial Guinea","GR":"Greece","GD":"Grenada","GL":"Greenland","GT":"Guatemala","GF":"French Guiana","GU":"Guam","GY":"Guyana","HK":"Hong Kong","HM":"Heard Island and McDonald Islands","HN":"Honduras","HR":"Croatia","HT":"Haiti","HU":"Hungary","ID":"Indonesia","IM":"Isle of Man","IN":"India","IO":"British Indian Ocean Territory","IE":"Ireland","IR":"Iran, Islamic Republic of","IQ":"Iraq","IS":"Iceland","IL":"Israel","IT":"Italy","JM":"Jamaica","JE":"Jersey","JO":"Jordan","JP":"Japan","KZ":"Kazakhstan","KE":"Kenya","KG":"Kyrgyzstan","KH":"Cambodia","KI":"Kiribati","KN":"Saint Kitts and Nevis","KR":"South Korea","KW":"Kuwait","LA":"Lao People's Democratic Republic","LB":"Lebanon","LR":"Liberia","LY":"Libya","LC":"Saint Lucia","LI":"Liechtenstein","LK":"Sri Lanka","LS":"Lesotho","LT":"Lithuania","LU":"Luxembourg","LV":"Latvia","MO":"Macao","MF":"Saint Martin (French part)","MA":"Morocco","MC":"Monaco","MD":"Moldova","MG":"Madagascar","MV":"Maldives","MX":"Mexico","MH":"Marshall Islands","MK":"North Macedonia","ML":"Mali","MT":"Malta","MM":"Myanmar","ME":"Montenegro","MN":"Mongolia","MP":"Northern Mariana Islands","MZ":"Mozambique","MR":"Mauritania","MS":"Montserrat","MQ":"Martinique","MU":"Mauritius","MW":"Malawi","MY":"Malaysia","YT":"Mayotte","NA":"Namibia","NC":"New Caledonia","NE":"Niger","NF":"Norfolk Island","NG":"Nigeria","NI":"Nicaragua","NU":"Niue","NL":"Netherlands","NO":"Norway","NP":"Nepal","NR":"Nauru","NZ":"New Zealand","OM":"Oman","PK":"Pakistan","PA":"Panama","PN":"Pitcairn","PE":"Peru","PH":"Philippines","PW":"Palau","PG":"Papua New Guinea","PL":"Poland","PR":"Puerto Rico","KP":"North Korea","PT":"Portugal","PY":"Paraguay","PS":"Palestine, State of","PF":"French Polynesia","QA":"Qatar","RE":"Réunion","RO":"Romania","RU":"Russian Federation","RW":"Rwanda","SA":"Saudi Arabia","SD":"Sudan","SN":"Senegal","SG":"Singapore","GS":"South Georgia and the South Sandwich Islands","SH":"Saint Helena, Ascension and Tristan da Cunha","SJ":"Svalbard and Jan Mayen","SB":"Solomon Islands","SL":"Sierra Leone","SV":"El Salvador","SM":"San Marino","SO":"Somalia","PM":"Saint Pierre and Miquelon","RS":"Serbia","SS":"South Sudan","ST":"Sao Tome and Principe","SR":"Suriname","SK":"Slovakia","SI":"Slovenia","SE":"Sweden","SZ":"Eswatini","SX":"Sint Maarten (Dutch part)","SC":"Seychelles","SY":"Syrian Arab Republic","TC":"Turks and Caicos Islands","TD":"Chad","TG":"Togo","TH":"Thailand","TJ":"Tajikistan","TK":"Tokelau","TM":"Turkmenistan","TL":"Timor-Leste","TO":"Tonga","TT":"Trinidad and Tobago","TN":"Tunisia","TR":"Turkey","TV":"Tuvalu","TW":"Taiwan","TZ":"Tanzania","UG":"Uganda","UA":"Ukraine","UM":"United States Minor Outlying Islands","UY":"Uruguay","US":"United States","UZ":"Uzbekistan","VA":"Holy See (Vatican City State)","VC":"Saint Vincent and the Grenadines","VE":"Venezuela","VG":"Virgin Islands, British","VI":"Virgin Islands, U.S.","VN":"Vietnam","VU":"Vanuatu","WF":"Wallis and Futuna","WS":"Samoa","YE":"Yemen","ZA":"South Africa","ZM":"Zambia","ZW":"Zimbabwe"}
+{"AW":"Aruba","AF":"Afghanistan","AO":"Angola","AI":"Anguilla","AX":"Åland Islands","AL":"Albania","AD":"Andorra","AE":"United Arab Emirates","AR":"Argentina","AM":"Armenia","AS":"American Samoa","AQ":"Antarctica","TF":"French Southern Territories","AG":"Antigua and Barbuda","AU":"Australia","AT":"Austria","AZ":"Azerbaijan","BI":"Burundi","BE":"Belgium","BJ":"Benin","BQ":"Bonaire, Sint Eustatius and Saba","BF":"Burkina Faso","BD":"Bangladesh","BG":"Bulgaria","BH":"Bahrain","BS":"Bahamas","BA":"Bosnia and Herzegovina","BL":"Saint Barthélemy","BY":"Belarus","BZ":"Belize","BM":"Bermuda","BO":"Bolivia","BR":"Brazil","BB":"Barbados","BN":"Brunei Darussalam","BT":"Bhutan","BV":"Bouvet Island","BW":"Botswana","CF":"Central African Republic","CA":"Canada","CC":"Cocos (Keeling) Islands","CH":"Switzerland","CL":"Chile","CN":"China","CI":"Côte d'Ivoire","CM":"Cameroon","CD":"Congo, The Democratic Republic of the","CG":"Congo","CK":"Cook Islands","CO":"Colombia","KM":"Comoros","CV":"Cabo Verde","CR":"Costa Rica","CU":"Cuba","CW":"Curaçao","CX":"Christmas Island","KY":"Cayman Islands","CY":"Cyprus","CZ":"Czechia","DE":"Germany","DJ":"Djibouti","DM":"Dominica","DK":"Denmark","DO":"Dominican Republic","DZ":"Algeria","EC":"Ecuador","EG":"Egypt","ER":"Eritrea","EH":"Western Sahara","ES":"Spain","EE":"Estonia","ET":"Ethiopia","FI":"Finland","FJ":"Fiji","FK":"Falkland Islands (Malvinas)","FR":"France","FO":"Faroe Islands","FM":"Micronesia, Federated States of","GA":"Gabon","GB":"United Kingdom","GE":"Georgia","GG":"Guernsey","GH":"Ghana","GI":"Gibraltar","GN":"Guinea","GP":"Guadeloupe","GM":"Gambia","GW":"Guinea-Bissau","GQ":"Equatorial Guinea","GR":"Greece","GD":"Grenada","GL":"Greenland","GT":"Guatemala","GF":"French Guiana","GU":"Guam","GY":"Guyana","HK":"Hong Kong","HM":"Heard Island and McDonald Islands","HN":"Honduras","HR":"Croatia","HT":"Haiti","HU":"Hungary","ID":"Indonesia","IM":"Isle of Man","IN":"India","IO":"British Indian Ocean Territory","IE":"Ireland","IR":"Iran","IQ":"Iraq","IS":"Iceland","IL":"Israel","IT":"Italy","JM":"Jamaica","JE":"Jersey","JO":"Jordan","JP":"Japan","KZ":"Kazakhstan","KE":"Kenya","KG":"Kyrgyzstan","KH":"Cambodia","KI":"Kiribati","KN":"Saint Kitts and Nevis","KR":"South Korea","KW":"Kuwait","LA":"Lao People's Democratic Republic","LB":"Lebanon","LR":"Liberia","LY":"Libya","LC":"Saint Lucia","LI":"Liechtenstein","LK":"Sri Lanka","LS":"Lesotho","LT":"Lithuania","LU":"Luxembourg","LV":"Latvia","MO":"Macao","MF":"Saint Martin (French part)","MA":"Morocco","MC":"Monaco","MD":"Moldova","MG":"Madagascar","MV":"Maldives","MX":"Mexico","MH":"Marshall Islands","MK":"North Macedonia","ML":"Mali","MT":"Malta","MM":"Myanmar","ME":"Montenegro","MN":"Mongolia","MP":"Northern Mariana Islands","MZ":"Mozambique","MR":"Mauritania","MS":"Montserrat","MQ":"Martinique","MU":"Mauritius","MW":"Malawi","MY":"Malaysia","YT":"Mayotte","NA":"Namibia","NC":"New Caledonia","NE":"Niger","NF":"Norfolk Island","NG":"Nigeria","NI":"Nicaragua","NU":"Niue","NL":"Netherlands","NO":"Norway","NP":"Nepal","NR":"Nauru","NZ":"New Zealand","OM":"Oman","PK":"Pakistan","PA":"Panama","PN":"Pitcairn","PE":"Peru","PH":"Philippines","PW":"Palau","PG":"Papua New Guinea","PL":"Poland","PR":"Puerto Rico","KP":"North Korea","PT":"Portugal","PY":"Paraguay","PS":"Palestine, State of","PF":"French Polynesia","QA":"Qatar","RE":"Réunion","RO":"Romania","RU":"Russian Federation","RW":"Rwanda","SA":"Saudi Arabia","SD":"Sudan","SN":"Senegal","SG":"Singapore","GS":"South Georgia and the South Sandwich Islands","SH":"Saint Helena, Ascension and Tristan da Cunha","SJ":"Svalbard and Jan Mayen","SB":"Solomon Islands","SL":"Sierra Leone","SV":"El Salvador","SM":"San Marino","SO":"Somalia","PM":"Saint Pierre and Miquelon","RS":"Serbia","SS":"South Sudan","ST":"Sao Tome and Principe","SR":"Suriname","SK":"Slovakia","SI":"Slovenia","SE":"Sweden","SZ":"Eswatini","SX":"Sint Maarten (Dutch part)","SC":"Seychelles","SY":"Syrian Arab Republic","TC":"Turks and Caicos Islands","TD":"Chad","TG":"Togo","TH":"Thailand","TJ":"Tajikistan","TK":"Tokelau","TM":"Turkmenistan","TL":"Timor-Leste","TO":"Tonga","TT":"Trinidad and Tobago","TN":"Tunisia","TR":"Turkey","TV":"Tuvalu","TW":"Taiwan","TZ":"Tanzania","UG":"Uganda","UA":"Ukraine","UM":"United States Minor Outlying Islands","UY":"Uruguay","US":"United States","UZ":"Uzbekistan","VA":"Holy See (Vatican City State)","VC":"Saint Vincent and the Grenadines","VE":"Venezuela","VG":"Virgin Islands, British","VI":"Virgin Islands, U.S.","VN":"Vietnam","VU":"Vanuatu","WF":"Wallis and Futuna","WS":"Samoa","YE":"Yemen","ZA":"South Africa","ZM":"Zambia","ZW":"Zimbabwe"}

data/lib/countries/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ISO3166
   class << self
     attr_writer :configuration

data/lib/countries/country/class_methods.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'sixarm_ruby_unaccent'
 
 module ISO3166
   UNSEARCHABLE_METHODS = [:translations].freeze
 
-  def self::Country(country_data_or_country)
+  def self.Country(country_data_or_country)
     case country_data_or_country
     when ISO3166::Country
       country_data_or_country
@@ -15,9 +17,6 @@ module ISO3166
   end
 
   module CountryClassMethods
-    FIND_BY_REGEX = /^find_(all_)?(country_|countries_)?by_(.+)/
-    SEARCH_TERM_FILTER_REGEX = /\(|\)|\[\]|,/
-
     def new(country_data)
       super if country_data.is_a?(Hash) || codes.include?(country_data.to_s.upcase)
     end
@@ -33,10 +32,6 @@ module ISO3166
 
     alias countries all
 
-    def all_translated(locale = 'en')
-      translations(locale).values
-    end
-
     def all_names_with_codes(locale = 'en')
       Country.all.map do |c|
         lc = (c.translation(locale) || c.iso_short_name)
@@ -50,6 +45,10 @@ module ISO3166
       end
     end
 
+    def all_translated(locale = 'en')
+      translations(locale).values
+    end
+
     def translations(locale = 'en')
       i18n_data_countries = I18nData.countries(locale.upcase)
 
@@ -62,54 +61,6 @@ module ISO3166
       i18n_data_countries.merge(custom_countries)
     end
 
-    def search(query)
-      country = new(query.to_s.upcase)
-      country && country.valid? ? country : nil
-    end
-
-    def [](query)
-      search(query)
-    end
-
-    def method_missing(method_name, *arguments)
-      matches = method_name.to_s.match(FIND_BY_REGEX)
-      return_all = matches[1]
-      super unless matches
-
-      if matches[3] == 'names'
-        if RUBY_VERSION =~ /^3\.\d\.\d/
-          warn "DEPRECATION WARNING: 'find_by_name' and 'find_*_by_name' methods are deprecated, please refer to the README file for more information on this change.", uplevel: 1, category: :deprecated
-        else
-          warn "DEPRECATION WARNING: 'find_by_name' and 'find_*_by_name' methods are deprecated, please refer to the README file for more information on this change.", uplevel: 1
-        end
-      end
-
-      countries = find_by(matches[3], arguments[0], matches[2])
-      return_all ? countries : countries.last
-    end
-
-    def respond_to_missing?(method_name, include_private = false)
-      matches = method_name.to_s.match(FIND_BY_REGEX)
-      if matches && matches[3]
-        instance_methods.include?(matches[3].to_sym)
-      else
-        super
-      end
-    end
-
-    def find_all_by(attribute, val)
-      attributes, lookup_value = parse_attributes(attribute, val)
-
-      ISO3166::Data.cache.select do |_, v|
-        country = Country.new(v)
-        attributes.any? do |attr|
-          Array(country.send(attr)).any? do |n|
-            lookup_value === cached(n) { parse_value(n) }
-          end
-        end
-      end
-    end
-
     def subdivisions(alpha2)
       @subdivisions ||= {}
       @subdivisions[alpha2] ||= create_subdivisions(subdivision_data(alpha2))
@@ -124,51 +75,14 @@ module ISO3166
 
     protected
 
-    def strip_accents(v)
-      if v.is_a?(Regexp)
-        Regexp.new(v.source.unaccent, 'i')
+    def strip_accents(string)
+      if string.is_a?(Regexp)
+        Regexp.new(string.source.unaccent, 'i')
       else
-        v.to_s.unaccent.downcase
-      end
-    end
-
-    def parse_attributes(attribute, val)
-      raise "Invalid attribute name '#{attribute}'" unless searchable_attribute?(attribute.to_sym)
-
-      attributes = Array(attribute.to_s)
-      if attribute.to_s == 'name'
-        if RUBY_VERSION =~ /^3\.\d\.\d/
-          warn "DEPRECATION WARNING: 'find_by_name' and 'find_*_by_name' methods are deprecated, please refer to the README file for more information on this change.", uplevel: 1, category: :deprecated
-        else
-          warn "DEPRECATION WARNING: 'find_by_name' and 'find_*_by_name' methods are deprecated, please refer to the README file for more information on this change.", uplevel: 1
-        end
-        # 'find_by_name' and 'find_*_by_name' will be changed for 5.0
-        # The addition of 'iso_short_name' here ensures the behaviour of 4.1 is kept for 4.2
-        attributes = %w[iso_short_name unofficial_names translated_names]
-      end
-
-      [attributes, parse_value(val)]
-    end
-
-    def searchable_attribute?(attribute)
-      searchable_attributes.include?(attribute.to_sym)
-    end
-
-    def searchable_attributes
-      instance_methods - UNSEARCHABLE_METHODS
-    end
-
-    def find_by(attribute, value, obj = nil)
-      find_all_by(attribute.downcase, value).map do |country|
-        obj.nil? ? country : new(country.last)
+        string.to_s.unaccent.downcase
       end
     end
 
-    def parse_value(value)
-      value = value.gsub(SEARCH_TERM_FILTER_REGEX, '') if value.respond_to?(:gsub)
-      strip_accents(value)
-    end
-
     def subdivision_data(alpha2)
       file = subdivision_file_path(alpha2)
       File.exist?(file) ? YAML.load_file(file) : {}
@@ -190,6 +104,7 @@ module ISO3166
     def cached(value)
       @_parsed_values_cache ||= {}
       return @_parsed_values_cache[value] if @_parsed_values_cache[value]
+
       @_parsed_values_cache[value] = yield
     end
   end

data/lib/countries/country/currency_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'money'
 
 module ISO3166

data/lib/countries/country/emoji.rb

@@ -1,5 +1,4 @@
-#!/bin/env ruby
-# encoding: utf-8
+# frozen_string_literal: true
 
 module ISO3166
   module Emoji
@@ -36,7 +35,7 @@ module ISO3166
     #
     # The emoji flag for this country, using Unicode Regional Indicator characters. e.g: "U+1F1FA U+1F1F8" for 🇺🇸
     def emoji_flag
-      alpha2.downcase.chars.map { |c| CODE_POINTS[c] }.join('')
+      alpha2.downcase.chars.map { |c| CODE_POINTS[c] }.join
     end
   end
 end

data/lib/countries/country/finder_methods.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module ISO3166
+  module CountryFinderMethods
+    FIND_BY_REGEX = /^find_(all_)?(country_|countries_)?by_(.+)/.freeze
+    SEARCH_TERM_FILTER_REGEX = /\(|\)|\[\]|,/.freeze
+
+    def search(query)
+      country = new(query.to_s.upcase)
+      country&.valid? ? country : nil
+    end
+
+    def [](query)
+      search(query)
+    end
+
+    def find_all_by(attribute, val)
+      attributes, lookup_value = parse_attributes(attribute, val)
+
+      ISO3166::Data.cache.select do |_, v|
+        country = Country.new(v)
+        attributes.any? do |attr|
+          Array(country.send(attr)).any? do |n|
+            lookup_value === cached(n) { parse_value(n) }
+          end
+        end
+      end
+    end
+
+    def method_missing(method_name, *arguments)
+      matches = method_name.to_s.match(FIND_BY_REGEX)
+      return_all = matches[1]
+      super unless matches
+
+      countries = find_by(matches[3], arguments[0], matches[2])
+      return_all ? countries : countries.last
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      matches = method_name.to_s.match(FIND_BY_REGEX)
+      if matches && matches[3]
+        instance_methods.include?(matches[3].to_sym)
+      else
+        super
+      end
+    end
+
+    protected
+
+    def find_by(attribute, value, obj = nil)
+      find_all_by(attribute.downcase, value).map do |country|
+        obj.nil? ? country : new(country.last)
+      end
+    end
+
+    def parse_attributes(attribute, val)
+      raise "Invalid attribute name '#{attribute}'" unless searchable_attribute?(attribute.to_sym)
+
+      attributes = Array(attribute.to_s)
+      if attribute.to_s == 'any_name'
+        attributes = %w[iso_long_name iso_short_name unofficial_names translated_names]
+      end
+
+      [attributes, parse_value(val)]
+    end
+
+    def parse_value(value)
+      value = value.gsub(SEARCH_TERM_FILTER_REGEX, '') if value.respond_to?(:gsub)
+      strip_accents(value)
+    end
+
+    def searchable_attribute?(attribute)
+      searchable_attributes.include?(attribute.to_sym)
+    end
+
+    def searchable_attributes
+      # Add name and names until we complete the deprecation of the finders
+      instance_methods - UNSEARCHABLE_METHODS + [:name, :names, :any_name]
+    end
+  end
+end

data/lib/countries/country.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 module ISO3166
   class Country
     extend CountryClassMethods
+    extend CountryFinderMethods
     include Emoji
     attr_reader :data
 
@@ -31,24 +34,6 @@ module ISO3166
     alias zip_format postal_code_format
     alias languages languages_official
 
-    def latitude_dec
-      if RUBY_VERSION =~ /^3\.\d\.\d/
-        warn "DEPRECATION WARNING: The Country#latitude_dec method has been deprecated and will be removed in 5.0. Please use Country#latitude instead.", uplevel: 1, category: :deprecated
-      else
-        warn "DEPRECATION WARNING: The Country#latitude_dec method has been deprecated and will be removed in 5.0. Please use Country#latitude instead.", uplevel: 1
-      end
-      latitude
-    end
-
-    def longitude_dec
-      if RUBY_VERSION =~ /^3\.\d\.\d/
-        warn "DEPRECATION WARNING: The Country#longitude_dec method has been deprecated and will be removed in 5.0. Please use Country#longitude instead.", uplevel: 1, category: :deprecated
-      else
-        warn "DEPRECATION WARNING: The Country#longitude_dec method has been deprecated and will be removed in 5.0. Please use Country#longitude instead.", uplevel: 1
-      end
-      longitude
-    end
-
     def ==(other)
       other.respond_to?(:alpha2) && other.alpha2 == alpha2
     end
@@ -136,28 +121,6 @@ module ISO3166
       @local_name ||= local_names.first
     end
 
-    # @return [String] This Country's ISO Short Name
-    # @deprecated Use {#iso_short_name} instead.
-    def name
-      if RUBY_VERSION =~ /^3\.\d\.\d/
-        warn "DEPRECATION WARNING: The Country#name method has been deprecated. Please use Country#iso_short_name instead or refer to the README file for more information on this change.", uplevel: 1, category: :deprecated
-      else
-        warn "DEPRECATION WARNING: The Country#name method has been deprecated. Please use Country#iso_short_name instead or refer to the README file for more information on this change.", uplevel: 1
-      end
-      iso_short_name
-    end
-
-    # @return [Array<String>] Array of unofficial, slang names or aliases for this Country
-    # @deprecated Use {#unofficial_names} instead.
-    def names
-      if RUBY_VERSION =~ /^3\.\d\.\d/
-        warn "DEPRECATION WARNING: The Country#names method has been deprecated. Please use Country#unofficial_names instead or refer to the README file for more information on this change.", uplevel: 1, category: :deprecated
-      else
-        warn "DEPRECATION WARNING: The Country#names method has been deprecated. Please use Country#unofficial_names instead or refer to the README file for more information on this change.", uplevel: 1
-      end
-      unofficial_names
-    end
-
     # @!attribute alpha2
     #   @return [String] the ISO3166 alpha-2 code for this Country
     #

data/lib/countries/data/countries/KN.yaml

@@ -9,7 +9,6 @@ KN:
   geo:
     latitude: 17.357822
     longitude: -62.782998
-    longitude_dec: "-62.643184661865234"
     max_latitude: 17.4205891
     max_longitude: -62.52369989999999
     min_latitude: 17.07861

data/lib/countries/data/subdivisions/MX.yaml

@@ -565,7 +565,7 @@ CMX:
 COA:
   name: Coahuila
   code:
-  unofficial_names: Coahuila
+  unofficial_names: Coahuila de Zaragoza
   geo:
     latitude: 27.058676
     longitude: -101.7068294
@@ -1170,7 +1170,7 @@ MEX:
 MIC:
   name: Michoacán
   code:
-  unofficial_names: Michoacán
+  unofficial_names: Michoacán de Ocampo
   geo:
     latitude: 19.5665192
     longitude: -101.7068294
@@ -2234,7 +2234,7 @@ TLA:
 VER:
   name: Veracruz
   code:
-  unofficial_names: Veracruz
+  unofficial_names: Veracruz de Ignacio de la Llave
   geo:
     latitude: 19.173773
     longitude: -96.1342241
@@ -2463,15 +2463,3 @@ ZAC:
     mk: Закатекас
     'no': Zacatecas
   comments:
-DIF:
-  name: Mexico City
-  code:
-  unofficial_names:
-  geo:
-    latitude: 19.3663162
-    longitude: -99.1593231
-  translations:
-    en: Mexico City
-    ccp: "\U0001111F\U0001112C\U00011107\U00011134\U00011125\U00011128\U00011107\U0001112E
-      \U00011125\U00011128\U00011111\U00011128"
-  comments:

data/lib/countries/data/subdivisions/PT.yaml

@@ -86,7 +86,7 @@
     nb: Beja
     nl: Beja
     pl: Dystrykt Beja
-    pt: Distrito de Beja
+    pt: Beja
     ro: Districtul Beja
     ru: Бежа
     si: බෙජා දිස්ත්‍රික්කය
@@ -147,7 +147,7 @@
     nb: Braga
     nl: Braga
     pl: Dystrykt Braga
-    pt: Distrito de Braga
+    pt: Braga
     ro: Districtul Braga
     ru: Брага
     si: බ්‍රගා දිස්ත්‍රික්කය
@@ -252,7 +252,7 @@
     nb: Castelo Branco
     nl: Castelo Branco
     pl: Dystrykt Castelo Branco
-    pt: Distrito de Castelo Branco
+    pt: Castelo Branco
     ro: Districtul Castelo Branco
     ru: Каштелу-Бранку
     si: කැස්ටෙලෝ බ්‍රන්කෝ දිස්ත්‍රික්කය
@@ -313,7 +313,7 @@
     nb: Coimbra
     nl: Coimbra
     pl: Dystrykt Coimbra
-    pt: Distrito de Coimbra
+    pt: Coimbra
     ro: Districtul Coimbra
     ru: Коимбра
     si: කොයිම්බ්‍රා දිස්ත්‍රික්කය
@@ -372,7 +372,7 @@
     nb: Évora
     nl: Évora
     pl: Dystrykt Évora
-    pt: Distrito de Évora
+    pt: Évora
     ro: Districtul Évora
     ru: Эвора
     si: එවොරා දිස්ත්‍රික්කය
@@ -432,7 +432,7 @@
     nb: Faro
     nl: Faro
     pl: Dystrykt Faro
-    pt: Distrito de Faro
+    pt: Faro
     ro: Districtul Faro
     ru: Фару
     si: ෆාරො දිස්ත්‍රික්කය
@@ -486,7 +486,7 @@
     nb: Guarda
     nl: Guarda
     pl: Dystrykt Guarda
-    pt: Distrito da Guarda
+    pt: Guarda
     ro: Districtul Guarda
     ru: Гуарда
     sr: Гварда
@@ -539,7 +539,7 @@
     nb: Leiria
     nl: Leiria
     pl: Dystrykt Leiria
-    pt: Distrito de Leiria
+    pt: Leiria
     ro: Districtul Leiria
     ru: Лейрия
     si: ලේයිරියා දිස්ත්‍රික්කය
@@ -597,7 +597,7 @@
     nb: Lisboa
     nl: Lissabon
     pl: Dystrykt Lizbona
-    pt: Distrito de Lisboa
+    pt: Lisboa
     ro: Districtul Lisabona
     ru: Лиссабон
     sr: Лисабон
@@ -642,7 +642,7 @@
     nb: Portalegre
     nl: Portalegre
     pl: Dystrykt Portalegre
-    pt: Distrito de Portalegre
+    pt: Portalegre
     ro: Districtul Portalegre
     ru: Порталегри
     sr: Порталегре
@@ -741,7 +741,7 @@
     nb: Santarém
     nl: Santarém
     pl: Dystrykt Santarém
-    pt: Distrito de Santarém
+    pt: Santarém
     ro: Districtul Santarém
     ru: Сантарен
     si: සැන්ටරේම් දිස්ත්‍රික්කය
@@ -802,7 +802,7 @@
     nb: Setúbal
     nl: Setúbal
     pl: Dystrykt Setúbal
-    pt: Distrito de Setúbal
+    pt: Setúbal
     ro: Districtul Setúbal
     ru: Сетубал
     si: සෙටුබල් දිස්ත්‍රික්කය
@@ -862,7 +862,7 @@
     nb: Viana do Castelo
     nl: Viana do Castelo
     pl: Dystrykt Viana do Castelo
-    pt: Distrito de Viana do Castelo
+    pt: Viana do Castelo
     ro: Districtul Viana do Castelo
     ru: Виана-ду-Каштелу
     si: වියානා ඩො කැස්ටෙලෝ දිස්ත්‍රික්කය

data/lib/countries/data/translation_corrections.yaml

@@ -21,6 +21,8 @@ ar:
   CW: "كوراساو"
 da:
   CZ: 'Tjekkiet'
+en:
+  IR: 'Iran'
 fa:
   IR: "ایران"
 he: