countries 3.1.0 → 4.0.0

data/lib/countries/data/translation_corrections.yaml

@@ -1,6 +1,6 @@
 # Contains fixes for upstream pkg-iso-codes
 # Any change here should have an upstream bug report
-# https://alioth.debian.org/projects/pkg-iso-codes/
+# https://salsa.debian.org/iso-codes-team/iso-codes
 #
 # These changes are applied during `rake update_cache`
 #
@@ -34,5 +34,8 @@ he:
   VI: "איי הבתולה (ארה)"
 sv:
   GB: "Storbritannien"
+  RU: "Ryssland"
 pt:
   CZ: 'República Checa'
+da:
+  CZ: 'Tjekkiet'

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/version.rb

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

data/spec/country_spec.rb

@@ -345,6 +345,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
@@ -838,6 +858,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'

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'}),
+                                         'CYI' => ISO3166::Subdivision.new({name: 'New Municipality'}))
     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'}),
+                                         'LOL2' => ISO3166::Subdivision.new({name: 'Happy sub2'}))
     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.0.0
 platform: ruby
 authors:
 - Josh Robinson
 - Joe Corcoran
 - Russell Osborne
-autorequire:
+- Pedro Moreira
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-06-11 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.0
   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.0
 - !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,12 +758,17 @@ 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: {}
-post_install_message:
+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:
 - lib
@@ -776,8 +783,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Gives you a country object full of all sorts of useful information.
 test_files:
@@ -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