countries 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68db55f4a800a6550927a8ff53be5b2aafe17c46
-  data.tar.gz: 76dae2ad449277ed7372b741e1f584bb3f23665b
+  metadata.gz: 615f8b882b8aefd4336426a94b54e832a6e4d81f
+  data.tar.gz: a911e2ce784df6ebefa016e000c7df6f62f784c4
 SHA512:
-  metadata.gz: 4e2185942067efbe4b726e79e6af655c253f0af86c33cebef5c7e5976cb7b7eb039e2b19d0f3971d53e6e545052addfeaff4ad0e73932e7dac795bfa19c03354
-  data.tar.gz: 7d6fa78fe31b17e5b0a6b7cf9e8c45da32f5cfec6fb20329fe1aee50afa90cf83f3e7771cca78fce347c4456e742901dc18038ffe11f3ada7b3a36a954f1c62e
+  metadata.gz: e2bdd3c7eb450016b8a00ccb890ff1a1290df0265afc8a00d2f54656fc9d656cc81de5eb879275b167e77500574f2c8c8374a0ee3b8066f4c182e7e8f6e2e956
+  data.tar.gz: 12c948c3f07d05150b121995a95c904e239c71c5ad245fa0904734ebaab4593e08dccd4ac40e9c605c7a289bbdd929fa32de29ffb4728a697e47ee0049b89e59

data/.travis.yml

@@ -1,4 +1,6 @@
+sudo: false
+cache: bundler
 rvm:
  - 1.9.3
- - 2.0.0
- - 2.2.0
+ - 2.0
+ - 2.2

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.2.0
+- Cleaning up Global Load Path @rposborne
+- Add MOP as the currency for Macao @kriskhaira
+
 ## 1.1.0
 - Adding compare operation to country @guilleart
 - Content Updates @rposbone

data/README.markdown

@@ -3,7 +3,7 @@ Countries
 
 Countries is a collection of all sorts of useful information for every country in the ISO 3166 standard. It contains info for the following standards ISO3166-1(countries), ISO3166-2(states/subdivisions), ISO4217(currency) and E.164(phone numbers). I will add any country based data I can get access to. I hope this to be a repository for all country based information.
 
-[![Build Status](https://travis-ci.org/hexorx/countries.png)](https://travis-ci.org/hexorx/countries) [![Dependency Status](https://gemnasium.com/hexorx/countries.png)](https://gemnasium.com/hexorx/countries) [![Code Climate](https://codeclimate.com/github/hexorx/countries.png)](https://codeclimate.com/github/hexorx/countries) [![Waffle.io Issues in Ready](https://badge.waffle.io/hexorx/countries.png)](http://waffle.io/hexorx/countries)
+[![Build Status](https://travis-ci.org/hexorx/countries.svg)](https://travis-ci.org/hexorx/countries) [![Dependency Status](https://gemnasium.com/hexorx/countries.svg)](https://gemnasium.com/hexorx/countries) [![Code Climate](https://codeclimate.com/github/hexorx/countries.svg)](https://codeclimate.com/github/hexorx/countries) [![Waffle.io Issues in Ready](https://badge.waffle.io/hexorx/countries.svg)](http://waffle.io/hexorx/countries)
 
 Installation
 ------------
@@ -20,8 +20,18 @@ Or you can install via bundler Gemfile if you are using Rails 3:
 
 Or you can install via bundler Gemfile with a Country Helper class:
 
+    gem 'countries', :require => 'countries/global'
+
+Upgrading to 1.2.0
+-----------
+
     gem 'countries', :require => 'global'
 
+has become
+
+    gem 'countries', :require => 'countries/global'
+
+
 Basic Usage
 -----------
 
@@ -62,6 +72,11 @@ Country Info
     c.name #=> "United States"
     c.names #=> ["United States of America", "Vereinigte Staaten von Amerika", "États-Unis", "Estados Unidos"]
 
+    # Get the names for a country translated to its local languages
+    c = Country[:BE]
+    c.local_names #=> ["België", "Belgique", "Belgien"]
+    c.local_name #=> "België"
+
     # Get a specific translation
     c.translation('de') #=> 'Vereinigte Staaten von Amerika'
     c.translations['fr'] #=> "États-Unis"
@@ -186,7 +201,7 @@ Any additions should be directed upstream to (pkg-isocodes)[http://anonscm.debia
 New Bugs can be filed upstream here https://alioth.debian.org/projects/pkg-iso-codes/
 
 Any corrections can be applied in translations_corrections.yaml these will be injected during
-the next ```rake cache_translations```
+the next ```rake update_cache```
 
 * Fork the project.
 * Make your feature addition or bug fix.

data/Rakefile

@@ -62,7 +62,7 @@ task :update_cache do
     end
   end
 
-  File.open(File.join(File.dirname(__FILE__), 'lib', 'cache', "countries"), 'wb') {|f| f.write(Marshal.dump(data))}
+  File.open(File.join(File.dirname(__FILE__), 'lib', 'cache', 'countries'), 'wb') { |f| f.write(Marshal.dump(data)) }
 end
 
 require 'geocoder'
@@ -93,7 +93,7 @@ task :fetch_subdivisions do
 
       # Handle special geocoding cases where Google defaults to well known
       # cities, instead of the states.
-      if(c.alpha2 == "US" && ["NY", "WA", "OK"].include?(code))
+      if c.alpha2 == 'US' && %w(NY WA OK).include?(code)
         location = "#{data['name']} State, United States"
       end
 

data/countries.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/countries/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ['Josh Robinson', 'Joe Corcoran']
-  gem.email         = ['hexorx@gmail.com']
+  gem.authors       = ['Josh Robinson', 'Joe Corcoran', 'Russell Osborne']
+  gem.email         = ['hexorx@gmail.com', 'russell@burningpony.com']
   gem.description   = 'All sorts of useful information about every country packaged as pretty little country objects. It includes data from ISO 3166'
   gem.summary       = 'Gives you a country object full of all sorts of useful information.'
   gem.homepage      = 'http://github.com/hexorx/countries'

data/lib/countries.rb

@@ -1,5 +1,5 @@
 require 'countries/version'
 
-require 'iso3166'
+require 'countries/iso3166'
 
 require 'countries/mongoid' if defined?(Mongoid)

data/lib/countries/country.rb

@@ -66,7 +66,7 @@ class ISO3166::Country
   end
 
   def <=>(other)
-    self.to_s <=> other.to_s
+    to_s <=> other.to_s
   end
 
   def currency
@@ -78,13 +78,13 @@ class ISO3166::Country
   end
 
   def subdivisions
-    @subdivisions ||= subdivisions? ? YAML.load_file(File.join(File.dirname(__FILE__), '..', 'data', 'subdivisions', "#{alpha2}.yaml")) : {}
+    @subdivisions ||= subdivisions? ? YAML.load_file(File.join(File.dirname(__FILE__), 'data', 'subdivisions', "#{alpha2}.yaml")) : {}
   end
 
   alias_method :states, :subdivisions
 
   def subdivisions?
-    File.exist?(File.join(File.dirname(__FILE__), '..', 'data', 'subdivisions', "#{alpha2}.yaml"))
+    File.exist?(File.join(File.dirname(__FILE__), 'data', 'subdivisions', "#{alpha2}.yaml"))
   end
 
   def in_eu?
@@ -99,13 +99,17 @@ class ISO3166::Country
     @data['translations'][locale.downcase]
   end
 
-  private
+  def local_names
+    @local_names ||= languages.map { |language| translations[language] }
+  end
+
+  def local_name
+    @local_name ||= local_names.first
+  end
 
   class << self
     def new(country_data)
-      if country_data.is_a?(Hash) || codes.include?(country_data.to_s.upcase)
-        super
-      end
+      super if country_data.is_a?(Hash) || codes.include?(country_data.to_s.upcase)
     end
 
     def codes
@@ -113,7 +117,7 @@ class ISO3166::Country
     end
 
     def all(&blk)
-      blk ||= proc {|alpha2, d| ISO3166::Country.new(d)}
+      blk ||= proc { |_alpha2, d| ISO3166::Country.new(d) }
       Setup.data.map(&blk)
     end
 
@@ -125,7 +129,7 @@ class ISO3166::Country
 
     def all_names_with_codes(locale = 'en')
       ISO3166::Country.all.map do |c|
-        [(c.translation(locale) || c.name ).html_safe, c.alpha2]
+        [(c.translation(locale) || c.name).html_safe, c.alpha2]
       end.sort_by { |d| d[0] }
     end
 

data/lib/countries/data.rb

@@ -9,11 +9,11 @@ module ISO3166
     end
 
     def call
-       @@cache[@alpha2]
+      @@cache[@alpha2]
     end
 
     def self.codes
-      @@codes ||= Data.load_yaml(['data', 'countries.yaml']).freeze
+      @@codes ||= Data.load_yaml(['countries', 'data', 'countries.yaml']).freeze
     end
 
     private
@@ -27,7 +27,7 @@ module ISO3166
     end
 
     def self.load_cache
-      @@cache ||= Marshal.load(File.binread(datafile_path %w(cache countries )))
+      @@cache ||= Marshal.load(File.binread(datafile_path %w(countries cache countries )))
     end
   end
 end

data/lib/{data → countries/data}/countries/AQ.yaml

@@ -4,9 +4,9 @@ AQ:
   alpha2: AQ
   alpha3: ATA
   country_code: '672'
-  currency: 
+  currency: USD
   international_prefix: ''
-  ioc: 
+  ioc:
   gec: AY
   latitude: 90 00 S
   longitude: 0 00 E

data/lib/{data → countries/data}/countries/AX.yaml

@@ -4,10 +4,10 @@ AX:
   alpha2: AX
   alpha3: ALA
   country_code: '358'
-  currency: 
+  currency: EUR
   international_prefix: ''
-  ioc: 
-  gec: 
+  ioc:
+  gec:
   latitude: ''
   longitude: ''
   name: "Åland Islands"
@@ -23,7 +23,7 @@ AX:
   region: Europe
   subregion: Northern Europe
   world_region: EMEA
-  un_locode: 
+  un_locode:
   languages:
   - sv
   nationality: Swedish

data/lib/{data → countries/data}/countries/BO.yaml

@@ -31,7 +31,7 @@ BO:
   - ay
   - qu
   nationality: Bolivian
-  postal_code: true
+  postal_code: false
   min_longitude: "-69.6"
   min_latitude: "-22.883333"
   max_longitude: "-57.566667"

data/lib/{data → countries/data}/countries/CD.yaml

@@ -4,7 +4,7 @@ CD:
   alpha2: CD
   alpha3: COD
   country_code: '243'
-  currency: 
+  currency: CDF
   international_prefix: '00'
   ioc: COD
   gec: CG