countries 6.0.1 → 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/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

@@ -9,13 +9,13 @@ module ISO3166
     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/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/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/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.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/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.1'
+  VERSION = '7.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: countries
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Josh Robinson
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-18 00:00:00.000000000 Z
+date: 2024-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unaccent
@@ -849,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.9
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Gives you a country object full of all sorts of useful information.