address_composer 0.1.3.pre → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d768e74414488a36d9941af1f3fe0db060ff8664
-  data.tar.gz: 8b5c62d17693bc8456a3328d49145624c1fb5419
+SHA256:
+  metadata.gz: 4c044946e2cf8967b36aa267c126579b5bcbf4e529abed3a121bac815265fb6f
+  data.tar.gz: 4849d192a1073e378624714e536e964846aff9e9297fc5a32ea96238e5abdbc0
 SHA512:
-  metadata.gz: 5606dde039f00156bfcf558e1eb7e9e0da351957572077fab3f08f28713c8d7c155ec068351f639e6ea4fded9f89f9bae370aa5b83e1793367e8ec4f9530e117
-  data.tar.gz: e67389b1c5431193693923ef1a118b820b3b6541ed32f0a0c137b565678e3b615a701767d2da2f83b1021db81138e98176ee1593914efb4ccfaeeb767cd92250
+  metadata.gz: 105c406cc5cf4f269ab44a07ebb31ed7f5db74705f38f0f3379dd23c1331cd86c873dd00f5846a608e221fef402f97a55c9a5320af92d8af61fe8dfa7d06abbb
+  data.tar.gz: eab56b159a893271e8815c2f4bc2d3ce3686cda249e6376e18fcafe444c08ef5831a10aba4e16ee220b0228de24fb62f2fd140895cd857b660f08137907c9784

data/.github/workflows/main.yml

@@ -0,0 +1,25 @@
+name: Ruby
+
+on: [push,pull_request]
+
+jobs:
+  rspec:
+    strategy:
+      matrix:
+        ruby: [2.4, 2.5, 2.6, 2.7, 3.0]
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: recursive
+
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+
+    - name: Run tests
+      run: bundle exec rake spec

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+.ruby-version

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "address-formatting"]
 	path = address-formatting
-	url = git@github.com:OpenCageData/address-formatting.git
+	url = https://github.com/OpenCageData/address-formatting.git

data/Gemfile.lock

@@ -1,48 +1,49 @@
 PATH
   remote: .
   specs:
-    address_composer (0.1.3.pre)
+    address_composer (1.0.1)
       mustache (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     byebug (11.1.3)
-    coderay (1.1.2)
-    diff-lcs (1.3)
+    coderay (1.1.3)
+    diff-lcs (1.4.4)
     method_source (1.0.0)
     mustache (1.1.1)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+      pry (~> 0.10)
+    rake (13.0.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
 
 PLATFORMS
   ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
   address_composer!
-  bundler (~> 1.17)
-  pry (~> 0.13)
-  pry-byebug (~> 3.9)
+  bundler (~> 2.2)
+  pry (~> 0.14)
+  pry-byebug (~> 3.8)
   rake (~> 13.0)
-  rspec (~> 3.0)
+  rspec (~> 3.10)
 
 BUNDLED WITH
-   1.17.3
+   2.2.22

data/README.md

@@ -48,7 +48,9 @@ United States of America
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `git submodule init` and `git submodule update` to fetch all the data from the submodule project and check out the mapped commit.
+
+Then, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/address-formatting/.travis.yml

@@ -1,10 +1,12 @@
----
-language: 'perl'
+language: perl
 perl:
-  - "5.26" # Ubuntu 18
+- '5.30'
 env: PERL_CPANM_OPT="--notest --force --skip-satisfied"
 install:
-  - cpanm File::Find::Rule~0.34
-  - cpanm Geo::Address::Formatter~1.76
+- cpanm File::Find::Rule~0.34
+- cpanm Geo::Address::Formatter
 script:
-  - bin/run_tests.t
+- bin/run_tests.t
+notifications:
+  slack:
+    secure: M7U87fLJ7oXOPjFDBASOwhNZXqRoYsTYtPxVbAHlQfS1at38IfK7/6rWdf7yNUPCV0JqfRCsR7frWQNncR9BbjtYSoDFywY/IcdVMoOl3haZJqXbA/LfGgI9ZIBAx5nBUlZkBaaq/RhXoKlNbZ89p6zq3qyvsUIgmUSkNTGejRU=

data/address-formatting/README.md

@@ -6,7 +6,8 @@ This project contains templates and test cases for address formats used in terri
 
 ### Build Status
 
-[![Build Status](https://travis-ci.org/OpenCageData/address-formatting.svg?branch=master)](https://travis-ci.org/OpenCageData/address-formatting)
+[![Build Status](https://travis-ci.com/OpenCageData/address-formatting.svg?branch=master)](https://travis-ci.com/OpenCageData/address-formatting)
+[![Twitter Follow](https://img.shields.io/twitter/follow/OpenCage?label=Follow%20OpenCage&style=social)](https://twitter.com/opencage)
 
 ### An example:
 
@@ -52,10 +53,16 @@ Our goal with this repository is a series of (programming) language independent
 
 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)
 
 We would love more language implementations. The more people who use the templates, the more likely bugs will be reported. 
 If you write a processor, please submit a pull request adding it to the list. Thanks. 
@@ -71,7 +78,7 @@ As of `Sun 17 Feb 2019` coverage is:
     
 This output is generated by `bin/coverage.pl`    
 
-We need more language specific abbreviations. Please see `conf/abbreviations`. Pull requests wil lbe glaldy received. 
+We need more language specific abbreviations. Please see `conf/abbreviations`. Pull requests gladly received. 
 
 A detailed breakdown of test and configuration coverage can be found by running `bin/coverage.pl -d`. A list of all known territories is in `conf/country_codes.yaml`
 

data/address-formatting/SECURITY.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please see the [OpenCage security bounty page](https://opencagedata.com/security-bounty)

data/address-formatting/conf/abbreviations/{dk.yaml → da.yaml}

@@ -12,6 +12,3 @@ road:
      Vestre: V
      Øster: Ø
      Østre: Ø
-     
-     
-     

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

@@ -3,5 +3,3 @@ road:
      Sankt: St
      Straße: Str
      Strasse: Str
-
-     

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

@@ -28,4 +28,4 @@ road:
      Square: Sq
      Street: St
      Terrace: Tce
-     Throughway: TRWY
+     Throughway: TRWY

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

@@ -7,4 +7,4 @@ road:
      Rue: r
      Saint: St
      Sainte: Ste
-     Zone industrielle: Z.I
+     Zone industrielle: Z.I

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

@@ -1,4 +1,3 @@
 road:
      utca: u
-
-     
+     körút: krt

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

@@ -1,13 +1,26 @@
 road:
+     Burgemeester: Burg
+     Docter: Dr
+     Dokter: Dr
+     Gebroeders: Gebr
+     Generaal: Gen
      Gracht: Gr
+     Kardinaal: Kard
+     Kolonel: Kol
      Kort: K
      Korte: Kte
      Laan: ln
      Lange: L
      Markt: mkt
+     Minister: Min
+     Monseigneur: Mgr
+     Pastoor: Past
+     Prins: Pr
+     Prinses: Pr
      Professor: Prof
      Sint: St
      Straat: str
      Van: v
+     Vrouwe: Vr
      Weg: wg
-     
+     Zuster: Zr

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

@@ -0,0 +1,16 @@
+road:
+     gata: g
+     gate: g
+     gaten: g
+     plass: pl
+     plassen: pl
+     sving: sv
+     svingen: sv
+     veg: v
+     vegen: v
+     vei: v
+     veien: v
+
+
+
+     

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

@@ -0,0 +1,24 @@
+road:
+     Aleja: al.
+     Aleje: al.
+     Alei: al.
+     Alejach: al.
+     Aleją: al.
+     Biskupa: bpa.
+     Biskup: bp.
+     Doktora: dr.
+     Księcia: ks.
+     Księdza: ks.     
+     Kardynała: kard.
+     Marszałka: marsz.
+     Majora: mjr.
+     Plac: pl.
+     Placu: pl.
+     Placem: pl.
+     Profesora: prof.
+     Pułkownika: płk.     
+     Rotmistrza: rotm.
+     Ulica: ul.
+     Ulice: ul.
+     Ulicą: ul.
+     Ulicy: ul.

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

@@ -28,4 +28,3 @@ road:
      Urbanização: Urb
      Vila: Vl
      Zona: Zn
-     

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

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

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

@@ -6,6 +6,3 @@ road:
      проспект: просп
      шосе: ш
      вулиця: вул
-
-
-     

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

@@ -0,0 +1,7 @@
+road:
+     Công trường: CT
+     Đại lộ: ĐL
+     Đường: D     
+     Quảng trường: QT
+
+     

data/address-formatting/conf/components.yaml

@@ -7,6 +7,9 @@ name: house
 aliases:
     - building
     - public_building
+    - isolated_dwelling
+    - farmland
+    - allotments
 ---
 name: road
 aliases:
@@ -21,37 +24,51 @@ aliases:
     - square
     - place
 ---
-name: village
+name: hamlet
 aliases:
-    - hamlet
     - locality
     - croft
 ---
+name: village
+---
 name: neighbourhood
 aliases:
     - suburb
     - city_district
     - district
     - quarter
+    - borough
+    - city_block
     - residential
     - commercial
     - industrial
     - houses
+    - subdistrict    
     - subdivision
+    - ward
+---
+name: postal_city    
 ---
 name: city
 aliases:
     - town
-    - municipality
+    - township
 ---
-name: county
+name: municipality
 aliases:
     - local_administrative_area
+    - subcounty
+---    
+name: county
+aliases:
     - county_code
+    - department
 ---
 name: state_district
 ---
 name: postcode
+aliases:
+    - partial_postcode
 ---
 name: state
 aliases:
@@ -62,6 +79,8 @@ name: region
 ---
 name: island
 ---
+name: archipelago
+---
 name: country
 aliases:
     - country_name