countries 6.0.0 → 7.0.0

data/lib/countries/configuration.rb

@@ -19,13 +19,17 @@ module ISO3166
   end
 
   class Configuration
-    attr_accessor :locales, :loaded_locales
+    attr_accessor :loaded_locales
+    attr_writer :locales
 
     def initialize
-      @locales = default_locales
       @loaded_locales = []
     end
 
+    def locales
+      @locales ||= default_locales
+    end
+
     # Enables the integration with the {Money}[https://github.com/RubyMoney/money] gem
     #
     # Please note that it requires you to add "money" gem to your gemfile.

data/lib/countries/country/class_methods.rb

@@ -34,7 +34,7 @@ module ISO3166
 
     def all_names_with_codes(locale = 'en')
       Country.all.map do |c|
-        lc = (c.translation(locale) || c.iso_short_name)
+        lc = c.translation(locale) || c.iso_short_name
         [lc.respond_to?('html_safe') ? lc.html_safe : lc, c.alpha2]
       end.sort
     end

data/lib/countries/country/conversion_methods.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module ISO3166
+  module ConversionMethods
+    # @param alpha2 [String] ISO 3166 alpha-2 country code.
+    # @return [String] ISO 3166 alpha-3 country code.
+    def from_alpha2_to_alpha3(alpha2)
+      find_country_by_alpha2(alpha2)&.alpha3
+    end
+
+    # @param alpha3 [String] ISO 3166 alpha-3 country code.
+    # @return [String] ISO 3166 alpha-2 country code.
+    def from_alpha3_to_alpha2(alpha3)
+      find_country_by_alpha3(alpha3)&.alpha2
+    end
+  end
+end

data/lib/countries/country/country_subdivision_methods.rb

@@ -11,8 +11,8 @@ module ISO3166
     end
 
     def subdivision_for_string?(subdivision_str)
-      !subdivisions.transform_values(&:translations)
-                   .select { |k, v| subdivision_str == k || v.values.include?(subdivision_str) }.empty?
+      subdivisions.transform_values(&:translations)
+                  .any? { |k, v| subdivision_str == k || v.values.include?(subdivision_str) }
     end
 
     #  +true+ if this Country has any Subdivisions.
@@ -61,18 +61,6 @@ module ISO3166
       subdivisions.map { |_k, v| v.translations[locale] || v.name }
     end
 
-    def states
-      if RUBY_VERSION =~ /^3\.\d\.\d/
-        warn 'DEPRECATION WARNING: The Country#states method has been deprecated and will be removed in 6.0. Please use Country#subdivisions instead.',
-             uplevel: 1, category: :deprecated
-      else
-        warn 'DEPRECATION WARNING: The Country#states method has been deprecated and will be removed in 6.0. Please use Country#subdivisions instead.',
-             uplevel: 1
-      end
-
-      subdivisions
-    end
-
     private
 
     def humanize_string(str)

data/lib/countries/country/finder_methods.rb

@@ -29,8 +29,8 @@ module ISO3166
 
     def method_missing(method_name, *arguments)
       matches = method_name.to_s.match(FIND_BY_REGEX)
-      return_all = matches[1]
       super unless matches
+      return_all = matches[1]
 
       countries = find_by(matches[3], arguments[0], matches[2])
       return_all ? countries : countries.last
@@ -72,8 +72,7 @@ module ISO3166
     end
 
     def searchable_attributes
-      # Add name and names until we complete the deprecation of the finders
-      instance_methods - UNSEARCHABLE_METHODS + %i[name names any_name]
+      instance_methods - UNSEARCHABLE_METHODS + %i[any_name]
     end
   end
 end

data/lib/countries/country.rb

@@ -3,18 +3,19 @@
 module ISO3166
   class Country
     extend CountryClassMethods
+    extend ConversionMethods
     extend CountryFinderMethods
     include Emoji
     include CountrySubdivisionMethods
     attr_reader :data
 
-    ISO3166::DEFAULT_COUNTRY_HASH.each do |method_name, _type|
+    ISO3166::DEFAULT_COUNTRY_HASH.each_key do |method_name|
       define_method method_name do
         data[method_name.to_s]
       end
     end
 
-    ISO3166::DEFAULT_COUNTRY_HASH['geo'].each do |method_name, _type|
+    ISO3166::DEFAULT_COUNTRY_HASH['geo'].each_key do |method_name|
       define_method method_name do
         data['geo'][method_name.to_s]
       end

data/lib/countries/data/countries/AM.yaml

@@ -27,7 +27,6 @@ AM:
   iso_short_name: Armenia
   languages_official:
   - hy
-  - ru
   languages_spoken:
   - hy
   - ru

data/lib/countries/data/countries/AR.yaml

@@ -38,6 +38,7 @@ AR:
   languages_spoken:
   - es
   - gn
+  - qu
   national_destination_code_lengths:
   - 2
   national_number_lengths:

data/lib/countries/data/countries/BG.yaml

@@ -53,6 +53,7 @@ BG:
   un_locode: BG
   unofficial_names:
   - Bulgaria
+  - България
   - Bulgarien
   - Bulgarie
   - ブルガリア

data/lib/countries/data/countries/CD.yaml

@@ -58,4 +58,5 @@ CD:
   - Congo (The Democratic Republic Of The)
   - Democratic Republic of the Congo
   - Congo, Democratic Republic of
+  - Congo (Kinshasa)
   world_region: EMEA

data/lib/countries/data/countries/CG.yaml

@@ -49,4 +49,5 @@ CG:
   - コンゴ共和国
   - Congo [Republiek]
   - Congo, Republic of
+  - Congo (Brazzaville)
   world_region: EMEA

data/lib/countries/data/countries/CH.yaml

@@ -35,10 +35,12 @@ CH:
   - de
   - fr
   - it
+  - rm
   languages_spoken:
   - de
   - fr
   - it
+  - rm
   national_destination_code_lengths:
   - 2
   national_number_lengths:
@@ -61,10 +63,10 @@ CH:
   - スイス
   - Zwitserland
   vat_rates:
-    standard: 7.7
+    standard: 8.1
     reduced:
-    - 2.5
-    - 3.7
+    - 2.6
+    - 3.8
     super_reduced:
     parking:
   world_region: EMEA

data/lib/countries/data/countries/EE.yaml

@@ -51,7 +51,7 @@ EE:
   - Estonie
   - エストニア
   vat_rates:
-    standard: 20
+    standard: 22
     reduced:
     - 9
     super_reduced:

data/lib/countries/data/countries/ER.yaml

@@ -4,7 +4,7 @@ ER:
   alpha3: ERI
   continent: Africa
   country_code: '291'
-  currency_code: ETB
+  currency_code: ERN
   distance_unit: KM
   gec: ER
   geo:

data/lib/countries/data/countries/ES.yaml

@@ -37,6 +37,14 @@ ES:
   - es
   languages_spoken:
   - es
+  - ca
+  - gl
+  - eu
+  - an
+  - ast
+  - fax
+  - rif
+  - rmq
   national_destination_code_lengths:
   - 2
   national_number_lengths:

data/lib/countries/data/countries/FI.yaml

@@ -58,7 +58,7 @@ FI:
   - Finlandia
   - フィンランド
   vat_rates:
-    standard: 24
+    standard: 25.5
     reduced:
     - 10
     - 14

data/lib/countries/data/countries/FJ.yaml

@@ -29,7 +29,6 @@ FJ:
   - en
   - fj
   - hi
-  - ur
   languages_spoken:
   - en
   - fj

data/lib/countries/data/countries/GB.yaml

@@ -71,6 +71,7 @@ GB:
   - Velká Británie
   - İngiltere
   - Великобританія
+  - Great Britain
   vat_rates:
     standard: 20
     reduced:

data/lib/countries/data/countries/MM.yaml

@@ -46,4 +46,5 @@ MM:
   unofficial_names:
   - Myanmar (Burma)
   - ミャンマー
+  - Burma
   world_region: APAC

data/lib/countries/data/countries/NL.yaml

@@ -36,6 +36,7 @@ NL:
   - nl
   languages_spoken:
   - nl
+  - fy
   national_destination_code_lengths:
   - 2
   national_number_lengths:

data/lib/countries/data/countries/PY.yaml

@@ -39,7 +39,7 @@ PY:
   nationality: Paraguayan
   number: '600'
   postal_code: true
-  postal_code_format: "\\d{4}"
+  postal_code_format: "\\d{6}"
   region: Americas
   start_of_week: monday
   subregion: South America

data/lib/countries/data/countries/UZ.yaml

@@ -27,7 +27,6 @@ UZ:
   iso_short_name: Uzbekistan
   languages_official:
   - uz
-  - ru
   languages_spoken:
   - uz
   - ru

data/lib/countries/data/subdivisions/GB.yaml

@@ -9029,7 +9029,7 @@ PTE:
     max_latitude: 52.6637708
     max_longitude: -0.1032429
   translations:
-    en: Peter
+    en: Peterborough
     af: Peterborough
     ar: بيتربرة
     bn: পিটারবার্গ

data/lib/countries/data/subdivisions/GT.yaml

@@ -1,7 +1,7 @@
 ---
-AV:
+'16':
   name: Alta Verapaz
-  code: AV
+  code: '16'
   unofficial_names: Alta Verapaz
   geo:
     latitude: 15.5942883
@@ -61,9 +61,9 @@ AV:
     'no': Alta Verapaz
   comments:
   type: department
-BV:
+'15':
   name: Baja Verapaz
-  code: BV
+  code: '15'
   unofficial_names: Baja Verapaz
   geo:
     latitude: 15.0787498
@@ -122,9 +122,9 @@ BV:
     'no': Baja Verapaz
   comments:
   type: department
-CM:
+'04':
   name: Chimaltenango
-  code: CM
+  code: '04'
   unofficial_names: Chimaltenango
   geo:
     latitude: 14.662222
@@ -183,9 +183,9 @@ CM:
     'no': Chimaltenango
   comments:
   type: department
-CQ:
+'20':
   name: Chiquimula
-  code: CQ
+  code: '20'
   unofficial_names: Chiquimula
   geo:
     latitude: 14.783333
@@ -242,9 +242,9 @@ CQ:
     'no': Chiquimula
   comments:
   type: department
-ES:
+'05':
   name: Escuintla
-  code: ES
+  code: '05'
   unofficial_names: Escuintla
   geo:
     latitude: 14.3009389
@@ -302,9 +302,9 @@ ES:
     'no': Escuintla
   comments:
   type: department
-GU:
+'01':
   name: Guatemala
-  code: GU
+  code: '01'
   unofficial_names: Guatemala
   geo:
     latitude: 14.613333
@@ -365,9 +365,9 @@ GU:
     'no': Guatemala
   comments:
   type: department
-HU:
+'13':
   name: Huehuetenango
-  code: HU
+  code: '13'
   unofficial_names: Huehuetenango
   geo:
     latitude: 15.314722
@@ -425,9 +425,9 @@ HU:
     'no': Huehuetenango
   comments:
   type: department
-IZ:
+'18':
   name: Izabal
-  code: IZ
+  code: '18'
   unofficial_names: Izabal
   geo:
     latitude: 15.4036847
@@ -485,9 +485,9 @@ IZ:
     'no': Izabal
   comments:
   type: department
-JA:
+'21':
   name: Jalapa
-  code: JA
+  code: '21'
   unofficial_names: Jalapa
   geo:
     latitude: 14.5655154
@@ -545,9 +545,9 @@ JA:
     'no': Jalapa
   comments:
   type: department
-JU:
+'22':
   name: Jutiapa
-  code: JU
+  code: '22'
   unofficial_names: Jutiapa
   geo:
     latitude: 14.282778
@@ -606,9 +606,9 @@ JU:
     'no': Jutiapa
   comments:
   type: department
-PE:
+'17':
   name: Petén
-  code: PE
+  code: '17'
   unofficial_names: Petén
   geo:
     latitude: 16.912033
@@ -668,9 +668,9 @@ PE:
     'no': Petén
   comments:
   type: department
-PR:
+'02':
   name: El Progreso
-  code: PR
+  code: '02'
   unofficial_names: El Progreso
   geo:
     latitude: 14.86527
@@ -728,9 +728,9 @@ PR:
     'no': El Progreso
   comments:
   type: department
-QC:
+'14':
   name: Quiché
-  code: QC
+  code: '14'
   unofficial_names: Quiché
   geo:
     latitude: 15.4983808
@@ -788,9 +788,9 @@ QC:
     'no': Quiché
   comments:
   type: department
-QZ:
+'09':
   name: Quetzaltenango
-  code: QZ
+  code: '09'
   unofficial_names:
   - Quetzaltenango
   geo:
@@ -851,9 +851,9 @@ QZ:
     'no': Quetzaltenango
   comments:
   type: department
-RE:
+'11':
   name: Retalhuleu
-  code: RE
+  code: '11'
   unofficial_names: Retalhuleu
   geo:
     latitude: 14.533333
@@ -912,9 +912,9 @@ RE:
     'no': Retalhuleu
   comments:
   type: department
-SA:
+'03':
   name: Sacatepéquez
-  code: SA
+  code: '03'
   unofficial_names: Sacatepéquez
   geo:
     latitude: 14.6110576
@@ -974,9 +974,9 @@ SA:
     'no': Sacatepéquez
   comments:
   type: department
-SM:
+'12':
   name: San Marcos
-  code: SM
+  code: '12'
   unofficial_names: San Marcos
   geo:
     latitude: 14.9309569
@@ -1034,9 +1034,9 @@ SM:
     'no': San Marcos (departement)
   comments:
   type: department
-SO:
+'07':
   name: Sololá
-  code: SO
+  code: '07'
   unofficial_names: Sololá
   geo:
     latitude: 14.773889
@@ -1094,9 +1094,9 @@ SO:
     'no': Sololá
   comments:
   type: department
-SR:
+'06':
   name: Santa Rosa
-  code: SR
+  code: '06'
   unofficial_names: Santa Rosa
   geo:
     latitude: 14.1928003
@@ -1156,9 +1156,9 @@ SR:
     'no': Santa Rosa (departement)
   comments:
   type: department
-SU:
+'10':
   name: Suchitepéquez
-  code: SU
+  code: '10'
   unofficial_names: Suchitepéquez
   geo:
     latitude: 14.4215982
@@ -1216,9 +1216,9 @@ SU:
     'no': Suchitepéquez
   comments:
   type: department
-TO:
+'08':
   name: Totonicapán
-  code: TO
+  code: '08'
   unofficial_names: Totonicapán
   geo:
     latitude: 14.910833
@@ -1276,9 +1276,9 @@ TO:
     'no': Totonicapán (departement)
   comments:
   type: department
-ZA:
+'19':
   name: Zacapa
-  code: ZA
+  code: '19'
   unofficial_names: Zacapa
   geo:
     latitude: 15.0784265

data/lib/countries/data.rb

@@ -98,8 +98,8 @@ module ISO3166
         end
       end
 
-      def synchronized(&block)
-        @mutex.synchronize(&block)
+      def synchronized(&)
+        @mutex.synchronize(&)
       end
 
       def load_required?

data/lib/countries/iso3166.rb

@@ -11,6 +11,7 @@ require 'countries/structure'
 require 'countries/translations'
 require 'countries/country/country_subdivision_methods'
 require 'countries/country/class_methods'
+require 'countries/country/conversion_methods'
 require 'countries/country/finder_methods'
 require 'countries/country/emoji'
 require 'countries/country'

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

@@ -24,7 +24,7 @@ module Sources
         last_country_code_seen = nil
 
         subdivisions.each_with_index do |subdivision, index|
-          subdivision = Sources::CLDR::Subdivision.new(language_code: language_code, xml: subdivision)
+          subdivision = Sources::CLDR::Subdivision.new(language_code:, xml: subdivision)
           data = @loader.load(subdivision.country_code)
           data[subdivision.code] ||= {}
           data[subdivision.code] = data[subdivision.code].deep_merge(subdivision.to_h)

data/lib/countries/sources.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative './sources/local/cached_loader'
-require_relative './sources/local/subdivision'
+require_relative 'sources/local/cached_loader'
+require_relative 'sources/local/subdivision'
 
-require_relative './sources/cldr/downloader'
-require_relative './sources/cldr/subdivision'
-require_relative './sources/cldr/subdivision_updater'
+require_relative 'sources/cldr/downloader'
+require_relative 'sources/cldr/subdivision'
+require_relative 'sources/cldr/subdivision_updater'

data/lib/countries/translations.rb

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

data/lib/countries/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: countries
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Josh Robinson
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-17 00:00:00.000000000 Z
+date: 2024-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unaccent
@@ -229,6 +229,7 @@ files:
 - lib/countries/configuration.rb
 - lib/countries/country.rb
 - lib/countries/country/class_methods.rb
+- lib/countries/country/conversion_methods.rb
 - lib/countries/country/country_subdivision_methods.rb
 - lib/countries/country/currency_methods.rb
 - lib/countries/country/emoji.rb
@@ -848,14 +849,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Gives you a country object full of all sorts of useful information.