countries 2.1.2 → 2.1.4

data/lib/countries/data/subdivisions/ZW.yaml

@@ -3,6 +3,7 @@ BU:
   unofficial_names: Bulawayo
   translations:
     en: Bulawayo
+    ru: Булавайо
   geo:
     latitude: -20.1325066
     longitude: 28.626479
@@ -15,6 +16,8 @@ HA:
   unofficial_names: Harare
   translations:
     en: Harare
+    de: Provinz Harare
+    ru: Хараре
   geo:
     latitude: -17.863889
     longitude: 31.029722
@@ -27,6 +30,49 @@ MA:
   unofficial_names: Manicaland
   translations:
     en: Manicaland
+    af: Manicaland
+    ar: محافظة مانيكالاند
+    bg: Маникаленд
+    bn: মনিকাল্যান্ড প্রদেশ
+    ca: Manicaland
+    cs: Provincie Manica
+    da: Manicaland
+    de: Provinz Manicaland
+    el: Μανικαλάνδη
+    es: Manicalandia
+    et: Manicaland
+    eu: Manicaland
+    fa: استان مانیکالند
+    fi: Manicaland
+    fr: Manicaland
+    gu: મેનિકાલૅન્ડ પ્રાંત
+    hi: मैनिकालैंड प्रांत
+    id: Manicaland
+    it: provincia del Manicaland
+    ja: マニカランド州
+    ka: მანიკალენდი
+    kn: ಮ್ಯಾನಿಕಲ್ ಮತ್ತು ಪ್ರಾಂತ್ಯ
+    ko: 마니칼랜드 주
+    lt: Manikalandas
+    mr: माणिकलँड प्रांत
+    ms: Manicaland
+    nb: Manicaland
+    nl: Manicaland
+    pl: Manicaland
+    pt: Manicaland
+    ro: Manicaland
+    ru: Маникаленд
+    si: මනිකලන්ඩ් පළාත
+    sr: Маникаленд
+    sv: Manicaland
+    ta: மணிகலந்து மாகாணம்
+    te: మానికాలాండ్ ప్రావిన్స్
+    th: จังหวัดมานิกาแลนด์
+    tr: Manicaland
+    uk: Манікаленд
+    ur: مانیکالینڈ صوبہ
+    vi: Tỉnh Manicaland
+    zh: 馬尼卡蘭省
   geo:
     latitude: -18.9216386
     longitude: 32.174605
@@ -39,6 +85,48 @@ MC:
   unofficial_names: Mashonaland Central
   translations:
     en: Mashonaland Central
+    af: Masjonaland-Sentraal
+    ar: مقاطعة ماشونالاند الوسطى
+    bg: Централен Машоналенд
+    bn: ম্যাশোনাল্যান্ড কেন্দ্রীয় প্রদেশ
+    ca: Mashonaland Central
+    da: Mashonaland Central
+    de: Provinz Mashonaland Central
+    el: Κεντρική Μασοναλάνδη
+    es: Mashonalandia Central
+    et: Kesk-Mashonaland
+    eu: Erdialdeko Mashonaland
+    fa: استان ماشونالند مرکزی
+    fi: Mashonaland Central
+    fr: Mashonaland central
+    gu: મશોનાલેન્ડ સેન્ટ્રલ પ્રાંત
+    hi: मशोनालैंड मध्य प्रांत
+    id: Mashonaland Pusat
+    it: provincia del Mashonaland Centrale
+    ja: 中央マショナランド州
+    ka: ცენტრალური მაშონალენდი
+    kn: ಮಶೋನಾಲ್ಯಾಂಡ್ ಮಧ್ಯ ಪ್ರಾಂತ್ಯ
+    ko: 중앙마쇼날랜드 주
+    lt: Vidurio Mašonalandas
+    mr: माशॉनलँड मध्यवर्ती प्रांत
+    ms: Mashonaland Central Province
+    nb: Mashonaland Central
+    nl: Mashonaland Central
+    pl: Maszona Środkowa
+    pt: Mashonaland Central
+    ro: Mashonaland Central
+    ru: Центральный Машоналенд
+    si: මාෂ්හොනලන්ඩ් මධ්‍යම පළාත
+    sr: Машоналенд Централ
+    sv: Mashonaland Central
+    ta: மஷோநலன்ட் சென்ட்ரல் மாகாணம்
+    te: మషూనాలాండ్ సెంట్రల్ ప్రావిన్స్
+    th: มาโชนาแลนด์เซนทรัล
+    tr: Mashonaland Merkez
+    uk: Центральний Машоналенд
+    ur: ماشونالینڈ وسطی صوبہ
+    vi: Tỉnh Miền Trung Mashonaland
+    zh: 中馬紹納蘭省
   geo:
     latitude: -16.7644295
     longitude: 31.0793705
@@ -51,6 +139,48 @@ ME:
   unofficial_names: Mashonaland East
   translations:
     en: Mashonaland East
+    af: Masjonaland-Oos
+    ar: محافظة شرق ماشونالاند
+    bg: Източен Машоналенд
+    bn: ম্যাশনাল্যান্ড পূর্ব প্রদেশ
+    ca: Mashonaland Oriental
+    da: Mashonaland East
+    de: Provinz Mashonaland East
+    el: Ανατολική Μασοναλάνδη
+    es: Mashonalandia Oriental
+    et: Ida-Mashonaland
+    eu: Ekialdeko Mashonaland
+    fa: استان ماشونالند شرقی
+    fi: Mashonaland East
+    fr: Mashonaland oriental
+    gu: મશોનાલેન્ડ પૂર્વ પ્રાંત
+    hi: माशोनालैंड पूर्व प्रांत
+    id: Mashonaland Timur
+    it: provincia del Mashonaland Orientale
+    ja: 東マショナランド州
+    ka: აღმოსავლეთი მაშონალენდი
+    kn: ಮಶೋನಾಲ್ಯಾಂಡ್ ಪೂರ್ವ ಪ್ರಾಂತ್ಯ
+    ko: 동마쇼날랜드 주
+    lt: Rytų Mašonalandas
+    mr: माशोनॅंड पूर्व प्रांत
+    ms: Mashonaland Timur
+    nb: Mashonaland East
+    nl: Mashonaland East
+    pl: Maszona Wschodnia
+    pt: Mashonaland Este
+    ro: Provincia Mashonaland East
+    ru: Восточный Машоналенд
+    si: මශෝනලන්ඩ් නැගෙනහිර පළාත
+    sr: Машоналенд Исток
+    sv: Mashonaland East
+    ta: மஷோநலன்ட் கிழக்கு மாகாணம்
+    te: మాషోనాలాండ్ ఈస్ట్ ప్రావిన్స్
+    th: มาโชนาแลนด์
+    tr: Doğu Mashonaland
+    uk: Східний Машоналенд
+    ur: ماشونالینڈ مشرقی صوبہ
+    vi: Tỉnh Mashonaland East
+    zh: 東馬紹納蘭省
   geo:
     latitude: -18.5871642
     longitude: 31.2626366
@@ -63,6 +193,48 @@ MI:
   unofficial_names: Midlands
   translations:
     en: Midlands
+    af: Midlands
+    ar: محافظة ميدلاندز
+    bg: Мидлендс
+    bn: মিডল্যান্ডস প্রদেশ
+    ca: Midlands
+    da: Midlands
+    de: Provinz Midlands
+    el: Μίντλαντς
+    es: Midlands
+    et: Midlandsi provints
+    eu: Midlands
+    fa: استان میدلندز
+    fi: Midlands
+    fr: Province des Midlands
+    gu: મિડલેન્ડ્સ પ્રાંત
+    hi: मिडलैंड्स प्रांत
+    id: Provinsi Midlands
+    it: provincia delle Midland
+    ja: ミッドランズ州
+    ka: მიდლენდსი
+    kn: ಮಿಡ್ಲ್ಯಾಂಡ್ಸ್ ಪ್ರಾಂತ್ಯ
+    ko: 미들랜즈 주
+    lt: Midlandsas
+    mr: मिडलंड्स प्रांत
+    ms: Midlands Province
+    nb: Midlands
+    nl: Midlands
+    pl: Midlands
+    pt: Midlands
+    ro: Provincia Midlands
+    ru: Мидлендс
+    si: මිඩ්ලන්ඩ් පළාත
+    sr: Мидлендс
+    sv: Midlands
+    ta: மிட்லாண்ட்ஸ் மாகாணம்
+    te: మిడ్‌లాండ్స్ ప్రావిన్స్
+    th: จังหวัดมิดแลนด์
+    tr: Midlands
+    uk: Мідлендс
+    ur: مڈلینڈز صوبہ
+    vi: Tỉnh Midlands
+    zh: 中部省
   geo:
     latitude: -19.0552009
     longitude: 29.6035495
@@ -75,6 +247,49 @@ MN:
   unofficial_names: Matabeleland North
   translations:
     en: Matabeleland North
+    af: Matabeleland-Noord
+    ar: محافظة شمال ماتابيليلاند
+    bg: Северен Матабелеленд
+    bn: মাতাবেলেল্যান্ড উত্তর প্রদেশ
+    ca: Matabeleland Septentrional
+    da: Matabeleland North
+    de: Provinz Matabeleland North
+    el: Βόρεια Ματαμπελελάνδη
+    es: Matabelelandia Septentrional
+    et: Põhja-Matabeleland
+    eu: Iparraldeko Matabeleland
+    fa: استان ماتابلند شمالی
+    fi: Matabeleland North
+    fr: Matabeleland septentrional
+    gu: મતાબેલેલેન્ડ ઉત્તર પ્રાંત
+    hi: माटेबेलेलैंड उत्तरी प्रांत
+    id: Matabeleland Utara
+    it: provincia del Matabeleland Settentrionale
+    ja: 北マタベレランド州
+    ka: ჩრდილოეთი მატაბელელენდი
+    kn: ಮಾಟಬೇಲೆಲ್ಯಾಂಡ್ ಉತ್ತರ ಪ್ರಾಂತ್ಯ
+    ko: 북마타벨랜드 주
+    lt: Šiaurės Matabelelandas
+    mr: माटेबेलेलांड उत्तर प्रांत
+    ms: Matabeleland North Province
+    nb: Matabeleland North
+    nl: Matabeleland North
+    pl: Matabeleland Północny
+    pt: Matabeleland Norte
+    ro: Matabeleland North
+    ru: Северный Матабелеленд
+    si: මටබෙලෙලන්ඩ් උතුරු පළාත
+    sr: Матабелеленд Север
+    sv: Matabeleland North
+    sw: Matabeleland North
+    ta: மதபேலேலாண்ட் வடக்கு மாகாணம்
+    te: మాటాబెలెలాండ్ ఉత్తర ప్రావిన్స్
+    th: จังหวัดมาทาเบเลแลนด์เหนือ
+    tr: Kuzey Matabeleland
+    uk: Північний Матабелеленд
+    ur: ماتابیلےلینڈ شمالی صوبہ
+    vi: Tỉnh Matabeleland North
+    zh: 北馬塔貝萊蘭省
   geo:
     latitude: -18.5331566
     longitude: 27.5495846
@@ -87,6 +302,48 @@ MS:
   unofficial_names: Matabeleland South
   translations:
     en: Matabeleland South
+    af: Matabeleland-Suid
+    ar: مقاطعة جنوب ماتابيليلاند
+    bg: Южен Матабелеленд
+    bn: মাটাবেলেল্যান্ড দক্ষিন প্রদেশ
+    ca: Matabeleland Meridional
+    da: Matabeleland South
+    de: Provinz Matabeleland South
+    el: Νότια Ματαμπελελάνδη
+    es: Matabelelandia Meridional
+    et: Lõuna-Matabeleland
+    eu: Hegoaldeko Matabeleland
+    fa: استان ماتابلند جنوبی
+    fi: Matabeleland South
+    fr: Matabeleland méridional
+    gu: માટેબેલેલેન્ડ દક્ષિણ પ્રાંત
+    hi: माताबेलेलैंड दक्षिण प्रांत
+    id: Matabeleland Selatan
+    it: provincia del Matabeleland Meridionale
+    ja: 南マタベレランド州
+    ka: სამხრეთი მატაბელელენდი
+    kn: ಮ್ಯಾಟಬೇಲೆಲ್ಯಾಂಡ್ ದಕ್ಷಿಣ ಪ್ರಾಂತ್ಯ
+    ko: 남마타벨랜드 주
+    lt: Pietų Matabelelandas
+    mr: माटेबेलेईल दक्षिण प्रांत
+    ms: Daerah Selatan Matabeleland
+    nb: Matabeleland South
+    nl: Matabeleland South
+    pl: Matabeleland Południowy
+    pt: Matabeleland Sul
+    ro: Matabeleland South
+    ru: Южный Матабелеленд
+    si: මටබෙලේලන්ඩ් දකුණු පළාත
+    sr: Матабелеленд Југ
+    sv: Matabeleland South
+    ta: மதபேலேலாண்ட் தெற்கு மாகாணம்
+    te: మాటాబెలెలాండ్ దక్షిణ ప్రావిన్స్
+    th: จังหวัดเมตาเบเลแลนด์เซาท์
+    tr: Güney Matabeleland
+    uk: Південний Матабелеленд
+    ur: ماتابیلےلینڈ جنوبی صوبہ
+    vi: Tỉnh Matabeleland South
+    zh: 南馬塔貝萊蘭省
   geo:
     latitude: -21.052337
     longitude: 29.0459927
@@ -99,6 +356,48 @@ MV:
   unofficial_names: Masvingo
   translations:
     en: Masvingo
+    af: Masvingo
+    ar: منطقة ماسفينغو
+    bg: Масвинго
+    bn: মাাভিঙ্গো প্রদেশ
+    ca: Província de Masvingo
+    da: Masvingo
+    de: Provinz Masvingo
+    el: Μασβίνγκο
+    es: Provincia de Masvingo
+    et: Masvingo provints
+    eu: Masvingoko probintzia
+    fa: استان ماسوینگو
+    fi: Masvingo
+    fr: Province de Masvingo
+    gu: માસવિન્ગો પ્રાંત
+    hi: मैसविंगो प्रांत
+    id: Provinsi Masvingo
+    it: Provincia di Masvingo
+    ja: マシンゴ州
+    ka: მასვინგოს პროვინცია
+    kn: ಮಾಸ್ವಿಂಗ್ ಪ್ರಾಂತ್ಯ
+    ko: 마스빙고 주
+    lt: Masvingo provincija
+    mr: मासिविओ प्रांत
+    ms: Wilayah Masvingo
+    nb: Masvingo
+    nl: Masvingo
+    pl: Masvingo
+    pt: Masvingo
+    ro: Provincia Masvingo
+    ru: Масвинго
+    si: මස්වින්ගෝ පළාත
+    sr: Машвинго
+    sv: Masvingo
+    ta: மாசுவிங்கோ மாகாணம்
+    te: మాస్వింగో ప్రావిన్స్
+    th: จังหวัดมาสวินโก
+    tr: Masvingo
+    uk: Масвінго
+    ur: ماسونگو صوبہ
+    vi: Tỉnh Masvingo
+    zh: 馬斯溫戈省
   geo:
     latitude: -20.074444
     longitude: 30.83277799999999
@@ -111,6 +410,48 @@ MW:
   unofficial_names: Mashonaland West
   translations:
     en: Mashonaland West
+    af: Masjonaland-Wes
+    ar: محافظة ماشونالاند الغربية
+    bg: Западен Машоналенд
+    bn: ম্যাশনাল্যান্ড ওয়েস্ট প্রদেশ
+    ca: Mashonaland Occidental
+    da: Mashonaland West
+    de: Provinz Mashonaland West
+    el: Δυτική Μασοναλάνδη
+    es: Mashonalandia Occidental
+    et: Lääne-Mashonaland
+    eu: Mendebaldeko Mashonaland
+    fa: استان ماشونالند غربی
+    fi: Mashonaland West
+    fr: Mashonaland occidental
+    gu: મેશોનાલેન્ડ પશ્ચિમ પ્રાંત
+    hi: मशोनालैंड पश्चिमी प्रांत
+    id: Mashonaland Barat
+    it: provincia del Mashonaland Occidentale
+    ja: 西マショナランド州
+    ka: დასავლეთი მაშონალენდი
+    kn: ಪಶ್ಚಿಮ ಪ್ರಾಂತ್ಯದ ಮಶೋನಾಲ್ಯಾಂಡ್
+    ko: 서마쇼날랜드 주
+    lt: Vakarų Mašonalandas
+    mr: मशोनालँड पश्चिम प्रांत
+    ms: Mashonaland Barat
+    nb: Mashonaland West
+    nl: Mashonaland West
+    pl: Maszona Zachodnia
+    pt: Mashonaland Oeste
+    ro: Mashonaland West
+    ru: Западный Машоналенд
+    si: ලක්ෂද්වීප්
+    sr: Машоналенд Запад
+    sv: Mashonaland West
+    ta: மாஷானலேண்ட் மேற்கு மாகாணம்
+    te: మాషోనాలాండ్ పశ్చిమ ప్రావిన్స్
+    th: จังหวัดมาสโฮนาแลน เวส
+    tr: Batı Mashonaland
+    uk: Західний Машоналенд
+    ur: ماشونالینڈ مغربی صوبہ
+    vi: Tỉnh Mashonaland West
+    zh: 西馬紹納蘭省
   geo:
     latitude: -17.4851029
     longitude: 29.7889248

data/lib/countries/data/translation_corrections.yaml

@@ -28,3 +28,5 @@ fa:
 he:
   PS: "פלסטין, מדינת"
   VI: "איי הבתולה (ארה)"
+se:
+  GB: "Storbritannien"

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

@@ -0,0 +1,35 @@
+require 'uri'
+require 'net/http'
+require 'nokogiri'
+require 'fileutils'
+module Sources
+  module CLDR
+    module Downloader
+      module_function
+
+      def subdivisions
+        download_folder('subdivisions')
+      end
+
+      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('/')))
+        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/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/sources.rb

@@ -0,0 +1,6 @@
+require_relative './sources/local/cached_loader'
+require_relative './sources/local/subdivision'
+
+require_relative './sources/cldr/downloader'
+require_relative './sources/cldr/subdivision'
+require_relative './sources/cldr/subdivision_updater'

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.1.2'.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
@@ -498,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('россия') }
 
@@ -576,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|