sportdb 1.9.8 → 1.9.9

data/test/helper.rb

@@ -3,7 +3,6 @@
 
 ## minitest setup
 
-# require 'minitest/unit'
 require 'minitest/autorun'
 
 
@@ -60,6 +59,60 @@ ClubSquadReader         = SportDb::ClubSquadReader
 
 PersonReader       = PersonDb::PersonReader
 
+######
+# New Reader ShortCuts
+
+module TestTeamReader
+  def self.from_file( name, more_attribs={} )
+    TeamReader.from_file( "#{SportDb.test_data_path}/#{name}.txt", more_attribs )
+  end
+end
+
+module TestClubSquadReader
+  def self.from_file( name, more_attribs={} )
+    ClubSquadReader.from_file( "#{SportDb.test_data_path}/#{name}.txt", more_attribs )
+  end
+end
+
+module TestNationalTeamSquadReader
+  def self.from_file( name, more_attribs={} )
+    NationalTeamSquadReader.from_file( "#{SportDb.test_data_path}/#{name}.txt", more_attribs )
+  end
+end
+
+module TestLeagueReader
+  def self.from_file( name, more_attribs={} )
+    LeagueReader.from_file( "#{SportDb.test_data_path}/#{name}.txt", more_attribs )
+  end
+end
+
+module TestSeasonReader
+  def self.from_file( name )
+    SeasonReader.from_file( "#{SportDb.test_data_path}/#{name}.txt" )
+  end
+end
+
+module TestEventReader
+  def self.from_file( name )
+    EventReader.from_file( "#{SportDb.test_data_path}/#{name}.yml" )
+  end
+end
+
+module TestGameReader
+  ## NOTE: pass in .yml as path (that is, event config!!!!)
+  def self.from_file( name, more_attribs={} )
+    GameReader.from_file( "#{SportDb.test_data_path}/#{name}.yml", more_attribs )
+  end
+end
+
+module TestAssocReader
+  def self.from_file( name )
+    AssocReader.from_file( "#{SportDb.test_data_path}/#{name}.txt" )
+  end
+end
+
+
+
 #################################
 # setup db -> schema / tables
 

data/test/test_assoc_reader.rb

@@ -9,7 +9,7 @@
 
 require 'helper'
 
-class TestAssocReader < MiniTest::Unit::TestCase
+class TestAssocReaderXX < MiniTest::Test    # note: TestAssocReader alreay defined, thus, add xx
 
   def setup
     WorldDb.delete!
@@ -79,8 +79,8 @@ class TestAssocReader < MiniTest::Unit::TestCase
 
 
   def test_assocs
-    reader = AssocReader.new( SportDb.test_data_path )
-    reader.read( 'national-teams/assocs' )
+    reader = TestAssocReader.from_file( 'national-teams/assocs' )
+    reader.read()
 
     assert_equal 20, Assoc.count
 
@@ -124,7 +124,8 @@ class TestAssocReader < MiniTest::Unit::TestCase
     ca = Country.create!( key: 'ca', name: 'Canada', code: 'CAN', pop: 1, area: 1)
     us = Country.create!( key: 'us', name: 'United States', code: 'USA', pop: 1, area: 1)
 
-    reader.read( 'national-teams/north-america/assocs' )
+    reader = TestAssocReader.from_file( 'national-teams/north-america/assocs' )
+    reader.read()
 
     assert_equal 23, Assoc.count
 
@@ -148,8 +149,8 @@ class TestAssocReader < MiniTest::Unit::TestCase
 
 
   def test_teams
-    assocreader = AssocReader.new( SportDb.test_data_path )
-    assocreader.read( 'national-teams/assocs' )
+    assocreader = TestAssocReader.from_file( 'national-teams/assocs' )
+    assocreader.read()
 
     assert_equal 20, Assoc.count
     
@@ -172,12 +173,13 @@ class TestAssocReader < MiniTest::Unit::TestCase
                        area: 1)
     end
 
-    teamreader = TeamReader.new( SportDb.test_data_path )
-    teamreader.read( 'national-teams/teams' )
-    teamreader.read( 'national-teams/north-america/teams' )
+    teamreader = TestTeamReader.from_file( 'national-teams/teams' )
+    teamreader.read()
+    teamreader = TestTeamReader.from_file( 'national-teams/north-america/teams' )
+    teamreader.read()
 
     assert_equal 9, Team.count
-    
+
     ## fifa = Assoc.find_by_key!( 'fifa' )
     ## assert_equal 7, fifa.teams.count
 

data/test/test_changes.rb

@@ -2,7 +2,7 @@
 
 require 'helper'
 
-class TestChanges < MiniTest::Unit::TestCase
+class TestChanges < MiniTest::Test
 
   def test_scores
     game1 = Game.new

data/test/test_cursor.rb

@@ -2,7 +2,7 @@
 
 require 'helper'
 
-class TestCursor < MiniTest::Unit::TestCase
+class TestCursor < MiniTest::Test
 
   def test_games
     games = []

data/test/test_date.rb

@@ -6,7 +6,7 @@
 
 require 'helper'
 
-class TestDate < MiniTest::Unit::TestCase
+class TestDate < MiniTest::Test
 
   def test_date
     data = [

data/test/test_goals.rb

@@ -9,7 +9,7 @@
 
 require 'helper'
 
-class TestGoals < MiniTest::Unit::TestCase
+class TestGoals < MiniTest::Test
 
   def setup
     WorldDb.delete!
@@ -69,13 +69,13 @@ class TestGoals < MiniTest::Unit::TestCase
 
 
   def test_world_cup_1930
-    teamreader = TeamReader.new( SportDb.test_data_path )
-    teamreader.read( 'world-cup/teams_1930' )
+    teamreader = TestTeamReader.from_file( 'world-cup/teams_1930' )
+    teamreader.read()
 
     assert_equal  13, Team.count
 
-    seasonreader = SeasonReader.new( SportDb.test_data_path )
-    seasonreader.read( 'world-cup/seasons_1930')
+    seasonreader = TestSeasonReader.from_file( 'world-cup/seasons_1930' )
+    seasonreader.read()
 
     assert_equal 1, Season.count
 
@@ -83,8 +83,8 @@ class TestGoals < MiniTest::Unit::TestCase
     assert_equal '1930', y.title
 
 
-    leaguereader = LeagueReader.new( SportDb.test_data_path )
-    leaguereader.read( 'world-cup/leagues' )
+    leaguereader = TestLeagueReader.from_file( 'world-cup/leagues' )
+    leaguereader.read()
 
     assert_equal 1, League.count
 
@@ -92,8 +92,8 @@ class TestGoals < MiniTest::Unit::TestCase
     assert_equal 'World Cup', l.title
 
 
-    gamereader = GameReader.new( SportDb.test_data_path )
-    gamereader.read( 'world-cup/1930/cup_goals' )
+    gamereader = TestGameReader.from_file( 'world-cup/1930/cup_goals' )
+    gamereader.read()
 
     assert_equal 1, Event.count
 

data/test/test_lang.rb

@@ -8,7 +8,7 @@
 
 require 'helper'
 
-class TestLang < MiniTest::Unit::TestCase
+class TestLang < MiniTest::Test
 
   def test_getters
 

data/test/test_load.rb

@@ -9,7 +9,7 @@
 
 require 'helper'
 
-class TestLoad < MiniTest::Unit::TestCase
+class TestLoad < MiniTest::Test
 
   def setup
     WorldDb.delete!
@@ -26,8 +26,8 @@ class TestLoad < MiniTest::Unit::TestCase
     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( 'players/south-america/br-brazil/players' )
+    ## assert_equal 30, Person.count
 
     reader.load( 'world-cup/leagues' )
     assert_equal 1, League.count
@@ -45,8 +45,8 @@ class TestLoad < MiniTest::Unit::TestCase
 
     reader = Reader.new( SportDb.test_data_path ) 
 
-    reader.load( 'players/europe/de-deutschland/players' )
-    assert_equal 27, Person.count
+    ## reader.load( 'players/europe/de-deutschland/players' )
+    ## assert_equal 27, Person.count
 
     reader.load( 'world-cup/leagues' )
     assert_equal 1, League.count

data/test/test_reader.rb

@@ -9,7 +9,7 @@
 
 require 'helper'
 
-class TestReader < MiniTest::Unit::TestCase
+class TestReader < MiniTest::Test
 
   def setup
     WorldDb.delete!
@@ -19,16 +19,16 @@ class TestReader < MiniTest::Unit::TestCase
 
   def test_bl
     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 )
+    teamreader = TestTeamReader.from_file( 'at-austria/teams', country_id: at.id )
+    teamreader.read()
+
+    leaguereader = TestLeagueReader.from_file( 'at-austria/leagues', country_id: at.id )
+    leaguereader.read()
 
-    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 )
+    gamereader = TestGameReader.from_file( 'at-austria/2013_14/bl', country_id: at.id )
+    gamereader.read()
 
     bl = Event.find_by_key!( 'at.2013/14' )
 
@@ -41,9 +41,10 @@ class TestReader < MiniTest::Unit::TestCase
   def test_game_reader
     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 )
-    teamreader.read( 'at-austria/teams_2', country_id: at.id )
+    teamreader = TestTeamReader.from_file( 'at-austria/teams',   country_id: at.id )
+    teamreader.read()
+    teamreader = TestTeamReader.from_file( 'at-austria/teams_2', country_id: at.id )
+    teamreader.read()
 
     austria = Team.find_by_key!( 'austria' )
     rapid   = Team.find_by_key!( 'rapid' )
@@ -57,8 +58,8 @@ class TestReader < MiniTest::Unit::TestCase
     assert_equal 'RAP', rapid.code
     assert_equal 'STU', sturm.code
 
-    leaguereader = LeagueReader.new( SportDb.test_data_path )
-    leaguereader.read( 'at-austria/leagues', country_id: at.id )
+    leaguereader = TestLeagueReader.from_file( 'at-austria/leagues', country_id: at.id )
+    leaguereader.read()
 
     at1   = League.find_by_key!( 'at' )
     at2   = League.find_by_key!( 'at.2' )
@@ -68,10 +69,11 @@ class TestReader < MiniTest::Unit::TestCase
     assert_equal 'Österr. Erste Liga', at2.title
     assert_equal 'ÖFB Cup', atcup.title
 
-    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 )
-    gamereader.read( 'at-austria/2013_14/el', country_id: at.id )
+    gamereader = TestGameReader.from_file( 'at-austria/2013_14/bl', country_id: at.id )
+    gamereader.read()
+    gamereader = TestGameReader.from_file( 'at-austria/2013_14/el', country_id: at.id )
+    gamereader.read()
 
     bl = Event.find_by_key!( 'at.2013/14' )
     el = Event.find_by_key!( 'at.2.2013/14' )

data/test/test_reader_from_string.rb

@@ -9,7 +9,7 @@
 
 require 'helper'
 
-class TestReaderFromString < MiniTest::Unit::TestCase
+class TestReaderFromString < MiniTest::Test
 
   def setup
     WorldDb.delete!
@@ -20,14 +20,14 @@ class TestReaderFromString < MiniTest::Unit::TestCase
   def test_bl
     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 )
+    teamreader = TestTeamReader.from_file( 'at-austria/teams', country_id: at.id )
+    teamreader.read()
 
-    leaguereader = LeagueReader.new( SportDb.test_data_path )
-    leaguereader.read( 'at-austria/leagues', country_id: at.id )
+    leaguereader = TestLeagueReader.from_file( 'at-austria/leagues', country_id: at.id )
+    leaguereader.read()
 
-    eventreader  = EventReader.new( SportDb.test_data_path )
-    eventreader.read( 'at-austria/2013_14/bl' )
+    eventreader  = TestEventReader.from_file( 'at-austria/2013_14/bl' )
+    eventreader.read()
 
     bl = Event.find_by_key!( 'at.2013/14' )
 
@@ -36,20 +36,25 @@ class TestReaderFromString < MiniTest::Unit::TestCase
     assert_equal   0, bl.games.count  # 36x5 = 180
 
 
+    ## fix: use File.readutf8 ??? why?? why not??
     bl_txt    = File.read( "#{SportDb.test_data_path}/at-austria/2013_14/bl.txt" )
     bl_txt_ii = File.read( "#{SportDb.test_data_path}/at-austria/2013_14/bl_ii.txt" )
 
     text_ary = [bl_txt,bl_txt_ii]
 
-    ## try reading from string -- fix: /tmp is a placeholder/remove
-    gamereader = GameReader.new( '/tmp' )
-    gamereader.read_fixtures_from_string( bl.key, text_ary )
+    gamereader = GameReader.from_string( bl, text_ary )
+    gamereader.read()
+
+    ## fix: add bl.key - allow event_keys too
+    ## gamereader = GameReader.from_string( bl.key, text_ary )
+    ## gamereader.read()
+
 
     assert_equal  36, bl.rounds.count
     assert_equal 180, bl.games.count  # 36x5 = 180
     
     ## check if is stable (update will not create new matches and rounds) on second pass/rerun
-    gamereader.read_fixtures_from_string( bl.key, text_ary )
+    gamereader.read()
 
     assert_equal  36, bl.rounds.count
     assert_equal 180, bl.games.count  # 36x5 = 180
@@ -57,3 +62,4 @@ class TestReaderFromString < MiniTest::Unit::TestCase
 
 
 end # class TestReaderFromString
+

data/test/test_round_auto.rb

@@ -9,7 +9,7 @@
 
 require 'helper'
 
-class TestRoundAuto < MiniTest::Unit::TestCase
+class TestRoundAuto < MiniTest::Test
 
   def setup
     WorldDb.delete!
@@ -69,29 +69,29 @@ class TestRoundAuto < MiniTest::Unit::TestCase
 
 
   def test_world_cup_1974
-    teamreader = TeamReader.new( SportDb.test_data_path )
-    teamreader.read( 'world-cup/teams_1974' )
+    teamreader = TestTeamReader.from_file( 'world-cup/teams_1974' )
+    teamreader.read()
 
     assert_equal  16, Team.count
 
-    seasonreader = SeasonReader.new( SportDb.test_data_path )
-    seasonreader.read( 'world-cup/seasons_1974')
+    seasonreader = TestSeasonReader.from_file( 'world-cup/seasons_1974' )
+    seasonreader.read()
 
     assert_equal 1, Season.count
 
     y = Season.find_by_key!( '1974' )
     assert_equal '1974', y.title
 
-    leaguereader = LeagueReader.new( SportDb.test_data_path )
-    leaguereader.read( 'world-cup/leagues' )
+    leaguereader = TestLeagueReader.from_file( 'world-cup/leagues' )
+    leaguereader.read()
 
     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/1974/cup' )
+    gamereader = TestGameReader.from_file( 'world-cup/1974/cup' )
+    gamereader.read()
 
     assert_equal 1, Event.count
 
@@ -125,8 +125,8 @@ class TestRoundAuto < MiniTest::Unit::TestCase
     #  note: update only works if rounds get not deleted or added
     #  - (adding for updates works only at the end/tail - not at the beginning or inbetween, for example)
 
-    gamereader = GameReader.new( SportDb.test_data_path )
-    gamereader.read( 'world-cup/1974/cup' )
+    gamereader = TestGameReader.from_file( 'world-cup/1974/cup' )
+    gamereader.read()
 
     assert_equal 1, Event.count
 
@@ -142,8 +142,8 @@ class TestRoundAuto < MiniTest::Unit::TestCase
 
 
   def test_world_cup_1954
-    teamreader = TeamReader.new( SportDb.test_data_path )
-    teamreader.read( 'world-cup/teams_1954' )
+    teamreader = TestTeamReader.from_file( 'world-cup/teams_1954' )
+    teamreader.read()
 
     assert_equal  16, Team.count
 
@@ -152,8 +152,8 @@ class TestRoundAuto < MiniTest::Unit::TestCase
       [ 'uru', 'Uruguay', 'URU' ],
       [ 'bel', 'Belgium', 'BEL' ] ] )
 
-    seasonreader = SeasonReader.new( SportDb.test_data_path )
-    seasonreader.read( 'world-cup/seasons_1954')
+    seasonreader = TestSeasonReader.from_file( 'world-cup/seasons_1954' )
+    seasonreader.read()
 
     assert_equal 1, Season.count
 
@@ -161,8 +161,8 @@ class TestRoundAuto < MiniTest::Unit::TestCase
     assert_equal '1954', y.title
 
 
-    leaguereader = LeagueReader.new( SportDb.test_data_path )
-    leaguereader.read( 'world-cup/leagues' )
+    leaguereader = TestLeagueReader.from_file( 'world-cup/leagues' )
+    leaguereader.read()
 
     assert_equal 1, League.count
 
@@ -170,8 +170,8 @@ class TestRoundAuto < MiniTest::Unit::TestCase
     assert_equal 'World Cup', l.title
 
 
-    gamereader = GameReader.new( SportDb.test_data_path )
-    gamereader.read( 'world-cup/1954/cup' )
+    gamereader = TestGameReader.from_file( 'world-cup/1954/cup' )
+    gamereader.read()
 
     assert_equal 1, Event.count
 
@@ -200,8 +200,8 @@ class TestRoundAuto < MiniTest::Unit::TestCase
 
 
   def test_world_cup_1930
-    teamreader = TeamReader.new( SportDb.test_data_path )
-    teamreader.read( 'world-cup/teams_1930' )
+    teamreader = TestTeamReader.from_file( 'world-cup/teams_1930' )
+    teamreader.read()
 
     assert_equal  13, Team.count
 
@@ -210,8 +210,8 @@ class TestRoundAuto < MiniTest::Unit::TestCase
       [ 'bra', 'Brazil',    'BRA' ],
       [ 'bel', 'Belgium',   'BEL' ] ] )
 
-    seasonreader = SeasonReader.new( SportDb.test_data_path )
-    seasonreader.read( 'world-cup/seasons_1930')
+    seasonreader = TestSeasonReader.from_file( 'world-cup/seasons_1930' )
+    seasonreader.read()
 
     assert_equal 1, Season.count
 
@@ -219,8 +219,8 @@ class TestRoundAuto < MiniTest::Unit::TestCase
     assert_equal '1930', y.title
 
 
-    leaguereader = LeagueReader.new( SportDb.test_data_path )
-    leaguereader.read( 'world-cup/leagues' )
+    leaguereader = TestLeagueReader.from_file( 'world-cup/leagues' )
+    leaguereader.read()
 
     assert_equal 1, League.count
 
@@ -228,8 +228,8 @@ class TestRoundAuto < MiniTest::Unit::TestCase
     assert_equal 'World Cup', l.title
 
 
-    gamereader = GameReader.new( SportDb.test_data_path )
-    gamereader.read( 'world-cup/1930/cup' )
+    gamereader = TestGameReader.from_file( 'world-cup/1930/cup' )
+    gamereader.read()
 
     assert_equal 1, Event.count
 
@@ -259,8 +259,8 @@ class TestRoundAuto < MiniTest::Unit::TestCase
 
 
   def test_world_cup_1962
-    teamreader = TeamReader.new( SportDb.test_data_path )
-    teamreader.read( 'world-cup/teams_1962' )
+    teamreader = TestTeamReader.from_file( 'world-cup/teams_1962' )
+    teamreader.read()
 
     assert_equal  16, Team.count
 
@@ -269,8 +269,8 @@ class TestRoundAuto < MiniTest::Unit::TestCase
       [ 'bra', 'Brazil',    'BRA' ],
       [ 'ita', 'Italy',     'ITA' ] ] )
 
-    seasonreader = SeasonReader.new( SportDb.test_data_path )
-    seasonreader.read( 'world-cup/seasons_1962')
+    seasonreader = TestSeasonReader.from_file( 'world-cup/seasons_1962' )
+    seasonreader.read()
 
     assert_equal 1, Season.count
 
@@ -278,8 +278,8 @@ class TestRoundAuto < MiniTest::Unit::TestCase
     assert_equal '1962', y.title
 
 
-    leaguereader = LeagueReader.new( SportDb.test_data_path )
-    leaguereader.read( 'world-cup/leagues' )
+    leaguereader = TestLeagueReader.from_file( 'world-cup/leagues' )
+    leaguereader.read()
 
     assert_equal 1, League.count
 
@@ -287,8 +287,8 @@ class TestRoundAuto < MiniTest::Unit::TestCase
     assert_equal 'World Cup', l.title
 
 
-    gamereader = GameReader.new( SportDb.test_data_path )
-    gamereader.read( 'world-cup/1962/cup' )
+    gamereader = TestGameReader.from_file( 'world-cup/1962/cup' )
+    gamereader.read()
 
     assert_equal 1, Event.count
 
@@ -320,8 +320,8 @@ class TestRoundAuto < MiniTest::Unit::TestCase
     #  note: update only works if rounds get not deleted or added
     #  - (adding for updates works only at the end/tail - not at the beginning or inbetween, for example)
 
-    gamereader = GameReader.new( SportDb.test_data_path )
-    gamereader.read( 'world-cup/1962/cup' )
+    gamereader = TestGameReader.from_file( 'world-cup/1962/cup' )
+    gamereader.read()
 
     assert_equal 1, Event.count