worldwide 0.14.0 → 1.0.0

data/db/data/regions/_default/vi.yml

@@ -208,7 +208,7 @@ vi:
             optional: Khu phố (không bắt buộc)
           errors:
             blank: Nhập khu phố
-            too_long: Khu phố quá dài (tối đa 255 ký tự)
+            too_long: Khu phố quá dài (tối đa %{limit} ký tự)
             contains_emojis: Khu phố không được chứa biểu tượng cảm xúc
             contains_mathematical_symbols: Khu phố không được chứa ký hiệu toán học
             contains_restricted_characters: Khu phố chỉ được chứa chữ cái, chữ số,
@@ -222,3 +222,26 @@ vi:
             unknown_for_address: Khu phố có thể không chính xác.
           warnings:
             contains_too_many_words: Khu phố nên có tối đa %{word_count} từ
+        line2:
+          label:
+            default: Căn hộ, dãy, v.v.
+            optional: Căn hộ, dãy, v.v. (không bắt buộc)
+          errors:
+            blank: Nhập căn hộ, dãy, v.v.
+            too_long: Dòng địa chỉ thứ hai quá dài (tối đa %{limit} ký tự)
+            contains_emojis: Dòng địa chỉ thứ hai không được chứa biểu tượng cảm xúc
+            contains_mathematical_symbols: Dòng địa chỉ thứ hai không được chứa ký
+              hiệu toán học
+            contains_restricted_characters: Dòng địa chỉ thứ hai chỉ được chứa chữ
+              cái, chữ số, ký tự địa phương và ký tự đặc biệt
+            contains_too_many_words: Dòng địa chỉ thứ hai chỉ được có tối đa %{word_count}
+              từ
+            contains_html_tags: Dòng địa chỉ thứ hai không được chứa thẻ HTML.
+            contains_url: Dòng địa chỉ thứ hai không được chứa URL.
+            missing_building_number: Thêm số tòa nhà nếu có.
+            street_unknown_for_zip: Nhập tên đường hợp lệ cho %{zip}.
+            building_number_invalid: Không thể định vị số tòa nhà cho %{street}, %{zip}.
+            unknown_for_address: Dòng địa chỉ thứ hai có thể không chính xác.
+          warnings:
+            contains_too_many_words: Dòng địa chỉ thứ hai nên có tối đa %{word_count}
+              từ

data/db/data/regions/_default/zh-CN.yml

@@ -186,7 +186,7 @@ zh-CN:
             optional: 街区（选填）
           errors:
             blank: 输入街区
-            too_long: 街区过长（最多包含 255 个字符）
+            too_long: 街区名过长（最多 %{limit} 个字符）
             contains_emojis: 街区名不能包含表情符号
             contains_mathematical_symbols: 街区名不能包含数学符号
             contains_restricted_characters: 街区名只能包含字母、数字、当地字符和特殊字符
@@ -198,3 +198,22 @@ zh-CN:
             unknown_for_address: 街区名可能不正确。
           warnings:
             contains_too_many_words: 建议街区名少于 %{word_count} 个字词
+        line2:
+          label:
+            default: 公寓、房间号等
+            optional: 公寓、房间号等（可选）
+          errors:
+            blank: 输入公寓、房间号等
+            too_long: 第二个地址行过长（最多 %{limit} 个字符）
+            contains_emojis: 第二个地址行不能包含表情符号
+            contains_mathematical_symbols: 第二个地址行不能包含数学符号
+            contains_restricted_characters: 第二个地址行只能包含字母、数字、当地字符和特殊字符
+            contains_too_many_words: 第二个地址行不能超过 %{word_count} 个字词
+            contains_html_tags: 第二个地址行不能包含 HTML 标记。
+            contains_url: 第二个地址行不能包含 URL。
+            missing_building_number: 添加大楼编号（如果有）。
+            street_unknown_for_zip: 输入 %{zip} 对应的有效街道名称。
+            building_number_invalid: 大楼编号与 %{street} 和 %{zip} 不匹配。
+            unknown_for_address: 第二个地址行可能不正确。
+          warnings:
+            contains_too_many_words: 建议第二个地址行少于 %{word_count} 个字词

data/db/data/regions/_default/zh-TW.yml

@@ -186,7 +186,7 @@ zh-TW:
             optional: 鄰 (選填)
           errors:
             blank: 請輸入「鄰」
-            too_long: "「鄰」過長 (最多 255 個字元)"
+            too_long: "「鄰」過長 (最多 %{limit} 個字元)"
             contains_emojis: "「鄰」不得包含表情符號"
             contains_mathematical_symbols: "「鄰」不得包含數學符號"
             contains_restricted_characters: "「鄰」僅可包含字母、數字、當地字元和特殊字元"
@@ -198,3 +198,22 @@ zh-TW:
             unknown_for_address: "「鄰」可能不正確。"
           warnings:
             contains_too_many_words: 建議「鄰」少於 %{word_count} 個字
+        line2:
+          label:
+            default: 公寓、套房等
+            optional: 公寓、套房等 (選填)
+          errors:
+            blank: 請輸入公寓、套房等
+            too_long: "「地址第二行」過長 (最多 %{limit} 個字元)"
+            contains_emojis: "「地址第二行」不得包含表情符號"
+            contains_mathematical_symbols: "「地址第二行」不得包含數學符號"
+            contains_restricted_characters: "「地址第二行」僅可包含字母、數字、當地字元和特殊字元"
+            contains_too_many_words: "「地址第二行」不得超過 %{word_count} 個字"
+            contains_html_tags: "「地址第二行」不得包含 HTML 標籤。"
+            contains_url: "「地址第二行」不得包含網址。"
+            missing_building_number: 如果您有建築物號碼，請新增建築物號碼。
+            street_unknown_for_zip: 請輸入 %{zip} 的有效街道名稱。
+            building_number_invalid: 在 %{zip}，%{street} 找不到此建築物號碼。
+            unknown_for_address: "「地址第二行」可能並不正確。"
+          warnings:
+            contains_too_many_words: "「地址第二行」建議少於 %{word_count} 字"

data/lib/worldwide/address.rb

@@ -149,23 +149,23 @@ module Worldwide
     def concatenated_address1
       return address1 if address1.present?
 
-      additional_fields = region.additional_address_fields["address1"] || []
+      additional_fields = region.combined_address_format["address1"] || []
       concatenate_fields(additional_fields)
     end
 
     def concatenated_address2
-      additional_fields = region.additional_address_fields["address2"] || []
+      additional_fields = region.combined_address_format["address2"] || []
       concatenate_fields(additional_fields)
     end
 
     def split_address1
-      additional_fields = region.additional_address_fields["address1"] || []
+      additional_fields = region.combined_address_format["address1"] || []
       split_fields_arr = address1&.split(RESERVED_DELIMITER) || []
       split_fields(additional_fields, split_fields_arr)
     end
 
     def split_address2
-      additional_fields = region.additional_address_fields["address2"] || []
+      additional_fields = region.combined_address_format["address2"] || []
       split_fields_arr = address2&.split(RESERVED_DELIMITER) || []
       split_fields(additional_fields, split_fields_arr)
     end

data/lib/worldwide/region.rb

@@ -34,6 +34,7 @@ module Worldwide
       :zip_regex,
       :zip_requirement,
       :additional_address_fields,
+      :combined_address_format,
     ]
 
     # A region may have more than one parent.
@@ -197,9 +198,12 @@ module Worldwide
     # If true, then the province is optional for addresses in this region.
     attr_accessor :province_optional
 
-    # A hash of additional address fields and the rules for concatening them into the standard fields
+    # An array of the additional address fields that are defined for this region
     attr_accessor :additional_address_fields
 
+    # A hash of the rules for concatening the additional address fields into the standard fields
+    attr_accessor :combined_address_format
+
     def initialize(
       alpha_three: nil,
       continent: false,
@@ -235,7 +239,8 @@ module Worldwide
       @tax_rate = tax_rate
       @use_zone_code_as_short_name = use_zone_code_as_short_name
 
-      @additional_address_fields = {}
+      @additional_address_fields = []
+      @combined_address_format = {}
       @building_number_required = false
       @building_number_may_be_in_address2 = false
       @currency = nil
@@ -414,6 +419,21 @@ module Worldwide
       end
     end
 
+    # is a neighborhood required for this region?
+    def neighborhood_required?
+      additional_field_required?("neighborhood")
+    end
+
+    # is a street name required for this region?
+    def street_name_required?
+      additional_field_required?("streetName")
+    end
+
+    # is a street number required for this region?
+    def street_number_required?
+      additional_field_required?("streetNumber")
+    end
+
     # is the given postal code value valid for this region?
     def valid_zip?(zip, partial_match: false)
       normalized = Zip.normalize(
@@ -441,6 +461,11 @@ module Worldwide
       end
     end
 
+    def additional_field_required?(field_name)
+      field = additional_address_fields.find { |f| f["name"] == field_name }
+      field ? !!field["required"] : false
+    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/regions_loader.rb

@@ -95,7 +95,8 @@ module Worldwide
     end
 
     def apply_territory_attributes(region, spec)
-      region.additional_address_fields = spec["additional_address_fields"] || {}
+      region.additional_address_fields = spec["additional_address_fields"] || []
+      region.combined_address_format = spec["combined_address_format"] || {}
       region.building_number_required = spec["building_number_required"] || false
       region.building_number_may_be_in_address2 = spec["building_number_may_be_in_address2"] || false
       currency_code = spec["currency"]

data/lib/worldwide/version.rb

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

data/worldwide.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.metadata["changelog_uri"] = "https://github.com/Shopify/worldwide/blob/main/CHANGELOG.md"
 
   spec.files = %x(git ls-files -z).split("\x0").reject do |f|
-    f.match(%r{^(rake|test|spec|features)/})
+    f.match(%r{^(rake|test|spec|features|lang/typescript)/})
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worldwide
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -64,11 +64,14 @@ files:
 - ".github/CONTRIBUTING.md"
 - ".github/dependabot.yml"
 - ".github/pull_request_template.md"
+- ".github/workflows/ci-typescript.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/cla.yml"
+- ".github/workflows/npm-release.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"
+- ".vscode/settings.json"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -7703,6 +7706,7 @@ files:
 - db/data/regions/PF.yml
 - db/data/regions/PG.yml
 - db/data/regions/PH.yml
+- db/data/regions/PH/en.yml
 - db/data/regions/PK.yml
 - db/data/regions/PL.yml
 - db/data/regions/PM.yml