sportdb-catalogs 1.0.0 → 1.2.1

data/lib/sportdb/catalogs.rb

@@ -1,20 +1,182 @@
-# encoding: utf-8
-
 ### our own sportdb libs / gems
+###  try min. dependencies  - change to structs only (NOT formats) - why? why not?
+## require 'sportdb/structs'
 require 'sportdb/formats'
 
-### "built-in" default dataset libs / gems
-require 'fifa'    ## get a list of all fifa countries with (three letter) codes
-require 'footballdb/leagues'
-require 'footballdb/clubs'
+require 'sqlite3'
+
 
 
 ###
 # our own code
-require 'sportdb/catalogs/version' # let version always go first
-require 'sportdb/catalogs/wiki_index'
-require 'sportdb/catalogs/catalog'
-require 'sportdb/catalogs/config'
+require_relative 'catalogs/version' # let version always go first
+
+require_relative 'catalogs/base'       ## base record
+require_relative 'catalogs/country'
+require_relative 'catalogs/city'
+
+require_relative 'catalogs/club'   
+require_relative 'catalogs/national_team'
+require_relative 'catalogs/league'
+require_relative 'catalogs/event_info'
+require_relative 'catalogs/ground'   
+
+## more
+require_relative 'catalogs/player'
+
+
+
+module SportDb
+module Import
+
+class Configuration
+  ## note: add more configs (open class), see sportdb-structs for original config!!!
+
+  ###   
+  #  find a better name for setting - why? why not?
+  #     how about catalogdb or ???
+  attr_reader   :catalog_path 
+  def catalog_path=(path)
+      @catalog_path = path
+      ######## 
+      # reset database here to new path
+      CatalogDb::Metal::Record.database = path
+
+      ##  plus automagically set world search too (to use CatalogDb)
+      self.world = WorldSearch.new( 
+                          countries: CatalogDb::Metal::Country,
+                          cities:    CatalogDb::Metal::City, 
+                        ) 
+
+      @catalog_path
+  end
+
+  def catalog      
+       @catalog ||= SportSearch.new( 
+                           leagues:        CatalogDb::Metal::League,
+                           national_teams: CatalogDb::Metal::NationalTeam,
+                           clubs:          CatalogDb::Metal::Club,
+                           grounds:        CatalogDb::Metal::Ground,
+                           events:         CatalogDb::Metal::EventInfo,
+                           players:        CatalogDb::Metal::Player,    # note - via players.db !!!
+                        )
+  end
+
+  ###   
+  #  find a better name for setting - why? why not?
+  #     how about playersdb or ???
+  attr_reader   :players_path 
+  def players_path=(path)
+      @players_path = path
+      ######## 
+      # reset database here to new path
+      CatalogDb::Metal::PlayerRecord.database = path
+
+      @players_path
+  end
+end # class Configuration
+
+
+  ##  e.g. use config.catalog  -- keep Import.catalog as a shortcut (for "read-only" access)
+  def self.catalog() config.catalog;  end
+end   # module Import
+end   # module SportDb
+
+
+
+
+
+###
+# add status
+module CatalogDb
+module Metal
+
+def self.tables
+
+  puts "==> table stats"
+  catalog_path = SportDb::Import.config.catalog_path 
+  if catalog_path
+    puts "  #{File.basename(catalog_path)} in (#{File.dirname(catalog_path)})"
+    puts "    #{Country.count} countries / #{City.count} cities" 
+    puts "    #{NationalTeam.count} national teams"
+    puts "    #{League.count} leagues"
+    puts "    #{Club.count} clubs"
+    puts "    #{Ground.count} grounds"
+      ## add more
+
+  else
+    puts "  - no catalog.db set - "
+  end
+
+  ## todo/fix:
+  ##   check if players_path configured???
+  players_path = SportDb::Import.config.players_path 
+  if players_path
+    puts "  #{File.basename(players_path)} in (#{File.dirname(players_path)})"
+    puts "    #{Player.count} players"
+  else
+    puts " - no players.db set -"
+  end
+end
+
+end # module Metal
+end # module CatalogDb
+        
+
+
+###
+# global helpers
+#    find a better name/place in module(s) or such
+##
+##  what name to use?
+##    find_countries_for_league_clubs or such
+##     find_countries_for_league  - why? why not?
+##     note -  returns array of countries OR single country 
+
+def find_countries_for_league( league )
+    ## todo/fix: assert league is a League with country record/struct !!!!! 
+
+    countries = [] 
+    countries << league.country   ### assume league.country is already db record/struct - why? why not?
+    ## check for 2nd countries for known leagues 
+    ## (re)try with second country - quick hacks for known leagues
+    ##  e.g. Swanse, cardiff  in premier league
+    ##       san mariono in serie a (italy)
+    ##       monaco  in ligue 1 (france)
+    ##       etc.
+    ##   add  andorra to spanish la liga (e.g. andorra fc???)
+ 
+    case league.country.key
+    when 'eng' then countries << CatalogDb::Metal::Country._record('wal') 
+    when 'sco' then countries << CatalogDb::Metal::Country._record('eng')
+    when 'ie'  then countries << CatalogDb::Metal::Country._record('nir')   
+    when 'fr'  then countries << CatalogDb::Metal::Country._record('mc') 
+    when 'es'  then countries << CatalogDb::Metal::Country._record('ad') 
+    when 'it'  then countries << CatalogDb::Metal::Country._record('sm')
+    when 'ch'  then countries << CatalogDb::Metal::Country._record('li') 
+    when 'us'  then countries << CatalogDb::Metal::Country._record('ca')
+    when 'au'  then countries << CatalogDb::Metal::Country._record('nz')
+    end 
+
+    ## use single ("unwrapped") item for one country 
+    ##    otherwise use array
+    country =  countries.size == 1 ? countries[0] : countries
+    country
+end
+
+
+
+
+
+
+require 'footballdb/data'   ## pull in catalog.db (built-in/default data/db)
+
+###
+## add default/built-in catalog here - why? why not?
+##  todo/fix  - set catalog_path on demand 
+##   note:  for now required for world search setup etc.
+SportDb::Import.config.catalog_path = "#{FootballDb::Data.data_dir}/catalog.db"
+
 
 
 puts SportDb::Module::Catalogs.banner   # say hello

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-catalogs
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Gerald Bauer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-01 00:00:00.000000000 Z
+date: 2024-08-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: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 2.0.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
@@ -136,16 +125,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: 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'