worldly 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80bac88b9df838e5201f1a96125378c733fa1677
-  data.tar.gz: 8b837f12b7ce9e5778ba8a18c444d58007b489c6
+  metadata.gz: b84b6615e26e6486618cbbdc1596cfea9a9550bf
+  data.tar.gz: 32d3894a330baced5aaefc58c3ee054e75e1f0ea
 SHA512:
-  metadata.gz: 879b89b79f749b2b2b616f43ca5cb9361142c4752d7c86526ec2684345ba014f258633d58eaf619d342a15f38a3bc60cdcbfe7dd306e156038a20c1d7f424242
-  data.tar.gz: 758dd872e75be8ab0d59edb07db72b3f606ce09d9ebbd69b8ea751e6ce1692bb9a61219e8744aeca8e49993cee85712cf2e441e20464c69c3c5ef377401e28f6
+  metadata.gz: 10d069ed2dd4c0ba8824e475f00e6e3d90a6c3748c7480536d46d554d581792e505e17fbcee97b2175fb178c05e5f9117f121302189cf39107c3b85dd8f05e99
+  data.tar.gz: 9e8e958ff63ff055140c0793adf181afc231d0b5cea9261690ca52cdeb4dda4a9efcd31cc921aa6b47e238cd56a8f24ea0bd59cf5358263e63ab0db620d3967b

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+= Version 0.1.8 - 2016-01-20
+  * Improvement: Address line 3 not accepted
 = Version 0.1.7 - 2015-04-09
   * Fix: format_values method - dup value to ensure original data not changed
 

data/lib/data/countries.yml

@@ -9,7 +9,7 @@ AD:
       label: City
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{postcode}} {{city}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{postcode}} {{city}}\n{{country}}"
 AE:
   name: United Arab Emirates
   alpha2: AE
@@ -18,7 +18,7 @@ AE:
   fields:
     city:
       label: City
-  address_format: "{{address1}}\n{{address2}}\n{{city}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}}\n{{country}}"
 AF:
   name: Afghanistan
   alpha2: AF
@@ -29,7 +29,7 @@ AF:
       label: City
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{city}}\n{{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}}\n{{postcode}}\n{{country}}"
 AG:
   name: Antigua and Barbuda
   alpha2: AG
@@ -55,7 +55,7 @@ AM:
       label: City
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{postcode}} {{city}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{postcode}} {{city}}\n{{country}}"
 AN:
   name: Netherlands Antilles
   alpha2: AN
@@ -83,7 +83,7 @@ AR:
       label: 'Post Code'
     region:
       label: Province
-  address_format: "{{address1}}\n{{address2}}\n{{postcode}} {{city}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{postcode}} {{city}}\n{{country}}"
 AS:
   name: American Samoa
   alpha2: AS
@@ -92,7 +92,7 @@ AS:
   fields:
     city:
       label: City
-  address_format: "{{address1}}\n{{address2}}\n{{city}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}}\n{{country}}"
 AT:
   name: Austria
   alpha2: AT
@@ -103,7 +103,7 @@ AT:
       label: City
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{postcode}} {{city}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{postcode}} {{city}}\n{{country}}"
 AU:
   name: Australia
   alpha2: AU
@@ -120,7 +120,7 @@ AU:
         - upcase
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{city}} {{region}} {{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}} {{region}} {{postcode}}\n{{country}}"
 AW:
   name: Aruba
   alpha2: AW
@@ -141,7 +141,7 @@ AZ:
       label: City
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{postcode}} {{city}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{postcode}} {{city}}\n{{country}}"
 BA:
   name: Bosnia and Herzegovina
   alpha2: BA
@@ -226,7 +226,7 @@ BR:
       label: State
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{locality}}\n{{city}} {{region}}\n{{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}}\n{{city}} {{region}}\n{{postcode}}\n{{country}}"
 BS:
   name: Bahamas
   alpha2: BS
@@ -237,7 +237,7 @@ BS:
       label: City
     region:
       label: Island
-  address_format: "{{address1}}\n{{address2}}\n{{city}}, {{region}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}}, {{region}}\n{{country}}"
 BT:
   name: Bhutan
   alpha2: BT
@@ -281,7 +281,7 @@ CA:
       label: 'Postal Code'
       format:
         - upcase
-  address_format: "{{address1}}\n{{address2}}\n{{city}} {{postcode}}\n{{region}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}} {{postcode}}\n{{region}}\n{{country}}"
 CC:
   name: Cocos (Keeling) Islands
   alpha2: CC
@@ -312,7 +312,7 @@ CH:
       label: City
     postcode:
       label: 'Postal Code'
-  address_format: "{{address1}}\n{{address2}}\n{{postcode}} {{city}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{postcode}} {{city}}\n{{country}}"
 CI:
   name: Côte D'Ivoire
   alpha2: CI
@@ -351,7 +351,7 @@ CN:
         - upcase
     region:
       label: Province
-  address_format: "{{address1}}\n{{address2}}\n{{locality}} {{city}}\n{{postcode}} {{region}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}} {{city}}\n{{postcode}} {{region}}\n{{country}}"
 CO:
   name: Colombia
   alpha2: CO
@@ -448,7 +448,7 @@ EG:
     postcode:
       label: 'Post Code'
       required: false
-  address_format: "{{address1}}\n{{address2}}\n{{locality}}\n{{city}}\n{{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}}\n{{city}}\n{{postcode}}\n{{country}}"
 EH:
   name: Western Sahara
   alpha2: EH
@@ -521,7 +521,7 @@ GB:
       label: 'Post Code'
       format:
         - upcase
-  address_format: "{{address1}}\n{{address2}}\n{{locality}}\n{{city}}\n{{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}}\n{{city}}\n{{postcode}}\n{{country}}"
 GD:
   name: Grenada
   alpha2: GD
@@ -606,7 +606,7 @@ GU:
       label: State
       format:
         - upcase
-  address_format: "{{address1}}\n{{address2}}\n{{city}} {{region}} {{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}} {{region}} {{postcode}}\n{{country}}"
 GW:
   name: Guinea-Bissau
   alpha2: GW
@@ -660,7 +660,7 @@ ID:
       label: City
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{locality}}\n{{city}} {{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}}\n{{city}} {{postcode}}\n{{country}}"
 IE:
   name: Ireland
   alpha2: IE
@@ -675,7 +675,7 @@ IE:
     postcode:
       label: 'Post Code'
       required: false
-  address_format: "{{address1}}\n{{address2}}\n{{city}}\n{{region}} {{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}}\n{{region}} {{postcode}}\n{{country}}"
 IL:
   name: Israel
   alpha2: IL
@@ -686,7 +686,7 @@ IL:
       label: City
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{city}} {{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}} {{postcode}}\n{{country}}"
 IM:
   name: Isle of Man
   alpha2: IM
@@ -704,7 +704,7 @@ IN:
         - upcase
     postcode:
       label: 'PIN Code'
-  address_format: "{{address1}}\n{{address2}}\n{{city}} {{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}} {{postcode}}\n{{country}}"
 IO:
   name: British Indian Ocean Territory
   alpha2: IO
@@ -750,7 +750,7 @@ JO:
       label: City
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{city}} {{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}} {{postcode}}\n{{country}}"
 JP:
   name: Japan
   alpha2: JP
@@ -914,7 +914,7 @@ MK:
       label: City
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{locality}}\n{{postcode}} {{city}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}}\n{{postcode}} {{city}}\n{{country}}"
 ML:
   name: Mali
   alpha2: ML
@@ -994,7 +994,7 @@ MY:
       label: State
       format:
         - fullname
-  address_format: "{{address1}}\n{{address2}}\n{{postcode}} {{city}}\n{{region}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{postcode}} {{city}}\n{{region}}\n{{country}}"
 MZ:
   name: Mozambique
   alpha2: MZ
@@ -1068,7 +1068,7 @@ NZ:
       label: City
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{locality}}\n{{city}} {{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}}\n{{city}} {{postcode}}\n{{country}}"
 OM:
   name: Oman
   alpha2: OM
@@ -1142,7 +1142,7 @@ PT:
       label: City
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{locality}}\n{{postcode}} {{city}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}}\n{{postcode}} {{city}}\n{{country}}"
 PW:
   name: Palau
   alpha2: PW
@@ -1185,7 +1185,7 @@ RU:
       label: Province
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{city}}\n{{region}}\n{{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}}\n{{region}}\n{{postcode}}\n{{country}}"
 RW:
   name: Rwanda
   alpha2: RW
@@ -1225,7 +1225,7 @@ SE:
       label: 'Post Code'
       format:
         - upcase
-  address_format: "{{address1}}\n{{address2}}\n{{postcode}} {{city}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{postcode}} {{city}}\n{{country}}"
 SG:
   name: Singapore
   alpha2: SG
@@ -1234,7 +1234,7 @@ SG:
   fields:
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{country}} {{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{country}} {{postcode}}\n{{country}}"
 SH:
   name: Saint Helena
   alpha2: SH
@@ -1419,7 +1419,7 @@ US:
       label: State
       format:
         - upcase
-  address_format: "{{address1}}\n{{address2}}\n{{city}} {{region}} {{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}} {{region}} {{postcode}}\n{{country}}"
 UY:
   name: Uruguay
   alpha2: UY
@@ -1480,7 +1480,7 @@ WS:
       label: City
       format:
         - upcase
-  address_format: "{{address1}}\n{{address2}}\n{{city}}\n{{region}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}}\n{{region}}\n{{country}}"
 YE:
   name: Yemen
   alpha2: YE
@@ -1506,7 +1506,7 @@ ZA:
     region:
       label: Province
       required: false
-  address_format: "{{address1}}\n{{address2}}\n{{locality}}\n{{city}}\n{{region}}\n{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}}\n{{city}}\n{{region}}\n{postcode}}\n{{country}}"
 ZM:
   name: Zambia
   alpha2: ZM

data/lib/worldly/country.rb

@@ -26,11 +26,11 @@ module Worldly
     end
 
     def address_format
-      @data[:address_format] || "{{address1}}\n{{address2}}\n{{city}}\n{{region}} {{postcode}}\n{{country}}"
+      @data[:address_format] || "{{address1}}\n{{address2}}\n{{address3}}\n{{city}}\n{{region}} {{postcode}}\n{{country}}"
     end
 
     def all_fields
-      [:address1, :address2, :country] + fields.keys
+      [:address1, :address2, :address3, :country] + fields.keys
     end
 
     # Generate an address for printing based on the countries address format.

data/lib/worldly/version.rb

@@ -1,3 +1,3 @@
 module Worldly
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worldly
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Daniel Lewis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Country address formatting and telephone information