sportdb 1.8.23 → 1.8.24

data/Manifest.txt

@@ -54,9 +54,10 @@ lib/sportdb/readers/event.rb
 lib/sportdb/readers/game.rb
 lib/sportdb/readers/ground.rb
 lib/sportdb/readers/league.rb
+lib/sportdb/readers/national_team.rb
 lib/sportdb/readers/race.rb
+lib/sportdb/readers/race_team.rb
 lib/sportdb/readers/record.rb
-lib/sportdb/readers/roster.rb
 lib/sportdb/readers/season.rb
 lib/sportdb/readers/team.rb
 lib/sportdb/readers/track.rb
@@ -110,6 +111,8 @@ test/data/at-austria/2013_14/el.yml
 test/data/at-austria/leagues.txt
 test/data/at-austria/teams.txt
 test/data/at-austria/teams_2.txt
+test/data/players/europe/de-deutschland/players.txt
+test/data/players/south-america/br-brazil/players.txt
 test/data/world-cup/1930/cup.txt
 test/data/world-cup/1930/cup.yml
 test/data/world-cup/1954/cup.txt
@@ -120,6 +123,10 @@ test/data/world-cup/1974/cup.yml
 test/data/world-cup/1974/cup_finals.txt
 test/data/world-cup/1974/cup_i.txt
 test/data/world-cup/1974/cup_ii.txt
+test/data/world-cup/2014/cup.txt
+test/data/world-cup/2014/cup.yml
+test/data/world-cup/2014/squads/br-brazil.txt
+test/data/world-cup/2014/squads/de-deutschland.txt
 test/data/world-cup/leagues.txt
 test/data/world-cup/seasons_1930.txt
 test/data/world-cup/seasons_1954.txt
@@ -134,6 +141,8 @@ test/test_changes.rb
 test/test_cursor.rb
 test/test_date.rb
 test/test_lang.rb
+test/test_load.rb
+test/test_national_team_reader.rb
 test/test_reader.rb
 test/test_round_auto.rb
 test/test_round_def.rb

data/lib/sportdb.rb

@@ -95,7 +95,8 @@ require 'sportdb/readers/ground'
 require 'sportdb/readers/league'
 require 'sportdb/readers/race'
 require 'sportdb/readers/record'
-require 'sportdb/readers/roster'
+require 'sportdb/readers/race_team'
+require 'sportdb/readers/national_team'
 require 'sportdb/readers/season'
 require 'sportdb/readers/team'
 require 'sportdb/readers/track'

data/lib/sportdb/reader.rb

@@ -73,27 +73,40 @@ class Reader
       reader = TrackReader.new( include_path )
       reader.read( name )
     elsif name =~ /^drivers/ # e.g. drivers.txt in formula1.db
-      load_persons( name )
+      reader = PersonDb::PersonReader.new( include_path )
+      reader.read( name )
     elsif match_players_for_country( name ) do |country_key|
             country = Country.find_by_key!( country_key )
-            load_persons( name, country_id: country.id )
+            reader = PersonDb::PersonReader.new( include_path )
+            reader.read( name, country_id: country.id )
           end
     elsif match_skiers_for_country( name ) do |country_key|  # name =~ /^([a-z]{2})\/skiers/
             # auto-add country code (from folder structure) for country-specific skiers (persons)
             #  e.g. at/skiers  or at-austria/skiers.men
             country = Country.find_by_key!( country_key )
-            load_persons( name, country_id: country.id )
+            reader = PersonDb::PersonReader.new( include_path )
+            reader.read( name, country_id: country.id )
           end
     elsif name =~ /^skiers/ # e.g. skiers.men.txt in ski.db
-      load_persons( name )
+      reader = PersonDb::PersonReader.new( include_path )
+      reader.read( name )
     elsif name =~ /^teams/   # e.g. teams.txt in formula1.db
       reader = TeamReader.new( include_path )
       reader.read( name )
     elsif name =~ /\/races/  # e.g. 2013/races.txt in formula1.db
+      ## fix/bug:  NOT working for now; sorry
+      #   need to read event first and pass along to read (event_id: event.id) etc.
       reader = RaceReader.new( include_path )
       reader.read( name )
+    elsif name =~ /\/squads\/([a-z]{2,3})-[^\/]+$/
+      ## fix: add to country matcher new format
+      ##   name is country! and parent folder is type name e.g. /squads/br-brazil
+      country = Country.find_by_key!( $1 )
+      reader = NationalTeamReader.new( include_path )
+      ## note: pass in @event.id - that is, last seen event (e.g. parsed via GameReader/MatchReader)
+      reader.read( name, country_id: country.id, event_id: @event.id )
     elsif name =~ /\/squads/ || name =~ /\/rosters/  # e.g. 2013/squads.txt in formula1.db
-      reader = RosterReader.new( include_path )
+      reader = RaceTeamReader.new( include_path )
       reader.read( name )
     elsif name =~ /\/([0-9]{2})-/
       race_pos = $1.to_i
@@ -131,6 +144,12 @@ class Reader
       reader.read( name, club: is_club_fixture?( name ) )
     elsif name =~ /\/(\d{4}|\d{4}_\d{2})(--[^\/]+)?\// ||
           name =~ /\/(\d{4}|\d{4}_\d{2})$/
+
+      # note: keep a "public" reference of last event in @event  - e.g. used/required by squads etc.
+      eventreader = EventReader.new( include_path )
+      eventreader.read( name )
+      @event    = eventreader.event
+
       # e.g. must match /2012/ or /2012_13/  or   /2012--xxx/ or /2012_13--xx/
       #  or   /2012 or /2012_13   e.g. brazil/2012 or brazil/2012_13
       reader = GameReader.new( include_path )
@@ -142,16 +161,5 @@ class Reader
   end # method load
 
 
-  ####
-  # fix: move to persondb for (re)use
-
-  def load_persons( name, more_attribs={} )
-    reader = PersonDb::PersonReader.new( include_path )
-    ## fix: add more_attribs !!!!!   -- check other readers as an example
-    ##  - gets added to new or read??
-    reader.read( name )
-  end # load_persons
-
-  
 end # class Reader
 end # module SportDb

data/lib/sportdb/readers/national_team.rb

@@ -0,0 +1,148 @@
+# encoding: UTF-8
+
+module SportDb
+
+
+### squad/roster reader for national teams
+class NationalTeamReader
+
+  include LogUtils::Logging
+
+## make models available by default with namespace
+#  e.g. lets you use Usage instead of Model::Usage
+  include Models
+
+## value helpers e.g. is_year?, is_taglist? etc.
+  include TextUtils::ValueHelper
+
+  include FixtureHelpers
+
+
+  attr_reader :include_path
+
+
+  def initialize( include_path, opts = {} )
+    @include_path = include_path
+  end
+
+
+  def read( name, more_attribs={} )
+    path = "#{include_path}/#{name}.txt"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    # event
+    @event = Event.find( more_attribs[:event_id] )
+    pp @event
+
+    ## check/fix:
+    ##   allow three letter codes
+    ##  assume three letter code are *team* codes (e.g. fdr, gdr, etc)
+    ##      not country code (allows multiple teams per country)
+
+    ### check for country_id
+    ##  fix: check for country_key  - allow (convert to country_id)
+
+    country = Country.find( more_attribs[:country_id] )
+    logger.info "  find national team squad/lineup for #{country.name}"
+
+    ## todo/fix: find national team for country - use event.teams w/ where country.id ??
+    ###  for now assume country code matches team for now (do NOT forget to downcase e.g. BRA==bra)
+    logger.info "  assume country code == team code for #{country.code}"
+    
+    ## note: use @team - share/use in worker method
+    @team = Team.find_by_key!( country.code.downcase )
+    pp @team
+
+    ### SportDb.lang.lang = LangChecker.new.analyze( name, include_path )
+
+    reader = LineReader.new( path )
+
+    logger.info "  persons count for country: #{country.persons.count}"
+    known_persons_old = TextUtils.build_title_table_for( country.persons )
+
+    ### fix:  add auto camelcase/titlecase
+    ## move to textutils
+    ##  make it an option for name to auto Camelcase/titlecase?
+    ##  e.g. BONFIM COSTA SANTOS    becomes
+    ##       Bonfim Costa Santos  etc.
+    ##  fix: better move into person parser?
+    ##   store all alt_names titleized!!!!!
+
+    @known_persons = []
+    known_persons_old.each do |person_pair|
+       key    = person_pair[0]
+       values = person_pair[1].map { |value| titleize(value) }
+
+       @known_persons << [ key, values ]
+    end
+
+    pp @known_persons
+
+
+    read_worker( reader )
+
+    Prop.create_from_fixture!( name, path )  
+  end
+
+
+  def titleize( str )
+    ## fix: for now works only with ASCII only
+    ##  words 2 letters and ups
+    str.gsub(/\b[A-Z]{2,}\b/) { |match| match.capitalize }
+  end
+
+
+  def read_worker( reader )
+
+    pos_counter = 999000   # pos counter for undefined players w/o pos
+
+    reader.each_line do |line|
+      logger.debug "  line: >#{line}<"
+
+      cut_off_end_of_line_comment!( line )
+
+      pos = find_leading_pos!( line )
+
+      if pos.nil?
+        pos_counter+=1       ## e.g. 999001,999002 etc.
+        pos = pos_counter
+      end
+
+      # map_team!( line )
+      # team_key = find_team!( line )
+      # team = Team.find_by_key!( team_key )
+
+      map_person!( line )
+      person_key = find_person!( line )
+      person = Person.find_by_key!( person_key )
+
+      logger.debug "  line2: >#{line}<"
+
+      ### check if roster record exists
+      roster = Roster.find_by_event_id_and_team_id_and_person_id( @event.id, @team.id, person.id )
+
+      if roster.present?
+        logger.debug "update Roster #{roster.id}:"
+      else
+        logger.debug "create Roster:"
+        roster = Roster.new
+      end
+
+      roster_attribs = {
+        pos:       pos,
+        person_id: person.id,
+        team_id:   @team.id,
+        event_id:  @event.id   # NB: reuse/fallthrough from races - make sure load_races goes first (to setup event)
+      }
+
+      logger.debug roster_attribs.to_json
+
+      roster.update_attributes!( roster_attribs )
+    end # lines.each
+
+  end # method read_worker
+
+
+end # class NationTeamReader
+end # module SportDb

data/lib/sportdb/readers/{roster.rb → race_team.rb}

@@ -3,7 +3,8 @@
 module SportDb
 
 
-class RosterReader
+### squad/roster reader for races
+class RaceTeamReader
 
   include LogUtils::Logging
 
@@ -44,13 +45,13 @@ class RosterReader
     @known_persons = TextUtils.build_title_table_for( Person.all )
 
 
-    read_rosters_worker( reader )
+    read_worker( reader )
 
     Prop.create_from_fixture!( name, path )  
   end
 
 
-  def read_rosters_worker( reader )
+  def read_worker( reader )
 
     reader.each_line do |line|
       logger.debug "  line: >#{line}<"
@@ -91,8 +92,8 @@ class RosterReader
       roster.update_attributes!( roster_attribs )
     end # lines.each
 
-  end # method read_rosters_worker
+  end # method read_worker
 
 
-end # class RosterReader
+end # class RaceTeamReader
 end # module SportDb

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.23'
+  VERSION = '1.8.24'
 end
 
 

data/test/data/players/europe/de-deutschland/players.txt

@@ -0,0 +1,41 @@
+#############################
+# Germany / Deutschland
+
+## GK
+
+Manuel Neuer,   27 Mar 1986   ##  Germany Bayern Munich
+Ron-Robert Zieler,   12 Feb 1989  ##   Germany Hannover 96
+Roman Weidenfeller,   6 Aug 1980   ##   Germany Borussia Dortmund
+
+## DF
+
+Philipp Lahm,   11 Nov 1983   ##   Germany Bayern Munich
+Per Mertesacker,   29 Sep 1984  ##   Germany Arsenal
+Jérôme Boateng,   3 Sep1988    ##  Germany Bayern Munich
+Mats Hummels,   16 Dec1988      ##  Germany Borussia Dortmund
+Benedikt Höwedes,   29 Feb 1988  ##   Germany Schalke 04
+Marcel Schmelzer,   22 Jan1988   ##   Germany Borussia Dortmund
+Kevin Großkreutz,   19 Jul 1988      ##   Germany Borussia Dortmund
+Matthias Ginter,   19 Jan 1994    ##  Germany SC Freiburg
+Shkodran Mustafi,   17 Apr 1992     ##   Italy Sampdoria
+Erik Durm,   12 May 1992              ##   Germany Borussia Dortmund
+
+## MF
+
+Bastian Schweinsteiger,   1 Aug 1984   ##   Germany Bayern Munich
+Mesut Özil,   15 Oct 1988             ##   England Arsenal
+Sami Khedira,   4 Apr 1987         ##   Spain Real Madrid
+Toni Kroos,   4 Jan 1990         ##   Germany Bayern Munich
+Mario Götze,   3 Jun 1992           ##   Germany Bayern Munich
+Lars Bender,   27 Apr 1989         ##   Germany Bayer Leverkusen
+Julian Draxler,   20 Sep 1993  ##   Germany Schalke 04
+Christoph Kramer,   12 Feb 1991 ##   Germany Borussia Mönchengladbach
+
+## FW
+
+Miroslav Klose,   9 Jun 1978  ##   Italy Lazio
+Lukas Podolski,   4 Jun 1985  ##   England Arsenal
+André Schürrle,   6 Nov 1990  ##   England Chelsea
+Marco Reus,   31 May 1989          ##   Germany Borussia Dortmund
+Thomas Müller,   13 Sep 1989 ##   Germany Bayern Munich
+Kevin Volland,   30 Jul 1992      ##   Germany 1899 Hoffenheim

data/test/data/players/south-america/br-brazil/players.txt

@@ -0,0 +1,51 @@
+#############
+# Brazil
+
+
+# NB: let official (player) shirt name go first (e.g. Neymar Jr)
+
+
+## GK / Goalkeepers
+
+Jefferson|Jefferson DE OLIVEIRA GALVAO,          2 Jan 1983, 190
+Júlio César|Júlio César SOARES DE ESPINDOLA,     3 Sep 1979, 186
+D. Cavalieri|Diego CAVALIERI,                    1 Dec 1982, 189
+Victor,    21 Jan 1983      ## Brazil Atlético Mineiro
+
+
+## DF / Defenders
+
+Dani Alves|Daniel ALVES|Daniel ALVES DA SILVA,    6 May 1983, 172
+T. Silva|Thiago SILVA|Thiago EMILIANO DA SILVA, 22 Sep 1984, 183
+David Luiz|David Luiz MOREIRA MARINHO,  22 Apr 1987, 189
+Marcelo|Marcelo VIEIRA DA SILVA JUNIOR, 12 May 1988, 174
+Dante|Dante BONFIM COSTA SANTOS, 18 Oct 1983, 188
+Filipe Luís|Filipe Luís KASMIRSKI, 9 Aug 1985, 182
+Réver|Réver Humberto ALVES ARAUJO, 4 Jan 1985, 192
+Maicon,  26 Jul 1981    ## Italy Roma
+Maxwell,  27 Aug 1981   ## France Paris Saint-Germain
+Henrique, 14 Oct 1986   ## Italy Napoli
+
+
+## MF / Midfielders
+
+Fernando|Fernando Lucas MARTINS, 3 Mar 1992, 175
+Lucas|Lucas RODRIGUES MOURA SILVA, 13 Aug 1992, 173
+Hernanes|Anderson Hernanes DE CARVALHO VIANA LIMA, 29 May 1985, 180
+Oscar|Oscar DOS SANTOS EMBOABA JUNIOR,  9 Sep 1991, 180
+Jean|Jean Raphael VANDERLEI MOREIRA,  24 Jun 1986, 170
+L. Gustavo|Luiz Gustavo|Luiz Gustavo DIAS,   23 Jul 1987, 186
+Paulinho|José Paulo BEZERRA MACIEL JUNIOR, 25 Jul 1988, 182
+Bernard|Bernard ANICIO CALDEIRA DUARTE, 8 Sep 1992, 164
+Jádson|Jádson RODRIGUES, 5 Oct 1983, 169
+Ramires,     24 Mar 1987   ##  England Chelsea
+Fernandinho,  4 May 1985   ##  England Manchester City
+Willian,      9 Aug 1988   ##  England Chelsea
+
+
+## FW / Forwards
+
+Fred|Frederico CHAVES GUEDES, 3 Oct 1983, 185
+Neymar Jr|Neymar|Neymar DA SILVA SANTOS JUNIOR,  5 Feb 1992, 174
+Hulk|Givanildo VIEIRA DE SOUSA, 25 Jul 1986, 180
+Jô|João Alves de Assis Silva,  20 Mar 1987

data/test/data/world-cup/2014/cup.txt

@@ -0,0 +1,5 @@
+############################
+# World Cup 2014 Brazil
+
+# note: empty just for testing squads
+

data/test/data/world-cup/2014/cup.yml

@@ -0,0 +1,54 @@
+##################################
+#  World Cup 2014 Brazil
+
+league: world
+season: 2014
+start_at: 2014-06-12
+
+
+######
+# 32 Teams
+# 
+# Europe (UEFA): 13 places
+# Africa (CAF): 5 places
+# Asia (AFC): 4 places
+# South America (CONMEBOL) 5 places (+ Brazil qualified automatically as host nation for a total of 5 or 6 places)
+# North, Central American and Caribbean (CONCACAF): 4 places
+# Oceania (OFC): 0
+#
+# see en.wikipedia.org/wiki/2014_FIFA_World_Cup_qualification
+
+# teams:
+#- nga    # Nigeria    -- Africa (5)
+#- civ    # Côte d'Ivoire
+#- cmr    # Cameroon
+#- gha    # Ghana
+#- alg    # Algeria
+#- aus    # Australia   -- Asia (4) includes Australia
+#- irn    # Iran
+#- jpn    # Japan
+#- kor    # South Korea
+#- crc    # Costa Rica   -- North, Central American and Caribbean (4)
+#- usa    # United States
+#- hon    # Honduras
+#- mex    # Mexico
+#- bra    # Brazil -- South America (5+1)
+#- arg    # Argentina
+#- col    # Colombia
+#- chi    # Chile
+#- ecu    # Ecuador
+#- uru    # Uruguay
+#- bel    # Belgium  -- Europe (13)
+#- ger    # Germany
+#- ita    # Italy
+#- ned    # Netherlands
+#- sui    # Switzerland
+#- bih    # Bosnia and Herzegovina
+#- rus    # Russia
+#- esp    # Spain
+#- eng    # England
+#- gre    # Greece
+#- cro    # Croatia
+#- por    # Portugal
+#- fra    # France
+

data/test/data/world-cup/2014/squads/br-brazil.txt

@@ -0,0 +1,46 @@
+##############################
+# Brazil - World Cup 2014
+#
+# Coaching Staff
+# - Head Coach: Luiz Felipe Scolari
+
+
+####################
+# GK / Goal Keepers
+
+Jefferson       ## Botafogo
+Julio César     ## Toronto F.C
+Victor          ## Atlético-MG
+
+####################
+# DF / Defenders
+
+Dante            (Bayern de Munique)
+David Luiz       (Chelsea)
+Henrique         (Napoli)
+Thiago Silva     (Paris Saint-Germain)
+Daniel Alves     (Barcelona)
+Maicon           (Roma)
+Marcelo          (Real Madrid)
+Maxwell          (PSG)
+
+####################
+# MF / Midfielders
+
+Fernandinho     (Manchester City)
+Hernanes        (Inter de Milão)
+Luiz Gustavo    (Wolfsburg)
+Oscar           (Chelsea)
+Paulinho        (Tottenham)
+Ramires         (Chelsea)
+Willian         (Chelsea)
+
+####################
+# FW / Forwards
+
+Bernard         (Shakhtar)
+Fred            (Fluminense)
+Hulk            (Zenit)
+Jô              (Atlético-MG)
+Neymar          (Barcelona)
+

data/test/data/world-cup/2014/squads/de-deutschland.txt

@@ -0,0 +1,8 @@
+#################################
+# Deutschland - World Cup 2014
+
+
+Mesut Özil
+Thomas Müller
+Bastian Schweinsteiger
+

data/test/helper.rb

@@ -23,19 +23,25 @@ League     = SportDb::Model::League
 Season     = SportDb::Model::Season
 Event      = SportDb::Model::Event
 Team       = SportDb::Model::Team
+Roster     = SportDb::Model::Roster
 
 Round      = SportDb::Model::Round
 Game       = SportDb::Model::Game
 GameCursor = SportDb::Model::GameCursor
 
+
 ####################
 # Reader shortcuts
 
-TeamReader   = SportDb::TeamReader
-SeasonReader = SportDb::SeasonReader
-LeagueReader = SportDb::LeagueReader
-GameReader   = SportDb::GameReader
+Reader             = SportDb::Reader
+TeamReader         = SportDb::TeamReader
+SeasonReader       = SportDb::SeasonReader
+LeagueReader       = SportDb::LeagueReader
+GameReader         = SportDb::GameReader
+NationalTeamReader = SportDb::NationalTeamReader
+RaceTeamReader     = SportDb::RaceTeamReader
 
+PersonReader       = PersonDb::PersonReader
 
 #################################
 # setup db -> schema / tables

data/test/test_load.rb

@@ -0,0 +1,61 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_load.rb
+#  or better
+#     rake -I ./lib test
+
+
+require 'helper'
+
+class TestLoad < MiniTest::Unit::TestCase
+
+  def setup
+    WorldDb.delete!
+    SportDb.delete!
+    PersonDb.delete!
+    SportDb.read_builtin   # add 2014 season
+  end
+
+
+  def test_br
+    br  = Country.create!( key: 'br', title: 'Brazil', code: 'BRA', pop: 1, area: 1)
+    bra = Team.create!( key: 'bra', title: 'Brazil', code: 'BRA', country_id: br.id )
+
+    reader = Reader.new( SportDb.test_data_path ) 
+
+    ## fix: add to country_matcher - allow players/br-brazil.txt e.g. country encode in file
+    reader.load( 'players/south-america/br-brazil/players' )
+    assert_equal 30, Person.count
+
+    reader.load( 'world-cup/leagues' )
+    assert_equal 1, League.count
+    reader.load( 'world-cup/2014/cup' )
+    assert_equal 1, Event.count
+
+    reader.load( 'world-cup/2014/squads/br-brazil' )
+    assert_equal 23, Roster.count
+  end  # method test_br
+
+
+  def test_de
+    de  = Country.create!( key: 'de', title: 'Germany', code: 'GER', pop: 1, area: 1)
+    ger = Team.create!( key: 'ger', title: 'Germany', code: 'GER', country_id: de.id )
+
+    reader = Reader.new( SportDb.test_data_path ) 
+
+    reader.load( 'players/europe/de-deutschland/players' )
+    assert_equal 27, Person.count
+
+    reader.load( 'world-cup/leagues' )
+    assert_equal 1, League.count
+    reader.load( 'world-cup/2014/cup' )
+    assert_equal 1, Event.count
+
+    reader.load( 'world-cup/2014/squads/de-deutschland' )
+    assert_equal 3, Roster.count
+  end  # method test_de
+
+
+end # class TestLoad

data/test/test_national_team_reader.rb

@@ -0,0 +1,80 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_national_team_reader.rb
+#  or better
+#     rake -I ./lib test
+
+
+require 'helper'
+
+class TestNationalTeamReader < MiniTest::Unit::TestCase
+
+  def setup
+    WorldDb.delete!
+    SportDb.delete!
+    PersonDb.delete!
+    
+    add_world_cup_2014
+  end
+
+  def add_world_cup_2014
+    SportDb.read_builtin   # add 2014 season
+
+    leaguereader = LeagueReader.new( SportDb.test_data_path )
+    leaguereader.read( 'world-cup/leagues' )
+
+    assert_equal 1, League.count
+
+    l = League.find_by_key!( 'world' )
+    assert_equal 'World Cup', l.title
+
+    gamereader = GameReader.new( SportDb.test_data_path )
+    gamereader.read( 'world-cup/2014/cup' )
+
+    assert_equal 1, Event.count
+  end
+
+  def test_br
+    br  = Country.create!( key: 'br', title: 'Brazil', code: 'BRA', pop: 1, area: 1)
+    
+    ## read persons
+    personreader = PersonReader.new( SportDb.test_data_path )
+    personreader.read( 'players/south-america/br-brazil/players', country_id: br.id ) 
+
+    assert_equal 30, Person.count
+
+    bra = Team.create!( key: 'bra', title: 'Brazil', code: 'BRA', country_id: br.id )
+
+
+    event = Event.find_by_key!( 'world.2014' )
+
+    reader = NationalTeamReader.new( SportDb.test_data_path )
+    reader.read( 'world-cup/2014/squads/br-brazil', country_id: br.id, event_id: event.id )
+
+    assert_equal 23, Roster.count
+  end  # method test_br
+
+
+  def test_de
+    de  = Country.create!( key: 'de', title: 'Germany', code: 'GER', pop: 1, area: 1)
+
+    ## read persons
+    personreader = PersonReader.new( SportDb.test_data_path )
+    personreader.read( 'players/europe/de-deutschland/players', country_id: de.id ) 
+
+    assert_equal 27, Person.count
+
+    ger = Team.create!( key: 'ger', title: 'Germany', code: 'GER', country_id: de.id )
+
+    event = Event.find_by_key!( 'world.2014' )
+
+    reader = NationalTeamReader.new( SportDb.test_data_path )
+    reader.read( 'world-cup/2014/squads/de-deutschland', country_id: de.id, event_id: event.id )
+
+    assert_equal 3, Roster.count
+  end  # method test_de
+
+
+end # class TestNationalTeamReader

metadata

@@ -1,183 +1,148 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.23
+  version: 1.8.24
+  prerelease: 
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77540830 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *77540830
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77563220 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *77563220
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77562470 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *77562470
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77561520 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.2
+  version_requirements: *77561520
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77560760 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *77560760
 - !ruby/object:Gem::Dependency
   name: persondb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77558250 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *77558250
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77556820 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *77556820
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77346810 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.3'
+  version_requirements: *77346810
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77369960 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.5.6
+  version_requirements: *77369960
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77271920 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *77271920
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77265060 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
+  version_requirements: *77265060
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77283630 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
+  version_requirements: *77283630
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -244,9 +209,10 @@ files:
 - lib/sportdb/readers/game.rb
 - lib/sportdb/readers/ground.rb
 - lib/sportdb/readers/league.rb
+- lib/sportdb/readers/national_team.rb
 - lib/sportdb/readers/race.rb
+- lib/sportdb/readers/race_team.rb
 - lib/sportdb/readers/record.rb
-- lib/sportdb/readers/roster.rb
 - lib/sportdb/readers/season.rb
 - lib/sportdb/readers/team.rb
 - lib/sportdb/readers/track.rb
@@ -300,6 +266,8 @@ files:
 - test/data/at-austria/leagues.txt
 - test/data/at-austria/teams.txt
 - test/data/at-austria/teams_2.txt
+- test/data/players/europe/de-deutschland/players.txt
+- test/data/players/south-america/br-brazil/players.txt
 - test/data/world-cup/1930/cup.txt
 - test/data/world-cup/1930/cup.yml
 - test/data/world-cup/1954/cup.txt
@@ -310,6 +278,10 @@ files:
 - test/data/world-cup/1974/cup_finals.txt
 - test/data/world-cup/1974/cup_i.txt
 - test/data/world-cup/1974/cup_ii.txt
+- test/data/world-cup/2014/cup.txt
+- test/data/world-cup/2014/cup.yml
+- test/data/world-cup/2014/squads/br-brazil.txt
+- test/data/world-cup/2014/squads/de-deutschland.txt
 - test/data/world-cup/leagues.txt
 - test/data/world-cup/seasons_1930.txt
 - test/data/world-cup/seasons_1954.txt
@@ -324,6 +296,8 @@ files:
 - test/test_cursor.rb
 - test/test_date.rb
 - test/test_lang.rb
+- test/test_load.rb
+- test/test_national_team_reader.rb
 - test/test_reader.rb
 - test/test_round_auto.rb
 - test/test_round_def.rb
@@ -335,7 +309,6 @@ files:
 homepage: https://github.com/geraldb/sport.db.ruby
 licenses:
 - Public Domain
-metadata: {}
 post_install_message: ! '******************************************************************************
 
 
@@ -353,30 +326,34 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 1.8.17
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: sportdb - sport.db command line tool
 test_files:
-- test/test_changes.rb
-- test/test_cursor.rb
 - test/test_date.rb
 - test/test_lang.rb
-- test/test_reader.rb
-- test/test_round_auto.rb
-- test/test_round_def.rb
-- test/test_round_header.rb
+- test/test_load.rb
+- test/test_cursor.rb
 - test/test_scores.rb
-- test/test_utils.rb
 - test/test_winner.rb
+- test/test_round_def.rb
+- test/test_utils.rb
+- test/test_round_header.rb
+- test/test_round_auto.rb
+- test/test_national_team_reader.rb
+- test/test_reader.rb
+- test/test_changes.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 7aa8a4205419c3506fc1527e6cf45ca56d4bfcb8
-  data.tar.gz: bed9fcb72a3f0f931048afb1c348f4d24a224dc0
-SHA512:
-  metadata.gz: 2b16a61eb98bd836272199997275f8dd08989bb2501a8939c961208367566ab8a99cb4198f563b027249523f6ad247a781a65a6f6a0602ae6b7b9ed5b17082cd
-  data.tar.gz: 167a8ec86e1b0f8069e6f02ae7eff72fb9acc08ee1b31222d1786f4d3d3f80e55a625f4b50c377528ac57607932edf216964225caffb254adf8e52cacff53ce2