countries 4.2.3 → 5.0.0

data/lib/countries/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ISO3166
   class << self
     attr_writer :configuration

data/lib/countries/country/class_methods.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'sixarm_ruby_unaccent'
 
 module ISO3166
   UNSEARCHABLE_METHODS = [:translations].freeze
 
-  def self::Country(country_data_or_country)
+  def self.Country(country_data_or_country)
     case country_data_or_country
     when ISO3166::Country
       country_data_or_country
@@ -15,9 +17,6 @@ module ISO3166
   end
 
   module CountryClassMethods
-    FIND_BY_REGEX = /^find_(all_)?(country_|countries_)?by_(.+)/
-    SEARCH_TERM_FILTER_REGEX = /\(|\)|\[\]|,/
-
     def new(country_data)
       super if country_data.is_a?(Hash) || codes.include?(country_data.to_s.upcase)
     end
@@ -33,10 +32,6 @@ module ISO3166
 
     alias countries all
 
-    def all_translated(locale = 'en')
-      translations(locale).values
-    end
-
     def all_names_with_codes(locale = 'en')
       Country.all.map do |c|
         lc = (c.translation(locale) || c.iso_short_name)
@@ -50,6 +45,10 @@ module ISO3166
       end
     end
 
+    def all_translated(locale = 'en')
+      translations(locale).values
+    end
+
     def translations(locale = 'en')
       i18n_data_countries = I18nData.countries(locale.upcase)
 
@@ -62,54 +61,6 @@ module ISO3166
       i18n_data_countries.merge(custom_countries)
     end
 
-    def search(query)
-      country = new(query.to_s.upcase)
-      country && country.valid? ? country : nil
-    end
-
-    def [](query)
-      search(query)
-    end
-
-    def method_missing(method_name, *arguments)
-      matches = method_name.to_s.match(FIND_BY_REGEX)
-      return_all = matches[1]
-      super unless matches
-
-      if matches[3] == 'names'
-        if RUBY_VERSION =~ /^3\.\d\.\d/
-          warn "DEPRECATION WARNING: 'find_by_name' and 'find_*_by_name' methods are deprecated, please refer to the README file for more information on this change.", uplevel: 1, category: :deprecated
-        else
-          warn "DEPRECATION WARNING: 'find_by_name' and 'find_*_by_name' methods are deprecated, please refer to the README file for more information on this change.", uplevel: 1
-        end
-      end
-
-      countries = find_by(matches[3], arguments[0], matches[2])
-      return_all ? countries : countries.last
-    end
-
-    def respond_to_missing?(method_name, include_private = false)
-      matches = method_name.to_s.match(FIND_BY_REGEX)
-      if matches && matches[3]
-        instance_methods.include?(matches[3].to_sym)
-      else
-        super
-      end
-    end
-
-    def find_all_by(attribute, val)
-      attributes, lookup_value = parse_attributes(attribute, val)
-
-      ISO3166::Data.cache.select do |_, v|
-        country = Country.new(v)
-        attributes.any? do |attr|
-          Array(country.send(attr)).any? do |n|
-            lookup_value === cached(n) { parse_value(n) }
-          end
-        end
-      end
-    end
-
     def subdivisions(alpha2)
       @subdivisions ||= {}
       @subdivisions[alpha2] ||= create_subdivisions(subdivision_data(alpha2))
@@ -124,51 +75,14 @@ module ISO3166
 
     protected
 
-    def strip_accents(v)
-      if v.is_a?(Regexp)
-        Regexp.new(v.source.unaccent, 'i')
+    def strip_accents(string)
+      if string.is_a?(Regexp)
+        Regexp.new(string.source.unaccent, 'i')
       else
-        v.to_s.unaccent.downcase
-      end
-    end
-
-    def parse_attributes(attribute, val)
-      raise "Invalid attribute name '#{attribute}'" unless searchable_attribute?(attribute.to_sym)
-
-      attributes = Array(attribute.to_s)
-      if attribute.to_s == 'name'
-        if RUBY_VERSION =~ /^3\.\d\.\d/
-          warn "DEPRECATION WARNING: 'find_by_name' and 'find_*_by_name' methods are deprecated, please refer to the README file for more information on this change.", uplevel: 1, category: :deprecated
-        else
-          warn "DEPRECATION WARNING: 'find_by_name' and 'find_*_by_name' methods are deprecated, please refer to the README file for more information on this change.", uplevel: 1
-        end
-        # 'find_by_name' and 'find_*_by_name' will be changed for 5.0
-        # The addition of 'iso_short_name' here ensures the behaviour of 4.1 is kept for 4.2
-        attributes = %w[iso_short_name unofficial_names translated_names]
-      end
-
-      [attributes, parse_value(val)]
-    end
-
-    def searchable_attribute?(attribute)
-      searchable_attributes.include?(attribute.to_sym)
-    end
-
-    def searchable_attributes
-      instance_methods - UNSEARCHABLE_METHODS
-    end
-
-    def find_by(attribute, value, obj = nil)
-      find_all_by(attribute.downcase, value).map do |country|
-        obj.nil? ? country : new(country.last)
+        string.to_s.unaccent.downcase
       end
     end
 
-    def parse_value(value)
-      value = value.gsub(SEARCH_TERM_FILTER_REGEX, '') if value.respond_to?(:gsub)
-      strip_accents(value)
-    end
-
     def subdivision_data(alpha2)
       file = subdivision_file_path(alpha2)
       File.exist?(file) ? YAML.load_file(file) : {}
@@ -190,6 +104,7 @@ module ISO3166
     def cached(value)
       @_parsed_values_cache ||= {}
       return @_parsed_values_cache[value] if @_parsed_values_cache[value]
+
       @_parsed_values_cache[value] = yield
     end
   end

data/lib/countries/country/currency_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'money'
 
 module ISO3166

data/lib/countries/country/emoji.rb

@@ -1,5 +1,4 @@
-#!/bin/env ruby
-# encoding: utf-8
+# frozen_string_literal: true
 
 module ISO3166
   module Emoji
@@ -36,7 +35,7 @@ module ISO3166
     #
     # The emoji flag for this country, using Unicode Regional Indicator characters. e.g: "U+1F1FA U+1F1F8" for 🇺🇸
     def emoji_flag
-      alpha2.downcase.chars.map { |c| CODE_POINTS[c] }.join('')
+      alpha2.downcase.chars.map { |c| CODE_POINTS[c] }.join
     end
   end
 end

data/lib/countries/country/finder_methods.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module ISO3166
+  module CountryFinderMethods
+    FIND_BY_REGEX = /^find_(all_)?(country_|countries_)?by_(.+)/.freeze
+    SEARCH_TERM_FILTER_REGEX = /\(|\)|\[\]|,/.freeze
+
+    def search(query)
+      country = new(query.to_s.upcase)
+      country&.valid? ? country : nil
+    end
+
+    def [](query)
+      search(query)
+    end
+
+    def find_all_by(attribute, val)
+      attributes, lookup_value = parse_attributes(attribute, val)
+
+      ISO3166::Data.cache.select do |_, v|
+        country = Country.new(v)
+        attributes.any? do |attr|
+          Array(country.send(attr)).any? do |n|
+            lookup_value === cached(n) { parse_value(n) }
+          end
+        end
+      end
+    end
+
+    def method_missing(method_name, *arguments)
+      matches = method_name.to_s.match(FIND_BY_REGEX)
+      return_all = matches[1]
+      super unless matches
+
+      countries = find_by(matches[3], arguments[0], matches[2])
+      return_all ? countries : countries.last
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      matches = method_name.to_s.match(FIND_BY_REGEX)
+      if matches && matches[3]
+        instance_methods.include?(matches[3].to_sym)
+      else
+        super
+      end
+    end
+
+    protected
+
+    def find_by(attribute, value, obj = nil)
+      find_all_by(attribute.downcase, value).map do |country|
+        obj.nil? ? country : new(country.last)
+      end
+    end
+
+    def parse_attributes(attribute, val)
+      raise "Invalid attribute name '#{attribute}'" unless searchable_attribute?(attribute.to_sym)
+
+      attributes = Array(attribute.to_s)
+      if attribute.to_s == 'any_name'
+        attributes = %w[iso_long_name iso_short_name unofficial_names translated_names]
+      end
+
+      [attributes, parse_value(val)]
+    end
+
+    def parse_value(value)
+      value = value.gsub(SEARCH_TERM_FILTER_REGEX, '') if value.respond_to?(:gsub)
+      strip_accents(value)
+    end
+
+    def searchable_attribute?(attribute)
+      searchable_attributes.include?(attribute.to_sym)
+    end
+
+    def searchable_attributes
+      # Add name and names until we complete the deprecation of the finders
+      instance_methods - UNSEARCHABLE_METHODS + [:name, :names, :any_name]
+    end
+  end
+end

data/lib/countries/country.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 module ISO3166
   class Country
     extend CountryClassMethods
+    extend CountryFinderMethods
     include Emoji
     attr_reader :data
 
@@ -31,24 +34,6 @@ module ISO3166
     alias zip_format postal_code_format
     alias languages languages_official
 
-    def latitude_dec
-      if RUBY_VERSION =~ /^3\.\d\.\d/
-        warn "DEPRECATION WARNING: The Country#latitude_dec method has been deprecated and will be removed in 5.0. Please use Country#latitude instead.", uplevel: 1, category: :deprecated
-      else
-        warn "DEPRECATION WARNING: The Country#latitude_dec method has been deprecated and will be removed in 5.0. Please use Country#latitude instead.", uplevel: 1
-      end
-      latitude
-    end
-
-    def longitude_dec
-      if RUBY_VERSION =~ /^3\.\d\.\d/
-        warn "DEPRECATION WARNING: The Country#longitude_dec method has been deprecated and will be removed in 5.0. Please use Country#longitude instead.", uplevel: 1, category: :deprecated
-      else
-        warn "DEPRECATION WARNING: The Country#longitude_dec method has been deprecated and will be removed in 5.0. Please use Country#longitude instead.", uplevel: 1
-      end
-      longitude
-    end
-
     def ==(other)
       other.respond_to?(:alpha2) && other.alpha2 == alpha2
     end
@@ -136,28 +121,6 @@ module ISO3166
       @local_name ||= local_names.first
     end
 
-    # @return [String] This Country's ISO Short Name
-    # @deprecated Use {#iso_short_name} instead.
-    def name
-      if RUBY_VERSION =~ /^3\.\d\.\d/
-        warn "DEPRECATION WARNING: The Country#name method has been deprecated. Please use Country#iso_short_name instead or refer to the README file for more information on this change.", uplevel: 1, category: :deprecated
-      else
-        warn "DEPRECATION WARNING: The Country#name method has been deprecated. Please use Country#iso_short_name instead or refer to the README file for more information on this change.", uplevel: 1
-      end
-      iso_short_name
-    end
-
-    # @return [Array<String>] Array of unofficial, slang names or aliases for this Country
-    # @deprecated Use {#unofficial_names} instead.
-    def names
-      if RUBY_VERSION =~ /^3\.\d\.\d/
-        warn "DEPRECATION WARNING: The Country#names method has been deprecated. Please use Country#unofficial_names instead or refer to the README file for more information on this change.", uplevel: 1, category: :deprecated
-      else
-        warn "DEPRECATION WARNING: The Country#names method has been deprecated. Please use Country#unofficial_names instead or refer to the README file for more information on this change.", uplevel: 1
-      end
-      unofficial_names
-    end
-
     # @!attribute alpha2
     #   @return [String] the ISO3166 alpha-2 code for this Country
     #

data/lib/countries/data/countries/KN.yaml

@@ -9,7 +9,6 @@ KN:
   geo:
     latitude: 17.357822
     longitude: -62.782998
-    longitude_dec: "-62.643184661865234"
     max_latitude: 17.4205891
     max_longitude: -62.52369989999999
     min_latitude: 17.07861

data/lib/countries/data.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module ISO3166
   # Handles building the in memory store of countries data
   class Data
-    @@cache_dir = [File.dirname(__FILE__), 'cache']
-    @@cache = {}
-    @@registered_data = {}
-    @@mutex = Mutex.new
+    @cache_dir = [File.dirname(__FILE__), 'cache']
+    @cache = {}
+    @registered_data = {}
+    @mutex = Mutex.new
 
     def initialize(alpha2)
       @alpha2 = alpha2.to_s.upcase
@@ -15,30 +17,23 @@ module ISO3166
     end
 
     class << self
-      def cache_dir
-        @@cache_dir
-      end
-
-      def cache_dir=(value)
-        @@cache_dir = value
-      end
 
       # Registers a new Country with custom data.
       # If you are overriding an existing country, this does not perform a deep merge so you will need to __bring in all data you wish to be available__.
       # Overriding an existing country will also remove it from the internal management of translations.
       def register(data)
         alpha2 = data[:alpha2].upcase
-        @@registered_data[alpha2] = deep_stringify_keys(data)
-        @@registered_data[alpha2]['translations'] = \
+        @registered_data[alpha2] = deep_stringify_keys(data)
+        @registered_data[alpha2]['translations'] = \
           Translations.new.merge(data['translations'] || {})
-        @@cache = cache.merge(@@registered_data)
+        @cache = cache.merge(@registered_data)
       end
 
       # Removes a country from the loaded data
       def unregister(alpha2)
         alpha2 = alpha2.to_s.upcase
-        @@cache.delete(alpha2)
-        @@registered_data.delete(alpha2)
+        @cache.delete(alpha2)
+        @registered_data.delete(alpha2)
       end
 
       def cache
@@ -47,8 +42,8 @@ module ISO3166
 
       # Resets the loaded data and cache
       def reset
-        @@cache = {}
-        @@registered_data = {}
+        @cache = {}
+        @registered_data = {}
         ISO3166.configuration.loaded_locales = []
       end
 
@@ -60,16 +55,19 @@ module ISO3166
       def update_cache
         load_data!
         sync_translations!
-        @@cache
+        @cache
       end
 
+      private
+
       def load_data!
-        return @@cache unless load_required?
+        return @cache unless load_required?
+
         synchronized do
-          @@cache = load_cache %w(countries.json)
-          @@_country_codes = @@cache.keys
-          @@cache = @@cache.merge(@@registered_data)
-          @@cache
+          @cache = load_cache %w[countries.json]
+          @_country_codes = @cache.keys
+          @cache = @cache.merge(@registered_data)
+          @cache
         end
       end
 
@@ -85,11 +83,9 @@ module ISO3166
         end
       end
 
-      private
-
       def synchronized(&block)
         if use_mutex?
-          @@mutex.synchronize(&block)
+          @mutex.synchronize(&block)
         else
           block.call
         end
@@ -102,17 +98,17 @@ module ISO3166
 
       def load_required?
         synchronized do
-          @@cache.empty?
+          @cache.empty?
         end
       end
 
       def loaded_codes
-        @@cache.keys
+        @cache.keys
       end
 
       # Codes that we have translations for in dataset
       def internal_codes
-        @@_country_codes - @@registered_data.keys
+        @_country_codes - @registered_data.keys
       end
 
       def cache_flush_required?
@@ -139,9 +135,9 @@ module ISO3166
         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
+            @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
@@ -150,8 +146,8 @@ module ISO3166
       def unload_translations(locale)
         synchronized do
           internal_codes.each do |alpha2|
-            @@cache[alpha2]['translations'].delete(locale)
-            @@cache[alpha2]['translated_names'] = @@cache[alpha2]['translations'].values.freeze
+            @cache[alpha2]['translations'].delete(locale)
+            @cache[alpha2]['translated_names'] = @cache[alpha2]['translations'].values.freeze
           end
           ISO3166.configuration.loaded_locales.delete(locale)
         end
@@ -163,7 +159,7 @@ module ISO3166
       end
 
       def datafile_path(file_array)
-        File.join([@@cache_dir] + file_array)
+        File.join([@cache_dir] + file_array)
       end
 
       def deep_stringify_keys(data)
@@ -171,7 +167,8 @@ module ISO3166
         data.transform_values! do |v|
           v.is_a?(Hash) ? deep_stringify_keys(v) : v
         end
-        return data
+
+        data
       end
     end
   end

data/lib/countries/global.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'countries'
 
 # Some apps might not want to constantly call +ISO3166::Country+. This gem has a helper that can provide a Country class

data/lib/countries/iso3166.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'json'
 require 'i18n_data'
@@ -8,6 +10,7 @@ require 'countries/data'
 require 'countries/structure'
 require 'countries/translations'
 require 'countries/country/class_methods'
+require 'countries/country/finder_methods'
 require 'countries/country/emoji'
 require 'countries/country'
 require 'countries/subdivision'

data/lib/countries/kwarg_struct.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ISO3166
   class KwargStruct < Struct
     # Override the initialize to handle hashes of named parameters

data/lib/countries/mongoid.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ISO3166
   class Country
     def mongoize

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 require 'net/http'
 require 'nokogiri'
@@ -19,19 +21,17 @@ module Sources
       def download_folder(type)
         folder = File.join(ISO3166_ROOT_PATH, 'tmp', 'cldr', 'trunk', 'common', type)
         FileUtils.mkdir_p(folder)
-        url = URI.parse("https://api.github.com/repos/unicode-org/cldr/contents/common/" + type)
+        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
+          next unless 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
   end
 end
-

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

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module Sources
   module CLDR
     # Auxiliary Subdivision class to support loading Unicode CLDR data to update local files
     class Subdivision
       attr_reader :xml, :language_code
+
       def initialize(language_code:, xml:)
         @language_code = language_code
         @xml = xml

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support'
 require 'active_support/core_ext/hash/deep_merge'
 require 'nokogiri'
@@ -9,25 +11,29 @@ module Sources
     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
+        @loader = Sources::Local::CachedLoader.new(Sources::Local::Subdivision)
+        d.each { |file_path| update_locale(file_path) }
+      end
+
+      def update_locale(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
+        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

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

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 module Sources
   # Support code to allow updating subdivision data from the Unicode CLDR repository
   module Local
     # Loader for locally-cached data, to allow merging Unicode CLDR data with existing local data
     class CachedLoader
       attr_reader :klass
+
       def initialize(klass)
         @klass = klass
         @loaded_countries = {}

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

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module Sources
   module Local
     # Auxiliary Subdivision class to support loading the local subdivision data to be updated with Unicode CLDR data
     class Subdivision
       attr_reader :code
+
       def initialize(code)
         @code = code
       end
@@ -16,8 +19,8 @@ module Sources
       end
 
       def save(data)
-        File.open(file_path, 'w') { |f| f.write data.to_yaml }
-      rescue
+        File.write(file_path, data.to_yaml)
+      rescue StandardError
         puts "failed to read #{file}: #{$ERROR_INFO}"
       end