countries 2.0.6 → 2.1.1

data/lib/countries/data/translation_corrections.yaml

@@ -11,16 +11,20 @@
 #
 ---
 oc:
-  US: USA  
+  US: USA
 ar:
   PS: "فلسطين"
   SA: "السعودية"
-  AE: "الامارات العربية المتحدة"
+  AE: "الإمارات العربيّة المتّحدة"
   SD: "السودان"
   SO: "الصومال‎"
   SY: "سوريا"
+  BQ: "بونير، سينت أوستاتيوس وسابا"
+  CW: "كوراساو"
 zh:
   KH: '柬埔寨'
-ar:
-  BQ: "بونير، سينت أوستاتيوس وسابا"
-  CW: "كوراساو" 
+fa:
+  IR: "ایران"
+he:
+  PS: "פלסטין, מדינת"
+  VI: "איי הבתולה (ארה)"

data/lib/countries/data.rb

@@ -2,6 +2,7 @@ module ISO3166
   ##
   # Handles building the in memory store of countries data
   class Data
+    @@cache_dir = [File.dirname(__FILE__), 'cache']
     @@cache = {}
     @@registered_data = {}
 
@@ -14,6 +15,14 @@ module ISO3166
     end
 
     class << self
+      def cache_dir
+        @@cache_dir
+      end
+
+      def cache_dir=(value)
+        @@cache_dir = value
+      end
+
       def register(data)
         alpha2 = data[:alpha2].upcase
         @@registered_data[alpha2] = \
@@ -52,7 +61,7 @@ module ISO3166
 
       def load_data!
         return @@cache unless load_required?
-        @@cache = load_cache %w(cache countries.json)
+        @@cache = load_cache %w(countries.json)
         @@_country_codes = @@cache.keys
         @@cache = @@cache.merge(@@registered_data)
         @@cache
@@ -106,7 +115,7 @@ module ISO3166
       end
 
       def load_translations(locale)
-        locale_names = load_cache(['cache', 'locales', "#{locale}.json"])
+        locale_names = load_cache(['locales', "#{locale}.json"])
         internal_codes.each do |alpha2|
           @@cache[alpha2]['translations'] ||= Translations.new
           @@cache[alpha2]['translations'][locale] = locale_names[alpha2].freeze
@@ -129,7 +138,7 @@ module ISO3166
       end
 
       def datafile_path(file_array)
-        File.join([File.dirname(__FILE__)] + file_array)
+        File.join([@@cache_dir] + file_array)
       end
     end
   end

data/lib/countries/structure.rb

@@ -44,6 +44,7 @@ module ISO3166
     'postal_code' => nil,
     'region' => nil,
     'unofficial_names' => [],
+    'start_of_week' => 'monday',
     'subregion' => nil,
     'un_locode' => nil,
     'vat_rates' => {

data/lib/countries/subdivision.rb

@@ -1,6 +1,7 @@
 module ISO3166
   Subdivision = KwargStruct.new(
     :name,
+    :code,
     :unofficial_names,
     :geo,
     :translations,

data/lib/countries/version.rb

@@ -1,3 +1,3 @@
 module Countries
-  VERSION = '2.0.6'.freeze
+  VERSION = '2.1.1'.freeze
 end

data/spec/country_spec.rb

@@ -318,6 +318,27 @@ describe ISO3166::Country do
 
   describe 'all_names_with_codes' do
     require 'active_support/core_ext/string/output_safety'
+    it 'should return an alphabetized list of all country names with ISOCODE alpha2' do
+      countries = ISO3166::Country.all_names_with_codes
+      expect(countries).to be_an(Array)
+      expect(countries.first[0]).to be_a(String)
+      expect(countries.first[0]).to eq('Afghanistan')
+      expect(countries.size).to eq(NUM_OF_COUNTRIES)
+      expect(countries.any?{|pair| !pair[0].html_safe?}).to eq(false)
+    end
+
+    it 'should return an alphabetized list of all country names translated to current locale with ISOCODE alpha2' do
+      ISO3166.configuration.locales = [:es, :de, :en]
+
+      countries = ISO3166::Country.all_names_with_codes(:es)
+      expect(countries).to be_an(Array)
+      expect(countries.first[0]).to be_a(String)
+      expect(countries.first[0]).to eq('Afganistán')
+      expect(countries.size).to eq(NUM_OF_COUNTRIES)
+    end
+  end
+
+  describe 'all_names_with_codes_without_active_support' do
     it 'should return an alphabetized list of all country names with ISOCODE alpha2' do
       countries = ISO3166::Country.all_names_with_codes
       expect(countries).to be_an(Array)

data/spec/data_spec.rb

@@ -81,12 +81,12 @@ describe ISO3166::Data do
 
   describe '#load_cache' do
     it 'will return an empty hash for an unsupported locale' do
-      file_array = %w(cache locales unsupported.json)
+      file_array = %w(locales unsupported.json)
       expect(ISO3166::Data.send(:load_cache, file_array)).to eql({})
     end
 
     it 'will return json for a supported locale' do
-      file_array = %w(cache locales en.json)
+      file_array = %w(locales en.json)
       expect(ISO3166::Data.send(:load_cache, file_array)).not_to be_empty
     end
   end
@@ -96,6 +96,10 @@ describe ISO3166::Data do
       ISO3166::Data.register(
         alpha2: 'TW',
         name: 'NEW Taiwan',
+        subdivisions: {
+          CHA: {name: 'New Changhua'},
+          CYI: {name: 'New Municipality'}
+        },
         translations: {
           'en' => 'NEW Taiwan',
           'de' => 'NEW Taiwan'
@@ -112,6 +116,8 @@ describe ISO3166::Data do
       expect(subject.name).to eq 'NEW Taiwan'
       expect(subject.translations).to eq('en' => 'NEW Taiwan',
                                          'de' => 'NEW Taiwan')
+      expect(subject.subdivisions).to eq(CHA: ISO3166::Subdivision.new({name: 'New Changhua'}),
+                                         CYI: ISO3166::Subdivision.new({name: 'New Municipality'}))
     end
   end
 
@@ -120,6 +126,10 @@ describe ISO3166::Data do
       ISO3166::Data.register(
         alpha2: 'LOL',
         name: 'Happy Country',
+        subdivisions: {
+          LOL1: {name: 'Happy sub1'},
+          LOL2: {name: 'Happy sub2'}
+        },
         translations: {
           'en' => 'Happy Country',
           'de' => 'glückliches Land'
@@ -133,6 +143,8 @@ describe ISO3166::Data do
       data = ISO3166::Data.new('LOL').call
       expect(data['name']).to eq 'Happy Country'
       expect(subject.name).to eq 'Happy Country'
+      expect(subject.subdivisions).to eq(LOL1: ISO3166::Subdivision.new({name: 'Happy sub1'}),
+                                         LOL2: ISO3166::Subdivision.new({name: 'Happy sub2'}))
     end
 
     it 'detect a stale cache' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: countries
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.1
 platform: ruby
 authors:
 - Josh Robinson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n_data
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.7'
+        version: '6.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.7'
+        version: '6.9'
 - !ruby/object:Gem::Dependency
   name: unicode_utils
   requirement: !ruby/object:Gem::Requirement
@@ -704,7 +704,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Gives you a country object full of all sorts of useful information.