worldwide 0.12.2 → 0.13.0

data/db/data/regions/ZA/{lt-LT.yml → lt.yml}

@@ -1,5 +1,5 @@
 ---
-lt-LT:
+lt:
   worldwide:
     ZA:
       addresses:

data/db/data/regions/ZA/{ro-RO.yml → ro.yml}

@@ -1,5 +1,5 @@
 ---
-ro-RO:
+ro:
   worldwide:
     ZA:
       addresses:

data/db/data/regions/ZA/{sk-SK.yml → sk.yml}

@@ -1,5 +1,5 @@
 ---
-sk-SK:
+sk:
   worldwide:
     ZA:
       addresses:

data/db/data/regions/ZA/{sl-SI.yml → sl.yml}

@@ -1,5 +1,5 @@
 ---
-sl-SI:
+sl:
   worldwide:
     ZA:
       addresses:

data/db/data/regions/_default/{bg-BG.yml → bg.yml}

@@ -1,5 +1,5 @@
 ---
-bg-BG:
+bg:
   worldwide:
     _default:
       addresses:

data/db/data/regions/_default/{hr-HR.yml → hr.yml}

@@ -1,5 +1,5 @@
 ---
-hr-HR:
+hr:
   worldwide:
     _default:
       addresses:

data/db/data/regions/_default/{lt-LT.yml → lt.yml}

@@ -1,5 +1,5 @@
 ---
-lt-LT:
+lt:
   worldwide:
     _default:
       addresses:

data/db/data/regions/_default/{ro-RO.yml → ro.yml}

@@ -1,5 +1,5 @@
 ---
-ro-RO:
+ro:
   worldwide:
     _default:
       addresses:

data/db/data/regions/_default/{sk-SK.yml → sk.yml}

@@ -1,5 +1,5 @@
 ---
-sk-SK:
+sk:
   worldwide:
     _default:
       addresses:

data/db/data/regions/_default/{sl-SI.yml → sl.yml}

@@ -1,5 +1,5 @@
 ---
-sl-SI:
+sl:
   worldwide:
     _default:
       addresses:

data/lib/worldwide/address.rb

@@ -11,7 +11,10 @@ module Worldwide
       :city,
       :province_code,
       :country_code,
-      :phone
+      :phone,
+      :street_name,
+      :street_number,
+      :neighborhood
 
     def initialize(
       first_name: nil,
@@ -23,7 +26,10 @@ module Worldwide
       city: nil,
       province_code: nil,
       country_code: "ZZ", # Unknown region
-      phone: nil
+      phone: nil,
+      street_name: nil,
+      street_number: nil,
+      neighborhood: nil
     )
       @first_name = first_name
       @last_name = last_name
@@ -35,6 +41,9 @@ module Worldwide
       @province_code = province_code&.to_s&.upcase
       @country_code = country_code.to_s.upcase
       @phone = phone
+      @street_name = street_name
+      @street_number = street_number
+      @neighborhood = neighborhood
     end
 
     def errors
@@ -133,8 +142,39 @@ module Worldwide
       Util.blank?(errors)
     end
 
+    RESERVED_DELIMITER = "\u00A0"
+    def concatenated_address1
+      return address1 if address1.present?
+
+      additional_fields = region.additional_address_fields["address1"] || []
+      concatenate_fields(additional_fields)
+    end
+
+    def concatenated_address2
+      additional_fields = region.additional_address_fields["address2"] || []
+      concatenate_fields(additional_fields)
+    end
+
+    def split_address1
+      additional_fields = region.additional_address_fields["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"] || []
+      split_fields_arr = address2&.split(RESERVED_DELIMITER) || []
+      split_fields(additional_fields, split_fields_arr)
+    end
+
     private
 
+    def region
+      return @region if defined?(@region)
+
+      @region = Worldwide.region(code: country_code)
+    end
+
     LINE_SEP = "_"
     private_constant :LINE_SEP
     WORD_SEP = " "
@@ -414,5 +454,42 @@ module Worldwide
         stripped
       end
     end
+
+    def concatenate_fields(fields)
+      concatenated_field = ""
+      fields.each_with_index do |field, i|
+        field_value = send(field["key"].underscore.to_sym)
+        next if field_value.blank?
+
+        delimiter = concatenation_delimiter(concatenated_field, field["decorator"], i)
+        concatenated_field += delimiter + field_value
+      end
+
+      concatenated_field
+    end
+
+    def concatenation_delimiter(concatenated_field, decorator, field_index)
+      if field_index == 0
+        ""
+      else
+        concatenated_field.blank? ? RESERVED_DELIMITER : "#{decorator}#{RESERVED_DELIMITER}"
+      end
+    end
+
+    def split_fields(field_definitions, field_values)
+      return if field_definitions.empty?
+
+      field_definitions.each_with_index.with_object({}) do |(field, i), split_fields|
+        next unless field_values[i].present?
+
+        field_name = field["key"].underscore
+        split_fields[field_name] = strip_decorators(field_definitions[i + 1], field_values[i])
+      end
+    end
+
+    def strip_decorators(next_field_definition, current_field_value)
+      delimiter = next_field_definition&.fetch("decorator", nil) || ""
+      current_field_value&.delete_suffix(delimiter)
+    end
   end
 end

data/lib/worldwide/version.rb

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

data/translation.yml

@@ -1,5 +1,5 @@
 source_language: en
-target_languages: [bg-BG, cs, da, de, el, es, fi, fr, hi, hr-HR, hu, id, it, ja, ko, lt-LT, ms, nb, nl, pl, pt-BR, pt-PT, ro-RO, ru, sk-SK, sl-SI, sv, th, tr, vi, zh-CN, zh-TW]
+target_languages: [bg, cs, da, de, el, es, fi, fr, hi, hr, hu, id, it, ja, ko, lt, ms, nb, nl, pl, pt-BR, pt-PT, ro, ru, sk, sl, sv, th, tr, vi, zh-CN, zh-TW]
 async_pr_mode: per_pr
 components:
   - name: 'buyer'