worldwide 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 246832b6ca4adeaa2bb6e1dd5b236962316581b22ec49fa28db9d461e0065995
-  data.tar.gz: '0569123a25ae7afae4dd9d09e7049e2c86dd26c8924f15a935916dbe982f128f'
+  metadata.gz: 378551ef286d7b7f398ee9ca149e417ac0f85efbba591a97fa8373de299258fd
+  data.tar.gz: 2a26ebd6f73862b5cc01bdae65ed710dbb7af5666a65f11d224bb529acb32d15
 SHA512:
-  metadata.gz: 93b987051a980e244e817f1194e69e5e61a61544064029a5fabfe8d1739e385e803b19608bc3f0e3487c707f4deebd7186db584f8ba560d29f6c9cdb34272963
-  data.tar.gz: 4bd8196e846f3339f0f50607efe8a288a670563a087665e2082ed90d180d9f89b11b21c7976e3449961f9fc517f44022a1029d4c5b470ff06810455e312c0304
+  metadata.gz: 6487ee321f130d34da0da8f58bf0bcc38815eecbec6f502358204a859b22c31afc6e9bfe3d8ee002b4e57e3b50040aca9fda443fc05889d62165755c706b449f
+  data.tar.gz: 1caf34f3c88a07fb3aa532f8192caf1a448af2795b710369645c1841cad6de722fe525833fff4b25a0c992fdb853e6fadf2ffc4244ee4aec0ee6073953147744

data/CHANGELOG.md

@@ -27,10 +27,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
-- nil
+- nil.
 
 ---
 
+[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)
+- Avoid .present? and .blank? so we don't require Rails [#57](https://github.com/Shopify/worldwide/pull/57)
+- (bugfix) Zone lookup by name [#58](https://github.com/Shopify/worldwid/pull/58)
+
 [0.6.0] - 2023-12-08
 
 - Add localized concern messages for address1 + 2 warnings and address may not exist message [#54](https://github.com/Shopify/worldwide/pull/54)

data/Gemfile.lock

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

data/db/data/regions/DK.yml

@@ -18,6 +18,7 @@ zip_regex: "^(DK( |-)?)?(?!38\\d{2}|39\\d{2})((0[89]\\d{2})|([1-9]\\d{3}))$"
 zip_example: '8660'
 phone_number_prefix: 45
 building_number_required: true
+building_number_may_be_in_address2: true
 week_start_day: monday
 languages:
   - da

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,24 +361,22 @@ 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
 
         zones.find do |region|
-          search_name == region.legacy_name.upcase ||
-            search_name == region.full_name.upcase ||
-            search_name == I18n.with_locale(:en) { region.full_name.upcase }
+          search_name == region.legacy_name&.upcase ||
+            region.name_alternates&.any? { |a| search_name == a.upcase } ||
+            search_name == region.full_name&.upcase ||
+            search_name == I18n.with_locale(:en) { region.full_name&.upcase }
         end
       else # Worldwide::Util.present?(zip)
         zone_by_normalized_zip(Zip.normalize(country_code: iso_code, zip: zip))
@@ -413,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?
@@ -444,7 +456,7 @@ module Worldwide
     # Returns true if this country has zones defined, and has postal code prefix data for the zones
     def has_zip_prefixes?
       @zones&.any? do |zone|
-        zone.zip_prefixes.present?
+        Util.present?(zone.zip_prefixes)
       end
     end
 
@@ -471,7 +483,7 @@ module Worldwide
 
       adjusted_value = partial_match ? value.strip : value
 
-      Regexp.new(regex_prefix).match(adjusted_value).present?
+      Util.present?(Regexp.new(regex_prefix).match(adjusted_value))
     end
 
     # Search a list of zip prefixes (by province or timezone) to find the element that corresponds to the zip

data/lib/worldwide/version.rb

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

data/lib/worldwide/zip.rb

@@ -50,7 +50,7 @@ module Worldwide
     # @param min_confidence [Integer] The minimum confidence level (between 0-100) that is accepted from a suggestion (optional)
     # @return [Region] which is a "country" if we have a suggestion, or `nil` if we do not.
     def find_country(country_code: nil, zip:, min_confidence: 0)
-      return nil unless zip.present?
+      return nil unless Util.present?(zip)
 
       country = Worldwide.region(code: country_code) unless country_code.nil?
       return country if country&.valid_zip?(zip)
@@ -68,8 +68,8 @@ module Worldwide
       # We'll see if we have only a single suggestion and, if so, return it.
       # In cases where there's more than one possible match, we'll return nil.
       suggestions = find_country_using_zip_alone(adjusted_zip)
-      suggestion = suggestions.first[0] unless suggestions.blank?
-      confidence = suggestions.first[1] unless suggestions.blank?
+      suggestion = suggestions.first[0] unless Util.blank?(suggestions)
+      confidence = suggestions.first[1] unless Util.blank?(suggestions)
 
       return suggestion if suggestions.length == 1 && confidence && confidence >= min_confidence
 
@@ -90,7 +90,7 @@ module Worldwide
 
       if allow_autofill
         autofill = country.autofill_zip
-        return autofill if autofill.present?
+        return autofill if Util.present?(autofill)
       end
 
       return nil if zip.nil?
@@ -163,7 +163,7 @@ module Worldwide
     end
 
     def strip_optional_country_prefix(country_code:, zip:)
-      return zip if zip.blank?
+      return zip if Util.blank?(zip)
 
       unless OPTIONAL_PREFIX_COUNTRIES.include?(country_code&.to_sym)
         return zip
@@ -604,7 +604,7 @@ module Worldwide
         return zip
       end
 
-      return zip if zip.blank?
+      return zip if Util.blank?(zip)
 
       autocorrected_zips = []
       input = zip
@@ -727,7 +727,7 @@ module Worldwide
     end
 
     def normalize_for_bd(zip:)
-      return zip if zip.blank?
+      return zip if Util.blank?(zip)
 
       m = zip.match(/^(GPO:?|DHAKA)(\d{4})$/)
       if m.nil?
@@ -834,10 +834,10 @@ module Worldwide
       return zip if zip.nil?
 
       m = zip.match(/^0?0?0?0?([1-9])0?0?$/)
-      return "00#{m[1]}00" if m.present?
+      return "00#{m[1]}00" if Util.present?(m)
 
       m = zip.match(/^0?0?1([1-9])0?0?$/)
-      return "01#{m[1]}00" if m.present?
+      return "01#{m[1]}00" if Util.present?(m)
 
       if zip.match?(/^[1-9][0-9]00$/)
         "#{zip}0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worldwide
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-08 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport