address_composer 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30e870bd8e39f5cf689942c7b4343f2d885f4de4ebdcb01878f8627c1b685039
-  data.tar.gz: '07117792510f3dd522c3443fabf1844f8039fbca6f08e94e550a59a86198244d'
+  metadata.gz: 4c044946e2cf8967b36aa267c126579b5bcbf4e529abed3a121bac815265fb6f
+  data.tar.gz: 4849d192a1073e378624714e536e964846aff9e9297fc5a32ea96238e5abdbc0
 SHA512:
-  metadata.gz: 7b2063f714d1f0100f71274808375364677430d213794b63e4d1eb4cfc95e8ac2e6eb56e7dd8464699da03a7614a6d3d7ac5578fa4106ea1bbcae1a605390dda
-  data.tar.gz: 385f17417dc4884f44ced76e8a5d48b631395a53213554e840ef87072315df43caddd5fde7515d3f5da75824c64f4de3bc8d288783e0419d2c9e6b29c9c7e9a0
+  metadata.gz: 105c406cc5cf4f269ab44a07ebb31ed7f5db74705f38f0f3379dd23c1331cd86c873dd00f5846a608e221fef402f97a55c9a5320af92d8af61fe8dfa7d06abbb
+  data.tar.gz: eab56b159a893271e8815c2f4bc2d3ce3686cda249e6376e18fcafe444c08ef5831a10aba4e16ee220b0228de24fb62f2fd140895cd857b660f08137907c9784

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    address_composer (1.0.0)
+    address_composer (1.0.1)
       mustache (~> 1.1)
 
 GEM

data/address-formatting/README.md

@@ -52,11 +52,14 @@ Unlike [physical post (office) mail](http://www.bitboost.com/ref/international-a
 Our goal with this repository is a series of (programming) language independent templates. Those templates can then be processed by whatever software you like. 
 
 There are open-source implementations in
+
   * [Elixir](https://github.com/dkuku/ex_address_formatting)
+  * [Go](https://github.com/timonmasberg/address-formatter)
   * [Java](https://github.com/placemarkt/address-formatter-java)
   * [Javascript](https://github.com/fragaria/address-formatter)
   * [Perl](https://metacpan.org/release/Geo-Address-Formatter)
   * [PHP](https://github.com/predicthq/address-formatter-php)
+  * [Python](https://github.com/dunkelstern/international_address_formatter)
   * [Ruby](https://github.com/mirubiri/address_composer)
   * [Rust](https://github.com/CanalTP/address-formatter-rs)
   * [Scala](https://github.com/ben-willis/address-formatter)

data/address-formatting/conf/countries/worldwide.yaml

@@ -1930,6 +1930,8 @@ US:
         - ["\nUS$","\nUnited States of America"]
         - ["\nUSA$","\nUnited States of America"]
         - ["\nUnited States$","\nUnited States of America"]
+        - ["Town of ",""]
+        - ["Township of ",""]
 
 # Uzbekistan
 UZ:

data/address-formatting/conf/state_codes.yaml

@@ -1215,6 +1215,85 @@ HU:
     VM: Veszprém
     ZA: Zala
     ZE: Zalaegerszeg
+ID:
+    AC: Aceh
+    BA: Bali
+    BB:
+      default: Kepulauan Bangka Belitung
+      alt_en: Bangka-Belitung Islands
+    BE: Bengkulu
+    BT: Banten
+    GO: Gorontalo
+    JA: Jambi
+    JB:
+      default: Jawa Barat
+      alt_en: West Java
+    JI:
+      default: Jawa Timur
+      alt_en: East Java    
+    JK:
+      default: Daerah Khusus Ibukota Jakarta
+      alt_en: Jakarta Special Capital Region
+    JT:
+      default: Jawa Tengah
+      alt_en: Central Java    
+    KB:
+      default: Kalimantan Barat
+      alt_en: West Kalimantan
+    KI:
+      default: Kalimantan Timur
+      alt_en: East Kalimantan
+    KR:
+      default: Kepulauan Riau
+      alt_en: Riau Islands
+    KS:
+      default: Kalimantan Selatan
+      alt_en: South Kalimantan
+    KT:
+      default: Kalimantan Tengah
+      alt_en: Central Kalimantan
+    KU:
+      default: Kalimantan Utara
+      alt_en: North Kalimantan
+    LA: Lampung
+    MA: Maluku
+    MU:
+      default: Maluku Utara
+      alt_en: North Maluku
+    NB: Nusa Tenggara Barat
+    NT: Nusa Tenggara Timur
+    PA: Papua
+    PB:
+      default: Papua Barat
+      alt_en: West Papua
+    RI: Riau
+    SA:
+      default: Sulawesi Utara
+      alt_en: North Sulawesi
+    SB:
+      default: Sumatera Barat
+      alt_en: West Sumatra
+    SG:
+      default: Sulawesi Tenggara
+      alt_en: Southeast Sulawesi      
+    SN:
+      default: Sulawesi Selatan
+      alt_en: South Sulawesi
+    SR:
+      default: Sulawesi Barat
+      alt_en: West Sulawesi
+    SS:
+      default: Sumatera Selatan
+      alt_en: South Sumatra
+    ST:
+      default: Sulawesi Tengah
+      alt_en: Central Sulawesi
+    SU:
+      default: Sumatera Utara
+      alt_en: North Sumatra
+    YO:
+      default: Daerah Istimewa Yogyakarta
+      alt_en: Special Region of Yogyakarta
 IE:
     C: Connacht
     L: Leinster
@@ -1696,6 +1775,38 @@ MU:
     PW: Plaines Wilhems
     RR: Rivière du Rempart
     SA: Savanne
+MW:
+    BA: Balaka
+    BL: Blantyre
+    C: Central
+    CK: Chikwawa
+    CR: Chiradzulu
+    CT: Chitipa
+    DE: Dedza
+    DO: Dowa
+    KR: Karonga
+    KS: Kasungu
+    LI: Lilongwe
+    LK: Likoma
+    MC: Mchinji
+    MG: Mangochi
+    MH: Machinga
+    MU: Mulanje
+    MW: Mwanza
+    MZ: Mzimba
+    N: Northern
+    NB: Nkhata Bay
+    NE: Neno
+    NI: Ntchisi
+    NK: Nkhotakota
+    NS: Nsanje
+    NU: Ntcheu
+    PH: Phalombe
+    RU: Rumphi
+    S: Southern
+    SA: Salima
+    TH: Thyolo
+    ZO: Zomba
 MX:
     AGU: Aguascalientes
     BCN: Baja California

data/address-formatting/testcases/countries/us.yaml

@@ -139,6 +139,24 @@ expected:  |
     928 Flagler Avenue
     Edgewater, FL 32132
     United States of America
+
+---
+description: clean up "Town of " 40.7805,-73.4875
+components:
+    country: United States
+    country_code: us
+    county: Nassau County
+    house_number: 4
+    municipality: Town of Oyster Bay
+    postcode: 11803
+    road: Lakeville Lane
+    state: New York
+    state_code: NY 
+expected:  |
+    4 Lakeville Lane
+    Oyster Bay, NY 11803
+    United States of America
+
 ---
 description: use county if no city
 components:
@@ -170,14 +188,14 @@ expected:  |
 ---
 description: Library in Charlotte Amalie, 18.34119,-64.93546
 components:
-        country: United States of America
-        country_code: us
-        county: St. Thomas Island
-        library: Enid M Baa Library and Archives
-        postcode: "00803"
-        road: Dronningens Gade
-        state: United States Virgin Islands
-        town: Charlotte Amalie
+   country: United States of America
+   country_code: us
+   county: St. Thomas Island
+   library: Enid M Baa Library and Archives
+   postcode: "00803"
+   road: Dronningens Gade
+   state: United States Virgin Islands
+   town: Charlotte Amalie
 expected:  |
     Enid M Baa Library and Archives
     Dronningens Gade
@@ -188,19 +206,19 @@ expected:  |
 ---
 description: state_district
 components:
-        country: United States of America
-        country_code: us
-        state: New York
-        state_district: New York
+   country: United States of America
+   country_code: us
+   state: New York
+   state_district: New York
 expected:  |
     New York, New York
     United States of America
 ---
 description: just state
 components:
-        country: United States of America
-        country_code: us
-        state: New York
+   country: United States of America
+   country_code: us
+   state: New York
 expected:  |
     New York
     United States of America

data/lib/address_composer/version.rb

@@ -1,3 +1,3 @@
 class AddressComposer
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.1".freeze
 end

data/lib/address_composer.rb

@@ -178,14 +178,14 @@ class AddressComposer
       components["postcode"] = components["postcode"].split(",").first
     end
 
-    # Clean values with "", nil or []
-    self.components = components.reject { |_, v| v.nil? || v.empty? }
-
     # If country is a number use the state as country
-    if components["country"]&.match?(/[0-9]/)
+    if components["state"] && components["country"]&.match?(/^\d+$/)
       components["country"] = components["state"]
     end
 
+    # Clean values with "", nil or []
+    self.components = components.reject { |_, v| v.nil? || v.empty? }
+
     # Remove components with URL
     components.delete_if { |_, v| v.match?(URI::DEFAULT_PARSER.make_regexp) }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: address_composer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Alejandro Arrufat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2021-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache