sportdb 1.9.7 → 1.9.8

data/Manifest.txt

@@ -60,7 +60,8 @@ lib/sportdb/readers/game.rb
 lib/sportdb/readers/ground.rb
 lib/sportdb/readers/league.rb
 lib/sportdb/readers/season.rb
-lib/sportdb/readers/squad.rb
+lib/sportdb/readers/squad_club.rb
+lib/sportdb/readers/squad_national_team.rb
 lib/sportdb/readers/team.rb
 lib/sportdb/schema.rb
 lib/sportdb/standings.rb
@@ -79,6 +80,8 @@ test/data/at-austria/2013_14/bl.yml
 test/data/at-austria/2013_14/bl_ii.txt
 test/data/at-austria/2013_14/el.txt
 test/data/at-austria/2013_14/el.yml
+test/data/at-austria/2013_14/squads/austria.txt
+test/data/at-austria/2013_14/squads/salzburg.txt
 test/data/at-austria/leagues.txt
 test/data/at-austria/teams.txt
 test/data/at-austria/teams_2.txt
@@ -88,6 +91,7 @@ test/data/national-teams/europe/teams.txt
 test/data/national-teams/north-america/assocs.txt
 test/data/national-teams/north-america/teams.txt
 test/data/national-teams/teams.txt
+test/data/players/europe/at-austria/players.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
@@ -131,7 +135,8 @@ test/test_round_auto.rb
 test/test_round_def.rb
 test/test_round_header.rb
 test/test_scores.rb
-test/test_squad_reader.rb
+test/test_squad_club_reader.rb
+test/test_squad_national_team_reader.rb
 test/test_standings.rb
 test/test_standings_ii.rb
 test/test_utils.rb

data/lib/sportdb.rb

@@ -95,7 +95,8 @@ require 'sportdb/readers/game'
 require 'sportdb/readers/ground'
 require 'sportdb/readers/league'
 require 'sportdb/readers/season'
-require 'sportdb/readers/squad'    # roster
+require 'sportdb/readers/squad_club'    # roster
+require 'sportdb/readers/squad_national_team'
 require 'sportdb/readers/team'
 require 'sportdb/reader'
 

data/lib/sportdb/reader.rb

@@ -42,6 +42,12 @@ class Reader
             reader = PersonDb::PersonReader.new( include_path )
             reader.read( name, country_id: country.id )
           end
+    elsif name =~ /\/squads\/([a-z0-9]{3,})$/    # e.g. ajax.txt bayern.txt etc.
+      ## note: for now assume club (e.g. no dash (-) allowed for country code e.g. br-brazil etc.)
+      team = Team.find_by_key!( $1 )
+      ## note: pass in @event.id - that is, last seen event (e.g. parsed via GameReader/MatchReader)
+      reader = ClubSquadReader.new( include_path )
+      reader.read( name, team_id: team.id, event_id: @event.id )
     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
@@ -54,16 +60,17 @@ class Reader
       ##      not country code (allows multiple teams per country)
 
       if $1.length == 2
+        ## get national team via country
         country = Country.find_by_key!( $1 )
         ###  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}"
         team = Team.find_by_key!( country.code.downcase )
       else  # assume length == 3
+        ## get national team directly (use three letter fifa code)
         team = Team.find_by_key!( $1 )
       end
-
-      reader = SquadReader.new( include_path )
       ## note: pass in @event.id - that is, last seen event (e.g. parsed via GameReader/MatchReader)
+      reader = NationalTeamSquadReader.new( include_path )
       reader.read( name, team_id: team.id, event_id: @event.id )
     elsif name =~ /(?:^|\/)seasons/  # NB: ^seasons or also possible at-austria!/seasons
       reader = SeasonReader.new( include_path )

data/lib/sportdb/readers/squad_club.rb

@@ -0,0 +1,194 @@
+# encoding: UTF-8
+
+
+module SportDb
+
+###
+#  todo/fix: use one squad reader for
+#    national teams and clubs? possible? why? why not?
+
+
+class ClubSquadReader
+
+  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={} )
+    ## note:
+    #    event_id and team_id required!!
+
+    ## todo: move name_real_path code to LineReaderV2 ????
+    pos = name.index( '!/')
+    if pos.nil?
+      name_real_path = name   # not found; real path is the same as name
+    else
+      # cut off everything until !/ e.g.
+      #   at-austria!/w-wien/beers becomes
+      #   w-wien/beers
+      name_real_path = name[ (pos+2)..-1 ]
+    end
+
+    path = "#{include_path}/#{name_real_path}.txt"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    # event
+    @event = Event.find( more_attribs[:event_id] )
+    pp @event
+
+    ## note: use @team - share/use in worker method
+    @team = Team.find( more_attribs[:team_id] )
+    pp @team
+
+    ### SportDb.lang.lang = LangChecker.new.analyze( name, include_path )
+
+    ## mapping tables for persons per country (indexed by country code); reset
+    @country_persons_cache = {}
+
+    reader = LineReader.new( path )
+
+    read_worker( reader )
+
+    Prop.create_from_fixture!( name, path )  
+  end
+
+
+  def read_worker( reader )
+    ##
+    ## fix: use num (optional) for offical jersey number
+    #  use pos for internal use only (ordering)
+
+    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_num!( line )
+
+      if pos.nil?
+        pos_counter+=1       ## e.g. 999001,999002 etc.
+        pos = pos_counter
+      end
+
+      nationality = find_nationality!( line )  # e.g. ARG,AUT,USA,MEX etc. (three-letter country code)
+
+      if nationality.nil?
+        ## note: use/assume team's nationality is player's nationality
+        nationality = @team.country.code
+      end
+
+      ## note: for now allow lines w/ missing country records in db (used in unit tests)
+      country = Country.find_by_code( nationality )
+      if country.nil?
+        logger.warn "*** no country found for code >#{nationality}< in line: >#{line}<"
+        person_key = nil   ## no country, no mapping table - canNOT map person
+      else
+        ## try mapping person using country table
+        ##   cache mapping table by country code
+
+        country_persons = @country_persons_cache[ country.code ]
+        if country_persons.nil?
+          logger.info "  persons count for country (#{country.code}): #{country.persons.count}"
+          country_persons = TextUtils.build_title_table_for( country.persons )
+          @country_persons_cache[ country.code ] = country_persons   # cache mapping table
+        end
+
+         map_person!( line, country_persons )
+         person_key = find_person!( line )
+      end
+
+
+      logger.debug "  line2: >#{line}<"
+
+      if person_key.nil?
+        ## no person match found; try auto-add person
+        logger.info "  !! no player match found; try auto-create player"
+
+        buf = line.clone
+        # remove (single match) if line starts w/ - (allow spaces)  e.g. | - or |-  note: must start line e.g. anchor ^ used
+        buf = buf.sub( /^[ ]*-[ ]*/, '' )    # remove leading dash -  for jersey number n/a
+        buf = buf.gsub( /\[[^\]]+\]/, '' )         # remove [POS] or similar
+        buf = buf.sub( '(c)', '' )    # remove captain marker
+        buf = buf.sub( '(vc)', '' )   # remove vice-captain marker
+        ### note: uses sub; assumes one pos marker per line
+        buf = buf.sub( /\b(GK|DF|MF|FW)\b/, '' )   # remove position marker
+        # since year/date  e.g. 2011-  assume one per line
+        #   note: use (?= |$) lookahead e.g. must be followed by space or end-of-line
+        buf = buf.sub( /\b\d{4}-?(?= |$)/, '' )
+        buf = buf.strip   # remove leading and trailing spaces
+
+        ## assume what's left is player name
+        logger.info "   player_name >#{buf}<"
+
+        ## fix: add auto flag (for auto-created persons/players)
+        ## fix: move title_to_key logic to person model etc.
+        person_attribs = {
+               key:   TextUtils.title_to_key( buf ),
+               title: buf
+        }
+
+        # note: add country from team or nationality marker
+        if country
+          person_attribs[ :country_id     ] = country.id
+          person_attribs[ :nationality_id ] = country.id
+        end
+
+        logger.info "   using attribs: #{person_attribs.inspect}"
+
+        person = Person.create!( person_attribs )
+      else
+        person = Person.find_by_key( person_key )
+
+        if person.nil?
+          logger.error " !!!!!! no mapping found for player in line >#{line}< for team #{@team.code} - #{@team.title}"
+          next   ## skip further processing of line; can NOT save w/o person; continue w/ next record
+        end
+      end
+
+
+      ### 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 ClubSquadReader
+end # module SportDb

data/lib/sportdb/readers/{squad.rb → squad_national_team.rb}

@@ -1,13 +1,11 @@
 # encoding: UTF-8
 
-### fix: change/rename file to squads.rb !!!
-
 
 module SportDb
 
 ### squad/roster reader for national teams for now
 
-class SquadReader
+class NationalTeamSquadReader
 
   include LogUtils::Logging
 
@@ -165,5 +163,5 @@ class SquadReader
   end # method read_worker
 
 
-end # class SquadReader
+end # class NationTeamSquadReader
 end # module SportDb

data/lib/sportdb/utils.rb

@@ -16,15 +16,51 @@ module SportDb
 
   def cut_off_end_of_line_comment!( line )
     #  cut off (that is, remove) optional end of line comment starting w/ #
-    
+
     line.sub!( /#.*$/ ) do |_|
       logger.debug "   cutting off end of line comment - >>#{$&}<<"
       ''
     end
-    
+
     # NB: line = line.sub  will NOT work - thus, lets use line.sub!
   end
 
+
+  def find_nationality!( line )
+    # extract optional nationality - three-letter country code from line e.g.  Lionel Messi (ARG)
+    # and return it
+    # NB: side effect - removes num from line string
+
+    regex = /\(([A-Z]{3})\)/     # e.g. (ARG)
+    if line =~ regex
+      logger.debug "   nationality: >#{$1}<"
+
+      line.sub!( regex, '[NATIONALITY]' )
+      return $1.to_s
+    else
+      return nil
+    end
+  end
+
+
+  def find_leading_num!( line )
+    # extract optional leading num from line   e.g.   9 Lionel Messi
+    # and return it
+    # NB: side effect - removes num from line string
+
+    # e.g.  9  Lionel Messi   - must start line
+    ## note: use lookahead (?=) for trailing spaces - do NOT cosume
+    regex = /^[ \t]*(\d{1,3})(?=[ \t]+)/
+    if line =~ regex
+      logger.debug "   num: >#{$1}<"
+
+      line.sub!( regex, '[NUM]' )
+      return $1.to_i
+    else
+      return nil
+    end
+  end
+
   def find_leading_pos!( line )
     # extract optional game pos from line
     # and return it

data/lib/sportdb/utils_map.rb

@@ -9,17 +9,33 @@ module SportDb
   end
 
   ## todo/fix: pass in known_grounds as a parameter? why? why not?
-  def map_ground!( line )
-    TextUtils.map_titles_for!( 'ground', line, @known_grounds )
+  ### todo/fix:
+  ##    remove =nil in para - make param required w/o fallback
+
+  def map_ground!( line, known_grounds=nil )
+    if known_grounds.nil?
+      puts "depreciated API call map_ground! (pass in mapping table as 2nd param)"
+      known_grounds = @known_grounds
+    end
+
+    TextUtils.map_titles_for!( 'ground', line, known_grounds )
   end
 
 
+
   def find_person!( line )
     TextUtils.find_key_for!( 'person', line )
   end
 
-  def map_person!( line )
-    TextUtils.map_titles_for!( 'person', line, @known_persons)
+  ### todo/fix:
+  ##    remove =nil in para - make param required w/o fallback
+  def map_person!( line, known_persons=nil )
+    if known_persons.nil?
+      puts "depreciated API call map_person! (pass in mapping table as 2nd param)"
+      known_persons = @known_persons
+    end
+    
+    TextUtils.map_titles_for!( 'person', line, known_persons )
   end
 
 

data/lib/sportdb/version.rb

@@ -3,7 +3,7 @@ module SportDb
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
   MINOR = 9
-  PATCH = 7
+  PATCH = 8
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/data/at-austria/2013_14/squads/austria.txt

@@ -0,0 +1,40 @@
+#################
+# Austria Wien
+
+#
+#  sources:
+#    de.wikipedia.org/wiki/FK_Austria_Wien#Bundesligamannschaft
+
+
+13  Heinz Lindner             GK   2009- ##  AKA Austria Wien
+31  Osman Hadzikić  (BIH)     GK   2014- ##  Schwechat
+77  Tino Casali               GK   2014- ##  AKA Kärnten
+
+4   Vanče Šikov         (MKD)   DF   2014-    ##  Volyn Lutsk
+5   Philipp Koblischek          DF   2014-    ##  Austria Amat. 
+8   Jens Stryger Larsen (DEN)   DF   2014-    ##  FC Nordsjælland
+14  Manuel Ortlechner           DF   2009-    ## Austria Kärnten
+15  Christian Ramsebner         DF   2013-   ##  Wr Neustadt
+18  Sebastian Wimmer            DF   2014-   ## LASK Linz
+29  Markus Suttner              DF   2008-   ##  Austria Amat.
+30  Fabian Koch                 DF   2011-   ##   Wacker Innsbruck
+39  Petar Gluhaković            DF           ##   First Vienna      -- check missing ???????
+
+6   Mario Leitgeb               MF  2014-    ##  Grödig
+7   Marco Meilinger             MF  2014-    ##  RB Salzburg
+10  Alexander Grünwald          MF  2011-    ##  Wr Neustadt
+17  Florian Mader               MF  2010-    ##   SV Ried
+20  Alexander Gorgon            MF  2010-    ##  Austria Amat. 
+21  Sascha Horvath              MF  2013-    ## Austria Amat.
+22  Bernhard Luxbacher          MF  2013-    ##  Stadlau
+23  David de Paula  (ESP)       MF  2014-    ## Wolfsberger AC
+25  James Holland  (AUS)        MF  2012-    ##   AZ Alkmaar
+28  Daniel Royer                MF  2013-    ##  Hannover 96   -- check -- 1. FC Köln ??
+34  Peter Michorl               MF  2014-    ##  Austria Amat.
+35  Thomas Salamon              MF  2014-    ##  SV Grödig
+36  Tarkan Serbest              MF           ##  Donau         -- check missing ???????
+
+9   Martin Harrer               FW  2014-    ##  Köflach   -- check SCR Altach
+11  Ola Kamara  (NOR)           FW  2014-    ##  SV Ried      -- check Strömsgodset IF
+24  Roman Kienast               FW  2012-    ##  Sturm Graz
+

data/test/data/at-austria/2013_14/squads/salzburg.txt

@@ -0,0 +1,35 @@
+#############################
+# FC RB Salzburg
+
+
+31  Péter Gulácsi (HUN)     GK  2013-  ##  Liverpool
+33  Alexander Walke (GER)   GK  2011-  ## Hansa Rostock
+40  Fabian Bredlow (GER)    GK  2014-  ##   RB Leipzig
+
+2   Benno Schmitz (GER)        DF 2014-   ## Bayern München
+4   Peter Ankersen (DEN)       DF 2014-   ## Esbjerg Esbjerg
+5   André Ramalho (BRA)        DF 2011-   ## RB Brasil
+6   Christian Schwegler (SUI)  DF 2009-   ##  Young Boys
+15  Franz Schiemer             DF 2009-   ## Austria Vienna
+17  Andreas Ulmer              DF 2009-   ## SV Ried
+25  Isaac Vorsah (GHA)         DF 2012-   ## 1899 Hoffenheim
+28  Asger Sørensen (DEN)       DF 2014-   ##  FC Midtjylland
+29  Rodnei (BRA)               DF 2012-   ## Kaiserslautern
+36  Martin Hinteregger         DF 2010-   ## RB Juniors
+
+10  Sadio Mané (SEN)           MF 2012-  ##  Metz                ## check not FW ???
+13  Stefan Ilsanker            MF 2012-  ## Mattersburg
+14  Valon Berisha (NOR)        MF 2012-  ## Viking
+21  Taxiarchis Fountas (GRE)   MF 2013-  ## AEK
+24  Christoph Leitgeb          MF 2007-  ## Sturm Graz
+30  Jodel Dossou (BEN)         MF        ## Club Africain   -- check missing ??
+37  Valentino Lazaro           MF 2012-   ## Grazer AK
+44  Kevin Kampl (SVN)          MF 2012-  ##  VfR Aalen
+77  Massimo Bruno (BEL)        MF 2014-  ## RSC Anderlecht
+
+7   Marcel Sabitzer          FW  2014- ## RB Leipzig
+19  Yordi Reyna (PER)        FW        ##  Alianza Lima    -- check missing ??
+23  Robert Žulj              FW        ## SV Ried          -- check missing ??
+26  Jonathan Soriano (ESP)   FW  2012-  ##  Barcelona B
+27  Alan (BRA)               FW  2010-  ## Fluminense
+

data/test/data/players/europe/at-austria/players.txt

@@ -0,0 +1,45 @@
+###################################
+# Austria / Österreich
+
+
+### GK Goalkeepers
+
+Heinz Lindner,  8 Jan 1988
+Tino Casali,  8 Jan 1988
+
+### DF Defenders
+
+Philipp Koblischek,  8 Jan 1988
+Manuel Ortlechner,  8 Jan 1988
+Christian Ramsebner,  8 Jan 1988
+Sebastian Wimmer,  8 Jan 1988
+Markus Suttner,  8 Jan 1988
+Fabian Koch,  8 Jan 1988
+Petar Gluhakovićsing,  8 Jan 1988
+Franz Schiemer,  8 Jan 1988
+Andreas Ulmer,  8 Jan 1988
+Martin Hinteregger,  8 Jan 1988
+
+### MF Midfielders
+
+Mario Leitgeb,  8 Jan 1988
+Marco Meilinger,  8 Jan 1988
+Alexander Grünwald,  8 Jan 1988
+Florian Mader,  8 Jan 1988
+Alexander Gorgon,  8 Jan 1988
+Sascha Horvath,  8 Jan 1988
+Bernhard Luxbacher,  8 Jan 1988
+Daniel Royer,  8 Jan 1988
+Peter Michorl,  8 Jan 1988
+Thomas Salamon,  8 Jan 1988
+Tarkan Serbest,  8 Jan 1988
+Stefan Ilsanker,  8 Jan 1988
+Christoph Leitgeb,  8 Jan 1988
+Valentino Lazaro,  8 Jan 1988
+
+### FM Forwards
+
+Martin Harrer,  8 Jan 1988
+Roman Kienast,  8 Jan 1988
+Marcel Sabitzer,  8 Jan 1988
+Robert Žulj,  8 Jan 1988

data/test/helper.rb

@@ -45,14 +45,15 @@ AlltimeStandingEntry = SportDb::Model::AlltimeStandingEntry
 ####################
 # Reader shortcuts
 
-Reader             = SportDb::Reader
-TeamReader         = SportDb::TeamReader
-AssocReader        = SportDb::AssocReader
-SeasonReader       = SportDb::SeasonReader
-LeagueReader       = SportDb::LeagueReader
-EventReader        = SportDb::EventReader
-GameReader         = SportDb::GameReader
-SquadReader        = SportDb::SquadReader
+Reader                  = SportDb::Reader
+TeamReader              = SportDb::TeamReader
+AssocReader             = SportDb::AssocReader
+SeasonReader            = SportDb::SeasonReader
+LeagueReader            = SportDb::LeagueReader
+EventReader             = SportDb::EventReader
+GameReader              = SportDb::GameReader
+NationalTeamSquadReader = SportDb::NationalTeamSquadReader
+ClubSquadReader         = SportDb::ClubSquadReader
 
 ## moved to racing.db  - remove/delete!!
 ## RaceTeamReader     = SportDb::RaceTeamReader

data/test/test_squad_club_reader.rb

@@ -0,0 +1,76 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_squad_club_reader.rb
+#  or better
+#     rake -I ./lib test
+
+
+require 'helper'
+
+class TestSquadClubReader < MiniTest::Unit::TestCase
+
+  def setup
+    WorldDb.delete!
+    SportDb.delete!
+    PersonDb.delete!
+
+    add_bl
+  end
+
+  def add_bl
+    SportDb.read_builtin   # add 2013/14 season
+
+    at = Country.create!( key: 'at', name: 'Austria', code: 'AUT', pop: 1, area: 1)
+    
+    teamreader = TeamReader.new( SportDb.test_data_path )
+    teamreader.read( 'at-austria/teams',   country_id: at.id )
+
+    leaguereader = LeagueReader.new( SportDb.test_data_path )
+    leaguereader.read( 'at-austria/leagues', country_id: at.id )
+
+    gamereader = GameReader.new( SportDb.test_data_path )
+    ## check/fix: is country_id more_attribs needed? why? why not?
+    gamereader.read( 'at-austria/2013_14/bl', country_id: at.id )
+
+    bl = Event.find_by_key!( 'at.2013/14' )
+
+    assert_equal  10, bl.teams.count
+    assert_equal  36, bl.rounds.count
+    assert_equal 180, bl.games.count  # 36x5 = 180
+    
+    ## add players
+    ## -- read persons
+    personreader = PersonReader.new( SportDb.test_data_path )
+    personreader.read( 'players/europe/at-austria/players', country_id: at.id ) 
+
+    assert_equal 30, Person.count
+  end
+
+
+  def test_austria
+    austria = Team.find_by_key!( 'austria' )
+
+    event = Event.find_by_key!( 'at.2013/14' )
+
+    reader = ClubSquadReader.new( SportDb.test_data_path )
+    reader.read( 'at-austria/2013_14/squads/austria', team_id: austria.id, event_id: event.id )
+
+    assert_equal 28, Roster.count
+  end  # method test_br
+
+
+  def test_salzburg
+    salzburg = Team.find_by_key!( 'salzburg' )
+
+    event = Event.find_by_key!( 'at.2013/14' )
+
+    reader = ClubSquadReader.new( SportDb.test_data_path )
+    reader.read( 'at-austria/2013_14/squads/salzburg', team_id: salzburg.id, event_id: event.id )
+
+    assert_equal 27, Roster.count
+  end  # method test_salzburg
+
+
+end # class TestSquadClubReader

data/test/{test_squad_reader.rb → test_squad_national_team_reader.rb}

@@ -2,14 +2,14 @@
 
 ###
 #  to run use
-#     ruby -I ./lib -I ./test test/test_squad_reader.rb
+#     ruby -I ./lib -I ./test test/test_squad_national_team_reader.rb
 #  or better
 #     rake -I ./lib test
 
 
 require 'helper'
 
-class TestSquadReader < MiniTest::Unit::TestCase
+class TestSquadNationalTeamReader < MiniTest::Unit::TestCase
 
   def setup
     WorldDb.delete!
@@ -50,7 +50,7 @@ class TestSquadReader < MiniTest::Unit::TestCase
 
     event = Event.find_by_key!( 'world.2014' )
 
-    reader = SquadReader.new( SportDb.test_data_path )
+    reader = NationalTeamSquadReader.new( SportDb.test_data_path )
     reader.read( 'world-cup/2014/squads/br-brazil', team_id: bra.id, event_id: event.id )
 
     assert_equal 23, Roster.count
@@ -70,7 +70,7 @@ class TestSquadReader < MiniTest::Unit::TestCase
 
     event = Event.find_by_key!( 'world.2014' )
 
-    reader = SquadReader.new( SportDb.test_data_path )
+    reader = NationalTeamSquadReader.new( SportDb.test_data_path )
     reader.read( 'world-cup/2014/squads/de-deutschland', team_id: ger.id, event_id: event.id )
 
     assert_equal 3, Roster.count
@@ -87,7 +87,7 @@ class TestSquadReader < MiniTest::Unit::TestCase
 
     event = Event.find_by_key!( 'world.2014' )
 
-    reader = SquadReader.new( SportDb.test_data_path )
+    reader = NationalTeamSquadReader.new( SportDb.test_data_path )
     reader.read( 'world-cup/2014/squads/uy-uruguay', team_id: uru.id, event_id: event.id )
 
     assert_equal 23, Roster.count
@@ -105,7 +105,7 @@ class TestSquadReader < MiniTest::Unit::TestCase
 
     event = Event.find_by_key!( 'world.2014' )
 
-    reader = SquadReader.new( SportDb.test_data_path )
+    reader = NationalTeamSquadReader.new( SportDb.test_data_path )
     reader.read( 'world-cup/2014/squads/jp-japan', team_id: jpn.id, event_id: event.id )
 
     assert_equal 23, Roster.count
@@ -113,4 +113,4 @@ class TestSquadReader < MiniTest::Unit::TestCase
   end  # method test_jp
 
 
-end # class TestSquadReader
+end # class TestSquadNationalTeamReader

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.9.7
+  version: 1.9.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-07 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &77817680 !ruby/object:Gem::Requirement
+  requirement: &76904160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77817680
+  version_requirements: *76904160
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &77813970 !ruby/object:Gem::Requirement
+  requirement: &76903770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77813970
+  version_requirements: *76903770
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &77813710 !ruby/object:Gem::Requirement
+  requirement: &76902910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77813710
+  version_requirements: *76902910
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &77813330 !ruby/object:Gem::Requirement
+  requirement: &76902380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *77813330
+  version_requirements: *76902380
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &77813120 !ruby/object:Gem::Requirement
+  requirement: &76902160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77813120
+  version_requirements: *76902160
 - !ruby/object:Gem::Dependency
   name: persondb
-  requirement: &77812860 !ruby/object:Gem::Requirement
+  requirement: &76901930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77812860
+  version_requirements: *76901930
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: &77812640 !ruby/object:Gem::Requirement
+  requirement: &76901680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77812640
+  version_requirements: *76901680
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &77812360 !ruby/object:Gem::Requirement
+  requirement: &76901360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *77812360
+  version_requirements: *76901360
 - !ruby/object:Gem::Dependency
   name: sportdb-keys
-  requirement: &77812160 !ruby/object:Gem::Requirement
+  requirement: &76901140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77812160
+  version_requirements: *76901140
 - !ruby/object:Gem::Dependency
   name: sportdb-console
-  requirement: &77811880 !ruby/object:Gem::Requirement
+  requirement: &76900930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77811880
+  version_requirements: *76900930
 - !ruby/object:Gem::Dependency
   name: sportdb-update
-  requirement: &77811590 !ruby/object:Gem::Requirement
+  requirement: &76900490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77811590
+  version_requirements: *76900490
 - !ruby/object:Gem::Dependency
   name: sportdb-service
-  requirement: &77811170 !ruby/object:Gem::Requirement
+  requirement: &76900190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77811170
+  version_requirements: *76900190
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &77810710 !ruby/object:Gem::Requirement
+  requirement: &76899670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *77810710
+  version_requirements: *76899670
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &77809990 !ruby/object:Gem::Requirement
+  requirement: &76899430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77809990
+  version_requirements: *76899430
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77809630 !ruby/object:Gem::Requirement
+  requirement: &76898960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *77809630
+  version_requirements: *76898960
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &77809350 !ruby/object:Gem::Requirement
+  requirement: &76887310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,7 +186,7 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *77809350
+  version_requirements: *76887310
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -259,7 +259,8 @@ files:
 - lib/sportdb/readers/ground.rb
 - lib/sportdb/readers/league.rb
 - lib/sportdb/readers/season.rb
-- lib/sportdb/readers/squad.rb
+- lib/sportdb/readers/squad_club.rb
+- lib/sportdb/readers/squad_national_team.rb
 - lib/sportdb/readers/team.rb
 - lib/sportdb/schema.rb
 - lib/sportdb/standings.rb
@@ -278,6 +279,8 @@ files:
 - test/data/at-austria/2013_14/bl_ii.txt
 - test/data/at-austria/2013_14/el.txt
 - test/data/at-austria/2013_14/el.yml
+- test/data/at-austria/2013_14/squads/austria.txt
+- test/data/at-austria/2013_14/squads/salzburg.txt
 - test/data/at-austria/leagues.txt
 - test/data/at-austria/teams.txt
 - test/data/at-austria/teams_2.txt
@@ -287,6 +290,7 @@ files:
 - test/data/national-teams/north-america/assocs.txt
 - test/data/national-teams/north-america/teams.txt
 - test/data/national-teams/teams.txt
+- test/data/players/europe/at-austria/players.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
@@ -330,7 +334,8 @@ files:
 - test/test_round_def.rb
 - test/test_round_header.rb
 - test/test_scores.rb
-- test/test_squad_reader.rb
+- test/test_squad_club_reader.rb
+- test/test_squad_national_team_reader.rb
 - test/test_standings.rb
 - test/test_standings_ii.rb
 - test/test_utils.rb
@@ -379,16 +384,17 @@ test_files:
 - test/test_load.rb
 - test/test_cursor.rb
 - test/test_standings.rb
+- test/test_squad_club_reader.rb
 - test/test_scores.rb
 - test/test_winner.rb
 - test/test_standings_ii.rb
 - test/test_round_def.rb
 - test/test_utils.rb
-- test/test_squad_reader.rb
 - test/test_reader_from_string.rb
 - test/test_round_header.rb
 - test/test_round_auto.rb
 - test/test_goals.rb
+- test/test_squad_national_team_reader.rb
 - test/test_reader.rb
 - test/test_assoc_reader.rb
 - test/test_changes.rb