fifa 2024.9.21 → 2024.9.22

data/config/europe/countries.txt

@@ -0,0 +1,117 @@
+=========================================
+==  Europe
+# Note: The UEFA member country Kazachstan from Asia is listed in Asia.
+# Note: The UEFA member country Israel from Asia is listed in Middle East.
+
+al   Albania,              ALB,   fifa › uefa
+ad   Andorra,              AND,   fifa › uefa
+at   Austria,              AUT,   fifa › uefa
+      | Österreich [de]
+
+
+by   Belarus,              BLR,    fifa › uefa
+be   Belgium,              BEL,    fifa › uefa
+ba   Bosnia and Herzegovina,  BIH,  fifa › uefa
+      | Bosnia-Herzegovina | Bosnia | Bosnia-Herz.      # add Bosnia Herzegovina?
+bg   Bulgaria,             BUL,   fifa › uefa
+
+hr   Croatia,              CRO,   fifa › uefa
+      | Hrvatska [hr]
+cy   Cyprus,               CYP,   fifa › uefa
+cz   Czech Republic,       CZE,   fifa › uefa
+      | Czechia
+
+dk   Denmark,              DEN,   fifa › uefa
+
+ee   Estonia,              EST,  fifa › uefa
+es   Spain,                ESP,  fifa › uefa
+      | España [es]
+
+fi   Finland,              FIN,  fifa › uefa
+fr   France,               FRA,  fifa › uefa
+
+de   Germany,              GER,  fifa › uefa
+      | Deutschland [de]
+gr   Greece,               GRE,  fifa › uefa
+
+hu   Hungary,              HUN,  fifa › uefa
+
+is   Iceland,              ISL,  fifa › uefa
+it   Italy,                ITA,  fifa › uefa
+ie   Ireland,              IRL,  fifa › uefa
+      | Republic of Ireland
+
+lv   Latvia,               LVA,  fifa › uefa
+      | Latvija
+li   Liechtenstein,        LIE,  fifa › uefa
+lt   Lithuania,            LTU,  fifa › uefa
+lu   Luxembourg,           LUX,  fifa › uefa
+
+## note: country renamed to North Macedonia in February 2019
+##         keeps same fifa code - move Macedonia to history - why? why not?
+mk   North Macedonia,      MKD,  fifa › uefa
+      | Republic of North Macedonia
+      | Macedonia | FYR Macedonia | Macedonia FYR
+
+mt   Malta,                MLT,  fifa › uefa
+md   Moldova,              MDA,  fifa › uefa
+me   Montenegro,           MNE,  fifa › uefa
+
+nl   Netherlands,          NED,  fifa › uefa
+no   Norway,               NOR,  fifa › uefa
+
+pl   Poland,               POL,  fifa › uefa
+pt   Portugal,             POR,  fifa › uefa
+
+ro   Romania,              ROU,  fifa › uefa
+ru   Russia,               RUS,  fifa › uefa
+
+sm   San Marino,  SMR,  fifa › uefa
+rs   Serbia,  SRB,      fifa › uefa
+sk   Slovakia,  SVK,     fifa › uefa
+si   Slovenia,  SVN,     fifa › uefa
+se   Sweden,  SWE,       fifa › uefa
+ch   Switzerland,  SUI,  fifa › uefa
+      | Confoederatio Helvetica
+
+tr   Turkey,  TUR,   fifa › uefa
+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)
+
+##  south caucasus
+## - add to middle east?
+
+am   Armenia,              ARM,  fifa › uefa
+az   Azerbaijan,           AZE,  fifa › uefa
+ge   Georgia,              GEO,  fifa › uefa
+
+
+# Territories & Dependencies
+fo   Faroe Islands › DK,   FRO,  fifa › uefa
+gi   Gibraltar     › UK,   GIB,  fifa › uefa
+
+nkr  Artsakh        › AZ,  NKR   # note: NOT fifa or uefa member
+bsq  Basque Country › ES,  BSQ   # note: NOT fifa or uefa member
+cat  Catalonia      › ES,  CAT   # note: NOT fifa or uefa member
+gal  Galicia        › ES,  GAL   # note: NOT fifa or uefa member
+
+## note: uses four-letter codes!
+trnc Northern Cyprus › CY, TRNC  # note: NOT fifa or uefa member
+
+## not members
+# - Great Britain - only all its member e.g. England/Wales/Scotland/Northern Irland
+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
+nir  Northern Ireland › UK, NIR,  fifa › uefa
+      | N. Ireland
+
+## irregular codes
+va   Vatican City,  VAT    ## no "official" fifa code - listed in "irregular" codes
+      | Vatican
+mc   Monaco,        MCO    ## no "official" fifa code - listed in "irregular" codes
+
+

data/config/middle-east/countries.txt

@@ -0,0 +1,31 @@
+==========================================
+==  Middle East
+
+# note: israel is listed here (uefa member)
+
+
+### Arabian Peninsula
+bh   Bahrain,              BHR,  fifa › afc › waff
+kw   Kuwait,               KUW,  fifa › afc › waff
+om   Oman,                 OMA,  fifa › afc › waff
+qa   Qatar,                QAT,  fifa › afc › waff
+sa   Saudi Arabia,         KSA,  fifa › afc › waff
+ae   United Arab Emirates, UAE,  fifa › afc › waff
+      | UA Emirates
+ye   Yemen,                YEM,  fifa › afc › waff
+
+
+### Fertile Crescent
+iq   Iraq,                 IRQ,  fifa › afc › waff
+il   Israel,               ISR,  fifa › uefa         # note: was formerly a member of AFC (1954–1974); joined UEFA in 1994
+jo   Jordan,               JOR,  fifa › afc › waff
+lb   Lebanon,              LIB,  fifa › afc › waff
+ps   Palestine,            PLE,  fifa › afc › waff
+      | Palestinian Territories
+sy   Syria,                SYR,  fifa › afc › waff
+
+
+### Iranian Plateau
+ir   Iran,                 IRN,  fifa › afc › cafa   # note: NOT waff member
+      | IR Iran | Islamic Republic of Iran
+

data/config/north-america/countries.txt

@@ -0,0 +1,12 @@
+==================================
+==  North America
+
+ca   Canada,               CAN,  fifa › concacaf › nafu
+us   United States,        USA,  fifa › concacaf › nafu
+mx   Mexico,               MEX,  fifa › concacaf › nafu
+      | México [es]
+
+# Territories & Dependencies
+bm   Bermuda › UK,         BER,  fifa › concacaf › cfu
+    ## check alt old? code BMU - in use??
+gl   Greenland › DK,       GRL

data/config/pacific/countries.txt

@@ -0,0 +1,49 @@
+==============================================
+==  Pacific      ## Oceania & Australia
+
+au   Australia,            AUS,  fifa › afc › aff   # formerly a member of OFC (1966–2006)
+
+### Melanesia
+pg   Papua New Guinea,     PNG,  fifa › ofc
+      | Papua N.G.
+fj   Fiji,                 FIJ,  fifa › ofc
+sb   Solomon Islands,      SOL,  fifa › ofc
+      | Solomon Isl.
+vu   Vanuatu,              VAN,  fifa › ofc
+
+
+### Micronesia
+pw   Palau,       PLW             # note: NOT fifa member, NOT ofc member
+                                  #  Listed as associate member of the OFC in 2002 and again in 2006. It is unclear whether Palau is still associated with the confederation
+fm   Micronesia,  FSM             # note: NOT fifa member, NOT ofc member
+      | Federated States of Micronesia
+ki   Kiribati,    KIR,   ofc      # note: NOT fifa member
+
+
+### Polynesia
+nz   New Zealand,     NZL,  fifa › ofc   # was formerly a member of AFC (1964–1966)
+ws   Samoa,           SAM,  fifa › ofc
+to   Tonga,           TGA,  fifa › ofc
+tv   Tuvalu,          TUV,         ofc  # note: NOT fifa member
+
+
+
+# Territories & Dependencies
+
+pf   Tahiti        › FR,   TAH,   fifa › ofc      # todo/check: use French Polynesia (FR) as name - why? why not?
+      | French Polynesia     # note: Tahiti, which is located within the Society Islands, is the most populous island, having close to 69% of the population of French Polynesia as of 2017.
+nc   New Caledonia › FR,   NCL,   fifa › ofc
+
+as   American Samoa           › US,  ASA, fifa › ofc
+      | Am. Samoa
+gu   Guam                     › US,  GUM, fifa › afc › eaff
+mp   Northern Mariana Islands › US,  NMI,        afc › eaff  # note: NOT fifa member  -- was formerly a member of OFC (2005–2009)
+
+ck   Cook Islands › NZ,    COK,   fifa › ofc
+nu   Niue         › NZ,    NIU,          ofc  # note: NOT fifa member
+
+
+## More Irregular FIFA codes
+# - Marshall Islands
+# - Nauru
+

data/config/south-america/countries.txt

@@ -0,0 +1,23 @@
+==================================
+==  South America
+
+ar   Argentina,            ARG,  fifa › conmebol
+bo   Bolivia,              BOL,  fifa › conmebol
+br   Brazil,               BRA,  fifa › conmebol
+cl   Chile,                CHI,  fifa › conmebol
+co   Colombia,             COL,  fifa › conmebol
+ec   Ecuador,              ECU,  fifa › conmebol
+py   Paraguay,             PAR,  fifa › conmebol
+pe   Peru,                 PER,  fifa › conmebol
+uy   Uruguay,              URU,  fifa › conmebol
+ve   Venezuela,            VEN,  fifa › conmebol
+
+
+# NB: guyana, suriname n french guiana
+#  are part of north/central & caribbean according to fifa/concacaf
+
+gy   Guyana,               GUY,  fifa › concacaf › cfu
+sr   Suriname,             SUR,  fifa › concacaf › cfu
+
+gf   French Guiana › FR,  GUF,  concacaf › cfu     # note: NOT fifa member
+       ## todo: check alternative (old?) code GYF for French Guiana ??

data/lib/fifa/country_index.rb

@@ -5,6 +5,15 @@ module Fifa
 ## built-in countries for (quick starter) auto-add
 class CountryIndex
 
+  def self.read( *paths )
+    recs = []
+    paths.each do |path|
+      recs += CountryReader.read( path )
+    end
+    new( recs )
+  end
+
+
   def initialize( recs=nil )
     @countries  = []
     @by_code    = {}  ## countries by codes (fifa, internet, etc)
@@ -45,9 +54,6 @@ class CountryIndex
 
 
   def _add( recs )
-    ###########################################
-    ## auto-fill countries
-    ## pp recs
     recs.each do |rec|
       key = rec.code.downcase    ## add codes lookups - key, fifa, ...
       if @by_code[ key ]

data/lib/fifa/version.rb

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

data/lib/fifa.rb

@@ -15,15 +15,19 @@ require_relative 'fifa/org_index'
 
 module Fifa
   def self.world
-      @world ||= begin
-                   world = CountryIndex.new
-                   recs = CountryReader.read( "#{Fifa.data_dir}/countries.txt" )
-                   world.add( recs )
-                   world
-                 end
+      @world ||=  CountryIndex.read(
+                        "#{Fifa.data_dir}/africa/countries.txt",
+                        "#{Fifa.data_dir}/asia/countries.txt",
+                        "#{Fifa.data_dir}/caribbean/countries.txt",
+                        "#{Fifa.data_dir}/central-america/countries.txt",
+                        "#{Fifa.data_dir}/europe/countries.txt",
+                        "#{Fifa.data_dir}/middle-east/countries.txt",
+                        "#{Fifa.data_dir}/north-america/countries.txt",
+                        "#{Fifa.data_dir}/pacific/countries.txt",
+                        "#{Fifa.data_dir}/south-america/countries.txt",
+                        "#{Fifa.data_dir}/countries_history.txt" )
   end
 
-
   ## note: only returns fifa member countries (use world.countries for all) !!!
   def self.countries() world.members( :fifa ); end
 
@@ -34,9 +38,9 @@ end # class Fifa
 
 
 
-## add Uefa convenience module with scoped search/lookup - why? why not?
+## add Uefa/Conmebol convenience modules - why? why not?
 module Uefa
-  def self.countries() Fifa.world.members(:uefa); end
+  def self.countries() Fifa.members(:uefa); end
 end
 
 module Conmebol

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fifa
 version: !ruby/object:Gem::Version
-  version: 2024.9.21
+  version: 2024.9.22
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-21 00:00:00.000000000 Z
+date: 2024-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-structs
@@ -65,24 +65,44 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
+- LICENSE.md
 - Manifest.txt
 - NOTES.md
 - README.md
-- config/countries.txt
+- config/africa/countries.txt
+- config/asia/countries.txt
+- config/caribbean/countries.txt
+- config/central-america/countries.txt
+- config/countries_history.txt
+- config/europe/countries.txt
+- config/middle-east/countries.txt
+- config/north-america/countries.txt
+- config/pacific/countries.txt
+- config/south-america/countries.txt
 files:
 - CHANGELOG.md
+- LICENSE.md
 - Manifest.txt
 - NOTES.md
 - README.md
 - Rakefile
-- config/countries.txt
+- config/africa/countries.txt
+- config/asia/countries.txt
+- config/caribbean/countries.txt
+- config/central-america/countries.txt
+- config/countries_history.txt
+- config/europe/countries.txt
+- config/middle-east/countries.txt
+- config/north-america/countries.txt
+- config/pacific/countries.txt
+- config/south-america/countries.txt
 - lib/fifa.rb
 - lib/fifa/country_index.rb
 - lib/fifa/country_reader.rb
 - lib/fifa/org_index.rb
 - lib/fifa/outline_reader.rb
 - lib/fifa/version.rb
-homepage: https://github.com/sportdb/football.db
+homepage: https://github.com/sportdb/fifa
 licenses:
 - Public Domain
 metadata: {}