countries 3.1.0 → 4.1.1

data/lib/countries/data.rb

@@ -5,7 +5,7 @@ module ISO3166
     @@cache_dir = [File.dirname(__FILE__), 'cache']
     @@cache = {}
     @@registered_data = {}
-    @@semaphore = Mutex.new
+    @@mutex = Mutex.new
 
     def initialize(alpha2)
       @alpha2 = alpha2.to_s.upcase
@@ -26,10 +26,9 @@ module ISO3166
 
       def register(data)
         alpha2 = data[:alpha2].upcase
-        @@registered_data[alpha2] = \
-          data.each_with_object({}) { |(k, v), a| a[k.to_s] = v }
+        @@registered_data[alpha2] = deep_stringify_keys(data)
         @@registered_data[alpha2]['translations'] = \
-          Translations.new.merge(data[:translations] || {})
+          Translations.new.merge(data['translations'] || {})
         @@cache = cache.merge(@@registered_data)
       end
 
@@ -40,9 +39,7 @@ module ISO3166
       end
 
       def cache
-        @@semaphore.synchronize do
-          update_cache
-        end
+        update_cache
       end
 
       def reset
@@ -64,10 +61,12 @@ module ISO3166
 
       def load_data!
         return @@cache unless load_required?
-        @@cache = load_cache %w(countries.json)
-        @@_country_codes = @@cache.keys
-        @@cache = @@cache.merge(@@registered_data)
-        @@cache
+        synchronized do
+          @@cache = load_cache %w(countries.json)
+          @@_country_codes = @@cache.keys
+          @@cache = @@cache.merge(@@registered_data)
+          @@cache
+        end
       end
 
       def sync_translations!
@@ -84,8 +83,23 @@ module ISO3166
 
       private
 
+      def synchronized(&block)
+        if use_mutex?
+          @@mutex.synchronize(&block)
+        else
+          block.call
+        end
+      end
+
+      def use_mutex?
+        # Stubbed in testing
+        true
+      end
+
       def load_required?
-        @@cache.empty?
+        synchronized do
+          @@cache.empty?
+        end
       end
 
       def loaded_codes
@@ -118,21 +132,25 @@ module ISO3166
       end
 
       def load_translations(locale)
-        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
-          @@cache[alpha2]['translated_names'] = @@cache[alpha2]['translations'].values.freeze
+        synchronized do
+          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
+            @@cache[alpha2]['translated_names'] = @@cache[alpha2]['translations'].values.freeze
+          end
+          ISO3166.configuration.loaded_locales << locale
         end
-        ISO3166.configuration.loaded_locales << locale
       end
 
       def unload_translations(locale)
-        internal_codes.each do |alpha2|
-          @@cache[alpha2]['translations'].delete(locale)
-          @@cache[alpha2]['translated_names'] = @@cache[alpha2]['translations'].values.freeze
+        synchronized do
+          internal_codes.each do |alpha2|
+            @@cache[alpha2]['translations'].delete(locale)
+            @@cache[alpha2]['translated_names'] = @@cache[alpha2]['translations'].values.freeze
+          end
+          ISO3166.configuration.loaded_locales.delete(locale)
         end
-        ISO3166.configuration.loaded_locales.delete(locale)
       end
 
       def load_cache(file_array)
@@ -143,6 +161,14 @@ module ISO3166
       def datafile_path(file_array)
         File.join([@@cache_dir] + file_array)
       end
+
+      def deep_stringify_keys(data)
+        data.transform_keys!(&:to_s)
+        data.transform_values! do |v|
+          v.is_a?(Hash) ? deep_stringify_keys(v) : v
+        end
+        return data
+      end
     end
   end
 end

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

@@ -2,6 +2,8 @@ require 'uri'
 require 'net/http'
 require 'nokogiri'
 require 'fileutils'
+require 'json'
+
 module Sources
   module CLDR
     module Downloader
@@ -14,22 +16,19 @@ module Sources
       def download_folder(type)
         folder = File.join(ISO3166_ROOT_PATH, 'tmp', 'cldr', 'trunk', 'common', type)
         FileUtils.mkdir_p(folder)
-        doc = Nokogiri::HTML get(type + '/')
-        doc.css('a[href]').map { |e| e.attributes['href'].value }.each do |href|
-          next if href == '../'
-          File.write(File.join(folder, href), get([type, href].join('/')))
+        url = URI.parse("https://api.github.com/repos/unicode-org/cldr/contents/common/" + type)
+        path_listing = JSON.parse(Net::HTTP.get_response(url).body)
+        path_listing.each do |path|
+          if path['name'] =~ /\.xml$/
+            File.open(File.join(folder, path['name']), 'w') do |f|
+              raw_url = URI.parse(path['download_url'])
+              f.write(Net::HTTP.get_response(raw_url).body)
+            end
+          end
         end
       end
 
-      def get(path)
-        url = URI("http://www.unicode.org/repos/cldr/trunk/common/#{path}")
-
-        http = Net::HTTP.new(url.host, url.port)
-
-        request = Net::HTTP::Get.new(url)
-        response = http.request(request)
-        response.read_body
-      end
     end
   end
 end
+

data/lib/countries/tasks/geocoding.rake

@@ -2,7 +2,9 @@ require 'geocoder'
 require 'retryable'
 
 Geocoder.configure(
-  timeout: 10
+  lookup: :google,
+  timeout: 10,
+  api_key: GOOGLE_API_KEY
 )
 
 # raise on geocoding errors such as query limit exceeded
@@ -10,9 +12,9 @@ Geocoder.configure(always_raise: :all)
 # Try to geocode a given query, on exceptions it retries up to 3 times then gives up.
 # @param [String] query string to geocode
 # @return [Hash] first valid result or nil
-def geocode(query)
+def geocode(query, params)
   Retryable.retryable(tries: 3, sleep: ->(n) { 2**n }) do
-    Geocoder.search(query).first
+    Geocoder.search(query, params: params).first
   end
 rescue => e
   warn "Attempts exceeded for query #{query}, last error was #{e.message}"
@@ -41,12 +43,8 @@ namespace :geocode do
       # Load unmutated yaml file.
       data = load_country_yaml(country.alpha2)
 
-      lookup = "#{country.alpha2} country"
-      # LU country lookup appears to match to Los Angeles
-      lookup = country.name if country.alpha2 == 'LU'
-
-      next unless (result = geocode(lookup))
-      puts 'WARNING:: Geocoder returned something that was not a country' unless result.types.include?('country')
+      next unless (result = geocode(country.name, {region: country.alpha2}))
+      puts "WARNING:: Geocoder returned something that was not a country for #{country.alpha2}" unless result.types.include?('country')
       geometry = result.geometry
 
       # Extract center point data
@@ -76,15 +74,10 @@ namespace :geocode do
       # Iterate subdivisions
       state_data = c.subdivisions.dup
       state_data.reject { |_, data| data['geo'] }.each do |code, data|
-        location = "#{data['name']}, #{c.name}"
+        location = "#{c.alpha2}-#{code}"
 
-        # Handle special geocoding cases where Google defaults to well known
-        # cities, instead of the states.
-        if c.alpha2 == 'US' && %w(NY WA OK).include?(code)
-          location = "#{data['name']} State, United States"
-        end
+        next unless (result = geocode(location, {region: c.alpha2}))
 
-        next unless (result = geocode(location))
         geometry = result.geometry
         if geometry['location']
           state_data[code]['geo'] ||= {}

data/lib/countries/translations.rb

@@ -6,7 +6,7 @@ module ISO3166
   # to `pt` to prevent from showing nil values
   class Translations < Hash
     def [](locale)
-      super(locale) || super(locale.sub(/-.*/, ''))
+      super(locale) || super(locale.to_s.sub(/-.*/, ''))
     end
   end
 end

data/lib/countries/version.rb

@@ -1,3 +1,3 @@
 module Countries
-  VERSION = '3.1.0'.freeze
+  VERSION = '4.1.1'.freeze
 end

data/lib/countries.rb

@@ -1,4 +1,3 @@
-require 'unicode_utils/downcase'
 require 'sixarm_ruby_unaccent'
 
 require 'countries/version'

data/spec/country_spec.rb

@@ -248,6 +248,10 @@ describe ISO3166::Country do
       expect(virginia.name).to eq('Virginia')
     end
 
+    it 'should have a code' do
+      expect(virginia.code).to eq('VA')
+    end
+
     it 'should behave like a hash' do
       expect(virginia['name']).to eq('Virginia')
     end
@@ -345,6 +349,26 @@ describe ISO3166::Country do
       expect(countries.first).to eq('Aruba')
       expect(countries.size).to eq(NUM_OF_COUNTRIES)
     end
+
+    context 'with custom countries' do
+      before do
+        ISO3166::Data.register(
+          alpha2: 'XX',
+          name: 'Custom Country',
+          translations: { 'en' => 'Custom Country' }
+        )
+      end
+
+      it 'should include custom registered countries' do
+        custom_country = ISO3166::Country.find_by_alpha2('XX')[1]
+        countries = ISO3166::Country.all_translated
+        expect(countries).to include(custom_country['name'])
+      end
+
+      after do
+        ISO3166::Data.unregister('XX')
+      end
+    end
   end
 
   describe 'all_names_with_codes' do
@@ -780,6 +804,45 @@ describe ISO3166::Country do
     end
   end
 
+  describe 'finder methods respond_to_missing?' do
+    subject { ISO3166::Country.respond_to?(method_name) }
+    describe 'find_all_by' do
+      context 'find by a valid Country attribute' do
+        let(:method_name) { :find_all_by_currency }
+        it { is_expected.to be true }
+      end
+
+      context 'find by an invalid attribute' do
+        let(:method_name) { :find_all_by_invalid }
+        it { is_expected.to be false }
+      end
+    end
+
+    describe 'hash finder methods' do
+      context 'find by a valid Country attribute' do
+        let(:method_name) { :find_by_name }
+        it { is_expected.to be true }
+      end
+
+      context 'find by an invalid attribute' do
+        let(:method_name) { :find_by_invalid }
+        it { is_expected.to be false }
+      end
+    end
+
+    describe 'country finder methods' do
+      context 'find country by a valid Country attribute' do
+        let(:method_name) { :find_country_by_alpha3 }
+        it { is_expected.to be true }
+      end
+
+      context 'find by an invalid attribute' do
+        let(:method_name) { :find_country_by_invalid }
+        it { is_expected.to be false }
+      end
+    end
+  end
+
   describe 'names in Data' do
     it 'should be unique (to allow .find_by_name work properly)' do
       names = ISO3166::Data.cache.map do |_k, v|
@@ -838,6 +901,23 @@ describe ISO3166::Country do
     end
   end
 
+  describe 'in_esm?' do
+    let(:netherlands) { ISO3166::Country.search('NL') }
+    let(:switzerland) { ISO3166::Country.search('CH') }
+
+    it 'should return false for countries without esm_member or eea_member flag' do
+      expect(country.in_esm?).to be_falsey
+    end
+
+    it 'should return true for countries with eea_member flag set to true' do
+      expect(netherlands.in_esm?).to be_truthy
+    end
+
+    it 'should return true for countries with esm_member flag set to true' do
+      expect(switzerland.in_esm?).to be_truthy
+    end
+  end
+
   describe 'gec' do
     it 'should return the country\'s GEC code' do
       expect(ISO3166::Country.new('NA').gec).to eql 'WA'
@@ -931,4 +1011,24 @@ describe ISO3166::Country do
       expect(countries.all? { |country| country.un_locode.length == 2 }).to be
     end
   end
+
+  describe '.pluck' do
+    let(:args) { [] }
+
+    subject { ISO3166::Country.pluck(*args) }
+
+    it "returns empty arrays" do
+      expect(subject.first).to be_empty
+      expect(subject.last).to be_empty
+    end
+
+    context "when asking for alpha2, alpha3 and name" do
+      let(:args) { [:alpha2, :alpha3, :name] }
+
+      it "returns the correct values" do
+        expect(subject.first).to eq(["AD", "AND", "Andorra"])
+        expect(subject.last).to eq(["ZW", "ZWE", "Zimbabwe"])
+      end
+    end
+  end
 end

data/spec/data_spec.rb

@@ -116,8 +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'}))
+      expect(subject.subdivisions).to eq('CHA' => ISO3166::Subdivision.new({name: 'New Changhua', code: 'CHA'}),
+                                         'CYI' => ISO3166::Subdivision.new({name: 'New Municipality', code: 'CYI'}))
     end
   end
 
@@ -143,8 +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'}))
+      expect(subject.subdivisions).to eq('LOL1' => ISO3166::Subdivision.new({name: 'Happy sub1', code: 'LOL1'}),
+                                         'LOL2' => ISO3166::Subdivision.new({name: 'Happy sub2', code: 'LOL2'}))
     end
 
     it 'detect a stale cache' do

data/spec/thread_safety_spec.rb

@@ -0,0 +1,46 @@
+describe 'Accessing ISO3166::Country instances data in multiple threads' do
+  before do
+    if Thread.respond_to?(:report_on_exception)
+      @report_on_exception_value = Thread.report_on_exception
+      Thread.report_on_exception = false
+    end
+
+    ISO3166::Data.reset
+  end
+
+  def create_countries_threaded
+    nthreads = 100
+    threads = []
+
+    alpha2_codes = ['us', 'es', 'nl', 'ca', 'de', 'fr', 'mx', 'ru', 'ch', 'jp']
+
+    nthreads.times do
+      threads << Thread.new do
+        alpha2_codes.each do |a2|
+          country = ISO3166::Country[a2]
+          # This will fail if data['translations'] has been
+          # left nil due to a race condition
+          country.translation
+        end
+      end
+    end
+    threads.map(&:join)
+  end
+
+  it "doesn't raise any exceptions when using a mutex" do
+    expect { create_countries_threaded }.to_not raise_error
+  end
+
+  it "raises NoMethodError when not using a mutex" do
+    allow(ISO3166::Data).to receive(:use_mutex?).and_return(false)
+
+    expect { create_countries_threaded }.to raise_error(NoMethodError)
+  end
+
+  after do
+    if Thread.respond_to?(:report_on_exception)
+      Thread.report_on_exception = @report_on_exception_value
+    end
+  end
+end
+

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: countries
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Josh Robinson
 - Joe Corcoran
 - Russell Osborne
+- Pedro Moreira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n_data
@@ -18,28 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
-- !ruby/object:Gem::Dependency
-  name: unicode_utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: sixarm_ruby_unaccent
   requirement: !ruby/object:Gem::Requirement
@@ -101,15 +88,16 @@ description: All sorts of useful information about every country packaged as pre
 email:
 - hexorx@gmail.com
 - russell@burningpony.com
+- pedro@codecreations.tech
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -518,6 +506,7 @@ files:
 - lib/countries/data/subdivisions/AS.yaml
 - lib/countries/data/subdivisions/AT.yaml
 - lib/countries/data/subdivisions/AU.yaml
+- lib/countries/data/subdivisions/AW.yaml
 - lib/countries/data/subdivisions/AX.yaml
 - lib/countries/data/subdivisions/AZ.yaml
 - lib/countries/data/subdivisions/BA.yaml
@@ -529,6 +518,7 @@ files:
 - lib/countries/data/subdivisions/BH.yaml
 - lib/countries/data/subdivisions/BI.yaml
 - lib/countries/data/subdivisions/BJ.yaml
+- lib/countries/data/subdivisions/BL.yaml
 - lib/countries/data/subdivisions/BM.yaml
 - lib/countries/data/subdivisions/BN.yaml
 - lib/countries/data/subdivisions/BO.yaml
@@ -550,9 +540,11 @@ files:
 - lib/countries/data/subdivisions/CM.yaml
 - lib/countries/data/subdivisions/CN.yaml
 - lib/countries/data/subdivisions/CO.yaml
+- lib/countries/data/subdivisions/CP.yaml
 - lib/countries/data/subdivisions/CR.yaml
 - lib/countries/data/subdivisions/CU.yaml
 - lib/countries/data/subdivisions/CV.yaml
+- lib/countries/data/subdivisions/CW.yaml
 - lib/countries/data/subdivisions/CY.yaml
 - lib/countries/data/subdivisions/CZ.yaml
 - lib/countries/data/subdivisions/DE.yaml
@@ -577,11 +569,13 @@ files:
 - lib/countries/data/subdivisions/GB.yaml
 - lib/countries/data/subdivisions/GD.yaml
 - lib/countries/data/subdivisions/GE.yaml
+- lib/countries/data/subdivisions/GF.yaml
 - lib/countries/data/subdivisions/GG.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/GP.yaml
 - lib/countries/data/subdivisions/GQ.yaml
 - lib/countries/data/subdivisions/GR.yaml
 - lib/countries/data/subdivisions/GT.yaml
@@ -593,6 +587,7 @@ files:
 - lib/countries/data/subdivisions/HR.yaml
 - lib/countries/data/subdivisions/HT.yaml
 - lib/countries/data/subdivisions/HU.yaml
+- lib/countries/data/subdivisions/IC.yaml
 - lib/countries/data/subdivisions/ID.yaml
 - lib/countries/data/subdivisions/IE.yaml
 - lib/countries/data/subdivisions/IL.yaml
@@ -632,13 +627,16 @@ files:
 - lib/countries/data/subdivisions/MC.yaml
 - lib/countries/data/subdivisions/MD.yaml
 - lib/countries/data/subdivisions/ME.yaml
+- lib/countries/data/subdivisions/MF.yaml
 - lib/countries/data/subdivisions/MG.yaml
 - lib/countries/data/subdivisions/MH.yaml
 - lib/countries/data/subdivisions/MK.yaml
 - lib/countries/data/subdivisions/ML.yaml
 - lib/countries/data/subdivisions/MM.yaml
 - lib/countries/data/subdivisions/MN.yaml
+- lib/countries/data/subdivisions/MO.yaml
 - lib/countries/data/subdivisions/MP.yaml
+- lib/countries/data/subdivisions/MQ.yaml
 - lib/countries/data/subdivisions/MR.yaml
 - lib/countries/data/subdivisions/MS.yaml
 - lib/countries/data/subdivisions/MT.yaml
@@ -667,11 +665,13 @@ files:
 - lib/countries/data/subdivisions/PK.yaml
 - lib/countries/data/subdivisions/PL.yaml
 - lib/countries/data/subdivisions/PM.yaml
+- lib/countries/data/subdivisions/PR.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
 - lib/countries/data/subdivisions/QA.yaml
+- lib/countries/data/subdivisions/RE.yaml
 - lib/countries/data/subdivisions/RO.yaml
 - lib/countries/data/subdivisions/RS.yaml
 - lib/countries/data/subdivisions/RU.yaml
@@ -694,8 +694,10 @@ files:
 - lib/countries/data/subdivisions/SS.yaml
 - lib/countries/data/subdivisions/ST.yaml
 - lib/countries/data/subdivisions/SV.yaml
+- lib/countries/data/subdivisions/SX.yaml
 - lib/countries/data/subdivisions/SY.yaml
 - lib/countries/data/subdivisions/SZ.yaml
+- lib/countries/data/subdivisions/TA.yaml
 - lib/countries/data/subdivisions/TD.yaml
 - lib/countries/data/subdivisions/TF.yaml
 - lib/countries/data/subdivisions/TG.yaml
@@ -756,11 +758,16 @@ files:
 - spec/perf_spec.rb
 - spec/spec_helper.rb
 - spec/subdivision_spec.rb
+- spec/thread_safety_spec.rb
 - spec/timezone_spec.rb
-homepage: http://github.com/hexorx/countries
+homepage: http://github.com/countries/countries
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: http://github.com/countries/countries/issues
+  changelog_uri: https://github.com/countries/countries/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/countries/countries
+  wiki_uri: https://github.com/countries/countries/wiki
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -769,14 +776,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Gives you a country object full of all sorts of useful information.
@@ -789,4 +796,5 @@ test_files:
 - spec/perf_spec.rb
 - spec/spec_helper.rb
 - spec/subdivision_spec.rb
+- spec/thread_safety_spec.rb
 - spec/timezone_spec.rb

data/.travis.yml

@@ -1,15 +0,0 @@
-cache: bundler
-language: ruby
-rvm:
- - 1.9.3
- - 2.3.6
- - 2.4.3
- - 2.5.0
- - ruby-head
-before_install:
-  - gem update --system
-  - gem install bundler
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: 1.9.3