fifa 2020.9.15 → 2024.9.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dd92c5c70787c6432a03d47b2cde4da8b7ff353d
-  data.tar.gz: b06f319fbebf29adb64d8be4920b58056e014f7f
+SHA256:
+  metadata.gz: b0433ec0eba0cc3f885559be4eed61be2dbfc0196bf0091a48d822bae08ca9f8
+  data.tar.gz: 728d2e5268c8c53e5e077968b87591a5b64961d530a8e10f79620c8b4e44f735
 SHA512:
-  metadata.gz: 7386965137fe9e559e745dea6bf98d8cf2c34a9a349130733edac0297b6cb018b1418989a012d883699d9ab41ae9e82507b30be0a72573979da8daa04026f8ed
-  data.tar.gz: eda88cf59d5f2e8b5db8431a2934bcbbcff3d63b5b3d120ef7ae74c09e5b63fcf66f919b0765a776001019264e2c0ae5baa40ca2579aef333e1907debdc0946b
+  metadata.gz: 6f5e4d09b02249f04f38c726c27036d1a5a5f9148bec74a8e8e75970f950ea511f2d04a866c9e9dfb0f7306647b11f036cfeb3a0ea8f7e6dfa5ca7e2602e74f6
+  data.tar.gz: 4751c4632be3719f6e2aa51228ca9ba4da4b8e8b35bf3a2c172598b788152e2f1aa752bc3134460a5cdade27b62f885c103ac4eb2d5fc02e92108cdd83d21f91

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+### 2024.9.21
+
 ### 0.0.1 / 2019-08-12
 
 * Everything is new. First release.

data/Manifest.txt

@@ -5,8 +5,8 @@ README.md
 Rakefile
 config/countries.txt
 lib/fifa.rb
-lib/fifa/countries.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
-test/helper.rb
-test/test_countries.rb
-test/test_orgs.rb

data/README.md

@@ -5,17 +5,17 @@
 * bugs  :: [github.com/sportdb/football.db/issues](https://github.com/sportdb/football.db/issues)
 * gem   :: [rubygems.org/gems/fifa](https://rubygems.org/gems/fifa)
 * rdoc  :: [rubydoc.info/gems/fifa](http://rubydoc.info/gems/fifa)
-* forum :: [opensport](http://groups.google.com/group/opensport)
+
 
 
 ## Usage
 
-Get and pretty print (pp) all countries
+Get and pretty print (pp) all countries (incl. historic and non-members)
 
 ``` ruby
 require 'fifa'
 
-pp Fifa.countries
+pp Fifa.world.countries
 ```
 
 resulting in:
@@ -108,6 +108,17 @@ Fifa.members( 'Europe' ).size        #=> 55 members
 ...
 ```
 
+
+Bonus convenience shortcuts include:
+
+``` ruby
+Fifa.countries.size                  #=> 211 members
+Uefa.countries.size                  #=> 55 members
+Conmebol.countries.size              #=> 10 members
+```
+
+
+
 That's it.
 
 
@@ -165,8 +176,8 @@ The `fifa` scripts are dedicated to the public domain.
 Use it as you please with no restrictions whatsoever.
 
 
+
 ## Questions? Comments?
 
-Send them along to the
-[Open Sports & Friends Forum/Mailing List](http://groups.google.com/group/opensport).
-Thanks!
+Yes, you can. More than welcome.
+See [Help & Support »](https://github.com/openfootball/help)

data/Rakefile

@@ -11,7 +11,7 @@ Hoe.spec 'fifa' do
   self.urls = { home: 'https://github.com/sportdb/football.db' }
 
   self.author = 'Gerald Bauer'
-  self.email = 'opensport@googlegroups.com'
+  self.email = 'gerald.bauer@google.com'
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'
@@ -20,11 +20,11 @@ Hoe.spec 'fifa' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-formats',   '>= 1.0.4'],
+    ['sportdb-structs',   '>= 0.4.0'],
   ]
 
   self.spec_extras = {
-    required_ruby_version: '>= 2.2.2'
+    required_ruby_version: '>= 3.1.0'
   }
 
 end

data/lib/fifa/country_index.rb

@@ -0,0 +1,63 @@
+
+module Fifa
+
+
+## built-in countries for (quick starter) auto-add
+class CountryIndex
+
+  def initialize( recs=nil )
+    @countries  = []
+    @by_code    = {}  ## countries by codes (fifa, internet, etc)
+    @orgs       = OrgIndex.new
+
+    add( recs )   if recs
+  end
+
+  def countries() @countries; end
+  def size()  @countries.size; end
+  def each( &blk ) @countries.each { |country| blk.call( country ) }; end
+
+
+
+  def members( key=:fifa )   ## default to fifa members
+    @orgs.members( key )
+  end
+
+  ## for testing/debugging return org keys
+  ##   return OrgIndex instead - why? why not?
+  def orgs() @orgs.keys; end
+
+
+  def find( q )
+    key = q.to_s.downcase   ## allow symbols (and always downcase e.g. AUT to aut etc.)
+    @by_code[ key ]
+  end
+  alias_method :[], :find
+
+
+
+  def add( recs )
+    @countries += recs
+
+    _add( recs)              ## step one add to our own index
+    @orgs.add( recs )   ## step two add to orgs (helper) index (for members)
+  end
+
+
+  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 ]
+        puts "** !!! ERROR !!! country code (fifa)  >#{rec.code}< already exits!!"
+        exit 1
+      else
+        @by_code[ key ] = rec
+      end
+    end
+  end # method add
+end   # class CountryIndex
+
+end   # class Module

data/lib/fifa/country_reader.rb

@@ -0,0 +1,138 @@
+module Fifa
+class CountryReader
+
+
+  Country = Sports::Country
+
+
+def self.read( path )   ## use - rename to read_file or from_file etc. - why? why not?
+  txt = File.open( path, 'r:utf-8' ) { |f| f.read }
+  parse( txt )
+end
+
+def self.parse( txt )
+  new( txt ).parse
+end
+
+
+def initialize( txt )
+  @txt = txt
+end
+
+def parse
+  countries    = []
+  last_country = nil    ## note/check/fix: use countries[-1] - why? why not?
+
+  OutlineReader.parse( @txt ).each do |node|
+
+     node_type = node[0]
+
+     if [:h1, :h2].include?( node_type )
+       ## skip headings (and headings) for now too
+     elsif node_type == :p    ## paragraph
+      lines = node[1]
+      lines.each do |line|
+      if line.start_with?( '|' )
+        ## assume continuation with line of alternative names
+        ##  note: skip leading pipe
+        values = line[1..-1].split( '|' )   # team names - allow/use pipe(|)
+        ## strip and squish (white)spaces
+        #   e.g. East Germany        (-1989)  => East Germany (-1989)
+        values = values.map { |value| value.strip.gsub( /[ \t]+/, ' ' ) }
+        last_country.alt_names += values
+      elsif line =~ /^-[ ]*(\d{4})
+                        [ ]+
+                       (.+)$
+                    /x     ## check for historic lines e.g. -1989
+         year   = $1.to_i
+         parts  = $2.split( /=>|⇒/ )
+         values = parts[0].split( ',' )
+         values = values.map { |value| value.strip.gsub( /[ \t]+/, ' ' ) }
+
+         name = values[0]
+         code = values[1]
+
+         last_country = country = Country.new( name: "#{name} (-#{year})",
+                                                    code: code )
+         ## country.alt_names << name    ## note: for now do NOT add name without year to alt_names - gets auto-add by index!!!
+
+         countries << country
+         ## todo/fix: add reference to country today (in parts[1] !!!!)
+      else
+        ## assume "regular" line
+        ##  check if starts with id  (todo/check: use a more "strict"/better regex capture pattern!!!)
+        ##   note: allow country codes upto 4 (!!) e.g. Northern Cyprus
+        if line =~ /^([a-z]{2,4})
+                        [ ]+
+                       (.+)$/x
+          key    = $1
+          values = $2.split( ',' )
+          ## strip and squish (white)spaces
+          #   e.g. East Germany        (-1989)  => East Germany (-1989)
+          values = values.map { |value| value.strip.gsub( /[ \t]+/, ' ' ) }
+
+          ## note: remove "overlords" from geo-tree marked territories  e.g. UK, US, etc. from name
+          ##    e.g. England › UK      => England
+          ##         Puerto Rico › US  => Puerto Rico
+          geos = split_geo( values[0] )
+          name = geos[0]    ## note: ignore all other geos for now
+
+          ##   note: allow country codes up to 4 (!!) e.g. Northern Cyprus
+          code = if values[1] && values[1] =~ /^[A-Z]{3,4}$/   ## note: also check format
+                   values[1]
+                 else
+                   if values[1]
+                     puts "** !!! ERROR !!! wrong code format >#{values[1]}<; expected three (or four)-letter all up-case"
+                   else
+                     puts "** !!! ERROR !!! missing code for (canonical) country name"
+                   end
+                   exit 1
+                 end
+
+          tags = if values[2]   ## check if tags presents
+                   split_tags( values[2] )
+                 else
+                   []
+                 end
+
+          last_country = country = Country.new( key: key,
+                                                name: name,
+                                                code: code,
+                                                tags: tags )
+          countries << country
+        else
+          puts "** !! ERROR - missing key for (canonical) country name"
+          exit 1
+        end
+      end
+      end  # each line
+    else
+      puts "** !! ERROR - unknown node type / (input) source line:"
+      pp node
+      exit 1
+    end
+  end    # each node
+
+  countries
+end  # method parse
+
+
+
+#######################################
+##  helpers
+def split_tags( str )
+  tags = str.split( /[|<>‹›]/ )   ## allow pipe (|) and (<>‹›) as divider for now - add more? why? why not?
+  tags = tags.map { |tag| tag.strip }
+  tags
+end
+
+def split_geo( str )   ## todo/check: rename to parse_geo(s) - why? why not?
+  ## split into geo tree
+  geos = str.split( /[<>‹›]/ )          ## note: allow > < or › ‹ for now
+  geos = geos.map { |geo| geo.strip }   ## remove all whitespaces
+  geos
+end
+
+end  # class CountryReader
+
+end   # module Fifa

data/lib/fifa/org_index.rb

@@ -0,0 +1,76 @@
+
+module Fifa
+
+class CountryIndex   ## note - OrdIndex (helper) nested inside CountryIndex - why? why not?
+class OrgIndex      ## change to MemberIndex or AssocIndex or such - why? why not?
+
+    ALT_KEYS = {
+      'world'  => 'fifa',
+      'europe' => 'uefa',    #=> Union of European Football Associations
+      'northamericacentralamericacaribbean' => 'concacaf',  #=> Confederation of North, Central American and Caribbean Association Football
+      'northcentralamericacaribbean'        => 'concacaf',  ## e.g. North & Central America and the Caribbean
+      'northamerica' => 'nafu',  # => North American Football Union
+      'centralamerica' => 'uncaf',  #=> Unión Centroamericana de Fútbol
+      'caribbean' => 'cfu',  #=> Caribbean Football Union
+      'africa' => 'caf',      # => Confédération Africaine de Football
+      'eastcentralafrica' => 'cecafa',  # => Council for East and Central Africa Football Associations
+      'southernafrica' => 'cosafa',   # => Council of Southern Africa Football Associations
+      'westafrica' => 'wafu',         # => West African Football Union/Union du Football de l'Ouest Afrique
+      'northafrica' => 'unaf',        # => Union of North African Federations
+      'centralafrica' => 'uniffac',  # => Union des Fédérations du Football de l'Afrique Centrale
+      'asia'   => 'afc',      # => Asian Football Confederation
+      'middleeast' => 'waff', # => West Asian Football Federation  -- note: excludes Iran and Israel
+      'eastasia'   => 'eaff',
+      'centralasia' => 'cafa',
+      'southasia' => 'saff',
+      'southeastasia' => 'aff',
+      'oceania'    => 'ofc',  # =>  Oceania Football Confederation
+      'pacific'    => 'ofc',
+      'southamerica' => 'conmebol',  #=>  Confederación Sudamericana de Fútbol
+    }
+
+
+    def initialize( countries=nil )
+        @orgs = {}   ## countries by org (key)
+
+        add( countries )  if countries
+    end
+
+    def add( countries )
+        countries.each do |country|
+            ## note: assumes all tags are sport / fifa tags for now
+            country.tags.each do |tag|
+              @orgs[ tag ] ||= []
+              @orgs[ tag ] << country
+            end
+         end
+    end
+
+
+    def keys() @orgs.keys; end
+
+    def members( key=:fifa )   ## default to fifa members
+      key       = key.to_s.downcase
+      countries = @orgs[ key ]
+
+      if countries.nil?    ## (re)try / check with alternative (convenience) org name
+        alt_key = ALT_KEYS[ _norm_org( key ) ]
+        countries = @orgs[ alt_key ]   if alt_key
+      end
+      countries
+    end
+
+
+    def _norm_org( name )
+      ## remove space, comma, ampersand (&) and words: and, the
+      name.gsub( /  [ ,&] |
+                   \band\b |
+                   \bthe\b
+                 /x, '' )
+    end
+
+end  # class OrgIndex
+end  # class CountryIndex
+end # module Fifa
+
+

data/lib/fifa/outline_reader.rb

@@ -0,0 +1,99 @@
+module Fifa
+
+## todo/fix:
+##    for convenience use a copy-n-paste version here
+##         reuse from upstream - DO NOT DUPLICATE
+##     move outline reader to cocos (for easy reuse) in the future - why? why not?
+
+class OutlineReader
+
+  def self.debug=(value) @@debug = value; end
+  def self.debug?() @@debug ||= false; end
+  def debug?()  self.class.debug?; end
+
+
+  def self.read( path )   ## use - rename to read_file or from_file etc. - why? why not?
+    txt = File.open( path, 'r:utf-8' ) {|f| f.read }
+    parse( txt )
+  end
+
+  def self.parse( txt )
+    new( txt ).parse
+  end
+
+  def initialize( txt )
+    @txt = txt
+  end
+
+  ## note: skip "decorative" only heading e.g. ========
+  ##  todo/check:  find a better name e.g. HEADING_EMPTY_RE or HEADING_LINE_RE or ???
+  HEADING_BLANK_RE = %r{\A
+                        ={1,}
+                        \z}x
+
+  ## note: like in wikimedia markup (and markdown) all optional trailing ==== too
+  HEADING_RE = %r{\A
+                  (?<marker>={1,})       ## 1. leading ======
+                    [ ]*
+                  (?<text>[^=]+)         ## 2. text   (note: for now no "inline" = allowed)
+                    [ ]*
+                    =*                   ## 3. (optional) trailing ====
+                  \z}x
+
+  def parse
+    outline=[]   ## outline structure
+    start_para = true      ## start new para(graph) on new text line?
+
+    @txt.each_line do |line|
+        line = line.strip      ## todo/fix: keep leading and trailing spaces - why? why not?
+
+        if line.empty?    ## todo/fix: keep blank line nodes?? and just remove comments and process headings?! - why? why not?
+          start_para = true
+          next
+        end
+
+        break if line == '__END__'
+
+        next if line.start_with?( '#' )   ## skip comments too
+        ## strip inline (until end-of-line) comments too
+        ##  e.g Eupen | KAS Eupen ## [de]
+        ##   => Eupen | KAS Eupen
+        ##  e.g bq   Bonaire,  BOE        # CONCACAF
+        ##   => bq   Bonaire,  BOE
+        line = line.sub( /#.*/, '' ).strip
+        pp line    if debug?
+
+        ## todo/check: also use heading blank as paragraph "breaker" or treat it like a comment ?? - why? why not?
+        next if HEADING_BLANK_RE.match( line )  # skip "decorative" only heading e.g. ========
+
+         ## note: like in wikimedia markup (and markdown) all optional trailing ==== too
+        if m=HEADING_RE.match( line )
+           start_para = true
+
+           heading_marker = m[:marker]
+           heading_level  = heading_marker.length   ## count number of = for heading level
+           heading        = m[:text].strip
+
+           puts "heading #{heading_level} >#{heading}<"   if debug?
+           outline << [:"h#{heading_level}", heading]
+        else    ## assume it's a (plain/regular) text line
+           if start_para
+             outline << [:p, [line]]
+             start_para = false
+           else
+             node = outline[-1]    ## get last entry
+             if node[0] == :p      ##  assert it's a p(aragraph) node!!!
+                node[1] << line    ## add line to p(aragraph)
+             else
+               puts "!! ERROR - invalid outline state / format - expected p(aragraph) node; got:"
+               pp node
+               exit 1
+             end
+           end
+        end
+    end
+    outline
+  end # method read
+end # class OutlineReader
+
+end # module Fifa

data/lib/fifa/version.rb

@@ -1,12 +1,8 @@
-# encoding: utf-8
 
-
-## note: use class for now - change to module - possible? - why? why not?
-
-class Fifa
-  MAJOR = 2020    ## todo: namespace inside version or something - why? why not??
+module Fifa
+  MAJOR = 2024    ## todo: namespace inside version or something - why? why not??
   MINOR = 9
-  PATCH = 15
+  PATCH = 21
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -14,7 +10,7 @@ class Fifa
   end
 
   def self.banner
-    "fifa/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+    "fifa/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] in (#{root})"
   end
 
   def self.root
@@ -24,4 +20,4 @@ class Fifa
   def self.data_dir  ## rename to config_dir - why? why not?
     "#{root}/config"
   end
-end   # class Fifa
+end   # module Fifa

data/lib/fifa.rb

@@ -1,97 +1,52 @@
-# encoding: utf-8
-
-
 ## 3rd party gems
-require 'sportdb/formats'
+require 'sportdb/structs'    ## pull-in Sports::Country
 
 
 ###
 # our own code
-require 'fifa/version' # let version always go first
-require 'fifa/countries'
-
-
-class Fifa
-  def self.countries() country_index.countries; end   ## return all country (struct-like) records
-  def self.[]( key )   country_index[ key ]; end
-
-
-  ALT_ORG_NAMES = {
-    'world'  => 'fifa',
-    'europe' => 'uefa',    #=> Union of European Football Associations
-    'northamericacentralamericacaribbean' => 'concacaf',  #=> Confederation of North, Central American and Caribbean Association Football
-    'northcentralamericacaribbean'        => 'concacaf',  ## e.g. North & Central America and the Caribbean
-    'northamerica' => 'nafu',  # => North American Football Union
-    'centralamerica' => 'uncaf',  #=> Unión Centroamericana de Fútbol
-    'caribbean' => 'cfu',  #=> Caribbean Football Union
-    'africa' => 'caf',      # => Confédération Africaine de Football
-    'eastcentralafrica' => 'cecafa',  # => Council for East and Central Africa Football Associations
-    'southernafrica' => 'cosafa',   # => Council of Southern Africa Football Associations
-    'westafrica' => 'wafu',         # => West African Football Union/Union du Football de l'Ouest Afrique
-    'northafrica' => 'unaf',        # => Union of North African Federations
-    'centralafrica' => 'uniffac',  # => Union des Fédérations du Football de l'Afrique Centrale
-    'asia'   => 'afc',      # => Asian Football Confederation
-    'middleeast' => 'waff', # => West Asian Football Federation  -- note: excludes Iran and Israel
-    'eastasia'   => 'eaff',
-    'centralasia' => 'cafa',
-    'southasia' => 'saff',
-    'southeastasia' => 'aff',
-    'oceania'    => 'ofc',  # =>  Oceania Football Confederation
-    'pacific'    => 'ofc',
-    'southamerica' => 'conmebol',  #=>  Confederación Sudamericana de Fútbol
-  }
-
-  def self.members( key=:fifa )   ## default to fifa members
-    key       = key.to_s.downcase
-    countries = org_index[ key ]
-
-    if countries.nil?    ## (re)try / check with alternative (convenience) org name
-      alt_key = ALT_ORG_NAMES[ normalize_org( key ) ]
-      countries = org_index[ alt_key ]   if alt_key
-    end
-    countries
-  end
-
-  def self.normalize_org( name )
-    ## remove space, comma, ampersand (&) and words: and, the
-    name.gsub( /[ ,&]|\band\b|\bthe\b/, '' )
-  end
-
+require_relative 'fifa/version' # let version always go first
 
-  def self.orgs()  org_index.keys; end   ## return list of known org (keys) e.g. fifa, uefa, etc.
+require_relative 'fifa/outline_reader'
+require_relative 'fifa/country_reader'
 
+require_relative 'fifa/country_index'
+require_relative 'fifa/org_index'
 
-private
-  def self.country_index
-    @country_index ||= build_country_index
-  end
 
-  def self.build_country_index
-    recs = SportDb::Import::CountryReader.read( "#{Fifa.data_dir}/countries.txt" )
-    CountryIndex.new( recs )
+module Fifa
+  def self.world
+      @world ||= begin
+                   world = CountryIndex.new
+                   recs = CountryReader.read( "#{Fifa.data_dir}/countries.txt" )
+                   world.add( recs )
+                   world
+                 end
   end
 
 
-  def self.org_index
-    @org_index ||= build_org_index   ## fifa, uefa, etc.
-  end
+  ## note: only returns fifa member countries (use world.countries for all) !!!
+  def self.countries() world.members( :fifa ); end
 
-  def self.build_org_index
-    orgs = {}
-    countries.each do |country|
-      ## note: assumes all tags are sport / fifa tags for now
-       country.tags.each do |tag|
-         orgs[ tag ] ||= []
-         orgs[ tag ] << country
-       end
-    end
-    orgs
-  end
+  ## search service (using world - note: NOT scoped/limted to members only)
+  def self.[]( q )   world[ q ]; end
+  def self.members( key=:fifa ) world.members( key ); end
 end # class Fifa
 
 
+
+## add Uefa convenience module with scoped search/lookup - why? why not?
+module Uefa
+  def self.countries() Fifa.world.members(:uefa); end
+end
+
+module Conmebol
+  def self.countries() Fifa.members( :conmebol ); end
+end
+
 ## add a convenience upcase alias
-FIFA = Fifa
+FIFA     = Fifa
+UEFA     = Uefa
+CONMEBOL = Conmebol     # Confederación Sudamericana de Fútbol
 
 
 

metadata

@@ -1,60 +1,66 @@
 --- !ruby/object:Gem::Specification
 name: fifa
 version: !ruby/object:Gem::Version
-  version: 2020.9.15
+  version: 2024.9.21
 platform: ruby
 authors:
 - Gerald Bauer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2024-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sportdb-formats
+  name: sportdb-structs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '4.1'
 description: fifa - the world's football countries and codes (incl. non-member countries
   and irregular codes)
-email: opensport@googlegroups.com
+email: gerald.bauer@google.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -71,16 +77,16 @@ files:
 - Rakefile
 - config/countries.txt
 - lib/fifa.rb
-- lib/fifa/countries.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
-- test/helper.rb
-- test/test_countries.rb
-- test/test_orgs.rb
 homepage: https://github.com/sportdb/football.db
 licenses:
 - Public Domain
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -90,16 +96,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: fifa - the world's football countries and codes (incl. non-member countries
   and irregular codes)

data/lib/fifa/countries.rb

@@ -1,42 +0,0 @@
-# encoding: utf-8
-
-
-class Fifa
-
-## built-in countries for (quick starter) auto-add
-class CountryIndex
-
-  def initialize( recs )
-    @countries = {}   ## countries by fifa code
-
-    add( recs )
-  end
-
-  def countries  ## all country records
-    @countries.values
-  end
-
-  def []( key )
-    key = key.to_s.upcase   ## allow symbols (and always upcase e.g. aut to AUT etc.)
-    @countries[ key ]
-  end
-
-private
-  def add( recs )
-    ###########################################
-    ## auto-fill countries
-    ## pp recs
-    recs.each do |rec|
-
-      ## add codes lookups - key, fifa, ...
-      if @countries[ rec.code ]
-        puts "** !!! ERROR !!! country code (fifa)  >#{rec.code}< already exits!!"
-        exit 1
-      else
-        @countries[ rec.code ] = rec
-      end
-    end
-  end # method add
-end   # class CountryIndex
-
-end   # class Fifa

data/test/helper.rb

@@ -1,11 +0,0 @@
-## note: use the local version of gems
-$LOAD_PATH.unshift( File.expand_path( '../../sport.db/sportdb-formats/lib' ))
-
-## minitest setup
-
-require 'minitest/autorun'
-
-
-## our own code
-
-require 'fifa'

data/test/test_countries.rb

@@ -1,45 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_countries.rb
-
-
-require 'helper'
-
-class TestCountries < MiniTest::Test
-
-  def test_read_countries
-    recs = SportDb::Import::CountryReader.read( "#{Fifa.data_dir}/countries.txt" )
-    ## pp recs
-
-    assert_equal [{ key: 'bi', code: 'BDI', name: 'Burundi',   tags: ['fifa','caf','cecafa']},
-                  { key: 'dj', code: 'DJI', name: 'Djibouti', tags: ['fifa','caf','cecafa']}],
-                 recs[0..1].map { |rec| { key: rec.key, code: rec.code, name: rec.name, tags: rec.tags }}
-  end
-
-
-  def test_countries
-    pp Fifa.countries
-
-    eng = Fifa['ENG']
-    assert_equal eng, Fifa['eng']
-    assert_equal eng, Fifa[:eng]
-
-    assert_equal 'eng',           eng.key
-    assert_equal 'England',       eng.name
-    assert_equal 'ENG',           eng.code
-    assert_equal ['fifa','uefa'], eng.tags
-
-
-    aut  = Fifa['AUT']
-    assert_equal aut, Fifa['aut']
-    assert_equal aut, Fifa[:aut]
-
-    assert_equal 'at',            aut.key
-    assert_equal 'Austria',       aut.name
-    assert_equal 'AUT',           aut.code
-    assert_equal ['fifa','uefa'], aut.tags
-  end
-
-end # class TestCountries

data/test/test_orgs.rb

@@ -1,100 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_orgs.rb
-
-
-require 'helper'
-
-class TestOrgs < MiniTest::Test
-
-  def test_orgs
-    orgs = Fifa.orgs
-    pp orgs
-
-    ## print counts
-    puts "#{'%3d' % Fifa.countries.size} countries:"
-    orgs.each do |org|
-      countries = Fifa.members( org )
-      puts "#{'%3d' % countries.size} #{org}"
-    end
-
-    ## pp Fifa.members( 'OFC' ).sort_by {|rec| rec.name }
-
-    assert_equal  47, Fifa.members( 'AFC' ).size       # => Asian Football Confederation
-    assert_equal  56, Fifa.members( 'CAF' ).size       # => Confédération Africaine de Football
-    assert_equal  41, Fifa.members( 'CONCACAF' ).size  # => Confederation of North, Central American and Caribbean Association Football
-    assert_equal  10, Fifa.members( 'CONMEBOL' ).size  # => Confederación Sudamericana de Fútbol
-    assert_equal  14, Fifa.members( 'OFC' ).size       # => Oceania Football Confederation
-    assert_equal  55, Fifa.members( 'UEFA' ).size      # => Union of European Football Associations
-
-    assert_equal   3, Fifa.members( 'NAFU' ).size      # => North American Football Union
-    assert_equal   7, Fifa.members( 'UNCAF' ).size     # => Unión Centroamericana de Fútbol
-    assert_equal  31, Fifa.members( 'CFU' ).size       # => Caribbean Football Union
-
-    assert_equal  12, Fifa.members( 'WAFF' ).size      # => West Asian Football Federation
-    assert_equal  10, Fifa.members( 'EAFF' ).size      # => East Asian Football Federation
-    assert_equal   6, Fifa.members( 'CAFA' ).size      # => Central Asian Football Association
-    assert_equal   7, Fifa.members( 'SAFF' ).size      # => South Asian Football Federation
-    assert_equal  12, Fifa.members( 'AFF' ).size       # => ASEAN Football Federation
-
-    assert_equal  12, Fifa.members( 'CECAFA' ).size    # => Council for East and Central Africa Football Associations
-    assert_equal  14, Fifa.members( 'COSAFA' ).size    # => Council of Southern Africa Football Associations
-    assert_equal  16, Fifa.members( 'WAFU' ).size      # => West African Football Union/Union du Football de l'Ouest Afrique
-    assert_equal   5, Fifa.members( 'UNAF' ).size      # => Union of North African Federations
-    assert_equal   8, Fifa.members( 'UNIFFAC' ).size   # => Union des Fédérations du Football de l'Afrique Centrale
-
-    assert_equal 211, Fifa.members( 'FIFA' ).size
-
-
-    ## print countries NOT members of fifa (but of confederation)
-    puts "non-fifa member codes:"
-    Fifa.countries.each do |country|
-      if country.tags.empty? == false &&
-         country.tags.include?( 'fifa' ) == false
-        puts "  #{country.name}, #{country.code}, #{country.tags.join(' | ')}"
-      end
-    end
-
-    ## print countries NOT members of fifa or any confederation (irregular codes)
-    puts "irregular codes:"
-    Fifa.countries.each do |country|
-      puts "  #{country.name}, #{country.code}"    if country.tags.empty?
-    end
-  end
-
-
-  def test_alt_names
-    ## check normalize org key / name
-    assert_equal 'NorthAmericaCentralAmericaCaribbean', Fifa.normalize_org( 'North America, Central America and the Caribbean' )
-    assert_equal 'NorthCentralAmericaCaribbean', Fifa.normalize_org( 'North and Central America and the Caribbean' )
-    assert_equal 'NorthCentralAmericaCaribbean', Fifa.normalize_org( 'North & Central America & Caribbean' )
-
-
-    assert_equal Fifa.members( 'FIFA' ).size,     Fifa.members( 'World' ).size
-    assert_equal Fifa.members( 'UEFA' ).size,     Fifa.members( 'Europe' ).size
-    assert_equal Fifa.members( 'CAF' ).size,      Fifa.members( 'Africa' ).size
-    assert_equal Fifa.members( 'CECAFA' ).size,   Fifa.members( 'East and Central Africa' ).size
-    assert_equal Fifa.members( 'COSAFA' ).size,   Fifa.members( 'Southern Africa' ).size
-    assert_equal Fifa.members( 'WAFU' ).size,     Fifa.members( 'West Africa' ).size
-    assert_equal Fifa.members( 'UNAF' ).size,     Fifa.members( 'North Africa' ).size
-    assert_equal Fifa.members( 'UNIFFAC' ).size,  Fifa.members( 'Central Africa' ).size
-    assert_equal Fifa.members( 'CONCACAF' ).size, Fifa.members( 'North America, Central America and the Caribbean' ).size
-    assert_equal Fifa.members( 'CONCACAF' ).size, Fifa.members( 'North and Central America and the Caribbean' ).size
-    assert_equal Fifa.members( 'CONCACAF' ).size, Fifa.members( 'North & Central America & Caribbean' ).size
-    assert_equal Fifa.members( 'NAFU' ).size,     Fifa.members( 'North America' ).size
-    assert_equal Fifa.members( 'UNCAF' ).size,    Fifa.members( 'Central America' ).size
-    assert_equal Fifa.members( 'CFU' ).size,      Fifa.members( 'Caribbean' ).size
-    assert_equal Fifa.members( 'CONMEBOL' ).size, Fifa.members( 'South America' ).size
-    assert_equal Fifa.members( 'AFC' ).size,      Fifa.members( 'Asia' ).size
-    assert_equal Fifa.members( 'WAFF' ).size,     Fifa.members( 'Middle East' ).size
-    assert_equal Fifa.members( 'EAFF' ).size,     Fifa.members( 'East Asia' ).size
-    assert_equal Fifa.members( 'CAFA' ).size,     Fifa.members( 'Central Asia' ).size
-    assert_equal Fifa.members( 'SAFF' ).size,     Fifa.members( 'South Asia' ).size
-    assert_equal Fifa.members( 'AFF' ).size,      Fifa.members( 'Southeast Asia' ).size
-    assert_equal Fifa.members( 'OFC' ).size,      Fifa.members( 'Oceania' ).size
-    assert_equal Fifa.members( 'OFC' ).size,      Fifa.members( 'Pacific' ).size
-  end
-
-end # class TestOrgs