worldly 0.1.9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb1f6102b4a99fa4c0b05b542f7bdb0e2afe7a17
-  data.tar.gz: fe728dee0952adb4573df76edbbc3ffbb622f3d7
+  metadata.gz: bb441157a32d28a07410fad20f0d63909fd566c6
+  data.tar.gz: 74c9b3d2376f41c66346d9e77b15fbbef332c75c
 SHA512:
-  metadata.gz: 552cc4c1e6e6fad5b7be5f546314b51f3a41dca1fdf7033c785099453c64c4206486fe3f58df60bc4bc6c5ef832e412118d766006f82dbb221c982cb306885bc
-  data.tar.gz: 0e51f4894c1d5ff91870df8e7e5a65bdc61336e3e7a8a616f1ecc42a6ac3030d3a642daefe05cd55a1c802d9cfb081dacb72ca9edf003cbf3f2bc6914143f62f
+  metadata.gz: 03449631e6ea5bf375d8195bd63ebed6a56f19b97e53ac8435cdf2e61d8b87de1f267838ebefce96e339ff4a5dc82a2629978f623a32b3672d9f3219d2cbf81f
+  data.tar.gz: d4d1d4fb14f5ac7f66bf76cd8084ee3f79cd7df2b88eadb7a3f112c2cb9a8c41d6ccf1b3385211de902d98c9853cafb727066bc3aae1d024b229de89449a3b40

data/CHANGELOG.md

@@ -1,7 +1,13 @@
+= Version 1.0.0 - 2017-04-05
+  * Change: Removed Locality
+  * Change: Updated some country formats
+
 = Version 0.1.9 - 2016-07-26
   * Improvement: Added to_display method
+
 = 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/README.md

@@ -52,7 +52,7 @@ Retrieve a country using it's country code
   country.alpha3 => AUS
   country.country_code => 61
 ```
-Worldly uses the address fields locality, city, region & postcode. Address1, Address2 and Country are implied and hence not added. A call to country.fields will return the fields not implied that the country address uses.
+Worldly uses the address fields city, region & postcode. Address1, Address2 and Country are implied and hence not added. A call to country.fields will return the fields not implied that the country address uses.
 ```
   country.fields => {:city=>{:label=>"City", :format=>["upcase"], :required=>true}, :region=>{:label=>"State", :format=>["upcase"], :required=>true}, :postcode=>{:label=>"Post Code", :required=>true}}
 ```
@@ -67,7 +67,6 @@ Each field notes the following details:
 Field Methods
 ```
   country.has_field?(:city) => true
-  country.has_field?(:locality) => false
   country.required_fields => {:city=>{:label=>"City", :format=>["upcase"], :required=>true}, :region=>{:label=>"State", :format=>["upcase"], :required=>true}, :postcode=>{:label=>"Post Code", :required=>true}}
 ```
 To retrieve all fields including address1, address2 & country use

data/lib/data/countries.yml

@@ -8,7 +8,7 @@ AD:
     city:
       label: City
     postcode:
-      label: 'Post Code'
+      label: 'Postcode'
   address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{postcode}} {{city}}\n{{country}}"
 AE:
   name: United Arab Emirates
@@ -82,8 +82,8 @@ AR:
     postcode:
       label: 'Post Code'
     region:
-      label: Province
-  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{postcode}} {{city}}\n{{country}}"
+      label: State
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{postcode}} {{city}}\n{{state}}\n{{country}}"
 AS:
   name: American Samoa
   alpha2: AS
@@ -218,15 +218,13 @@ BR:
   alpha3: BRA
   country_code: '55'
   fields:
-    locality:
-      name: Suburb
     city:
       label: City
     region:
       label: State
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}}\n{{city}} {{region}}\n{{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}} {{region}}\n{{postcode}}\n{{country}}"
 BS:
   name: Bahamas
   alpha2: BS
@@ -339,9 +337,6 @@ CN:
   alpha3: CHN
   country_code: '86'
   fields:
-    locality:
-      label: Suburb
-      required: false
     city:
       label: City
       required: false
@@ -351,7 +346,7 @@ CN:
         - upcase
     region:
       label: Province
-  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}} {{city}}\n{{postcode}} {{region}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}}\n{{postcode}} {{region}}\n{{country}}"
 CO:
   name: Colombia
   alpha2: CO
@@ -438,9 +433,6 @@ EG:
   alpha3: EGY
   country_code: '20'
   fields:
-    locality:
-      label: District
-      required: false
     city:
       label: City
       format:
@@ -448,7 +440,7 @@ EG:
     postcode:
       label: 'Post Code'
       required: false
-  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}}\n{{city}}\n{{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}}\n{{postcode}}\n{{country}}"
 EH:
   name: Western Sahara
   alpha2: EH
@@ -510,18 +502,18 @@ GB:
   alpha3: GBR
   country_code: '44'
   fields:
-    locality:
-      label: 'Town'
-      required: false
     city:
       label: 'City'
       format:
         - upcase
+    region:
+      label: 'County'
+      required: false
     postcode:
       label: 'Post Code'
       format:
         - upcase
-  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}}\n{{city}}\n{{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}}\n{{county}}\n{{postcode}}\n{{country}}"
 GD:
   name: Grenada
   alpha2: GD
@@ -653,14 +645,11 @@ ID:
   alpha3: IDN
   country_code: '62'
   fields:
-    locality:
-      label: Suburb
-      required: false
     city:
       label: City
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}}\n{{city}} {{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}} {{postcode}}\n{{country}}"
 IE:
   name: Ireland
   alpha2: IE
@@ -907,14 +896,11 @@ MK:
   alpha3: MKD
   country_code: '389'
   fields:
-    locality:
-      label: Suburb
-      required: false
     city:
       label: City
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}}\n{{postcode}} {{city}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{postcode}} {{city}}\n{{country}}"
 ML:
   name: Mali
   alpha2: ML
@@ -1061,14 +1047,13 @@ NZ:
   alpha3: NZL
   country_code: '64'
   fields:
-    locality:
-      label: Suburb
-      required: false
     city:
+      label: Suburb
+    region:
       label: City
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}}\n{{city}} {{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}}\n{{region}} {{postcode}}\n{{country}}"
 OM:
   name: Oman
   alpha2: OM
@@ -1135,14 +1120,11 @@ PT:
   alpha3: PRT
   country_code: '351'
   fields:
-    locality:
-      label: Village
-      required: false
     city:
       label: City
     postcode:
       label: 'Post Code'
-  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}}\n{{postcode}} {{city}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{postcode}} {{city}}\n{{country}}"
 PW:
   name: Palau
   alpha2: PW
@@ -1497,16 +1479,12 @@ ZA:
   alpha3: ZAF
   country_code: '27'
   fields:
-    locality:
-      label: Suburb
-      format:
-        - upcase
     city:
       label: City
     region:
       label: Province
       required: false
-  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{locality}}\n{{city}}\n{{region}}\n{postcode}}\n{{country}}"
+  address_format: "{{address1}}\n{{address2}}\n{{address3}}\n{{city}}\n{{region}}\n{postcode}}\n{{country}}"
 ZM:
   name: Zambia
   alpha2: ZM

data/lib/worldly/country.rb

@@ -34,7 +34,7 @@ module Worldly
     end
 
     # Generate an address for printing based on the countries address format.
-    # attributes = {address1: '12 hey St', address2: '', locality:'Homeville', postcode: 'AHZ 312' }
+    # attributes = {address1: '12 hey St', address2: '', city: 'Homeville', postcode: 'AHZ 312' }
     # sending country = 'AU'. If added the country name will be excluded from address
     def to_print(attributes, sending_country=nil)
       # don't add country if sending from country
@@ -52,7 +52,7 @@ module Worldly
     end
 
     # Generate an address for printing based on the countries address format.
-    # attributes = {address1: '12 hey St', address2: '', locality:'Homeville', postcode: 'AHZ 312' }
+    # attributes = {address1: '12 hey St', address2: '', city: 'Homeville', postcode: 'AHZ 312' }
     # sending country = 'AU'. If added the country name will be excluded from address
     def to_display(attributes, sending_country=nil)
       # don't add country if sending from country

data/lib/worldly/version.rb

@@ -1,3 +1,3 @@
 module Worldly
-  VERSION = "0.1.9"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worldly
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 1.0.0
 platform: ruby
 authors:
 - Daniel Lewis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler