address_composer 0.1.3.pre → 0.1.4.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d768e74414488a36d9941af1f3fe0db060ff8664
-  data.tar.gz: 8b5c62d17693bc8456a3328d49145624c1fb5419
+  metadata.gz: f51d8002a7fe546e3ceb4ccef4dc20d998e60495
+  data.tar.gz: db7a8b613c2df380ea7eac633fc715594b592c74
 SHA512:
-  metadata.gz: 5606dde039f00156bfcf558e1eb7e9e0da351957572077fab3f08f28713c8d7c155ec068351f639e6ea4fded9f89f9bae370aa5b83e1793367e8ec4f9530e117
-  data.tar.gz: e67389b1c5431193693923ef1a118b820b3b6541ed32f0a0c137b565678e3b615a701767d2da2f83b1021db81138e98176ee1593914efb4ccfaeeb767cd92250
+  metadata.gz: 5839e91856f2043ee4afeca9623259df5beb80f1ba3848ca868799278183f3d85c52aa3d1fb635e256f66f8fa14d3b12636150fc802410a8765777df5dbe2c4c
+  data.tar.gz: fc1babb20fa8743984781f6392e484938df8906dd0c09a029b74d126b8b1b32d1d5c2d6b0c8b94c1c7ef4ef307af5b6d644a0090811a3857b3bd3239ad3f7b82

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    address_composer (0.1.3.pre)
+    address_composer (0.1.4.pre)
       mustache (~> 1.1)
 
 GEM

data/address-formatting/README.md

@@ -55,6 +55,7 @@ There are open-source implementations in
   * [Javascript](https://github.com/fragaria/address-formatter)
   * [Perl](https://metacpan.org/release/Geo-Address-Formatter)
   * [PHP](https://github.com/predicthq/address-formatter-php)
+  * [Ruby](https://github.com/mirubiri/address_composer)
   * [Rust](https://github.com/CanalTP/address-formatter-rs)
 
 We would love more language implementations. The more people who use the templates, the more likely bugs will be reported. 

data/address-formatting/conf/abbreviations/ru.yaml

@@ -0,0 +1,45 @@
+country:
+     Российская Федерация: РФ
+state:
+     автономный округ: АО
+     автономная область: Аобл
+     область: обл
+     Республика: Респ
+county:
+     городской округ: г.о.
+     сельский округ: с.о.
+     район: р-н
+city:
+     город: г
+     сельское поселение: с.п.
+     сельский совет: с.с.
+village:
+     поселок: пос
+     посёлок: пос
+     дачный поселок: дп
+     дачный посёлок: дп
+     деревня: д
+     курортный поселок: кп
+     курортный посёлок: кп
+     местечко: м
+     село: с
+     станица: ст-ца
+     поселок городского типа:	пгт
+     посёлок городского типа:	пгт
+neighbourhood:
+     квартал: кв-л
+     район: р-н
+     микрорайон: мкр
+road:
+     улица: ул
+     дорога: дор
+     переулок: пер
+     шоссе: ш
+     проспект: пр-кт
+     проезд: пр
+     площадь: пл
+     бульвар: б-р
+     набережная: наб
+     корпус: корп
+     строение: стр
+     тупик: туп

data/address-formatting/conf/components.yaml

@@ -33,6 +33,7 @@ aliases:
     - city_district
     - district
     - quarter
+    - city_block
     - residential
     - commercial
     - industrial
@@ -52,6 +53,8 @@ aliases:
 name: state_district
 ---
 name: postcode
+aliases:
+    - partial_postcode
 ---
 name: state
 aliases:

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

@@ -79,7 +79,7 @@ generic10: &generic10 |
         {{{attention}}}
         {{{house}}}
         {{{road}}} {{{house_number}}}
-        {{{suburb}}}
+        {{#first}} {{{suburb}}} || {{{city_district}}} {{/first}}
         {{#first}} {{{city}}} || {{{town}}} || {{{village}}} {{/first}}
         {{{state}}}
         {{{country}}}
@@ -191,7 +191,7 @@ fallback1: &fallback1 |
         {{{attention}}}
         {{{house}}}
         {{{road}}} {{{house_number}}}
-        {{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}
+        {{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} || {{{island}}} {{/first}}
         {{#first}} {{{city}}} || {{{town}}} || {{{village}}} {{/first}}
         {{#first}} {{{county}}} || {{{state_district}}} || {{{state}}} {{/first}}
         {{{country}}}
@@ -208,7 +208,7 @@ fallback3: &fallback3 |
         {{{attention}}}
         {{{house}}}
         {{{road}}} {{{house_number}}}
-        {{{suburb}}}
+        {{#first}} {{{suburb}}} || {{{island}}} {{/first}}
         {{#first}} {{{city}}} || {{{town}}} || {{{village}}} {{/first}}
         {{{county}}}
         {{{state}}}
@@ -1621,6 +1621,14 @@ RS:
 # Russia
 RU:
     address_template: *generic10
+    fallback_template: |
+        {{{attention}}}
+        {{{house}}}
+        {{{road}}} {{{house_number}}}
+        {{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} || {{{island}}} || {{{village}}} {{/first}}
+        {{#first}} {{{city}}} || {{{town}}} {{/first}}
+        {{#first}} {{{county}}} || {{{state_district}}} || {{{state}}} {{/first}}
+        {{{country}}}
 
 # Rwanda
 RW:

data/address-formatting/conf/county_codes.yaml

@@ -3,7 +3,9 @@ ES:
     AB: Albacete
     AL: Almería
     AV: Ávila
-    B: Barcelonès
+    B:
+      default: Barcelonés
+      alt_ca: Barcelonès
     BA: Badajoz
     BI: Vizcaya
     BU: Burgos
@@ -15,13 +17,18 @@ ES:
     CS: Castellón
     CU: Cuenca
     GC: Las Palmas
-    GI: Girona
+    GI:
+      default: Gironés
+      alt_ca: Gironès
+      alt_en: Girona
     GR: Granada
     GU: Guadalajara
     H: Huelva
     HU: Huesca
     J: Jaén
-    L: Lérida
+    L:
+      default: Lérida
+      alt_ca: Lleida
     LE: León
     LO: La Rioja
     LU: Lugo

data/address-formatting/conf/state_codes.yaml

@@ -505,7 +505,9 @@ DE:
     BB: Brandenburg
     BE: Berlin
     BW: Baden-Württemberg
-    BY: Bayern
+    BY:
+      default: Bayern
+      alt_en: Bavaria
     HB: Bremen
     HE: Hessen
     HH: Hamburg
@@ -559,7 +561,10 @@ ES:
     CL : Castilla y León
     CM : Castilla-La Mancha
     CN : Canarias
-    CT : Cataluña
+    CT :
+      default: Cataluña
+      alt_ca: Catalunya
+      alt_en: Catalonia
     EX : Extremadura
     GA : Galicia
     IB : Islas Baleares
@@ -1145,22 +1150,54 @@ PK:
     SD: Sindh
     TA: Federally Administered Tribal Areas
 PL:
-    DS: województwo dolnośląskie
-    KP: województwo kujawsko-pomorskie
-    LB: województwo lubuskie
-    LD: województwo łódzkie
-    LU: województwo lubelskie
-    MA: województwo małopolskie
-    MZ: województwo mazowieckie
-    OP: województwo opolskie
-    PD: województwo podlaskie
-    PK: województwo podkarpackie
-    PM: województwo pomorskie
-    SK: województwo świętokrzyskie
-    SL: województwo śląskie
-    WN: województwo warmińsko-mazurskie
-    WP: województwo wielkopolskie
-    ZP: województwo zachodniopomorskie
+    DS:
+      default: województwo dolnośląskie
+      alt_en: Lower Silesian Voivodeship
+    KP:
+      default: województwo kujawsko-pomorskie
+      alt_en: Kuyavian-Pomeranian Voivodeship       
+    LB:
+      default: województwo lubuskie
+      alt_en: Lubusz Voivodeship      
+    LD:
+      default: województwo łódzkie
+      alt_en: Łódź Voivodeship       
+    LU:
+      default: województwo lubelskie
+      alt_en: Lublin Voivodeship
+    MA:
+      default: województwo mazowieckie
+      alt_en: Masovian Voivodeship      
+    MP:
+      default: województwo małopolskie
+      alt_en: Lesser Poland Voivodeship       
+    OP:
+      default: województwo opolskie
+      alt_en: Opole Voivodeship      
+    PD:
+      default: województwo podlaskie
+      alt_en: Podlaskie Voivodeship
+    PK:
+      default: województwo podkarpackie
+      alt_en: Subcarpathian Voivodeship      
+    PM:
+      default: województwo pomorskie
+      alt_en: Pomeranian Voivodeship      
+    SK:
+      default: województwo świętokrzyskie
+      alt_en: Świętokrzyskie Voivodeship      
+    SL:
+      default: województwo śląskie
+      alt_en: Silesian Voivodeship
+    WM:
+      default: województwo warmińsko-mazurskie
+      alt_en: Warmian-Masurian Voivodeship
+    WP:
+      default: województwo wielkopolskie
+      alt_en: Greater Poland Voivodeship
+    ZP:
+      default: województwo zachodniopomorskie
+      alt_en: West Pomeranian Voivodeship
 RO:
     AB: Alba
     AG: Argeş

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

@@ -143,5 +143,21 @@ expected:  |
     64 Melbourne Road
     London E10
     United Kingdom
-
-
+---
+description: London Borough of Waltham Forest - partial_postcode
+components:
+    city: London
+    country: United Kingdom
+    country_code: gb
+    county: London Borough of Waltham Forest
+    house_number: 64
+    neighbourhood: Walthamstow Village
+    partial_postcode: E10
+    road: Melbourne Road
+    state: England
+    state_district: Greater London
+    suburb: Leyton
+expected:  |
+    64 Melbourne Road
+    London E10
+    United Kingdom

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

@@ -7,6 +7,7 @@ components:
         country_code: hm
         island: Heard Island
 expected:  |
+    Heard Island
     Heard Island and McDonald Islands
     Australia
 

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

@@ -20,3 +20,33 @@ expected:  |
     Санкт-Петербург
     Российская Федерация
     190000
+---
+description: village 55.8931701, 63.7019487
+components:
+    city : Батуринский сельсовет
+    country : Россия
+    country_code : ru
+    county : Шадринский район
+    hamlet : Камчатка
+    state : Курганская область
+expected:  |
+    Камчатка
+    Батуринский сельсовет
+    Шадринский район
+    Россия
+---
+# island
+description: use island name
+components:
+    city : Малиновараккское сельское поселение
+    country : Россия
+    country_code : ru
+    county : Лоухский район
+    island : Ярославль
+    state : Республика Карелия
+expected:  |
+    Ярославль
+    Малиновараккское сельское поселение
+    Лоухский район
+    Россия
+

data/lib/address_composer.rb

@@ -1,5 +1,5 @@
 require "address_composer/version"
-require "YAML"
+require "yaml"
 require "mustache"
 
 class AddressComposer

data/lib/address_composer/version.rb

@@ -1,3 +1,3 @@
 class AddressComposer
-  VERSION = "0.1.3.pre".freeze
+  VERSION = "0.1.4.pre".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: address_composer
 version: !ruby/object:Gem::Version
-  version: 0.1.3.pre
+  version: 0.1.4.pre
 platform: ruby
 authors:
 - Alejandro Arrufat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -133,6 +133,7 @@ files:
 - address-formatting/conf/abbreviations/nl.yaml
 - address-formatting/conf/abbreviations/pt.yaml
 - address-formatting/conf/abbreviations/ro.yaml
+- address-formatting/conf/abbreviations/ru.yaml
 - address-formatting/conf/abbreviations/se.yaml
 - address-formatting/conf/abbreviations/sk.yaml
 - address-formatting/conf/abbreviations/tr.yaml