fifa 2024.9.22 → 2024.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3bf43bacb89e178a5c836edc7b9654ae23e8ddc440e8ce2fd215295387d7f8b
-  data.tar.gz: 3dc3ee724c145640ddc5ba6a992cb751a290e38bdb78f6abcd0fa3c52fb4dbbd
+  metadata.gz: 867568e754139dd434ceada10ec464a3b171070d081f008819f7acfd0a90b02d
+  data.tar.gz: 249272b08c1b55e8ceebfd844f768e95eedc20e4b1087409b04bf4b9a2e18124
 SHA512:
-  metadata.gz: 30e3ec97c2d6b12edd84be1345d1acd90e3c7da87390296110dd51df502432811e57a6f2e4e6d8e672f736ab2eee7765fa09bd86e8a54105ca313e56732e91bb
-  data.tar.gz: 21cbba46ec38f6f94bcdcceaad86d86c060f8ff3afacf838032ffb0c636411b882be579eced74e8ed95d41483c27b3600040b3a30ec94330b85920c959602b57
+  metadata.gz: 8b7422f0a10e4aa40b15a5621fbcd936803f54ffd0735aed2d477036a08a2c1e5563eb0590e55fea6f7490b2e545a73e18e5073b3365b2f764bb2d7e365a331c
+  data.tar.gz: 740e883c235a56d3b8b137dd89eda13f1dc642d87e7eba34ac08d6373d38a86b1e99f0ed5fda024f045fcd4aebb77e612412337a0d483001962318ebcd79b250

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 2024.9.22
+### 2024.10.5
 
 ### 0.0.1 / 2019-08-12
 

data/README.md

@@ -128,7 +128,7 @@ That's it.
 The World's Football Association / Governing Body
 uses its own country list and (three-letter²) codes - see
 the [List of FIFA country codes @ Wikipedia](https://en.wikipedia.org/wiki/List_of_FIFA_country_codes)
-or the [built-in country datafiles (in .txt)](https://github.com/sportdb/football.db/blob/master/fifa/config) shipping with this library.
+or the [built-in country datafiles (in .txt)](https://github.com/sportdb/fifa/blob/master/config) shipping with this library.
 
 
 

data/Rakefile

@@ -21,6 +21,7 @@ Hoe.spec 'fifa' do
 
   self.extra_deps = [
     ['sportdb-structs',   '>= 0.4.0'],
+    ['alphabets'],
   ]
 
   self.spec_extras = {

data/config/africa/countries.txt

@@ -6,52 +6,76 @@ bi   Burundi,              BDI, fifa › caf › cecafa
 dj   Djibouti,             DJI, fifa › caf › cecafa
 er   Eritrea,              ERI, fifa › caf › cecafa
 et   Ethiopia,             ETH, fifa › caf › cecafa
+       | Äthiopien [de]
 ke   Kenya,                KEN, fifa › caf › cecafa
+       | Kenia [de]
 rw   Rwanda,               RWA, fifa › caf › cecafa
+       | Ruanda [de]
 so   Somalia,              SOM, fifa › caf › cecafa
 tz   Tanzania,             TAN, fifa › caf › cecafa
+       | Tansania [de]
 ug   Uganda,               UGA, fifa › caf › cecafa
 
 km   Comoros,              COM, fifa › caf › cosafa
+       | Komoren [de]
 mg   Madagascar,           MAD, fifa › caf › cosafa
+       | Madagaskar [de]
 mw   Malawi,               MWI, fifa › caf › cosafa
 mu   Mauritius,            MRI, fifa › caf › cosafa
 mz   Mozambique,           MOZ, fifa › caf › cosafa
+       | Mosambik [de]
 sc   Seychelles,           SEY, fifa › caf › cosafa
+       | Seychellen [de]
 zm   Zambia,               ZAM, fifa › caf › cosafa
+       | Sambia [de]
 zw   Zimbabwe,             ZIM, fifa › caf › cosafa
+      | Simbabwe [de]
 
 
 ### Central Africa
 ao   Angola,               ANG, fifa › caf › cosafa
 cm   Cameroon,             CMR, fifa › caf › uniffac
+      | Kamerun [de]
 cf   Central African Republic,  CTA, fifa › caf › uniffac
       | C. Afr. Rep.
+      | Zentralafr. Republik [de]
 td   Chad,                 CHA, fifa › caf › uniffac
+      | Tschad [de]
 cg   Congo,                CGO, fifa › caf › uniffac
       | Congo-Brazzaville | Congo-Brazz.
+      | Kongo [de]
 cd   Congo DR,             COD, fifa › caf › uniffac    ## use "Congo, DR"
       | DR Congo | Democratic Republic of the Congo
       | Congo-Kinshasa | Congo-Kinsh.
+      | DR Kongo [de]
 gq   Equatorial Guinea,    EQG, fifa › caf › uniffac
       | Equat. Guinea
+      | Äquatorialguinea [de]
 ga   Gabon,                GAB, fifa › caf › uniffac
+      | Gabun
 st   São Tomé and Príncipe,  STP, fifa › caf › uniffac
       | São Tomé e Príncipe | São Tomé/Pr.
 
 
 ### Northern Africa
 dz   Algeria,              ALG, fifa › caf › unaf
+      | Algerien [de]
 eg   Egypt,                EGY, fifa › caf › unaf
+      | Ägypten [de]
 ma   Morocco,              MAR, fifa › caf › unaf
+      | Marokko [de]
 ly   Libya,                LBY, fifa › caf › unaf
+      | Libyen [de]
 tn   Tunisia,              TUN, fifa › caf › unaf
+      | Tunesien [de]
 ss   South Sudan,          SSD, fifa › caf › cecafa
+      | Südsudan [de]
 sd   Sudan,                SDN, fifa › caf › cecafa
 
 
 ### Southern Africa
 za   South Africa,         RSA, fifa › caf › cosafa
+       | Südafrika [de]
 bw   Botswana,             BOT, fifa › caf › cosafa
 ls   Lesotho,              LES, fifa › caf › cosafa
 na   Namibia,              NAM, fifa › caf › cosafa
@@ -66,6 +90,7 @@ cv   Cabo Verde,           CPV, fifa › caf › wafu
       | Cape Verde | Cape Verde Islands
 ci   Côte d'Ivoire,        CIV, fifa › caf › wafu
       | Ivory Coast [en]
+      | Elfenbeinküste [de]
 gm   Gambia,               GAM, fifa › caf › wafu
 gh   Ghana,                GHA, fifa › caf › wafu
 gn   Guinea,               GUI, fifa › caf › wafu
@@ -73,6 +98,7 @@ gw   Guinea-Bissau,        GNB, fifa › caf › wafu
 lr   Liberia,              LBR, fifa › caf › wafu
 ml   Mali,                 MLI, fifa › caf › wafu
 mr   Mauritania,           MTN, fifa › caf › wafu
+      | Mauretanien [de]
 ne   Niger,                NIG, fifa › caf › wafu
 ng   Nigeria,              NGA, fifa › caf › wafu
 sn   Senegal,              SEN, fifa › caf › wafu
@@ -83,5 +109,5 @@ tg   Togo,                 TOG, fifa › caf › wafu
 # Territories & Dependencies
 re   Réunion  › FR, REU,   caf             # note: NOT fifa member
 zan  Zanzibar › TZ, ZAN,   caf › cecafa    # note: NOT fifa member  -- is a semi-autonomous region of Tanzania
-
+       | Sansibar [de]
 

data/config/asia/countries.txt

@@ -5,6 +5,7 @@
 
 ### Central Asia
 kz   Kazakhstan,           KAZ,  fifa › uefa     # note: was formerly a member of AFC (1993–2002)
+      | Kasachstan [de]
 kg   Kyrgyzstan,           KGZ,  fifa › afc › cafa
       | Kyrgyz Republic
 tj   Tajikistan,           TJK,  fifa › afc › cafa

data/config/europe/countries.txt

@@ -11,38 +11,54 @@ at   Austria,              AUT,   fifa › uefa
 
 by   Belarus,              BLR,    fifa › uefa
 be   Belgium,              BEL,    fifa › uefa
+      | Belgien [de]
 ba   Bosnia and Herzegovina,  BIH,  fifa › uefa
       | Bosnia-Herzegovina | Bosnia | Bosnia-Herz.      # add Bosnia Herzegovina?
+      | Bosnien-Herzegowina [de]
 bg   Bulgaria,             BUL,   fifa › uefa
+      | Bulgarien [de]
 
 hr   Croatia,              CRO,   fifa › uefa
       | Hrvatska [hr]
+      | Kroatien [de]
 cy   Cyprus,               CYP,   fifa › uefa
+       | Zypern [de]
 cz   Czech Republic,       CZE,   fifa › uefa
       | Czechia
+      | Tschechien [de]
 
 dk   Denmark,              DEN,   fifa › uefa
+      | Dänemark [de]
 
 ee   Estonia,              EST,  fifa › uefa
 es   Spain,                ESP,  fifa › uefa
       | España [es]
+      | Spanien [de]
 
 fi   Finland,              FIN,  fifa › uefa
+      | Finnland [de]
 fr   France,               FRA,  fifa › uefa
+      | Frankreich [de]
 
 de   Germany,              GER,  fifa › uefa
       | Deutschland [de]
 gr   Greece,               GRE,  fifa › uefa
+      | Griechenland [de]
 
 hu   Hungary,              HUN,  fifa › uefa
+      | Ungarn [de]
 
 is   Iceland,              ISL,  fifa › uefa
+      | Island [de]
 it   Italy,                ITA,  fifa › uefa
+      | Italien [de]
 ie   Ireland,              IRL,  fifa › uefa
       | Republic of Ireland
+      | Irland [de]
 
 lv   Latvia,               LVA,  fifa › uefa
       | Latvija
+      | Lettland [de]
 li   Liechtenstein,        LIE,  fifa › uefa
 lt   Lithuania,            LTU,  fifa › uefa
 lu   Luxembourg,           LUX,  fifa › uefa
@@ -55,41 +71,61 @@ mk   North Macedonia,      MKD,  fifa › uefa
 
 mt   Malta,                MLT,  fifa › uefa
 md   Moldova,              MDA,  fifa › uefa
+      | Moldau [de]
 me   Montenegro,           MNE,  fifa › uefa
 
 nl   Netherlands,          NED,  fifa › uefa
+       | Niederlande [de]
 no   Norway,               NOR,  fifa › uefa
+       | Norwegen [de]
 
 pl   Poland,               POL,  fifa › uefa
+       | Polen [de]
 pt   Portugal,             POR,  fifa › uefa
 
 ro   Romania,              ROU,  fifa › uefa
+       | Rumänien [de]
 ru   Russia,               RUS,  fifa › uefa
 
 sm   San Marino,  SMR,  fifa › uefa
 rs   Serbia,  SRB,      fifa › uefa
+      | Serbien [de]
 sk   Slovakia,  SVK,     fifa › uefa
+      | Slowakei [de]
 si   Slovenia,  SVN,     fifa › uefa
+      | Slowenien [de]
 se   Sweden,  SWE,       fifa › uefa
+      | Schweden [de]
 ch   Switzerland,  SUI,  fifa › uefa
       | Confoederatio Helvetica
+      | Schweiz [de]
 
 tr   Turkey,  TUR,   fifa › uefa
+      | Türkei [de]
 ua   Ukraine,  UKR,  fifa › uefa
 
-xk   Kosovo,  KVX,  fifa › uefa        # -- note: Kosovo is not listed as an ISO standard country. The unofficial 2 and 3-digit codes are used by the European Commission and others until Kosovo is assigned an ISO code
-      | KOS      # note: KOS used by UEFA, KVX by FIFA (use FIFA code for now)
+## old kosovo version
+# -- note: Kosovo is not listed as an ISO standard country. The unofficial 2 and 3-digit codes are used by the European Commission and others until Kosovo is assigned an ISO code
+#    note: KOS used by UEFA, KVX by FIFA (use FIFA code for now)
+# xk   Kosovo,  KVX,  fifa › uefa
+#       | KOS
+
+kos   Kosovo,  KOS,  fifa › uefa
+       | kvx | xk
 
 ##  south caucasus
 ## - add to middle east?
 
 am   Armenia,              ARM,  fifa › uefa
+       | Armenien [de]
 az   Azerbaijan,           AZE,  fifa › uefa
+       | Aserbaidschan [de]
 ge   Georgia,              GEO,  fifa › uefa
 
 
 # Territories & Dependencies
 fo   Faroe Islands › DK,   FRO,  fifa › uefa
+       | Färöer [de]
 gi   Gibraltar     › UK,   GIB,  fifa › uefa
 
 nkr  Artsakh        › AZ,  NKR   # note: NOT fifa or uefa member
@@ -106,8 +142,10 @@ uk   Great Britain,    GBR     # note: NOT fifa or uefa member
 eng  England          › UK, ENG,  fifa › uefa
 wal  Wales            › UK, WAL,  fifa › uefa
 sco  Scotland         › UK, SCO,  fifa › uefa
+      | Schottland [de]
 nir  Northern Ireland › UK, NIR,  fifa › uefa
       | N. Ireland
+      | Nordirland [de]
 
 ## irregular codes
 va   Vatican City,  VAT    ## no "official" fifa code - listed in "irregular" codes

data/lib/fifa/country_index.rb

@@ -17,6 +17,7 @@ class CountryIndex
   def initialize( recs=nil )
     @countries  = []
     @by_code    = {}  ## countries by codes (fifa, internet, etc)
+    @by_name    = {}  ##  normalized name
     @orgs       = OrgIndex.new
 
     add( recs )   if recs
@@ -38,11 +39,25 @@ class CountryIndex
 
 
   def find( q )
-    key = q.to_s.downcase   ## allow symbols (and always downcase e.g. AUT to aut etc.)
+    ## todo/fix - add find by name (find_by_name_and_code) - why? why not?
+    find_by_code( q )
+  end
+
+  def find_by_code( code )
+    key = code.to_s.downcase   ## allow symbols (and always downcase e.g. AUT to aut etc.)
     @by_code[ key ]
   end
-  alias_method :[], :find
+  alias_method :[], :find_by_code
+
+  def find_by_name( name )
+     key = normalize( unaccent( name.to_s ))
+     @by_name[ key ]
+  end
+
+
 
+  include SportDb::NameHelper
+  ## strip_year, strip_lang, normalize etc.
 
 
   def add( recs )
@@ -55,15 +70,36 @@ class CountryIndex
 
   def _add( recs )
     recs.each do |rec|
-      key = rec.code.downcase    ## add codes lookups - key, fifa, ...
+      ## step 1 - add code lookups - key, fifa, ...
+      ##  todo/fix - add  two-letter keys and alt keys - why? why not?
+      key = rec.code.downcase
       if @by_code[ key ]
         puts "** !!! ERROR !!! country code (fifa)  >#{rec.code}< already exits!!"
         exit 1
       else
         @by_code[ key ] = rec
       end
+
+
+      ## step 2 - add name lookups
+      keys = [ normalize( unaccent( strip_year( rec.name ))) ]
+
+      rec.alt_names.each do |name|
+         keys <<  normalize( unaccent( strip_year(strip_lang(name)) ))
+      end
+      ## note - allow duplicates only if same country
+      ##   e.g Panama, Panamá
+      keys = keys.uniq
+
+      keys.each do |key|
+        if @by_name[ key ]
+          puts "** !!! ERROR country (norm) name  >#{key}< already exits"
+          exit 1
+        else
+          @by_name[ key ] = rec
+        end
+      end
     end
   end # method add
 end   # class CountryIndex
-
-end   # class Module
+end   # module Fifa

data/lib/fifa/version.rb

@@ -1,8 +1,8 @@
 
 module Fifa
   MAJOR = 2024    ## todo: namespace inside version or something - why? why not??
-  MINOR = 9
-  PATCH = 22
+  MINOR = 10
+  PATCH = 5
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/fifa.rb

@@ -1,5 +1,6 @@
 ## 3rd party gems
 require 'sportdb/structs'    ## pull-in Sports::Country
+require 'alphabets'
 
 
 ###

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fifa
 version: !ruby/object:Gem::Version
-  version: 2024.9.22
+  version: 2024.10.5
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-22 00:00:00.000000000 Z
+date: 2024-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-structs
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: alphabets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement