countries 5.7.2 → 6.0.1

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/finder_methods.rb

@@ -2,8 +2,8 @@
 
 module ISO3166
   module CountryFinderMethods
-    FIND_BY_REGEX = /^find_(all_)?(country_|countries_)?by_(.+)/.freeze
-    SEARCH_TERM_FILTER_REGEX = /\(|\)|\[\]|,/.freeze
+    FIND_BY_REGEX = /^find_(all_)?(country_|countries_)?by_(.+)/
+    SEARCH_TERM_FILTER_REGEX = /\(|\)|\[\]|,/
 
     def search(query)
       country = new(query.to_s.upcase)

data/lib/countries/country.rb

@@ -3,6 +3,7 @@
 module ISO3166
   class Country
     extend CountryClassMethods
+    extend ConversionMethods
     extend CountryFinderMethods
     include Emoji
     include CountrySubdivisionMethods
@@ -10,13 +11,13 @@ module ISO3166
 
     ISO3166::DEFAULT_COUNTRY_HASH.each do |method_name, _type|
       define_method method_name do
-        data[method_name.to_s].freeze
+        data[method_name.to_s]
       end
     end
 
     ISO3166::DEFAULT_COUNTRY_HASH['geo'].each do |method_name, _type|
       define_method method_name do
-        data['geo'][method_name.to_s].freeze
+        data['geo'][method_name.to_s]
       end
     end
 

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/EE.yaml

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

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/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

@@ -45,10 +45,12 @@ module ISO3166
 
       # Resets the loaded data and cache
       def reset
-        @cache = {}
-        @subdivisions = {}
-        @registered_data = {}
-        ISO3166.configuration.loaded_locales = []
+        synchronized do
+          @cache = {}
+          @subdivisions = {}
+          @registered_data = {}
+          ISO3166.configuration.loaded_locales = []
+        end
       end
 
       def codes
@@ -97,16 +99,7 @@ module ISO3166
       end
 
       def synchronized(&block)
-        if use_mutex?
-          @mutex.synchronize(&block)
-        else
-          block.call
-        end
-      end
-
-      def use_mutex?
-        # Stubbed in testing
-        true
+        @mutex.synchronize(&block)
       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/tasks/postal_codes.rake

@@ -7,7 +7,7 @@ namespace :postal_codes do
     require 'open-uri'
     require 'yaml'
 
-    country_files = Dir['lib/countries/data/countries/*.yaml'].sort
+    country_files = Dir['lib/countries/data/countries/*.yaml']
 
     country_files.each do |country_file|
       yaml = YAML.load_file(country_file)

data/lib/countries/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: countries
 version: !ruby/object:Gem::Version
-  version: 5.7.2
+  version: 6.0.1
 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-05-18 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: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Gives you a country object full of all sorts of useful information.