sportdb-catalogs 1.0.0 → 1.2.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-catalogs
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Gerald Bauer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-01 00:00:00.000000000 Z
+date: 2024-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-formats
@@ -16,117 +16,106 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: fifa
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2020.5.18
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2020.5.18
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: footballdb-leagues
+  name: footballdb-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2020.7.7
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2020.7.7
-- !ruby/object:Gem::Dependency
-  name: footballdb-clubs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2020.7.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2020.7.7
+        version: '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: sportdb-catalogs - sport.db (search 'n' find) catalogs for countries,
   leagues, clubs, national teams, and more
-email: opensport@googlegroups.com
+email: gerald.bauer@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
 - Manifest.txt
-- NOTES.md
 - README.md
 files:
 - CHANGELOG.md
 - Manifest.txt
-- NOTES.md
 - README.md
 - Rakefile
 - lib/sportdb/catalogs.rb
-- lib/sportdb/catalogs/catalog.rb
-- lib/sportdb/catalogs/config.rb
+- lib/sportdb/catalogs/base.rb
+- lib/sportdb/catalogs/city.rb
+- lib/sportdb/catalogs/club.rb
+- lib/sportdb/catalogs/country.rb
+- lib/sportdb/catalogs/event_info.rb
+- lib/sportdb/catalogs/ground.rb
+- lib/sportdb/catalogs/league.rb
+- lib/sportdb/catalogs/national_team.rb
+- lib/sportdb/catalogs/player.rb
 - lib/sportdb/catalogs/version.rb
-- lib/sportdb/catalogs/wiki_index.rb
-- test/helper.rb
-- test/test_clubs.rb
-- test/test_clubs_history.rb
-- test/test_countries.rb
-- test/test_leagues.rb
-- test/test_national_teams.rb
-- test/test_wiki_index.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -143,9 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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: sportdb-catalogs - sport.db (search 'n' find) catalogs for countries, leagues,
   clubs, national teams, and more

data/NOTES.md

@@ -1,5 +0,0 @@
-# Notes
-
-## Todos
-
-

data/lib/sportdb/catalogs/catalog.rb

@@ -1,105 +0,0 @@
-
-module SportDb
-  module Import
-
-
-class Catalog
-  def config() Import.config; end
-
-
-  ## todo/check:  rename to country_mappings/index - why? why not?
-  ##    or countries_by_code or countries_by_key
-  def countries()      @countries      ||= build_country_index; end
-  def national_teams() @national_teams ||= build_national_team_index; end
-  def clubs()          @clubs          ||= build_club_index; end
-  def clubs_history()  @clubs_history  ||= build_club_history_index; end  ## note: used for now (only) lookups by season for now
-  def teams()          @teams          ||= build_team_index; end
-  def leagues()        @leagues        ||= build_league_index; end
-
-  def events()         @events         ||= build_event_index; end
-  def seasons()        @seasons        ||= build_season_index; end
-
-
-
-  def build_team_index() TeamIndex.new;  end
-
-  def build_country_index    ## todo/check: rename to setup_country_index or read_country_index - why? why not?
-    CountryIndex.new( Fifa.countries )
-  end
-
-  def build_national_team_index
-    ## auto-build national teams from Fifa.countries for now
-    teams = []
-    Fifa.countries.each do |country|
-      team = NationalTeam.new( key:        country.code.downcase,  ## note: use country code (fifa)
-                               name:       country.name,
-                               code:       country.code,           ## note: use country code (fifa)
-                               alt_names:  country.alt_names )
-      team.country = country
-
-      teams << team
-    end
-
-    NationalTeamIndex.new( teams )
-  end
-
-  def build_club_index
-    ## unify team names; team (builtin/known/shared) name mappings
-    ## cleanup team names - use local ("native") name with umlaut etc.
-    ## todo/fix: add to teamreader
-    ##              check that name and alt_names for a club are all unique (not duplicates)
-
-    clubs = if config.clubs_dir   ## check if clubs_dir is defined / set (otherwise it's nil)
-              ClubIndex.build( config.clubs_dir )
-            else   ## no clubs_dir set - try using builtin from footballdb-clubs
-              FootballDb::Import::build_club_index
-            end
-
-    if clubs.errors?
-      puts ""
-      puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-      puts " #{clubs.errors.size} errors:"
-      pp clubs.errors
-      ## exit 1
-    end
-
-    clubs
-  end # method build_club_index
-
-  def build_club_history_index
-    if config.clubs_dir    ## (re)use clubs dir for now  - why? why not?
-      ClubHistoryIndex.build( config.clubs_dir )
-    else
-      puts "!! WARN - no clubs_dir set; for now NO built-in club histories in catalog; sorry - fix!!!!"
-      ClubHistoryIndex.new   ## return empty history index
-    end
-  end
-
-
-  def build_league_index
-    leagues = if config.leagues_dir   ## check if clubs_dir is defined / set (otherwise it's nil)
-                LeagueIndex.build( config.leagues_dir )
-              else   ## no leagues_dir set - try using builtin from footballdb-leagues
-                FootballDb::Import.build_league_index
-              end
-  end
-
-
-  def build_event_index
-    if config.leagues_dir    ## (re)use leagues dir for now - add separate seasons_dir - why? why not?
-      EventIndex.build( config.leagues_dir )
-    else
-      puts "!! WARN - no leagues_dir set; for now NO built-in events in catalog; sorry - fix!!!!"
-      EventIndex.new   ## return empty event index
-    end
-  end
-
-  def build_season_index
-    # note: for now always (re)use the events from the event (info) index
-    SeasonIndex.new( events )
-  end
-
-end  # class Catalog
-
-  end   # module Import
-end   # module SportDb

data/lib/sportdb/catalogs/config.rb

@@ -1,25 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-  module Import
-
-class Configuration
-  ## note: add more configs (open class), see sportdb-formats for original config!!!
-
-  ##
-  ##  todo: allow configure of countries_dir like clubs_dir
-  ##         "fallback" and use a default built-in world/countries.txt
-
-  ####
-  #  todo/check:  find a better way to configure club / team datasets - why? why not?
-  attr_accessor   :clubs_dir
-  ## def clubs_dir()      @clubs_dir; end   ### note: return nil if NOT set on purpose for now - why? why not?
-
-  attr_accessor   :leagues_dir
-  ## def leagues_dir()    @leagues_dir; end
-
-  def catalog()      @catalog ||= Catalog.new;  end
-end # class Configuration
-
-end   # module Import
-end   # module SportDb

data/lib/sportdb/catalogs/wiki_index.rb

@@ -1,81 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-  module Import
-
-
-class WikiIndex
-
-  def self.build( path )
-    pack = Package.new( path )
-    recs = []
-    pack.each_clubs_wiki do |entry|
-      recs += WikiReader.parse( entry.read )
-    end
-    recs
-
-    new( recs )
-  end
-
-
-  include NameHelper
-  ## e.g. strip_lang, strip_year, normalize
-
-  ## fix/todo:
-  ##  also used / duplicated in ClubIndex#add_wiki !!!
-  def strip_wiki( name )     # todo/check: rename to strip_wikipedia_en - why? why not?
-    ## note: strip disambiguationn qualifier from wikipedia page name if present
-    ##        note: only remove year and foot... for now
-    ## e.g. FC Wacker Innsbruck (2002) => FC Wacker Innsbruck
-    ##      Willem II (football club)  => Willem II
-    ##
-    ## e.g. do NOT strip others !! e.g.
-    ##   América Futebol Clube (MG)
-    ##  only add more "special" cases on demand (that, is) if we find more
-    name = name.gsub( /\([12][^\)]+?\)/, '' ).strip  ## starting with a digit 1 or 2 (assuming year)
-    name = name.gsub( /\(foot[^\)]+?\)/, '' ).strip  ## starting with foot (assuming football ...)
-    name
-  end
-
-
-  def initialize( recs )
-    @pages_by_country = {}
-
-    ## todo/fix:
-    ##   check for duplicate recs - report and exit on dupliate!!!!!!
-    recs.each do |rec|
-      h = @pages_by_country[ rec.country.key ] ||= {}
-      h[ normalize( strip_wiki( rec.name )) ] = rec
-    end
-  end
-
-
-  def find_by( club: )    ## todo/check: use find_by_club - why? why not?
-    find_by_club( club )
-  end
-
-  def find_by_club( club )
-    rec = nil
-
-    ## get query params from club
-    names   = [club.name]+club.alt_names
-    country_key = club.country.key
-
-    h = @pages_by_country[ country_key ]
-    if h
-      ## todo/check: sort names ?
-      ##   sort by longest first (for best match)
-      names.each do |name|
-        ## note: normalize AND sanitize (e.g. remove/string year and lang e.g. (1946-2001), [en] too)
-        rec = h[ normalize( strip_year( strip_lang( name ))) ]
-        break if rec   ## bingo!! found - break on first match
-      end
-    end
-
-    rec  ## note: return nil if nothing found
-  end
-end  # class WikiIndex
-
-
-end   # module Import
-end   # module SportDb

data/test/helper.rb

@@ -1,13 +0,0 @@
-## note: use the local version of sportdb gems
-$LOAD_PATH.unshift( File.expand_path( '../sportdb-formats/lib' ))
-
-## minitest setup
-require 'minitest/autorun'
-
-
-## our own code
-require 'sportdb/catalogs'
-
-
-SportDb::Import.config.clubs_dir   = '../../../openfootball/clubs'
-SportDb::Import.config.leagues_dir = '../../../openfootball/leagues'

data/test/test_clubs.rb

@@ -1,100 +0,0 @@
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_clubs.rb
-
-
-require 'helper'
-
-class TestClubs < MiniTest::Test
-
-   CLUBS = SportDb::Import.catalog.clubs
-
-
-  def test_match
-    pp CLUBS.errors
-
-    CLUBS.dump_duplicates
-
-    m = CLUBS.match( 'Rapid Wien' )
-    assert_equal 'SK Rapid Wien', m[0].name
-    assert_equal 'Austria',       m[0].country.name
-    assert_equal 'Wien',          m[0].city
-
-    m = CLUBS.match( 'rapid wien' )
-    assert_equal 'SK Rapid Wien', m[0].name
-    assert_equal 'Austria',       m[0].country.name
-    assert_equal 'Wien',          m[0].city
-
-    ## note: all dots (.) get always removed
-    m = CLUBS.match( '...r.a.p.i.d w.i.e.n...' )
-    assert_equal 'SK Rapid Wien', m[0].name
-    assert_equal 'Austria',       m[0].country.name
-    assert_equal 'Wien',          m[0].city
-
-    ## note: all spaces and dashes (-) get always removed
-    m = CLUBS.match( '--- r a p i d  w i e n ---' )
-    assert_equal 'SK Rapid Wien', m[0].name
-    assert_equal 'Austria',       m[0].country.name
-    assert_equal 'Wien',          m[0].city
-
-    m = CLUBS.match( 'RAPID WIEN' )
-    assert_equal 'SK Rapid Wien', m[0].name
-    assert_equal 'Austria',       m[0].country.name
-    assert_equal 'Wien',          m[0].city
-
-
-    c = CLUBS[ 'SK Rapid Wien' ]   ## check canoncial name match (only)
-    assert_equal 'SK Rapid Wien', c.name
-    assert_equal 'Austria',       c.country.name
-    assert_equal 'Wien',          c.city
-
-
-    m = CLUBS.match( 'Arsenal' )
-    assert_equal 3, m.size
-
-    m = CLUBS.match( 'ARSENAL' )
-    assert_equal 3, m.size
-
-    m = CLUBS.match_by( name: 'Arsenal', country: 'eng' )
-    assert_equal 1, m.size
-    assert_equal 'Arsenal FC', m[0].name
-    assert_equal 'England',    m[0].country.name
-    assert_equal 'London',     m[0].city
-
-    m = CLUBS.match_by( name: 'Arsenal', country: 'ar' )
-    assert_equal 1, m.size
-    assert_equal 'Arsenal de Sarandí', m[0].name
-    assert_equal 'Argentina',          m[0].country.name
-    assert_equal 'Sarandí',            m[0].city
-
-    m = CLUBS.match_by( name: 'Arsenal', country: 'ru' )
-    assert_equal 1, m.size
-    assert_equal 'Arsenal Tula', m[0].name
-    assert_equal 'Russia',       m[0].country.name
-    assert_equal 'Tula',         m[0].city
-
-
-    m = CLUBS.match( 'Arsenal FC' )
-    assert_equal 2, m.size
-
-    m = CLUBS.match( 'Arsenal F.C.' )
-    assert_equal 2, m.size
-
-    m = CLUBS.match( '...A.r.s.e.n.a.l... F.C...' )
-    assert_equal 2, m.size
-  end
-
-
-  def test_wikipedia    ## test wikipedia names and links/urls
-    m = CLUBS.match( 'Club Brugge KV' )
-    assert_equal 1, m.size
-    assert_equal 'Club Brugge KV', m[0].wikipedia
-    assert_equal 'https://en.wikipedia.org/wiki/Club_Brugge_KV', m[0].wikipedia_url
-
-    m = CLUBS.match( 'RSC Anderlecht' )
-    assert_equal 1, m.size
-    assert_equal 'R.S.C. Anderlecht', m[0].wikipedia
-    assert_equal 'https://en.wikipedia.org/wiki/R.S.C._Anderlecht', m[0].wikipedia_url
-  end
-
-end # class TestClubs

data/test/test_clubs_history.rb

@@ -1,47 +0,0 @@
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_clubs_history.rb
-
-
-require 'helper'
-
-class TestClubsHistory < MiniTest::Test
-
-   CLUBS         = SportDb::Import.catalog.clubs
-   CLUBS_HISTORY = SportDb::Import.catalog.clubs_history
-
-
-  def test_at
-    pp CLUBS_HISTORY.mappings
-
-    puts CLUBS_HISTORY.find_name_by( name: 'WSG Tirol', season: '2019/20' )
-    puts CLUBS_HISTORY.find_name_by( name: 'WSG Tirol', season: '2018/9' )
-    puts CLUBS_HISTORY.find_name_by( name: 'WSG Tirol', season: '2017/8' )
-
-    club = CLUBS.find( 'WSG Wattens' )
-    pp club
-
-    assert_equal 'WSG Tirol',   club.name_by_season( '2019/20' )
-    assert_equal 'WSG Wattens', club.name_by_season( '2018/9' )
-    assert_equal 'WSG Wattens', club.name_by_season( '2017/8' )
-
-
-    club = CLUBS.find( 'Rapid Wien' )
-    pp club
-
-    assert_equal 'SK Rapid Wien', club.name_by_season( '2000/1' )
-    assert_equal 'SK Rapid Wien', club.name_by_season( '1891/2' )
-  end
-
-  def test_eng
-    club = CLUBS.find_by( name: 'Arsenal', country: 'ENG' )
-    pp club
-
-    assert_equal 'Arsenal FC',          club.name_by_season( '2000/1' )
-    assert_equal 'Arsenal FC',          club.name_by_season( '1927/8' )
-    assert_equal 'The Arsenal FC',      club.name_by_season( '1926/7' )
-    assert_equal 'Woolwich Arsenal FC', club.name_by_season( '1913/4' )
-    assert_equal 'Royal Arsenal FC',    club.name_by_season( '1891/2' )
-  end
-
-end # class TestClubsHistory

data/test/test_countries.rb

@@ -1,33 +0,0 @@
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_countries.rb
-
-
-require 'helper'
-
-class TestCountries < MiniTest::Test
-
-  COUNTRIES = SportDb::Import.catalog.countries
-
-
-  def test_countries
-    ## pp COUNTRIES
-
-    eng = COUNTRIES.find( :eng )
-    assert_equal 'eng',      eng.key
-    assert_equal 'England',  eng.name
-    assert_equal 'ENG',      eng.code
-
-    at  = COUNTRIES.find( :at )
-    assert_equal 'at',       at.key
-    assert_equal 'Austria',  at.name
-    assert_equal 'AUT',      at.code
-
-    assert at == COUNTRIES.find( 'AT' )
-    assert at == COUNTRIES.find( 'at' )
-    assert at == COUNTRIES.find( 'AUT' )
-    assert at == COUNTRIES.find( 'aut' )
-    assert at == COUNTRIES.find( :aut )
-  end
-
-end # class TestCountries

data/test/test_leagues.rb

@@ -1,38 +0,0 @@
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_leagues.rb
-
-
-require 'helper'
-
-class TestLeagues < MiniTest::Test
-
-  LEAGUES = SportDb::Import.catalog.leagues
-
-
-  def test_match
-    pp LEAGUES.errors
-
-    LEAGUES.dump_duplicates
-
-    m = LEAGUES.match( 'English Premier League' )
-    pp m
-    assert_equal 'Premier League',         m[0].name
-    assert_equal 'eng.1',                  m[0].key
-    assert_equal 'England',                m[0].country.name
-    assert_equal 'eng',                    m[0].country.key
-    assert                                 m[0].clubs?
-    assert                                 m[0].domestic?
-    assert_equal false,                    m[0].intl?
-    assert_equal false,                    m[0].national_teams?
-
-    m = LEAGUES.match( 'Euro' )
-    pp m
-    assert_equal 'Euro',                   m[0].name
-    assert_equal 'euro',                   m[0].key
-    assert                                 m[0].national_teams?
-    assert                                 m[0].intl?
-    assert_equal false,                    m[0].clubs?
-  end
-
-end # class TestLeagues

data/test/test_national_teams.rb

@@ -1,38 +0,0 @@
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_national_teams.rb
-
-
-require 'helper'
-
-class TestNationalTeams < MiniTest::Test
-
-  NATIONAL_TEAMS = SportDb::Import.catalog.national_teams
-
-
-  def test_find
-    t = NATIONAL_TEAMS.find( 'AUT' )
-    assert_equal 'Austria', t.name
-    assert_equal 'aut',     t.key
-    assert_equal 'AUT',     t.code
-
-
-    t = NATIONAL_TEAMS.find( 'England' )
-    assert_equal 'England', t.name
-    assert_equal 'eng',     t.key
-    assert_equal 'ENG',     t.code
-
-    ## note: all dots (.) get always removed
-    t = NATIONAL_TEAMS.find( '...e.n.g.l.a.n.d...' )
-    assert_equal 'England', t.name
-    assert_equal 'eng',     t.key
-    assert_equal 'ENG',     t.code
-
-    ## note: all spaces and dashes (-) get always removed
-    t = NATIONAL_TEAMS.find( '--- e n g l a n d ---' )
-    assert_equal 'England', t.name
-    assert_equal 'eng',     t.key
-    assert_equal 'ENG',     t.code
-  end
-
-end  # class TestNationalTeams