worldwide 0.13.0 → 0.15.0

data/db/data/regions/_default/pt-BR.yml

@@ -211,7 +211,7 @@ pt-BR:
             optional: Bairro (opcional)
           errors:
             blank: Insira um bairro
-            too_long: O bairro é muito longo (máximo de 255 caracteres)
+            too_long: O bairro é muito longo (máximo de %{limit} caracteres)
             contains_emojis: O bairro não pode conter emojis
             contains_mathematical_symbols: O bairro não pode conter símbolos matemáticos
             contains_restricted_characters: O bairro pode conter apenas letras, números,
@@ -225,3 +225,28 @@ pt-BR:
           warnings:
             contains_too_many_words: É recomendável que o bairro tenha menos de %{word_count}
               palavras
+        line2:
+          label:
+            default: Apartamento, bloco etc.
+            optional: Casa, apto. etc. (opcional)
+          errors:
+            blank: Insira apartamento, bloco etc.
+            too_long: A segunda linha do endereço é longa demais (máximo é %{limit}
+              caracteres)
+            contains_emojis: A segunda linha do endereço não pode conter emojis
+            contains_mathematical_symbols: A segunda linha do endereço não pode conter
+              símbolos matemáticos
+            contains_restricted_characters: A segunda linha do endereço pode conter
+              apenas letras, números, caracteres locais e caracteres especiais
+            contains_too_many_words: A segunda linha do endereço não pode ter mais
+              do que %{word_count} palavras
+            contains_html_tags: A segunda linha do endereço não pode conter tags HTML
+            contains_url: A segunda linha do endereço não pode conter URLs
+            missing_building_number: Adicione o número do prédio, se houver.
+            street_unknown_for_zip: Insira um nome de rua válido para %{zip}.
+            building_number_invalid: Não foi possível localizar o número do prédio
+              em %{street}, %{zip}.
+            unknown_for_address: A segunda linha do endereço pode estar incorreta.
+          warnings:
+            contains_too_many_words: É recomendável que a segunda linha do endereço
+              tenha menos que %{word_count} palavras

data/db/data/regions/_default/ro.yml

@@ -230,7 +230,7 @@ ro:
             optional: Cartier (opțional)
           errors:
             blank: Introdu un nume de cartier
-            too_long: Numele cartierului este prea lung (lungimea maximă este de 255
+            too_long: Numele cartierului este prea lung (lungimea maximă este de %{limit}
               caractere)
             contains_emojis: Numele cartierului nu poate conține emoji-uri
             contains_mathematical_symbols: Numele cartierului nu poate conține simboluri
@@ -247,3 +247,28 @@ ro:
           warnings:
             contains_too_many_words: Se recomandă ca numele cartierului să nu aibă
               mai mult de %{word_count} cuvinte
+        line2:
+          label:
+            default: Apartament, cameră etc.
+            optional: Apartament, cameră etc. (opțional)
+          errors:
+            blank: Introdu un apartament, o cameră etc.
+            too_long: A doua linie a adresei este prea lungă (lungimea maximă este
+              de %{limit} caractere)
+            contains_emojis: A doua linie de adresă nu poate conține emoji-uri
+            contains_mathematical_symbols: A doua linie de adresă nu poate conține
+              simboluri matematice
+            contains_restricted_characters: A doua linie de adresă poate conține numai
+              litere, cifre, caractere locale și caractere speciale
+            contains_too_many_words: A doua linie de adresă nu poate conține mai mult
+              de %{word_count} cuvinte
+            contains_html_tags: A doua linie de adresă nu poate conține etichete HTML.
+            contains_url: A doua linie de adresă nu poate conține adrese URL.
+            missing_building_number: Adaugă un număr de clădire, dacă ai unul.
+            street_unknown_for_zip: Introdu o denumire de stradă validă pentru %{zip}.
+            building_number_invalid: Numărul clădirii nu a putut fi găsit pentru %{street},
+              %{zip}.
+            unknown_for_address: Este posibil ca a doua linie de adresă să fie incorectă.
+          warnings:
+            contains_too_many_words: Se recomandă ca pentru a doua linie de adresă
+              să nu introduci mai mult de %{word_count} cuvinte

data/db/data/regions/_default/ru.yml

@@ -225,7 +225,7 @@ ru:
           errors:
             blank: Укажите район
             too_long: Название района слишком длинное (должно содержать не больше
-              255 символов)
+              %{limit} симв.)
             contains_emojis: Название района не может содержать емодзи
             contains_mathematical_symbols: Название района не может содержать математические
               символы
@@ -240,3 +240,27 @@ ru:
           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/sk.yml

@@ -217,7 +217,7 @@ sk:
             optional: Sídlisko (voliteľné)
           errors:
             blank: Zadajte sídlisko
-            too_long: Sídlisko je príliš dlhé (maximálne 255 znakov)
+            too_long: Sídlisko je príliš dlhé (maximálne %{limit} znakov)
             contains_emojis: Sídlisko nemôže obsahovať emotikony
             contains_mathematical_symbols: Sídlisko nemôže obsahovať matematické značky
             contains_restricted_characters: Sídlisko môže obsahovať len písmená, číslice,
@@ -232,3 +232,27 @@ sk:
           warnings:
             contains_too_many_words: 'Sídlisko by nemalo mať viac ako tento počet
               slov: %{word_count}'
+        line2:
+          label:
+            default: Apartmán, byt atď.
+            optional: Apartmán, byt atď. (voliteľné)
+          errors:
+            blank: Zadajte apartmán, byt atď.
+            too_long: Druhý riadok adresy je príliš dlhý (maximálne %{limit} znakov)
+            contains_emojis: Druhý riadok adresy nemôže obsahovať emotikony
+            contains_mathematical_symbols: Druhý riadok adresy nemôže obsahovať matematické
+              značky
+            contains_restricted_characters: Druhý riadok adresy môže obsahovať len
+              písmená, číslice, miestne znaky a špeciálne znaky
+            contains_too_many_words: 'Druhý riadok adresy nemôže mať viac ako tento
+              počet slov: %{word_count}'
+            contains_html_tags: Druhý riadok adresy nemôže obsahovať HTML značky.
+            contains_url: Druhý riadok adresy nemôže obsahovať URL adresy.
+            missing_building_number: Ak máte číslo budovy, pridajte ho.
+            street_unknown_for_zip: Zadajte platný názov ulice pre PSČ %{zip}.
+            building_number_invalid: Číslo budovy na ulici %{street} s PSČ %{zip}
+              sa nepodarilo nájsť.
+            unknown_for_address: Druhý riadok adresy môže byť nesprávny.
+          warnings:
+            contains_too_many_words: 'Druhý riadok adresy by nemal mať viac ako tento
+              počet slov: %{word_count}'

data/db/data/regions/_default/sl.yml

@@ -226,7 +226,7 @@ sl:
             optional: Soseska (izbirno)
           errors:
             blank: Vnesite sosesko
-            too_long: Ime soseske je predolgo (največje dovoljeno št. znakov je 255)
+            too_long: Ime soseske je predolgo (največje dovoljeno št. znakov je %{limit})
             contains_emojis: Ime soseske ne sme vsebovati čustvenih simbolov
             contains_mathematical_symbols: Ime soseske ne sme vsebovati matematičnih
               simbolov
@@ -242,3 +242,29 @@ sl:
           warnings:
             contains_too_many_words: Ime soseske naj ne vsebuje več kot %{word_count}
               besed
+        line2:
+          label:
+            default: Št. stanovanja, apartmaja itd.
+            optional: Št. stanovanja, apartmaja itn. (izbirno)
+          errors:
+            blank: Vnesite št. stanovanja, apartmaja itn.
+            too_long: Naslov v drugi vrstici je predolg (največje dovoljeno št. znakov
+              je %{limit})
+            contains_emojis: Naslov v drugi vrstici ne sme vsebovati čustvenih simbolov
+            contains_mathematical_symbols: Naslov v drugi vrstici ne sme vsebovati
+              matematičnih simbolov
+            contains_restricted_characters: Naslov v drugi vrstici lahko vsebuje le
+              črke, številke, lokalne znake in posebne znake
+            contains_too_many_words: Naslov v drugi vrstici ne sme vsebovati več kot
+              %{word_count} besed
+            contains_html_tags: Naslov v drugi vrstici ne sme vsebovati oznak HTML.
+            contains_url: Naslov v drugi vrstici ne sme vsebovati naslovov URL.
+            missing_building_number: Dodajte hišno številko, če jo imate.
+            street_unknown_for_zip: Vnesite veljavno ime ulice za poštno številko
+              %{zip}.
+            building_number_invalid: Hišne številke ni bilo mogoče najti za ulico
+              %{street}, %{zip}.
+            unknown_for_address: Naslov v drugi vrstici morda ni pravilen.
+          warnings:
+            contains_too_many_words: Naslov v drugi vrstici naj ne vsebuje več kot
+              %{word_count} besed

data/db/data/regions/_default/sv.yml

@@ -218,7 +218,7 @@ sv:
             optional: Område (valfritt)
           errors:
             blank: Ange ett område
-            too_long: Områdesnamnet är för långt (max. 255 tecken)
+            too_long: Områdesnamnet är för långt (max. %{limit} tecken)
             contains_emojis: Område får inte innehålla emojier
             contains_mathematical_symbols: Område får inte innehålla matematiska symboler
             contains_restricted_characters: Område får endast innehålla bokstäver,
@@ -233,3 +233,27 @@ sv:
           warnings:
             contains_too_many_words: Vi rekommenderar att området består av färre
               än %{word_count} ord
+        line2:
+          label:
+            default: Lägenhet, våning etc.
+            optional: Lägenhet, svit etc. (valfritt)
+          errors:
+            blank: Ange en lägenhet, våning etc.
+            too_long: Den andra adressraden är för lång (max. %{limit} tecken)
+            contains_emojis: Den andra adressraden får inte innehålla emojier
+            contains_mathematical_symbols: Den andra adressraden får inte innehålla
+              matematiska symboler
+            contains_restricted_characters: Den andra adressraden får endast innehålla
+              bokstäver, siffror, lokala tecken och specialtecken
+            contains_too_many_words: Den andra adressraden får inte innehålla fler
+              än %{word_count} ord
+            contains_html_tags: Den andra adressraden får inte innehålla HTML-taggar.
+            contains_url: Den andra adressraden får inte innehålla URL:er.
+            missing_building_number: Lägg till ett husnummer om du har ett.
+            street_unknown_for_zip: Ange ett giltigt gatunamn för %{zip}.
+            building_number_invalid: Vi kunde inte hitta husnumret för %{street},
+              %{zip}.
+            unknown_for_address: Den andra adressraden kan vara felaktig.
+          warnings:
+            contains_too_many_words: Vi rekommenderar att den andra adressraden består
+              av färre än %{word_count} ord

data/db/data/regions/_default/th.yml

@@ -207,7 +207,7 @@ th:
             optional: สถานที่ใกล้เคียง (ไม่บังคับ)
           errors:
             blank: ป้อนชื่อสถานที่ใกล้เคียง
-            too_long: ชื่อสถานที่ใกล้เคียงยาวเกินไป (สูงสุดคือ 255 อักขระ)
+            too_long: ชื่อสถานที่ใกล้เคียงยาวเกินไป (ต้องไม่เกิน %{limit} อักขระ)
             contains_emojis: ห้ามใส่อีโมจิในชื่อสถานที่ใกล้เคียง
             contains_mathematical_symbols: ห้ามใส่สัญลักษณ์ทางคณิตศาสตร์ในชื่อสถานที่ใกล้เคียง
             contains_restricted_characters: ชื่อสถานที่ใกล้เคียงต้องใช้เฉพาะตัวอักษร
@@ -222,3 +222,26 @@ th:
           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/tr.yml

@@ -208,7 +208,7 @@ tr:
             optional: Mahalle (isteğe bağlı)
           errors:
             blank: Mahalle girin
-            too_long: Mahalle adı çok uzun (maksimum 255 karakter)
+            too_long: Mahalle adı çok uzun (maksimum %{limit} karakter olmalıdır)
             contains_emojis: Mahalle adı emoji içeremez
             contains_mathematical_symbols: Mahalle adı matematiksel semboller içeremez
             contains_restricted_characters: Mahalle adı yalnızca harfler, sayılar,
@@ -222,3 +222,26 @@ tr:
           warnings:
             contains_too_many_words: Mahalle adında %{word_count} adetten az kelime
               olması önerilir
+        line2:
+          label:
+            default: Apartman, daire vb.
+            optional: Apartman, Daire vb. (isteğe bağlı)
+          errors:
+            blank: Apartman, daire vb. girin
+            too_long: İkinci adres satırı çok uzun (maksimum %{limit} karakter olmalıdır)
+            contains_emojis: İkinci adres satırı emoji içeremez
+            contains_mathematical_symbols: İkinci adres satırı matematiksel semboller
+              içeremez
+            contains_restricted_characters: İkinci adres satırı yalnızca harfler,
+              sayılar, yerel karakterler ve özel karakterler içerebilir
+            contains_too_many_words: İkinci adres satırı en fazla %{word_count} kelime
+              içerebilir
+            contains_html_tags: İkinci adres satırı HTML etiketleri içeremez.
+            contains_url: İkinci adres satırı URL içeremez.
+            missing_building_number: Varsa bina numaranızı ekleyin.
+            street_unknown_for_zip: "%{zip} için geçerli bir sokak adı girin."
+            building_number_invalid: "%{street} %{zip} için bina numarası bulunamadı."
+            unknown_for_address: İkinci adres satırı yanlış olabilir.
+          warnings:
+            contains_too_many_words: İkinci adres satırında %{word_count} adetten
+              az kelime olması önerilir

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

@@ -14,6 +14,7 @@ module Worldwide
       :phone,
       :street_name,
       :street_number,
+      :line2,
       :neighborhood
 
     def initialize(
@@ -29,6 +30,7 @@ module Worldwide
       phone: nil,
       street_name: nil,
       street_number: nil,
+      line2: nil,
       neighborhood: nil
     )
       @first_name = first_name
@@ -43,6 +45,7 @@ module Worldwide
       @phone = phone
       @street_name = street_name
       @street_number = street_number
+      @line2 = line2
       @neighborhood = neighborhood
     end
 
@@ -146,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/field.rb

@@ -14,6 +14,7 @@ module Worldwide
       :street_name,
       :street_number,
       :address2,
+      :line2,
       :neighborhood,
       :city,
       :province,

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.13.0"
+  VERSION = "0.15.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.13.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-27 00:00:00.000000000 Z
+date: 2024-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -62,12 +62,16 @@ extra_rdoc_files: []
 files:
 - ".github/CODE_OF_CONDUCT.md"
 - ".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