sportdb-config 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a4445ef87f3b56b3ef17a685cdd0e1b2b576220
-  data.tar.gz: 508640a8a0a0e2519892d15d1ba7065e71738eea
+  metadata.gz: 8e732ec27a048790023945b81ee4bfb641b511df
+  data.tar.gz: c54dc64a1b019accb8337e1ef80d252338c8416c
 SHA512:
-  metadata.gz: 44cc3d79fcb8a16c34fe27c8ecdfb158a99ef308bd9a17901fd85c0849f1bddef3882c3878161738d1cb23f2a068d8e706bce5f28fb5b21bc2df94b427316447
-  data.tar.gz: d0e784ae220704714ebbd3187246bbd44b87c6dd55a01a6d79812d959fa2ad2772b788e4c5f910581fb3db7dfb82a72339d1cd0b18593579c932b46b71701f08
+  metadata.gz: d73d9aafbd977d57be80e230de8c9bb8d0090fe816ee235df9854e8d4f6877e1df863b74e1a22ff80ed360534141c46e7e1b23f1c219ebd418d3cf7d9c87d7f9
+  data.tar.gz: 730cf120ff994ac024b462e164faf2aba875e3f3e29ee72d73e4594706cbe088253050f85b9557e78881061c923cea30b12ee278a9de5b38b2fbffe0152eb830

data/Manifest.txt

@@ -17,6 +17,7 @@ lib/sportdb/config/season_utils.rb
 lib/sportdb/config/team_reader.rb
 lib/sportdb/config/version.rb
 test/helper.rb
+test/test_clubs.rb
 test/test_config.rb
 test/test_countries.rb
 test/test_league_reader.rb

data/lib/sportdb/config/config.rb

@@ -6,16 +6,13 @@ module SportDb
 
 class Configuration
 
-  def initialize
-    @errors = []     ## make parsing errors "global" for now
-  end
 
-  def team_mappings
+  def team_mappings    ## todo/fix: rename to clubs_mappings - why? why not?
     read_teams()        if @team_mappings.nil?
     @team_mappings
   end
 
-  def teams
+  def teams             ## todo/fix: rename to clubs - why? why not?
     read_teams()        if @teams.nil?
     @teams
   end
@@ -29,12 +26,9 @@ class Configuration
   ####
   #  todo/fix:  find a better way to configure club / team datasets
   attr_accessor   :clubs_dir
-  attr_accessor   :errors
-
   def clubs_dir()   @clubs_dir ||= './clubs'; end
 
 
-
   CLUBS_REGEX1 = %r{  (?:^|/)            # beginning (^) or beginning of path (/)
                        (?<country>[a-z]{1,3})\.clubs\.txt$
                    }x
@@ -116,13 +110,53 @@ class Configuration
 =end
 
 
-  def read_teams
+
+  class ClubsHash   ## todo/check: use (rename to) ClubsMapping(s) - why? why not?
+    def initialize
+      @h      = {}
+      @errors = []
+    end
+
+    attr_reader :errors
+    def errors?() @errors.empty? == false; end
+
+    def add( rec )   ## add club record / alt_names
+      rec.alt_names.each do |alt_name|
+        alt_recs = @h[ alt_name ]
+        if alt_recs
+          msg = "** !!! WARN !!! - alt name conflict/duplicate - >#{alt_name}< will overwrite >#{alt_recs[0].name}, #{alt_recs[0].country.name}< with >#{rec.name}, #{rec.country.name}<"
+          puts msg
+          @errors << msg
+          alt_recs << rec
+        else
+          @h[ alt_name ] = [rec]
+        end
+      end
+    end
+
+    def fetch( alt_name ) @h[alt_name]; end
+    def []( alt_name )   ## quick fix: for now returns first name; use fetch for recs array for now!!!
+       ## keep "compatible" with old code for now
+       alt_recs = @h[ alt_name ]
+       if alt_recs
+         alt_recs[0].name   ## use canonical name of first match for now
+       else
+         nil   # nothing found
+       end
+    end
+  end # class ClubHash
+
+
+  def read_teams   ## todo/fix: rename to read_clubs - why? why not?
     ## unify team names; team (builtin/known/shared) name mappings
     ## cleanup team names - use local ("native") name with umlaut etc.
     recs = []
-    @errors = []    ## reset errors
 
     ## todo/fix: pass along / use country code too
+    ##   note: country code no longer needed in path (is now expected as heading inside the file)
+
+    ## todo/fix: add to teamreader
+    ##              check that name and alt_names for a club are all unique (not duplicates)
     datafiles = find_clubs_datafiles( clubs_dir )
     datafiles.each do |datafile|
        country  = datafile[0]    ## country code e.g. eng, at, de, etc.
@@ -133,40 +167,45 @@ class Configuration
     ############################
     ## add team mappings
     ##   alt names to canonical pretty (recommended unique) name
-    @team_mappings = {}
-
-    recs.each do |rec|
-       rec.alt_names.each do |alt_name|
-         name = @team_mappings[ alt_name ]
-         if name  ## todo/fix: add better warn about duplicates (if key exits) ???????
-            msg = "** !!! WARN !!! - alt name conflict/duplicate - >#{alt_name}< will overwrite >#{name}< with >#{rec.name}<"
-            puts msg
-            @errors << msg
-         else
-           @team_mappings[ alt_name ] = rec.name
-         end
-       end
-    end
+    @team_mappings = ClubsHash.new
+    recs.each { |rec| @team_mappings.add( rec ) }
 
 ###
 ## reverse hash for lookup/list of "official / registered(?)"
 ##    pretty recommended canonical unique (long form)
 ##    team names
 
-
-##
-##  todo/fix: move to new TeamConfig class (for reuse) !!!!!!
-##   todo/fix:  add check for duplicates/conflicts too!!!
     @teams = {}
     recs.each do |rec|
-      @teams[ rec.name ] = rec
+      old_rec = @teams[ rec.name ]
+      if old_rec
+        puts "** !!! ERROR !!! - (canonical) name conflict - duplicate - >#{rec.name}< will overwrite >#{old_rec.name}<:"
+        pp old_rec
+        pp rec
+        exit 1
+      else
+        @teams[ rec.name ] = rec
+
+        ## note: check if there's an alternative name registered
+        ##           for the canonical name
+        ##    todo/fix: find a better scheme for (alt) name mapping - why? why not?
+        ##   allow alt names same as canonical names if not is the same club/record - why? why not?
+        alt_recs =  @team_mappings.fetch( rec.name )
+        if alt_recs
+          puts "** !!! ERROR !!! - (canonical) name conflict - >#{rec.name}< registered already as alternative name mapping:"
+          pp alt_recs
+
+          ## note: exit now only if it's the same club (that has alt name that is the canonical name)
+          exit 1    if alt_recs.include?(rec)
+        end
+      end
     end
 
-    if @errors.size > 0
+    if @team_mappings.errors?
       puts ""
       puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-      puts " #{@errors.size} errors:"
-      pp @errors
+      puts " #{@team_mappings.errors.size} errors:"
+      pp @team_mappings.errors
       ## exit 1
     end
 
@@ -174,6 +213,7 @@ class Configuration
 end
 
 
+
 def read_leagues
     #####
     # add / read-in leagues config

data/lib/sportdb/config/countries.rb

@@ -8,24 +8,34 @@ class Configuration
   ## built-in countries for (quick starter) auto-add
   COUNTRIES = {    ## rename to AUTO or BUILTIN_COUNTRIES or QUICK_COUNTRIES - why? why not?
     ## british isles
-    eng: ['England',     'ENG'],     ## title/name, code
-    sco: ['Scotland',    'SCO'],
-    ie:  ['Ireland',     'IRL'],
+    eng: ['England',          'ENG'],     ## title/name, code
+    sco: ['Scotland',         'SCO'],
+    ie:  ['Ireland',          'IRL'],
+    wal: ['Wales',            'WAL'],
+    nir: ['Northern Ireland', 'NIR'],
 
     ## central europe
     at:  ['Austria',      'AUT'],
     de:  ['Germany',      'GER'],   ## use fifa code or iso? - using fifa for now
-    ch:  ['Switzerland',  'SWZ'],
+    ch:  ['Switzerland',  'SUI'],
+    li:  ['Liechtenstein', 'LIE'],
     pl:  ['Poland',       'POL'],
+    cz:  ['Czech Republic', 'CZE'],
+    sk:  ['Slovakia', 'SVK'],
+    hu:  ['Hungary',       'HUN'],
+    si:  ['Slovenia', 'SVN'],
 
     ## western europe
+    be:  ['Belgium',     'BEL'],
+    nl:  ['Netherlands', 'NED'],
+    lu:  ['Luxembourg',  'LUX'],
     fr:  ['France',      'FRA'],
+    mc:  ['Monaco',      'MCO'],
     es:  ['Spain',       'ESP'],
-    be:  ['Belgium',     '' ],
-    nl:  ['Netherlands', '' ],
+    ad:  ['Andorra',     'AND'],
 
     ## northern europe / skandinavia
-    dk:  ['Denmark',      'DNK'],
+    dk:  ['Denmark',      'DEN'],
     fi:  ['Finland',      'FIN'],
     no:  ['Norway',       'NOR'],
     se:  ['Sweden',       'SWE'],
@@ -33,141 +43,86 @@ class Configuration
     ## eastern europe
     ro:  ['Romania',      'ROU'],
     ru:  ['Russia',       'RUS'],
+    al:  ['Albania',      'ALB'],
+    am:  ['Armenia',      'ARM'],
+    az:  ['Azerbaijan',   'AZE'],
+    ba:  ['Bosnia and Herzegovina', 'BIH'],
+    bg:  ['Bulgaria', 'BUL'],
+    by:  ['Belarus', 'BLR'],
+
+    ## more european
+    cy: ['Cyprus', 'CYP'],
+    is: ['Iceland', 'ISL'],
+    fo: ['Faroe Islands', 'FRO'],
+    ge: ['Georgia', 'GEO'],
+    gi: ['Gibraltar', 'GIB'],
+    gr: ['Greece', 'GRE'],
+    hr: ['Croatia', 'CRO'],
+    it: ['Italy', 'ITA'],
+    sm: ['San Marino', 'SMR'],
+    ee: ['Estonia', 'EST'],
+    lt: ['Lithuania', 'LTU'],
+    lv: ['Latvija', 'LVA'],
+    md: ['Moldova', 'MDA'],
+    me: ['Montenegro', 'MNE'],
+    mk: ['Macedonia', 'MKD'],
+    mt: ['Malta', 'MLT'],
+    pt: ['Portugal', 'POR'],
+    rs: ['Serbia', 'SRB'],
+    tr: ['Turkey', 'TUR'],
+    ua: ['Ukraine', 'UKR'],
+
 
     ## north america
     us:  ['United States', 'USA'],
     mx:  ['Mexico',        'MEX'],
+    ca:  ['Canada',        'CAN'],
 
     ## caribbean
-    ht:  ['Haiti',               ''],
-    pr:  ['Puerto Rico',         ''],
-    tt:  ['Trinidad and Tobago', ''],
+    ht:  ['Haiti',               'HAI'],
+    pr:  ['Puerto Rico',         'PUR'],
+    tt:  ['Trinidad and Tobago', 'TRI'],
 
     ## central america
-    cr:  ['Costa Rica',  ''],
-    gt:  ['Guatemala',   ''],
-    hn:  ['Honduras',    ''],
-    ni:  ['Nicaragua',   ''],
-    pa:  ['Panama',      ''],
-    sv:  ['El Salvador', ''],
+    cr:  ['Costa Rica',  'CRC'],
+    gt:  ['Guatemala',   'GUA'],
+    hn:  ['Honduras',    'HON'],
+    ni:  ['Nicaragua',   'NCA'],
+    pa:  ['Panama',      'PAN'],
+    sv:  ['El Salvador', 'SLV'],
+
 
     ## south america
     ar:  ['Argentina',   'ARG'],
     br:  ['Brazil',      'BRA'],
-    bo:  ['Bolivia',     ''],
-    cl:  ['Chile',       ''],
-    co:  ['Colombia',    ''],
-    ec:  ['Ecuador',     ''],
-    gy:  ['Guyana',      ''],
-    pe:  ['Peru',        ''],
-    py:  ['Paraguay',    ''],
-    uy:  ['Uruguay',     ''],
-    ve:  ['Venezuela',   ''],
+    bo:  ['Bolivia',     'BOL'],
+    cl:  ['Chile',       'CHI'],
+    co:  ['Colombia',    'COL'],
+    ec:  ['Ecuador',     'ECU'],
+    gy:  ['Guyana',      'GUY'],
+    pe:  ['Peru',        'PER'],
+    py:  ['Paraguay',    'PAR'],
+    uy:  ['Uruguay',     'URU'],
+    ve:  ['Venezuela',   'VEN'],
+
+    ## middle east
+    il:  ['Israel', 'ISR'],
 
     ## asia
     cn:  ['China',       'CHN'],
     jp:  ['Japan',       'JPN'],
-    kz:  ['Kazakhstan',  '' ],
-    kr:  ['South Korea', '' ],
+    kz:  ['Kazakhstan',  'KAZ'],
+    kr:  ['South Korea', 'KOR'],
 
     ## africa
-    eg:  ['Egypt',   ''],
-    ma:  ['Morocco', ''],
+    eg:  ['Egypt',   'EGY'],
+    ma:  ['Morocco', 'MAR'],
+
+    ## pacific
+    au:  ['Australia',   'AUS'],
+    nz:  ['New Zealand', 'NZL'],
   }
 
-## add more countries - see/check datasets !!
-=begin
-[["eg", "../../../openfootball/clubs/africa/egypt/eg.clubs.txt"],
- ["ma", "../../../openfootball/clubs/africa/morocco/ma.clubs.txt"],
- ["cn", "../../../openfootball/clubs/asia/china/cn.clubs.txt"],
- ["jp", "../../../openfootball/clubs/asia/japan/jp.clubs.txt"],
- ["kz", "../../../openfootball/clubs/asia/kazakhstan/kz.clubs.txt"],
- ["kr", "../../../openfootball/clubs/asia/south-korea/kr.clubs.txt"],
- ["ht", "../../../openfootball/clubs/caribbean/haiti/ht.clubs.txt"],
- ["pr", "../../../openfootball/clubs/caribbean/puerto-rico/pr.clubs.txt"],
- ["tt",
-  "../../../openfootball/clubs/caribbean/trinidad-n-tobago/tt.clubs.txt"],
- ["cr", "../../../openfootball/clubs/central-america/costa-rica/cr.clubs.txt"],
- ["gt", "../../../openfootball/clubs/central-america/guatemala/gt.clubs.txt"],
- ["hn", "../../../openfootball/clubs/central-america/hn-honduras/clubs.txt"],
- ["ni", "../../../openfootball/clubs/central-america/ni-nicaragua/clubs.txt"],
- ["pa", "../../../openfootball/clubs/central-america/pa-panama/clubs.txt"],
- ["sv",
-  "../../../openfootball/clubs/central-america/sv-el-salvador/clubs.txt"],
- ["ad", "../../../openfootball/clubs/europe/ad-andorra/clubs.txt"],
- ["al", "../../../openfootball/clubs/europe/al-albania/clubs.txt"],
- ["am", "../../../openfootball/clubs/europe/am-armenia/clubs.txt"],
- ["at", "../../../openfootball/clubs/europe/at-austria/clubs.txt"],
- ["az", "../../../openfootball/clubs/europe/az-azerbaijan/clubs.txt"],
- ["ba",
-  "../../../openfootball/clubs/europe/ba-bosnia-n-herzegovina/clubs.txt"],
- ["be", "../../../openfootball/clubs/europe/be-belgium/clubs.txt"],
- ["bg", "../../../openfootball/clubs/europe/bg-bulgaria/clubs.txt"],
- ["by", "../../../openfootball/clubs/europe/by-belarus/clubs.txt"],
- ["ch",
-  "../../../openfootball/clubs/europe/ch-confoederatio-helvetica/clubs.txt"],
- ["cy", "../../../openfootball/clubs/europe/cy-cyprus/clubs.txt"],
- ["cz", "../../../openfootball/clubs/europe/cz-czech-republic/clubs.txt"],
- ["de", "../../../openfootball/clubs/europe/de-deutschland/clubs.txt"],
- ["dk", "../../../openfootball/clubs/europe/dk-denmark/clubs.txt"],
- ["ee", "../../../openfootball/clubs/europe/ee-estonia/clubs.txt"],
- ["eng", "../../../openfootball/clubs/europe/eng-england/clubs.txt"],
- ["es", "../../../openfootball/clubs/europe/es-espana/clubs.txt"],
- ["fi", "../../../openfootball/clubs/europe/fi-finland/clubs.txt"],
- ["fo", "../../../openfootball/clubs/europe/fo-faroe-islands/clubs.txt"],
- ["fr", "../../../openfootball/clubs/europe/fr-france/clubs.txt"],
- ["ge", "../../../openfootball/clubs/europe/ge-georgia/clubs.txt"],
- ["gi", "../../../openfootball/clubs/europe/gi-gibraltar/clubs.txt"],
- ["gr", "../../../openfootball/clubs/europe/gr-greece/clubs.txt"],
- ["hr", "../../../openfootball/clubs/europe/hr-croatia/clubs.txt"],
- ["hu", "../../../openfootball/clubs/europe/hu-hungary/clubs.txt"],
- ["ie", "../../../openfootball/clubs/europe/ie-ireland/clubs.txt"],
- ["is", "../../../openfootball/clubs/europe/is-iceland/clubs.txt"],
- ["it", "../../../openfootball/clubs/europe/it-italy/clubs.txt"],
- ["li", "../../../openfootball/clubs/europe/li-liechtenstein/clubs.txt"],
- ["lt", "../../../openfootball/clubs/europe/lt-lithuania/clubs.txt"],
- ["lu", "../../../openfootball/clubs/europe/lu-luxembourg/clubs.txt"],
- ["lv", "../../../openfootball/clubs/europe/lv-latvija/clubs.txt"],
- ["mc", "../../../openfootball/clubs/europe/mc-monaco/clubs.txt"],
- ["md", "../../../openfootball/clubs/europe/md-moldova/clubs.txt"],
- ["me", "../../../openfootball/clubs/europe/me-montenegro/clubs.txt"],
- ["mk", "../../../openfootball/clubs/europe/mk-macedonia/clubs.txt"],
- ["mt", "../../../openfootball/clubs/europe/mt-malta/clubs.txt"],
- ["nir", "../../../openfootball/clubs/europe/nir-northern-ireland/clubs.txt"],
- ["nl", "../../../openfootball/clubs/europe/nl-netherlands/clubs.txt"],
- ["no", "../../../openfootball/clubs/europe/no-norway/clubs.txt"],
- ["pl", "../../../openfootball/clubs/europe/pl-poland/clubs.txt"],
- ["pt", "../../../openfootball/clubs/europe/pt-portugal/clubs.txt"],
- ["ro", "../../../openfootball/clubs/europe/ro-romania/clubs.txt"],
- ["rs", "../../../openfootball/clubs/europe/rs-serbia/clubs.txt"],
- ["ru", "../../../openfootball/clubs/europe/ru-russia/clubs.txt"],
- ["sco", "../../../openfootball/clubs/europe/sco-scotland/clubs.txt"],
- ["se", "../../../openfootball/clubs/europe/se-sweden/clubs.txt"],
- ["si", "../../../openfootball/clubs/europe/si-slovenia/clubs.txt"],
- ["sk", "../../../openfootball/clubs/europe/sk-slovakia/clubs.txt"],
- ["sm", "../../../openfootball/clubs/europe/sm-san-marino/clubs.txt"],
- ["tr", "../../../openfootball/clubs/europe/tr-turkey/clubs.txt"],
- ["ua", "../../../openfootball/clubs/europe/ua-ukraine/clubs.txt"],
- ["wal", "../../../openfootball/clubs/europe/wal-wales/clubs.txt"],
- ["il", "../../../openfootball/clubs/middle-east/il-israel/clubs.txt"],
- ["ca", "../../../openfootball/clubs/north-america/ca-canada/clubs.txt"],
- ["mx", "../../../openfootball/clubs/north-america/mx-mexico/clubs.txt"],
- ["us",
-  "../../../openfootball/clubs/north-america/us-united-states/clubs.txt"],
- ["au", "../../../openfootball/clubs/pacific/australia/au.clubs.txt"],
- ["nz", "../../../openfootball/clubs/pacific/new-zealand/nz.clubs.txt"],
- ["ar", "../../../openfootball/clubs/south-america/argentina/ar.clubs.txt"],
- ["bo", "../../../openfootball/clubs/south-america/bolivia/bo.clubs.txt"],
- ["br", "../../../openfootball/clubs/south-america/brazil/br.clubs.txt"],
- ["cl", "../../../openfootball/clubs/south-america/chile/cl.clubs.txt"],
- ["co", "../../../openfootball/clubs/south-america/co-colombia/clubs.txt"],
- ["ec", "../../../openfootball/clubs/south-america/ec-ecuador/clubs.txt"],
- ["gy", "../../../openfootball/clubs/south-america/gy-guyana/clubs.txt"],
- ["pe", "../../../openfootball/clubs/south-america/pe-peru/clubs.txt"],
- ["py", "../../../openfootball/clubs/south-america/py-paraguay/clubs.txt"],
- ["uy", "../../../openfootball/clubs/south-america/uy-uruguay/clubs.txt"],
- ["ve", "../../../openfootball/clubs/south-america/ve-venezuela/clubs.txt"]]
-=end
 
   ##
   #  note: use our own (internal) country struct for now - why? why not?
@@ -198,3 +153,4 @@ class Configuration
 end   # class Configuration
 end   # module Import
 end   # module SportDb
+

data/lib/sportdb/config/team_reader.rb

@@ -235,7 +235,8 @@ def self.parse( txt )
         rec.country = country
       else
         ## make it an error - why? why not?
-        puts "!!! warn - country missing in headings hierarchy"
+        puts "!!! error - country missing in headings hierarchy - sorry - add to quicklist"
+        exit 1
       end
 
       ## 2) check geo tree with headings hierarchy

data/lib/sportdb/config/version.rb

@@ -8,7 +8,7 @@ module Boot      ## note: use a different module than Config to avoid confusion
 
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
   MINOR = 3
-  PATCH = 3
+  PATCH = 4
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/test_clubs.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_clubs.rb
+
+
+require 'helper'
+
+class TestClubs < MiniTest::Test
+
+
+  def match1( txt ) SportDb::Import::Configuration::CLUBS_REGEX1.match( txt ); end
+  def match2( txt ) SportDb::Import::Configuration::CLUBS_REGEX2.match( txt ); end
+
+  def test_find_clubs
+    m = match1( 'de.clubs.txt' )
+    assert_equal 'de', m[:country]
+
+    m = match1( 'deutschland/de.clubs.txt' )
+    assert_equal 'de', m[:country]
+
+    m = match2( 'europe/de-deutschland/clubs.txt' )
+    assert_equal 'de', m[:country]
+
+    m = match2( 'de-deutschland/clubs.txt' )
+    assert_equal 'de', m[:country]
+
+
+    assert match1( 'clubs.txt' ) == nil
+    assert match2( 'clubs.txt' ) == nil
+    assert match1( 'deutschland/clubs.txt' ) == nil
+    assert match2( 'deutschland/clubs.txt' ) == nil
+  end
+
+end # class TestClubs

data/test/test_config.rb

@@ -9,39 +9,12 @@ require 'helper'
 
 class TestConfig < MiniTest::Test
 
-
-  def match1( txt ) SportDb::Import::Configuration::CLUBS_REGEX1.match( txt ); end
-  def match2( txt ) SportDb::Import::Configuration::CLUBS_REGEX2.match( txt ); end
-
-  def test_find_clubs
-    m = match1( 'de.clubs.txt' )
-    assert_equal 'de', m[:country]
-
-    m = match1( 'deutschland/de.clubs.txt' )
-    assert_equal 'de', m[:country]
-
-    m = match2( 'europe/de-deutschland/clubs.txt' )
-    assert_equal 'de', m[:country]
-
-    m = match2( 'de-deutschland/clubs.txt' )
-    assert_equal 'de', m[:country]
-
-
-    assert match1( 'clubs.txt' ) == nil
-    assert match2( 'clubs.txt' ) == nil
-    assert match1( 'deutschland/clubs.txt' ) == nil
-    assert match2( 'deutschland/clubs.txt' ) == nil
-  end
-
-
   def test_clubs
     SportDb::Import.config.clubs_dir = '../../../openfootball/clubs'
 
-    pp SportDb::Import.config.teams
-
-    pp SportDb::Import.config.errors
+    SportDb::Import.config.teams
 
     assert true ## assume ok if we get here
-  end  # method test_teams
+  end  # method test_clubs
 
 end # class TestConfig

data/test/test_team_reader.rb

@@ -105,17 +105,20 @@ TXT
     assert_equal 'London',           recs[0].city
     assert_equal 'Fulham',           recs[0].district
     assert_equal ['Greater London'], recs[0].geos
-    assert_equal 'eng',              recs[0].country
+    assert_equal 'England',          recs[0].country.name
+    assert_equal 'eng',              recs[0].country.key
 
     assert_equal 'London',           recs[1].city
     assert_equal 'Charlton',         recs[1].district
     assert_equal ['Greater London'], recs[1].geos
-    assert_equal 'eng',              recs[1].country
+    assert_equal 'England',          recs[1].country.name
+    assert_equal 'eng',              recs[1].country.key
 
     assert_equal 'Hamburg',          recs[2].city
     assert_equal 'St. Pauli',        recs[2].district
     assert_equal ['Hamburg'],        recs[2].geos
-    assert_equal 'de',               recs[2].country
+    assert_equal 'Germany',          recs[2].country.name
+    assert_equal 'de',               recs[2].country.key
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-config
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -71,6 +71,7 @@ files:
 - lib/sportdb/config/team_reader.rb
 - lib/sportdb/config/version.rb
 - test/helper.rb
+- test/test_clubs.rb
 - test/test_config.rb
 - test/test_countries.rb
 - test/test_league_reader.rb