sportdb-config 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f9518da3271d41c53429151ae62de407a7fb4a3
-  data.tar.gz: f6c9717adedf654049ff162ac5560f2b41d2da1f
+  metadata.gz: 72a9ce4c1edae6d428da40e3764282fea81995ae
+  data.tar.gz: aaf4a46f110099605e72df4f40cc416dba485ae2
 SHA512:
-  metadata.gz: eb87146374b46e8be05e4a61d6b7b267983dc870bfd8ad4921eb9b88fd1d1d88de7aeabdfc6d0025d3ec6c6c73c2a33e299a5b7e109428ddab8660aa05bea1bd
-  data.tar.gz: ef49c48e64709fc21c123d26fc18404f9bd61f7196fb250fd462abb833c5811f5066c6dc131fed8565f9dd8f9f96cbabdcaa98ab97c3a6b278565b6d70c8359f
+  metadata.gz: 32e485f24c938a59930978a95ce51734853af0c068d64d039cce9e10ca68532d14658c938f7c7a292b4f5a7d82d17dd4a9b7a1f1b69342c93c9080c4f77983be
+  data.tar.gz: 358731992f199ab916f07316ad9677972f8a8ddb76d75fdc83147e633af571bc4059e83b4a038eb121e924f01c2582d8aaaa6846e52ba948cde8abeb115cfe88

data/Manifest.txt

@@ -4,6 +4,7 @@ NOTES.md
 README.md
 Rakefile
 lib/sportdb/config.rb
+lib/sportdb/config/catalog.rb
 lib/sportdb/config/config.rb
 lib/sportdb/config/version.rb
 lib/sportdb/config/wiki_index.rb
@@ -11,4 +12,5 @@ test/helper.rb
 test/test_clubs.rb
 test/test_countries.rb
 test/test_leagues.rb
+test/test_national_teams.rb
 test/test_wiki_index.rb

data/NOTES.md

@@ -3,6 +3,7 @@
 ## Todos
 
 - use a different name for sportdb-config
+  - yes, use sportdb-catalogs !!!!
   -  use sportdb-boot   and SportDb::Boot or
   -  use sportdb-conf    - why? why not?
   -   or sportdb-setup/startup/...

data/Rakefile

@@ -3,7 +3,7 @@ require './lib/sportdb/config/version.rb'
 
 Hoe.spec 'sportdb-config' do
 
-  self.version = SportDb::Boot::VERSION
+  self.version = SportDb::Module::Catalogs::VERSION
 
   self.summary = "sportdb-config - sport.db configuration settings and built-in defaults"
   self.description = summary
@@ -20,13 +20,11 @@ Hoe.spec 'sportdb-config' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-countries',  '>= 0.5.1'],
-    ['sportdb-clubs',      '>= 0.4.0'],
-    ['sportdb-leagues',    '>= 0.2.2'],
+    ['sportdb-formats',    '>= 1.1.0'],
     ## dataset libs / gems
-    ['fifa',               '>= 2019.11.27'],    ## for (builtin/default) countries
-    ['footballdb-clubs',   '>= 2019.11.22'],    ## for (builtin/default) clubs
-    ['footballdb-leagues', '>= 2019.11.22'],    ## for (builtin/default) leagues & cups
+    ['fifa',               '>= 2020.5.18'],    ## for (builtin/default) countries
+    ['footballdb-clubs',   '>= 2020.6.16'],    ## for (builtin/default) clubs
+    ['footballdb-leagues', '>= 2020.6.16'],    ## for (builtin/default) leagues & cups
   ]
 
   self.spec_extras = {

data/lib/sportdb/config.rb

@@ -17,4 +17,4 @@ require 'sportdb/config/catalog'
 require 'sportdb/config/config'
 
 
-puts SportDb::Boot.banner   # say hello
+puts SportDb::Module::Catalogs.banner   # say hello

data/lib/sportdb/config/catalog.rb

@@ -0,0 +1,75 @@
+
+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 teams()          @teams          ||= build_team_index; end
+  def leagues()        @leagues        ||= build_league_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_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
+end  # class Catalog
+
+  end   # module Import
+end   # module SportDb

data/lib/sportdb/config/version.rb

@@ -1,13 +1,12 @@
 # encoding: utf-8
 
 
-
 module SportDb
-module Boot      ## note: use a different module than Config to avoid confusion with Configuration/config etc.!!!!
-                 ##   maybe rename later gem itself to sportdb-boot - why? why not?
+module Module
+module Catalogs
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
-  MINOR = 0
+  MINOR = 1
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
@@ -15,6 +14,7 @@ module Boot      ## note: use a different module than Config to avoid confusion
     VERSION
   end
 
+  ## todo/fix: rename to sportdb-catalogs - why? why not?
   def self.banner
     "sportdb-config/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
   end
@@ -23,5 +23,6 @@ module Boot      ## note: use a different module than Config to avoid confusion
     File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )
   end
 
-end # module Boot
+end # module Catalogs
+end # module Module
 end # module SportDb

data/test/test_countries.rb

@@ -18,12 +18,12 @@ class TestCountries < MiniTest::Test
     eng = COUNTRIES[:eng]
     assert_equal 'eng',      eng.key
     assert_equal 'England',  eng.name
-    assert_equal 'ENG',      eng.fifa
+    assert_equal 'ENG',      eng.code
 
     at  = COUNTRIES[:at]
     assert_equal 'at',       at.key
     assert_equal 'Austria',  at.name
-    assert_equal 'AUT',      at.fifa
+    assert_equal 'AUT',      at.code
 
     assert at == COUNTRIES['AT']
     assert at == COUNTRIES['at']

data/test/test_national_teams.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+###
+#  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

metadata

@@ -1,99 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-config
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-11 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sportdb-countries
+  name: sportdb-formats
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
-- !ruby/object:Gem::Dependency
-  name: sportdb-clubs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: sportdb-leagues
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: fifa
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2019.11.27
+        version: 2020.5.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2019.11.27
+        version: 2020.5.18
 - !ruby/object:Gem::Dependency
   name: footballdb-clubs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2019.11.22
+        version: 2020.6.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2019.11.22
+        version: 2020.6.16
 - !ruby/object:Gem::Dependency
   name: footballdb-leagues
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2019.11.22
+        version: 2020.6.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2019.11.22
+        version: 2020.6.16
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +110,7 @@ files:
 - README.md
 - Rakefile
 - lib/sportdb/config.rb
+- lib/sportdb/config/catalog.rb
 - lib/sportdb/config/config.rb
 - lib/sportdb/config/version.rb
 - lib/sportdb/config/wiki_index.rb
@@ -145,6 +118,7 @@ files:
 - test/test_clubs.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: