countries 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73f88c0991bcb5bf2b2d08014ae66f04adb368b856d1cd084928549b282e7b33
-  data.tar.gz: f2edba4b8014c85a4e5c263635bbb04d1f8b03d11a91814d08e009705f94e0d4
+  metadata.gz: 0ba15249a08854651cd8bba33f527c450145bce3c156c1dca3d0d1a60107d8f2
+  data.tar.gz: f4c0d30dd51686895801e21c7ff99b665b981f0fce46f9541f105091bbd942d3
 SHA512:
-  metadata.gz: 9ebd72d36cd13b11979325ef5f69535c6a3665a2763ca8920570e13d93feae05fd4e319698207f44d89fecb29daf3db5f56c875705d0e65d9c7c4560a84b75ee
-  data.tar.gz: 69d70fdc81b89ffcc128931ead30b874e1d24660e2a9db59d120f6ad46cdec7a6657823abc5abe8ee107564b7cb52d49f38fc05800cdd0704ea8eebe9f12fb7a
+  metadata.gz: d8af15c8ee5f6ef03c8a65eb3529c6ed4facab419ed8e8336ee3af58b474cab0bc3291cd7785e4105a05a741160104fce419f678f769dd075a4c6cfdc45fdf2e
+  data.tar.gz: 892d45e8c1f4d1c2ac95d4fde2d8294f9ea367a1123f5648bdc107056124d44b57d174bfba6d3caff66502db0b5f12dc8b13873611e4ac9611a9f25f1065a8fe

data/CHANGELOG.md

@@ -3,9 +3,22 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+## [5.1.1](https://github.com/countries/countries/releases/tag/v5.1.1') (2022/07/18 09:10 +00:00)
+
+**Important changes**
+
+- Subdivision loading now respects the configured locales and will only load subdivision translations for the configured locales instead of loading all translations. This fixes [\#580](https://github.com/countries/countries/issues/580)
+
+**Merged pull requests:**
+
+* Refactor subdivision loading to respect the configured locales. [\#762](https://github.com/countries/countries/pull/762) ([pmor](https://github.com/pmor))
+* Add an alternative name for USVI lookup [\#763](https://github.com/countries/countries/pull/763) ([tadejm](https://github.com/tadejm))
+
+
 ## [5.1.0](https://github.com/countries/countries/releases/tag/v5.1.0') (2022/06/27 07:50 +00:00)
 
 **Important changes**
+
 - `Subdivision` now has a `type` attribute obtained from ISO3166-2 subdivision types. `type` is a _lowercase_ and _snake_cased_ string.
 - Adds `Country#subdivision_types` and `#humanized_subdivision_types` to list a country's subdivision types
 - Adds `Country#subdivisions_of_types(types)` to allow getting subdivisions of given type(s)

data/README.markdown

@@ -256,6 +256,9 @@ ISO3166.configure do |config|
 end
 ```
 
+If you change the value of `ISO3166.configuration.locales` after initialization, you should call `ISO3166::Data.reset` to reset the data cache, or you may end up with inconsistently loaded locales.
+As of 5.1.1, subdivision translations also respect this and will only load the selected locales.
+
 ## Loading Custom Data
 
 As of 2.0 countries supports loading custom countries / overriding data in its data set, though if you choose to do this please contribute back to the upstream repo!

data/lib/countries/country/class_methods.rb

@@ -64,17 +64,6 @@ module ISO3166
       translations.merge(custom_countries)
     end
 
-    def subdivisions(alpha2)
-      @subdivisions ||= {}
-      @subdivisions[alpha2] ||= create_subdivisions(subdivision_data(alpha2))
-    end
-
-    def create_subdivisions(subdivision_data)
-      subdivision_data.each_with_object({}) do |(k, v), hash|
-        hash[k] = Subdivision.new(v)
-      end
-    end
-
     protected
 
     def strip_accents(string)
@@ -85,15 +74,6 @@ module ISO3166
       end
     end
 
-    def subdivision_data(alpha2)
-      file = subdivision_file_path(alpha2)
-      File.exist?(file) ? YAML.load_file(file) : {}
-    end
-
-    def subdivision_file_path(alpha2)
-      File.join(File.dirname(__FILE__), '..', 'data', 'subdivisions', "#{alpha2}.yaml")
-    end
-
     # Some methods like parse_value are expensive in that they
     # create a large number of objects internally. In order to reduce the
     # object creations and save the GC, we can cache them in an class instance

data/lib/countries/country.rb

@@ -58,9 +58,9 @@ module ISO3166
     # @return [Array<ISO3166::Subdivision>] the list of subdivisions for this Country.
     def subdivisions
       @subdivisions ||= if data['subdivisions']
-                          self.class.create_subdivisions(data['subdivisions'])
+                          ISO3166::Data.create_subdivisions(data['subdivisions'])
                         else
-                          self.class.subdivisions(alpha2)
+                          ISO3166::Data.subdivisions(alpha2)
                         end
     end
 

data/lib/countries/data/countries/VI.yaml

@@ -50,4 +50,5 @@ VI:
   - Amerikaanse Maagdeneilanden
   - Virgin Islands (U.S.)
   - United States Virgin Islands
+  - U.S. Virgin Islands
   world_region: AMER

data/lib/countries/data.rb

@@ -8,6 +8,7 @@ module ISO3166
     @loaded_country_codes = []
     @registered_data = {}
     @mutex = Mutex.new
+    @subdivisions = {}
 
     def initialize(alpha2)
       @alpha2 = alpha2.to_s.upcase
@@ -44,6 +45,7 @@ module ISO3166
       # Resets the loaded data and cache
       def reset
         @cache = {}
+        @subdivisions = {}
         @registered_data = {}
         ISO3166.configuration.loaded_locales = []
       end
@@ -68,6 +70,26 @@ module ISO3166
         File.join([@cache_dir] + file_array)
       end
 
+      def subdivision_data(alpha2)
+        file = subdivision_file_path(alpha2)
+        data = File.exist?(file) ? YAML.load_file(file) : {}
+        locales = ISO3166.configuration.locales.map(&:to_s)
+        data.each_value{ |v| v['translations'] = v['translations'].slice(*locales)}
+
+        return data
+      end
+
+      def subdivisions(alpha2)
+        @subdivisions ||= {}
+        @subdivisions[alpha2] ||= create_subdivisions(ISO3166::Data.subdivision_data(alpha2))
+      end
+
+      def create_subdivisions(subdivision_data)
+        subdivision_data.each_with_object({}) do |(k, v), hash|
+          hash[k] = Subdivision.new(v)
+        end
+      end
+
       private
 
       def load_data!
@@ -176,6 +198,10 @@ module ISO3166
 
         data
       end
+
+      def subdivision_file_path(alpha2)
+        File.join(File.dirname(__FILE__), 'data', 'subdivisions', "#{alpha2}.yaml")
+      end
     end
   end
 end

data/lib/countries/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Countries
-  VERSION = '5.1.0'.freeze
+  VERSION = '5.1.1'.freeze
 end

data/spec/data_spec.rb

@@ -26,6 +26,17 @@ describe ISO3166::Data do
     expect(data['translated_names'].size).to eq 1
   end
 
+  it 'only loads subdivision translations for the configured locales' do
+    ISO3166.configuration.locales = %i[en]
+    ISO3166::Data.reset
+    subdivisions = ISO3166::Data.subdivisions('US')
+    expect(subdivisions.values.first['translations'].keys).to eq(%w[en])
+    ISO3166.configuration.locales = %i[es de en]
+    ISO3166::Data.reset
+    subdivisions = ISO3166::Data.subdivisions('US')
+    expect(subdivisions.values.first['translations'].keys).to eq(%w[es de en])
+  end
+
   describe '#codes' do
     it 'returns an array' do
       data = ISO3166::Data.codes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: countries
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Josh Robinson
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sixarm_ruby_unaccent