worldwide 1.2.0 → 1.3.1

data/lib/worldwide/address.rb

@@ -146,15 +146,21 @@ module Worldwide
     end
 
     RESERVED_DELIMITER = "\u00A0"
-    def concatenated_address1
-      return address1 if address1.present?
-
+    def concatenate_address1
       additional_fields = region.combined_address_format["address1"] || []
+      additional_field_keys = additional_fields.map { |field| field["key"] }
+
+      return address1 if field_values(additional_field_keys).empty?
+
       concatenate_fields(additional_fields)
     end
 
-    def concatenated_address2
+    def concatenate_address2
       additional_fields = region.combined_address_format["address2"] || []
+      additional_field_keys = additional_fields.map { |field| field["key"] }
+
+      return address2 if field_values(additional_field_keys).empty?
+
       concatenate_fields(additional_fields)
     end
 
@@ -471,6 +477,12 @@ module Worldwide
       concatenated_field
     end
 
+    def field_values(fields)
+      fields.index_with do |field|
+        send(field.underscore.to_sym)
+      end.compact
+    end
+
     def concatenation_delimiter(concatenated_field, decorator, field_index)
       if field_index == 0
         ""

data/lib/worldwide/field.rb

@@ -48,6 +48,9 @@ module Worldwide
     end
 
     def error(locale: I18n.locale, code:, options: {})
+      unless code.end_with?("_instructional", "_informative")
+        code = "#{code}_instructional"
+      end
       lookup("errors.#{code}", locale: locale, options: options)
     end
 
@@ -63,33 +66,18 @@ module Worldwide
 
     def default_lookup(key_suffix, options: {})
       base = base_key("_default")
-
-      message = I18n.t("#{base}.#{key_suffix}", default: nil, **options)
-      return message if message.present?
-
-      key = key_suffix.include?("_instructional") ? "#{base}.#{key_suffix.sub("_instructional", "")}" : "#{base}.#{key_suffix}_instructional"
-      message = I18n.t(key, default: nil, **options)
-      return message if message.present?
-
-      I18n.with_locale(:en) { I18n.t("#{base}.#{key_suffix}", default: nil, **options) }
+      I18n.t("#{base}.#{key_suffix}", default: nil, **options) ||
+        I18n.with_locale(:en) { I18n.t("#{base}.#{key_suffix}", default: nil, **options) }
     end
 
     def lookup(key_suffix, locale:, options: {})
       I18n.with_locale(locale) do
-        unless @country_code.nil?
-          message = I18n.t("#{base_key(@country_code)}.#{key_suffix}", default: nil, **options)
-          return message if message.present?
-
-          key = if key_suffix.include?("_instructional")
-            "#{base_key(@country_code)}.#{key_suffix.sub("_instructional", "")}"
-          else
-            "#{base_key(@country_code)}.#{key_suffix}_instructional"
-          end
-          message = I18n.t(key, default: nil, **options)
-          return message if message.present?
+        if @country_code.nil?
+          default_lookup(key_suffix, options: options)
+        else
+          I18n.t("#{base_key(@country_code)}.#{key_suffix}", default: nil, **options) ||
+            default_lookup(key_suffix, options: options)
         end
-
-        default_lookup(key_suffix, options: options)
       end
     end
   end

data/lib/worldwide/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worldwide
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -7707,7 +7707,39 @@ files:
 - db/data/regions/PF.yml
 - db/data/regions/PG.yml
 - db/data/regions/PH.yml
+- db/data/regions/PH/bg.yml
+- db/data/regions/PH/cs.yml
+- db/data/regions/PH/da.yml
+- db/data/regions/PH/de.yml
+- db/data/regions/PH/el.yml
 - db/data/regions/PH/en.yml
+- db/data/regions/PH/es.yml
+- db/data/regions/PH/fi.yml
+- db/data/regions/PH/fr.yml
+- db/data/regions/PH/hi.yml
+- db/data/regions/PH/hr.yml
+- db/data/regions/PH/hu.yml
+- db/data/regions/PH/id.yml
+- db/data/regions/PH/it.yml
+- db/data/regions/PH/ja.yml
+- db/data/regions/PH/ko.yml
+- db/data/regions/PH/lt.yml
+- db/data/regions/PH/ms.yml
+- db/data/regions/PH/nb.yml
+- db/data/regions/PH/nl.yml
+- db/data/regions/PH/pl.yml
+- db/data/regions/PH/pt-BR.yml
+- db/data/regions/PH/pt-PT.yml
+- db/data/regions/PH/ro.yml
+- db/data/regions/PH/ru.yml
+- db/data/regions/PH/sk.yml
+- db/data/regions/PH/sl.yml
+- db/data/regions/PH/sv.yml
+- db/data/regions/PH/th.yml
+- db/data/regions/PH/tr.yml
+- db/data/regions/PH/vi.yml
+- db/data/regions/PH/zh-CN.yml
+- db/data/regions/PH/zh-TW.yml
 - db/data/regions/PK.yml
 - db/data/regions/PL.yml
 - db/data/regions/PM.yml