worldwide 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43a941ce0c45311eb558bbe78d3585613c38da718f2880533182d39ac8b1017b
-  data.tar.gz: 8553b4c0e92338eeec626987ccbde3e28b3e8bd3b3f7eee82ae0c4315b519a23
+  metadata.gz: e612eada41704a41e5aa1b7dfce0cb4d94d81c9a8022c6392e45e57ee3f4aa62
+  data.tar.gz: 7ff48a7f2d370b615d07c8410f62bb1464ea64be2cbd8da7e7a17a443846f1bb
 SHA512:
-  metadata.gz: 676b6e8903ef04b777c44ea464d7d77413a67f5b69993d4c3821252e554ee093ec07dde4f147684e2ad5cd57a8c5245beab11d116f19e74fd24fffba1ec4284d
-  data.tar.gz: 15f67c2fdda70190a1742144577600f067b05e1f769785c582e7d44d858b8597b9263a3b604b1eed03ae6a0e0d3400afe6bdf67d47e836184645b95c178aa0ce
+  metadata.gz: 72e2d6a9985fe09d8ed9fa5179e1525e56cd24c2603e8f4317f0ce6fe15a0cc1692738042defdc8be28fa3667e54b65b8a0e58995660e025fcfeefe4850f3bfb
+  data.tar.gz: e4696a9bec42809f27a803a1d39a8413eec5656666133602644faeb292fb9a0fcebf1fc64c6fd9cf8f9bd84d9b2073f34120cfcc98d6c3631b71f13d6a60fef9

data/CHANGELOG.md

@@ -31,6 +31,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ---
 
+[0.6.3] - 2023-12-11
+
+- Change HM, TF and GS `group_name` to respective continents based on M49. [#60](https://github.com/Shopify/worldwide/pull/60)
+
+[0.6.2] - 2023-12-11
+
+- Zone lookup by Hash [#61](https://github.com/Shopify/worldwide/pull/61)
+
 [0.6.1] - 2023-12-11
 
 - Allow building number in address2 for DK [#53](https://github.com/Shopify/worldwide/pull/53)

data/Gemfile.lock

@@ -13,7 +13,7 @@ GIT
 PATH
   remote: .
   specs:
-    worldwide (0.6.1)
+    worldwide (0.6.3)
       activesupport (~> 7.0)
       i18n (~> 1.12.0)
       phonelib (~> 0.8)

data/db/data/regions/GS.yml

@@ -1,8 +1,8 @@
 ---
 tax: 0.0
 name: South Georgia And The South Sandwich Islands
-group: Other Countries
-group_name: Other
+group: South American Countries
+group_name: South America
 code: GS
 unit_system: metric
 currency: GBP

data/db/data/regions/HM.yml

@@ -1,8 +1,8 @@
 ---
 tax: 0.0
 name: Heard Island And Mcdonald Islands
-group: Other Countries
-group_name: Other
+group: Oceanian Countries
+group_name: Oceania
 code: HM
 inhabited: false
 unit_system: metric

data/db/data/regions/TF.yml

@@ -1,8 +1,8 @@
 ---
 tax: 0.0
 name: French Southern Territories
-group: Other Countries
-group_name: Other
+group: African Countries
+group_name: Africa
 code: TF
 code_alternates:
 - FR-TF

data/lib/worldwide/region.rb

@@ -249,6 +249,7 @@ module Worldwide
 
       @parents = [].to_set
       @zones = []
+      @zones_by_code = {}
     end
 
     def inspect
@@ -262,6 +263,7 @@ module Worldwide
 
       region.parents << self
       @zones.append(region)
+      add_zone_to_hash(region)
     end
 
     # Attributes
@@ -320,6 +322,7 @@ module Worldwide
     # A user-facing name in the currently-active locale's language.
     def full_name(locale: I18n.locale)
       lookup_code = cldr_code
+
       if /^[0-9]+$/.match?(lookup_code) || lookup_code.length < 3
         Worldwide::Cldr.t("territories.#{lookup_code}", locale: locale, default: legacy_name)
       else
@@ -358,17 +361,14 @@ module Worldwide
       if Worldwide::Util.present?(code)
         search_code = code.to_s.upcase
         alt_search_code = "#{search_code[0..1]}-#{search_code[2..-1]}"
+        zone = nil
 
-        zones.find do |region|
-          [search_code, alt_search_code].any? do |candidate|
-            candidate == subdivision_code(region.iso_code) ||
-              candidate == region.alpha_three ||
-              candidate == region.iso_code ||
-              candidate == region.legacy_code ||
-              candidate == region.numeric_three ||
-              region&.code_alternates&.any?(candidate)
-          end
+        [search_code, alt_search_code].each do |candidate|
+          zone = @zones_by_code[candidate]
+          break if zone
         end
+
+        return zone unless zone.nil?
       elsif Worldwide::Util.present?(name)
         search_name = name.upcase
 
@@ -414,6 +414,17 @@ module Worldwide
 
     private
 
+    def add_zone_to_hash(zone)
+      @zones_by_code[subdivision_code(zone.iso_code)] = zone if Util.present?(subdivision_code(zone.iso_code))
+      @zones_by_code[zone.alpha_three] = zone if Util.present?(zone.alpha_three)
+      @zones_by_code[zone.iso_code] = zone if Util.present?(zone.iso_code)
+      @zones_by_code[zone.legacy_code] = zone if Util.present?(zone.legacy_code)
+      @zones_by_code[zone.numeric_three] = zone if Util.present?(zone.numeric_three)
+      zone.code_alternates&.each do |code|
+        @zones_by_code[code] = zone
+      end
+    end
+
     def answers_to_cldr_code(search_code)
       return false if Util.blank?(search_code) || Util.blank?(cldr_code)
       return true if search_code.casecmp(cldr_code).zero?

data/lib/worldwide/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Worldwide
-  VERSION = "0.6.1"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worldwide
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - Shopify