address_composer 0.1.7.pre → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c51465a502a9177e8c9a606f1c6757aeda1a667855293b1bd89bdfefb8201f16
-  data.tar.gz: 1a78c267e2a56d92f62b6244f5fab13f47131cd67693a302b59f2ff101a2a458
+  metadata.gz: 30e870bd8e39f5cf689942c7b4343f2d885f4de4ebdcb01878f8627c1b685039
+  data.tar.gz: '07117792510f3dd522c3443fabf1844f8039fbca6f08e94e550a59a86198244d'
 SHA512:
-  metadata.gz: a4029029674ed182251a88cc85d33d498e323b3ab7615e7cf61ee6bf94493f52ddf2a05ccb9f90477a6a210407b3c25c6dd0cb85ec556379ca00218811f46527
-  data.tar.gz: 1d46f20b0933703dced5b77f510bb38dc5c1d94402e0c1ae99448fd282177be9e61f1071270644166e3aa6446a6f19c0943bb7e35c23fdda36ad8f4313f1475f
+  metadata.gz: 7b2063f714d1f0100f71274808375364677430d213794b63e4d1eb4cfc95e8ac2e6eb56e7dd8464699da03a7614a6d3d7ac5578fa4106ea1bbcae1a605390dda
+  data.tar.gz: 385f17417dc4884f44ced76e8a5d48b631395a53213554e840ef87072315df43caddd5fde7515d3f5da75824c64f4de3bc8d288783e0419d2c9e6b29c9c7e9a0

data/Gemfile.lock

@@ -1,48 +1,49 @@
 PATH
   remote: .
   specs:
-    address_composer (0.1.7.pre)
+    address_composer (1.0.0)
       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/address-formatting/README.md

@@ -6,7 +6,7 @@ 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,7 +52,7 @@ 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)
   * [Java](https://github.com/placemarkt/address-formatter-java)
   * [Javascript](https://github.com/fragaria/address-formatter)
   * [Perl](https://metacpan.org/release/Geo-Address-Formatter)

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

@@ -31,7 +31,8 @@ generic4: &generic4 |
         {{{attention}}}
         {{{house}}}
         {{{house_number}}} {{{road}}}
-        {{#first}} {{{city}}} || {{{town}}} || {{{state_district}}} || {{{village}}} || {{{hamlet}}} || {{{suburb}}} || {{{municipality}}} || {{{county}}} {{/first}}, {{#first}} {{{state_code}}} || {{{state}}} {{/first}} {{{postcode}}}
+        {{#first}} {{{village}}} || {{{hamlet}}} {{/first}}
+        {{#first}} {{{city}}} || {{{town}}} || {{{state_district}}} || {{{suburb}}} || {{{municipality}}} || {{{county}}} {{/first}}, {{#first}} {{{state_code}}} || {{{state}}} {{/first}} {{{postcode}}}
         {{{country}}}
 
 # no postcode
@@ -588,7 +589,10 @@ CO:
         {{{postcode}}} {{#first}} {{{city}}} || {{{town}}} || {{{state_district}}} || {{{village}}} || {{{hamlet}}} {{/first}}, {{#first}} {{{state_code}}} || {{{state}}} {{/first}}
         {{{country}}}
     postformat_replace:
+        - ["Localidad "," "]    
         - ["Bogota, Bogota","Bogota"]
+        - ["Bogota, Bogotá Distrito Capital","Bogota"]
+        - ["Bogotá, Bogotá Distrito Capital","Bogotá"]
 
 # Costa Rica
 CR:
@@ -1697,7 +1701,12 @@ SE:
 
 # Singapore
 SG:
-    address_template: *generic2
+    address_template: |
+        {{{attention}}}
+        {{#first}} {{{house}}}, {{{quarter}}} || {{{house}}} {{/first}}
+        {{{house_number}}} {{{road}}}, {{{residential}}}
+        {{#first}} {{{village}}} || {{{town}}} || {{{city}}} || {{{municipality}}} || {{{hamlet}}} || {{{country}}} || {{{county}}} {{/first}} {{{postcode}}}
+        {{#first}} {{{country}}} || {{{state}}} {{/first}}
 
 # Saint Helena, Ascension and Tristan da Cunha - same as UK
 SH:

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

@@ -7,15 +7,14 @@ components:
         building: Executive Office Building (American Samoa Government)
         country: American Samoa
         country_code: as
-        county: Ituau
+        county: Eastern District
+        municipality: Maʻopūtasi County
         postcode: 96799
-        road: Route 001
-        village: Faganeanea
+        road: Route 118
+        village: Utulei
 expected:  |
     Executive Office Building (American Samoa Government)
-    Route 001
-    Faganeanea, AS 96799
+    Route 118
+    Utulei
+    Maʻopūtasi County, AS 96799
     United States of America
-
-
-

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

@@ -1,15 +1,15 @@
 # Guam, unincorporated territory of the US
 ---
-description: House in Tamuning
+description: House in Tamuning, 13.50294,144.77693
 components:
         country: Guam
         country_code: gu
         county: Guam
         house_number: 258
-        locality: Tamuning
         postcode: 96913
         road: Father San Vitores Street
         state: Guam
+        town: Tamuning
 expected:  |
     258 Father San Vitores Street
     Tamuning, GU 96913

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

@@ -1,5 +1,5 @@
 ---
-description: Chinatown Singapore
+description: SG no postcode
 components:
     country: Singapore
     country_code: SG
@@ -24,3 +24,20 @@ expected:  |
     16 Sandilands Road
     Singapore 546080
     Singapore
+---
+description: no city, 1.30585,103.78158
+components:
+    country: Singapore
+    country_code: sg
+    county: Southwest
+    house_number: 26
+    postcode: 130026
+    residential: Dover Gardens
+    road: Dover Crescent
+    suburb: Queenstown
+expected:  |
+    26 Dover Crescent, Dover Gardens
+    Singapore 130026
+    Singapore
+
+

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

@@ -219,3 +219,34 @@ expected:  |
     Burt
     Taymouth Township, Michigan
     United States of America
+#
+# village
+---
+description: village
+components:
+    country: United States of America
+    country_code:  us
+    county: Costilla County
+    postcode: "08113"
+    state: Colorado
+    village:  Fort Garland
+expected:  |
+    Fort Garland
+    Costilla County, CO 08113
+    United States of America
+#
+# hamlet
+---
+description: hamlet
+components:
+    city: Homestead
+    country: United States of America
+    country_code:  us
+    county: Miami-Dade County
+    hamlet: Homestead Trailer Park
+    postcode: 33030
+    state: Florida
+expected:  |
+    Homestead Trailer Park
+    Homestead, FL 33030
+    United States of America

data/address_composer.gemspec

@@ -28,9 +28,9 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency "mustache", "~> 1.1"
 
-  gem.add_development_dependency "bundler", "~> 1.17"
-  gem.add_development_dependency "pry", "~> 0.13"
-  gem.add_development_dependency "pry-byebug", "~> 3.9"
+  gem.add_development_dependency "bundler", "~> 2.2"
+  gem.add_development_dependency "pry", "~> 0.14"
+  gem.add_development_dependency "pry-byebug", "~> 3.8"
   gem.add_development_dependency "rake", "~> 13.0"
-  gem.add_development_dependency "rspec", "~> 3.0"
+  gem.add_development_dependency "rspec", "~> 3.10"
 end

data/lib/address_composer.rb

@@ -25,12 +25,12 @@ class AddressComposer
   attr_accessor :components
 
   def initialize(components)
-    self.components = components
-  end
+    self.components = components.dup
 
-  def compose
     normalize_components
+  end
 
+  def compose
     if components["country_code"]
       result = Template.render(template, components).squeeze("\n").lstrip.gsub(/\s*\n\s*/, "\n")
       result = post_format_replace(result)

data/lib/address_composer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: address_composer
 version: !ruby/object:Gem::Version
-  version: 0.1.7.pre
+  version: 1.0.0
 platform: ruby
 authors:
 - Alejandro Arrufat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-18 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
 description: Address Composer formats address components using worldwide regions formatting
   templates
 email:
@@ -424,11 +424,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Universal international address composer in Ruby