address_composer 0.1.3.pre → 1.0.1

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

@@ -75,7 +75,7 @@ components:
     county: Santa Clara County
     state: California
 expected:  |
-    Palo Alto, CA
+    Palo Alto, California
     United States of America
 ---
 description: NY, NY
@@ -85,7 +85,7 @@ components:
     country_code: US
     state: New York
 expected:  |
-    New York, NY
+    New York, New York
     United States of America
 ---    
 description: house number in New York, no city
@@ -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,16 +188,83 @@ 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
     Charlotte Amalie, VI 00803
     United States of America
+#
+# state_district
+---
+description: state_district
+components:
+   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
+expected:  |
+    New York
+    United States of America
+#
+# municipality
+---
+description: municipality
+components:
+    country: United States of America
+    country_code: us
+    county: Saginaw County
+    municipality: Taymouth Township
+    state: Michigan
+    village: Burt
+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-formatting/testcases/other/xx.yaml

@@ -0,0 +1,28 @@
+# Dummy test country to check that we fall back to the defaults
+---
+description: generic format
+components:
+    city: City
+    country: Null Island
+    country_code: XX
+    county: County
+    house_number: 123
+    postcode: PCPCPC
+    road: Main Street
+    state: State
+    suburb: The Hood
+expected:  |
+    Main Street 123
+    PCPCPC City
+    Null Island
+---
+description: generic fallback
+components:
+    city: City
+    country: Null Island
+    country_code: XX
+    state: State
+expected:  |
+    City
+    State
+    Null Island

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/version.rb

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

data/lib/address_composer.rb

@@ -1,5 +1,5 @@
 require "address_composer/version"
-require "YAML"
+require "yaml"
 require "mustache"
 
 class AddressComposer
@@ -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)
@@ -155,7 +155,7 @@ class AddressComposer
     unknown_components = components.keys - AllComponents
 
     components["attention"] = unknown_components.map do |unknown|
-      components[unknown]
+      components.delete(unknown)
     end.join(" ")
   end
 
@@ -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: 0.1.3.pre
+  version: 1.0.1
 platform: ruby
 authors:
 - Alejandro Arrufat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2021-10-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:
@@ -102,11 +102,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -116,12 +116,13 @@ files:
 - address-formatting/.travis.yml
 - address-formatting/LICENSE.txt
 - address-formatting/README.md
+- address-formatting/SECURITY.md
 - address-formatting/bin/coverage.pl
 - address-formatting/bin/run_tests.t
 - address-formatting/conf/abbreviations/ca.yaml
 - address-formatting/conf/abbreviations/cs.yaml
+- address-formatting/conf/abbreviations/da.yaml
 - address-formatting/conf/abbreviations/de.yaml
-- address-formatting/conf/abbreviations/dk.yaml
 - address-formatting/conf/abbreviations/en.yaml
 - address-formatting/conf/abbreviations/es.yaml
 - address-formatting/conf/abbreviations/et.yaml
@@ -131,12 +132,16 @@ files:
 - address-formatting/conf/abbreviations/hu.yaml
 - address-formatting/conf/abbreviations/it.yaml
 - address-formatting/conf/abbreviations/nl.yaml
+- address-formatting/conf/abbreviations/no.yaml
+- address-formatting/conf/abbreviations/pl.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
 - address-formatting/conf/abbreviations/uk.yaml
+- address-formatting/conf/abbreviations/vn.yaml
 - address-formatting/conf/components.yaml
 - address-formatting/conf/countries/worldwide.yaml
 - address-formatting/conf/country2lang.yaml
@@ -394,6 +399,7 @@ files:
 - address-formatting/testcases/countries/zm.yaml
 - address-formatting/testcases/countries/zw.yaml
 - address-formatting/testcases/other/null.yaml
+- address-formatting/testcases/other/xx.yaml
 - address_composer.gemspec
 - bin/console
 - bin/setup
@@ -418,12 +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: []
-rubyforge_project:
-rubygems_version: 2.6.14.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Universal international address composer in Ruby

data/.ruby-version

@@ -1 +0,0 @@
-2.4.5