sportdb-models 1.18.5 → 2.0.1

data/lib/sportdb/models/stats.rb

@@ -0,0 +1,23 @@
+
+module SportDb
+
+  class Stats
+    include Models
+
+    def tables
+      puts "  #{League.count} leagues  /  #{Season.count} seasons"
+      puts "  #{Event.count} events (league+season recs)  /  #{Round.count} rounds  /  #{Group.count} groups  /  #{Stage.count} stages"
+      puts "  #{Team.count} teams"
+      puts "  #{Match.count} matches"
+      puts "  #{Badge.count} badges"
+
+      puts "  #{Lineup.count} lineups (person+team+event recs)"
+      puts "  #{Goal.count} goals (person+match recs)"
+
+      puts "  #{Assoc.count}  assocs|orgs"
+      puts "  #{Ground.count}  grounds|stadiums"
+    end
+
+  end  # class Stats
+
+end  # module SportDb

data/lib/sportdb/models/utils.rb

@@ -2,27 +2,27 @@ module SportDb
   module Model
 
 
-class GameCursor
+class MatchCursor
 
-  def initialize( games )
-    @games = games
+  def initialize( matches )
+    @matches = matches
   end
 
   def each
-    state = GameCursorState.new 
+    state = MatchCursorState.new
 
-    @games.each do |game|
-      state.next( game )
-      yield( game, state )   # e.g. lets you use state.new_date?  or state.new_week? or state.new_year? etc.
+    @matches.each do |match|
+      state.next( match )
+      yield( match, state )   # e.g. lets you use state.new_date?  or state.new_week? or state.new_year? etc.
     end
   end # method each
-end # class GameCursor
+end # class MatchCursor
 
 
-class GameCursorState
+class MatchCursorState
 
   def initialize
-    @last_play_at  = DateTime.new( 1971, 1, 1 )
+    @last_date     = DateTime.new( 1971, 1, 1 )
     @new_date      = true
     @new_year      = true
     @new_week      = true
@@ -34,44 +34,44 @@ class GameCursorState
   def new_date?()  @new_date; end
   def new_year?()  @new_year; end
   def new_week?()  @new_week; end
-  
+
 
   ## add new league ?
   ## add new round  ?
   ## add new time   ?
-    
-  def next( game )
+
+  def next( match )
     @index += 1   # zero-based index; start off with -1 (undefined/uninitialized)
-    game_play_at = game.play_at  # cache play_at value ref
+    match_date = match.date  # cache date value ref
 
-    if @last_play_at.year   == game_play_at.year  &&
-       @last_play_at.month  == game_play_at.month &&
-       @last_play_at.day    == game_play_at.day
+    if @last_date.year   == match_date.year  &&
+       @last_date.month  == match_date.month &&
+       @last_date.day    == match_date.day
       @new_date = false
     else
       @new_date = true
-        
+
       # check for new_year
-      if @last_play_at.year == game_play_at.year
+      if @last_date.year == match_date.year
         @new_year = false
       else
         @new_year = true
       end
-        
+
       # check for new_week
       # -- todo: find a method for week number; do NOT use strftime; there must be something easier
       # -- check if activesupport adds  .week or similar ??? use it if it exists
-      if @last_play_at.strftime('%V') == game_play_at.strftime('%V')
+      if @last_date.strftime('%V') == match_date.strftime('%V')
         @new_week = false
       else
         @new_week = true
       end
     end
 
-    @last_play_at = game.play_at
+    @last_date = match.date
   end # method next
-    
-end # class GameCursorState
+
+end # class MatchCursorState
 
 
   end # module Model

data/lib/sportdb/{version.rb → models/version.rb}

@@ -1,10 +1,11 @@
 # encoding: utf-8
 
 module SportDb
-
-  MAJOR = 1    ## todo: namespace inside version or something - why? why not??
-  MINOR = 18
-  PATCH = 5
+module Module
+module Models
+  MAJOR = 2
+  MINOR = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -16,7 +17,13 @@ module SportDb
   end
 
   def self.root
-    "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
+    "#{File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )}"
   end
 
+end  # module Models
+end  # module Module
+
+  #################
+  ## add convenience shortcuts
+  VERSION = Module::Models::VERSION
 end  # module SportDb

data/test/helper.rb

@@ -1,13 +1,8 @@
-
-## $:.unshift(File.dirname(__FILE__))
-
 ## minitest setup
-
 require 'minitest/autorun'
 
 
 ## our own code
-
 require 'sportdb/models'
 
 
@@ -22,15 +17,15 @@ League      = SportDb::Model::League
 Season      = SportDb::Model::Season
 Event       = SportDb::Model::Event
 Team        = SportDb::Model::Team
-Roster      = SportDb::Model::Roster
+Lineup      = SportDb::Model::Lineup
 Assoc       = SportDb::Model::Assoc
 AssocAssoc  = SportDb::Model::AssocAssoc
 
-Round      = SportDb::Model::Round
-Group      = SportDb::Model::Group
-Stage      = SportDb::Model::Stage
-Game       = SportDb::Model::Game
-GameCursor = SportDb::Model::GameCursor
+Round       = SportDb::Model::Round
+Group       = SportDb::Model::Group
+Stage       = SportDb::Model::Stage
+Match       = SportDb::Model::Match
+MatchCursor = SportDb::Model::MatchCursor
 
 
 EventStanding        = SportDb::Model::EventStanding
@@ -41,110 +36,11 @@ AlltimeStanding      = SportDb::Model::AlltimeStanding
 AlltimeStandingEntry = SportDb::Model::AlltimeStandingEntry
 
 
-
-####################
-# Reader shortcuts
-
-Reader                  = SportDb::Reader
-TeamReader              = SportDb::TeamReader
-TeamIndexer             = SportDb::TeamIndexer
-AssocReader             = SportDb::AssocReader
-SeasonReader            = SportDb::SeasonReader
-LeagueReader            = SportDb::LeagueReader
-EventReader             = SportDb::EventReader
-EventMetaReader         = SportDb::EventMetaReader
-EventTableReader        = SportDb::EventTableReader
-GameReader              = SportDb::GameReader
-NationalTeamSquadReader = SportDb::NationalTeamSquadReader
-ClubSquadReader         = SportDb::ClubSquadReader
-
-## moved to racing.db  - remove/delete!!
-## RaceTeamReader     = SportDb::RaceTeamReader
-
-PersonReader       = PersonDb::PersonReader
-
-######
-# New Reader ShortCuts
-
-module TestPrettyPrinter
-  def self.from_file( name, opts={} )
-    SportDb::PrettyPrinter.from_file( "#{SportDb.test_data_path}/#{name}.txt", opts )
-  end
-end
-
-
-module TestTeamReader
-  def self.from_file( name, more_attribs={} )
-    TeamReader.from_file( "#{SportDb.test_data_path}/#{name}.txt", more_attribs )
-  end
-end
-
-module TestTeamIndexer
-  def self.from_file( name, more_attribs={} )
-    TeamIndexer.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 TestEventMetaReader
-  def self.from_file( name )
-    EventMetaReader.from_file( "#{SportDb.test_data_path}/#{name}.yml" )
-  end
-end
-
-module TestEventTableReader
-  def self.from_file( name )
-    EventTableReader.from_file( "#{SportDb.test_data_path}/#{name}.txt" )
-  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
 
 SportDb.setup_in_memory_db
+
+## test helpers here
+SportDb.delete!
+SportDb.tables

data/test/test_changes.rb

@@ -8,18 +8,18 @@ require 'helper'
 
 class TestChanges < MiniTest::Test
 
-  def test_scores
-    game1 = Game.new
-    game1.score1 = 1
-    game1.score2 = 2
-
-    game2 = Game.new
-    game2.score1   = 1
-    game2.score2   = 1
-    game2.score1p  = 5
-    game2.score2p  = 3
-
-    game_attribs = {
+  def test_score
+    match1 = Match.new
+    match1.score1 = 1
+    match1.score2 = 2
+
+    match2 = Match.new
+    match2.score1   = 1
+    match2.score2   = 1
+    match2.score1p  = 5
+    match2.score2p  = 3
+
+    match_attribs = {
       score1: 1,
       score2: 2,
       score1et: nil,
@@ -28,50 +28,50 @@ class TestChanges < MiniTest::Test
       score2p:  nil
     }
 
-    assert_equal  false, game1.check_for_changes( game_attribs )
-    assert_equal  true,  game2.check_for_changes( game_attribs )
+    assert_equal  false, match1.check_for_changes( match_attribs )
+    assert_equal  true,  match2.check_for_changes( match_attribs )
   end
 
-  def test_play_at
-    game1 = Game.new
-    game1.score1 = 1
-    game1.score2 = 2
-    game1.play_at = DateTime.new( 2012, 11, 5 )
+  def test_date
+    match1 = Match.new
+    match1.score1 = 1
+    match1.score2 = 2
+    match1.date   = Date.new( 2012, 11, 5 )
 
-    game2 = Game.new
-    game2.score1   = 1
-    game2.score2   = 2
-    game2.play_at = DateTime.new( 2012, 12, 24 )
+    match2 = Match.new
+    match2.score1   = 1
+    match2.score2   = 2
+    match2.date     = DateTime.new( 2012, 12, 24 )
 
-    game_attribs = {
+    match_attribs = {
       score1:  1,
       score2:  2,
-      play_at: DateTime.new( 2012, 11, 5 )
+      date: DateTime.new( 2012, 11, 5 )
     }
 
-    assert_equal  false, game1.check_for_changes( game_attribs )
-    assert_equal  true,  game2.check_for_changes( game_attribs )
+    assert_equal  false, match1.check_for_changes( match_attribs )
+    assert_equal  true,  match2.check_for_changes( match_attribs )
   end
 
   def test_group_id
-    game1 = Game.new
-    game1.score1 = 1
-    game1.score2 = 2
-    game1.group_id = 1
+    match1 = Match.new
+    match1.score1 = 1
+    match1.score2 = 2
+    match1.group_id = 1
 
-    game2 = Game.new
-    game2.score1   = 1
-    game2.score2   = 2
-    game2.group_id = 2
+    match2 = Match.new
+    match2.score1   = 1
+    match2.score2   = 2
+    match2.group_id = 2
 
-    game_attribs = {
+    match_attribs = {
       score1:  1,
       score2:  2,
       group_id: 1
     }
 
-    assert_equal  false, game1.check_for_changes( game_attribs )
-    assert_equal  true,  game2.check_for_changes( game_attribs )
+    assert_equal  false, match1.check_for_changes( match_attribs )
+    assert_equal  true,  match2.check_for_changes( match_attribs )
   end
 
 

data/test/test_cursor.rb

@@ -9,42 +9,42 @@ require 'helper'
 
 class TestCursor < MiniTest::Test
 
-  def test_games
-    games = []
+  def test_matches
+    matches = []
 
-    games << Game.new( score1: 3, score2: 1, play_at: DateTime.new(2013, 8, 9) )
-    games << Game.new( score1: 1, score2: 3, play_at: DateTime.new(2013, 8, 10) )
-    games << Game.new( score1: 2, score2: 0, play_at: DateTime.new(2013, 8, 10) )
-    games << Game.new( score1: 3, score2: 2, play_at: DateTime.new(2013, 8, 12) )  # new_week
+    matches << Match.new( score1: 3, score2: 1, date: Date.new(2013, 8, 9) )
+    matches << Match.new( score1: 1, score2: 3, date: Date.new(2013, 8, 10) )
+    matches << Match.new( score1: 2, score2: 0, date: Date.new(2013, 8, 10) )
+    matches << Match.new( score1: 3, score2: 2, date: Date.new(2013, 8, 12) )  # new_week
 
-    GameCursor.new( games ).each do |game,state|
+    MatchCursor.new( matches ).each do |match,state|
       if state.index == 0
-        assert_equal 3, game.score1
-        assert_equal 1, game.score2
+        assert_equal 3, match.score1
+        assert_equal 1, match.score2
         assert_equal true, state.new_date?
         assert_equal true, state.new_year?
         assert_equal true, state.new_week?
       end
 
       if state.index == 1
-        assert_equal 1, game.score1
-        assert_equal 3, game.score2
+        assert_equal 1, match.score1
+        assert_equal 3, match.score2
         assert_equal true, state.new_date?
         assert_equal false, state.new_year?
         assert_equal false, state.new_week?
       end
 
       if state.index == 2
-        assert_equal 2, game.score1
-        assert_equal 0, game.score2
+        assert_equal 2, match.score1
+        assert_equal 0, match.score2
         assert_equal false, state.new_date?
         assert_equal false, state.new_year?
         assert_equal false, state.new_week?
       end
 
       if state.index == 3
-        assert_equal 3, game.score1
-        assert_equal 2, game.score2
+        assert_equal 3, match.score1
+        assert_equal 2, match.score2
         assert_equal true,  state.new_date?
         assert_equal true,  state.new_week?
         assert_equal false, state.new_year?