countries 2.0.8 → 2.1.4

data/lib/countries/sources/cldr/subdivision.rb

@@ -0,0 +1,34 @@
+module Sources
+  module CLDR
+    class Subdivision
+      attr_reader :xml, :language_code
+      def initialize(language_code:, xml:)
+        @language_code = language_code
+        @xml = xml
+      end
+
+      def text
+        xml.text
+      end
+
+      def country_code
+        type[0..1].upcase
+      end
+
+      def code
+        type[2..-1].upcase
+      end
+
+      def type
+        xml.attributes['type'].value.delete('-')
+      end
+
+      def to_h
+        data = {}
+        data['translations'] ||= {}
+        data['translations'][language_code] = text
+        data
+      end
+    end
+  end
+end

data/lib/countries/sources/cldr/subdivision_updater.rb

@@ -0,0 +1,34 @@
+require 'active_support'
+require 'active_support/core_ext/hash/deep_merge'
+require 'nokogiri'
+require 'pry'
+
+module Sources
+  module CLDR
+    class SubdivisionUpdater
+      def call
+        d = Dir['./tmp/cldr/trunk/common/subdivisions/*.xml']
+        loader = Sources::Local::CachedLoader.new(Sources::Local::Subdivision)
+        d.each do |file_path|
+          language_data = Nokogiri::XML(File.read(file_path))
+          language_code = File.basename(file_path, '.*')
+          subdivisions = language_data.css('subdivision')
+          next if subdivisions.empty?
+          last_country_code_seen = nil
+
+          subdivisions.each_with_index do |subdivision, index|
+            subdivision = Sources::CLDR::Subdivision.new(language_code: language_code, xml: subdivision)
+            data = loader.load(subdivision.country_code)
+            data[subdivision.code] ||= {}
+            data[subdivision.code] = data[subdivision.code].deep_merge(subdivision.to_h)
+            if (last_country_code_seen && last_country_code_seen != subdivision.country_code) || index == subdivisions.size - 1
+              puts "Updated #{subdivision.country_code} with language_code #{language_code}"
+              loader.save(subdivision.country_code, data)
+            end
+            last_country_code_seen = subdivision.country_code
+          end
+        end
+      end
+    end
+  end
+end

data/lib/countries/sources/local/cached_loader.rb

@@ -0,0 +1,27 @@
+module Sources
+  module Local
+    class CachedLoader
+      attr_reader :klass
+      def initialize(klass)
+        @klass = klass
+        @loaded_countries = {}
+      end
+
+      def from_cache(country_code)
+        @loaded_countries[country_code]
+      end
+
+      def load(country_code)
+        if (data = from_cache(country_code))
+          data
+        else
+          @loaded_countries[country_code] = klass.load(country_code)
+        end
+      end
+
+      def save(country_code, data)
+        klass.new(country_code).save(data)
+      end
+    end
+  end
+end

data/lib/countries/sources/local/subdivision.rb

@@ -0,0 +1,32 @@
+module Sources
+  module Local
+    class Subdivision
+      attr_reader :code
+      def initialize(code)
+        @code = code
+      end
+
+      def load
+        if File.exist?(file_path)
+          YAML.load_file(file_path) || {}
+        else
+          {}
+        end
+      end
+
+      def save(data)
+        File.open(file_path, 'w') { |f| f.write data.to_yaml }
+      rescue
+        puts "failed to read #{file}: #{$ERROR_INFO}"
+      end
+
+      def file_path
+        "lib/countries/data/subdivisions/#{code}.yaml"
+      end
+
+      def self.load(code)
+        new(code).load
+      end
+    end
+  end
+end

data/lib/countries/subdivision.rb

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

data/lib/countries/tasks/geocoding.rake

@@ -32,7 +32,7 @@ def country_codes
 end
 
 namespace :geocode do
-  desc 'Retrieve and store subdivisions coordinates'
+  desc 'Retrieve and store countries coordinates'
   task :fetch_countries do
     require 'countries'
     # Iterate over countries
@@ -70,12 +70,12 @@ namespace :geocode do
 
   desc 'Retrieve and store subdivisions coordinates'
   task :fetch_subdivisions do
-    require 'countries'
+    require_relative '../../countries'
     # Iterate all countries with subdivisions
     ISO3166::Country.all.select(&:subdivisions?).each do |c|
       # Iterate subdivisions
       state_data = c.subdivisions.dup
-      state_data.reject { |_, data| data['latitude'] }.each do |code, data|
+      state_data.reject { |_, data| data['geo'] }.each do |code, data|
         location = "#{data['name']}, #{c.name}"
 
         # Handle special geocoding cases where Google defaults to well known
@@ -87,6 +87,7 @@ namespace :geocode do
         next unless (result = geocode(location))
         geometry = result.geometry
         if geometry['location']
+          state_data[code]['geo'] ||= {}
           state_data[code]['geo']['latitude'] = geometry['location']['lat']
           state_data[code]['geo']['longitude'] = geometry['location']['lng']
         end

data/lib/countries/version.rb

@@ -1,3 +1,3 @@
 module Countries
-  VERSION = '2.0.8'.freeze
+  VERSION = '2.1.4'.freeze
 end

data/spec/country_spec.rb

@@ -242,6 +242,26 @@ describe ISO3166::Country do
     end
   end
 
+  describe 'subdivision_names_with_codes' do
+    it 'should return an alphabetized list of all subdivisions names with codes' do
+      subdivisions = ISO3166::Country.search('EG').subdivision_names_with_codes
+      expect(subdivisions).to be_an(Array)
+      expect(subdivisions.first[0]).to be_a(String)
+      expect(subdivisions.size).to eq(27)
+      expect(subdivisions.first[0]).to eq('Alexandria')
+    end
+
+    it 'should return an alphabetized list of subdivision names translated to current locale with codes' do
+      ISO3166.configuration.locales = [:es, :de, :en]
+
+      subdivisions = ISO3166::Country.search('EG').subdivision_names_with_codes(:es)
+      expect(subdivisions).to be_an(Array)
+      expect(subdivisions.first[0]).to be_a(String)
+      expect(subdivisions.size).to eq(27)
+      expect(subdivisions.first[0]).to eq('Al Iskandariyah')
+    end
+  end
+
   describe 'valid?' do
     it 'should return true if country is valid' do
       expect(ISO3166::Country.new('US')).to be_valid
@@ -318,6 +338,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)
@@ -477,6 +518,31 @@ describe ISO3166::Country do
       end
     end
 
+    context "when search name with comma in 'name'" do
+      subject { ISO3166::Country.find_by_name(country_name) }
+
+      context 'with Republic of Korea' do
+        let(:country_name) { 'Korea, Republic of' }
+        it 'should return' do
+          expect(subject.first).to eq('KR')
+        end
+      end
+
+      context 'with Bolivia' do
+        let(:country_name) { 'Bolivia, Plurinational State of' }
+        it 'should return' do
+          expect(subject.first).to eq('BO')
+        end
+      end
+
+      context 'with Bonaire' do
+        let(:country_name) { 'Bonaire, Sint Eustatius and Saba' }
+        it 'should return' do
+          expect(subject.first).to eq('BQ')
+        end
+      end
+    end
+
     context 'when search lowercase multibyte name found' do
       subject { ISO3166::Country.find_country_by_name('россия') }
 
@@ -555,6 +621,15 @@ describe ISO3166::Country do
       end
     end
 
+    context 'when the search term contains comma' do
+      let(:korea) { ISO3166::Country.find_country_by_name('Korea, Republic of') }
+
+      it 'should be a country instance' do
+        expect(korea).to be_a(ISO3166::Country)
+        expect(korea.alpha2).to eq('KR')
+      end
+    end
+
     context 'when search translation found' do
       before do
         ISO3166.configure do |config|

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.8
+  version: 2.1.4
 platform: ruby
 authors:
 - Josh Robinson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2018-02-09 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
@@ -96,6 +96,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: All sorts of useful information about every country packaged as pretty
   little country objects. It includes data from ISO 3166
 email:
@@ -532,6 +546,7 @@ files:
 - lib/countries/data/subdivisions/GD.yaml
 - lib/countries/data/subdivisions/GE.yaml
 - lib/countries/data/subdivisions/GH.yaml
+- lib/countries/data/subdivisions/GL.yaml
 - lib/countries/data/subdivisions/GM.yaml
 - lib/countries/data/subdivisions/GN.yaml
 - lib/countries/data/subdivisions/GQ.yaml
@@ -563,10 +578,11 @@ files:
 - lib/countries/data/subdivisions/KP.yaml
 - lib/countries/data/subdivisions/KR.yaml
 - lib/countries/data/subdivisions/KW.yaml
+- lib/countries/data/subdivisions/KY.yaml
 - lib/countries/data/subdivisions/KZ.yaml
-- lib/countries/data/subdivisions/Ky.yaml
 - lib/countries/data/subdivisions/LA.yaml
 - lib/countries/data/subdivisions/LB.yaml
+- lib/countries/data/subdivisions/LC.yaml
 - lib/countries/data/subdivisions/LI.yaml
 - lib/countries/data/subdivisions/LK.yaml
 - lib/countries/data/subdivisions/LR.yaml
@@ -576,6 +592,7 @@ files:
 - lib/countries/data/subdivisions/LV.yaml
 - lib/countries/data/subdivisions/LY.yaml
 - lib/countries/data/subdivisions/MA.yaml
+- lib/countries/data/subdivisions/MC.yaml
 - lib/countries/data/subdivisions/MD.yaml
 - lib/countries/data/subdivisions/ME.yaml
 - lib/countries/data/subdivisions/MG.yaml
@@ -608,6 +625,7 @@ files:
 - lib/countries/data/subdivisions/PH.yaml
 - lib/countries/data/subdivisions/PK.yaml
 - lib/countries/data/subdivisions/PL.yaml
+- lib/countries/data/subdivisions/PS.yaml
 - lib/countries/data/subdivisions/PT.yaml
 - lib/countries/data/subdivisions/PW.yaml
 - lib/countries/data/subdivisions/PY.yaml
@@ -630,6 +648,7 @@ files:
 - lib/countries/data/subdivisions/SN.yaml
 - lib/countries/data/subdivisions/SO.yaml
 - lib/countries/data/subdivisions/SR.yaml
+- lib/countries/data/subdivisions/SS.yaml
 - lib/countries/data/subdivisions/ST.yaml
 - lib/countries/data/subdivisions/SV.yaml
 - lib/countries/data/subdivisions/SY.yaml
@@ -638,6 +657,7 @@ files:
 - lib/countries/data/subdivisions/TF.yaml
 - lib/countries/data/subdivisions/TG.yaml
 - lib/countries/data/subdivisions/TH.yaml
+- lib/countries/data/subdivisions/TJ.yaml
 - lib/countries/data/subdivisions/TL.yaml
 - lib/countries/data/subdivisions/TM.yaml
 - lib/countries/data/subdivisions/TN.yaml
@@ -647,7 +667,6 @@ files:
 - lib/countries/data/subdivisions/TV.yaml
 - lib/countries/data/subdivisions/TW.yaml
 - lib/countries/data/subdivisions/TZ.yaml
-- lib/countries/data/subdivisions/Tj.yaml
 - lib/countries/data/subdivisions/UA.yaml
 - lib/countries/data/subdivisions/UG.yaml
 - lib/countries/data/subdivisions/UM.yaml
@@ -658,6 +677,7 @@ files:
 - lib/countries/data/subdivisions/VE.yaml
 - lib/countries/data/subdivisions/VN.yaml
 - lib/countries/data/subdivisions/VU.yaml
+- lib/countries/data/subdivisions/WF.yaml
 - lib/countries/data/subdivisions/WS.yaml
 - lib/countries/data/subdivisions/YE.yaml
 - lib/countries/data/subdivisions/ZA.yaml
@@ -669,6 +689,12 @@ files:
 - lib/countries/kwarg_struct.rb
 - lib/countries/mongoid.rb
 - lib/countries/setup.rb
+- lib/countries/sources.rb
+- lib/countries/sources/cldr/downloader.rb
+- lib/countries/sources/cldr/subdivision.rb
+- lib/countries/sources/cldr/subdivision_updater.rb
+- lib/countries/sources/local/cached_loader.rb
+- lib/countries/sources/local/subdivision.rb
 - lib/countries/structure.rb
 - lib/countries/subdivision.rb
 - lib/countries/tasks/geocoding.rake
@@ -704,7 +730,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Gives you a country object full of all sorts of useful information.