fifa 2024.9.22 → 2024.9.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3bf43bacb89e178a5c836edc7b9654ae23e8ddc440e8ce2fd215295387d7f8b
-  data.tar.gz: 3dc3ee724c145640ddc5ba6a992cb751a290e38bdb78f6abcd0fa3c52fb4dbbd
+  metadata.gz: 1616a8e1385d8ece752e63a5fc1a44ff0f2ee9d4f6ab40d0774f151fa544025e
+  data.tar.gz: f4b8e17cce0e1a9a353520f6726a071ac0fb33dbd1c95490e323c56e4c3b366f
 SHA512:
-  metadata.gz: 30e3ec97c2d6b12edd84be1345d1acd90e3c7da87390296110dd51df502432811e57a6f2e4e6d8e672f736ab2eee7765fa09bd86e8a54105ca313e56732e91bb
-  data.tar.gz: 21cbba46ec38f6f94bcdcceaad86d86c060f8ff3afacf838032ffb0c636411b882be579eced74e8ed95d41483c27b3600040b3a30ec94330b85920c959602b57
+  metadata.gz: ff004e8985804a8ac8f6b51e3db0f40acd4bf00593fb19f5ea58e02d32fca3be8664dd3aa500c8553f49a59299791affd3c6d300d8b90a924f84c06540ae2187
+  data.tar.gz: 49831c5e0da0491506a54f7c9064ee0f5aecf9651bb75ea93ea4b2e4ae1707f053c6c3d3d79f1f58599b92d3f51c1bfad8853941cce2140a3412906bf7b11011

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 2024.9.22
+### 2024.9.24
 
 ### 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/europe/countries.txt

@@ -77,8 +77,14 @@ ch   Switzerland,  SUI,  fifa › uefa
 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)
+## 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?

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

@@ -2,7 +2,7 @@
 module Fifa
   MAJOR = 2024    ## todo: namespace inside version or something - why? why not??
   MINOR = 9
-  PATCH = 22
+  PATCH = 24
   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.9.24
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-22 00:00:00.000000000 Z
+date: 2024-09-24 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