sportdb 1.8.26 → 1.8.27

data/Manifest.txt

@@ -13,6 +13,7 @@ config/fixtures/ro.yml
 data/seasons.txt
 data/setups/all.txt
 lib/sportdb.rb
+lib/sportdb/calc.rb
 lib/sportdb/cli/main.rb
 lib/sportdb/cli/opts.rb
 lib/sportdb/console.rb
@@ -41,6 +42,12 @@ lib/sportdb/models/roster.rb
 lib/sportdb/models/round.rb
 lib/sportdb/models/run.rb
 lib/sportdb/models/season.rb
+lib/sportdb/models/stats/alltime_standing.rb
+lib/sportdb/models/stats/alltime_standing_entry.rb
+lib/sportdb/models/stats/event_standing.rb
+lib/sportdb/models/stats/event_standing_entry.rb
+lib/sportdb/models/stats/group_standing.rb
+lib/sportdb/models/stats/group_standing_entry.rb
 lib/sportdb/models/team.rb
 lib/sportdb/models/track.rb
 lib/sportdb/models/utils.rb
@@ -148,5 +155,6 @@ test/test_round_auto.rb
 test/test_round_def.rb
 test/test_round_header.rb
 test/test_scores.rb
+test/test_standings.rb
 test/test_utils.rb
 test/test_winner.rb

data/lib/sportdb.rb

@@ -53,6 +53,13 @@ require 'sportdb/models/season'
 require 'sportdb/models/team'
 require 'sportdb/models/track'
 
+require 'sportdb/models/stats/alltime_standing'
+require 'sportdb/models/stats/alltime_standing_entry'
+require 'sportdb/models/stats/event_standing'
+require 'sportdb/models/stats/event_standing_entry'
+require 'sportdb/models/stats/group_standing'
+require 'sportdb/models/stats/group_standing_entry'
+
 require 'sportdb/models/utils'   # e.g. GameCursor
 
 ## add backwards compatible n convenience namespace
@@ -76,6 +83,7 @@ require 'sportdb/utils_round'
 require 'sportdb/utils_scores'
 require 'sportdb/utils_teams'
 require 'sportdb/matcher'
+require 'sportdb/calc'
 
 
 require 'sportdb/readers/event'
@@ -97,6 +105,7 @@ require 'sportdb/updater'
 require 'sportdb/deleter'
 require 'sportdb/stats'
 
+
 ###############
 # optional: for convenience add some finders etc. for known fixtures
 #

data/lib/sportdb/calc.rb

@@ -0,0 +1,177 @@
+# encoding: utf-8
+
+module SportDb
+
+
+##############################################
+# helper/ builds standings table in memory
+#  - find a better module name for StandingsHelper ?? why? why not?
+
+
+module StandingsHelper
+
+  ## todo:
+  ##  add team_id to struct - why? why not?  - saves a db lookup?
+  ##  add appearances (event) count  or similar - add to struct or use an extension?
+  ##    == use recs for number of (stats) records?
+  Stats = Struct.new(
+            :pos,
+            :played,
+            :won,
+            :lost,
+            :drawn,
+            :goals_for,
+            :goals_against,
+            :pts )
+
+
+  def self.calc( games, opts={} )
+    recs = calc_stats( games, opts )
+
+    ## update pos (that is, ranking e.g. 1.,2., 3. etc.)
+    recs= update_ranking( recs )
+
+    pp recs
+    recs
+  end
+
+
+  def self.calc_for_events( events, opts={} )
+
+    ## todo:
+    ##  - add tracker for appeareances (stats records counter)
+
+    alltime_recs = {}  # stats recs indexed by team_key
+
+    events.each do |event|
+      puts "  update standings for #{event.title}"
+      recs = calc_stats( event.games )
+
+      recs.each do |team_key, rec|
+        alltime_rec = alltime_recs[ team_key ] || Stats.new( 0, 0, 0, 0, 0, 0, 0, 0 )
+
+        ## add stats values
+        alltime_rec.played        += rec.played
+        alltime_rec.won           += rec.won
+        alltime_rec.lost          += rec.lost
+        alltime_rec.drawn         += rec.drawn
+        alltime_rec.goals_for     += rec.goals_for
+        alltime_rec.goals_against += rec.goals_against
+        alltime_rec.pts           += rec.pts
+        
+        alltime_recs[ team_key ] = alltime_rec 
+      end
+    end
+
+    ## update pos (that is, ranking e.g. 1.,2., 3. etc.)
+    alltime_recs= update_ranking( alltime_recs )
+
+    pp alltime_recs
+    alltime_recs
+  end
+
+
+
+  def self.calc_stats( games, opts={} )
+    
+    ## fix:
+    #   passing in e.g. pts for win (3? 2? etc.)
+    #    default to 3 for now
+    
+    recs = {}
+
+    games.each_with_index do |g,i|   # note: index(i) starts w/ zero (0)
+      puts "  [#{i+1}] #{g.team1.title} - #{g.team2.title}  #{g.score_str}"
+      unless g.over?
+        puts "    skipping match - not yet over (play_at date in the future)"
+        next
+      end
+      unless g.complete?
+        puts "    skipping match - scores incomplete"
+        next
+      end
+
+      rec1 = recs[ g.team1.key ] || Stats.new( 0, 0, 0, 0, 0, 0, 0, 0 )
+      rec2 = recs[ g.team2.key ] || Stats.new( 0, 0, 0, 0, 0, 0, 0, 0 )
+
+      rec1.played += 1
+      rec2.played += 1
+      
+      if g.winner == 1
+        rec1.won  += 1
+        rec2.lost += 1
+        rec1.pts  += 3   # 3pts for win (hardcoded for now; change - use event setting?)
+      elsif g.winner == 2
+        rec1.lost  += 1
+        rec2.won   += 1
+        rec2.pts   += 3  # 3pts for win (hardcoded for now; change - use event setting?)
+      else ## assume == 0 (drawn)
+        rec1.drawn += 1
+        rec2.drawn += 1
+        rec1.pts   += 1
+        rec2.pts   += 1
+      end
+
+      rec1.goals_for     += g.score1
+      rec1.goals_against += g.score2
+      
+      rec2.goals_for     += g.score2
+      rec2.goals_against += g.score1
+
+      ## add overtime and penalty??
+      ##  - for now add only overtime if present
+      rec1.goals_for     += (g.score1et-g.score1)    if g.score1et.present?
+      rec1.goals_against += (g.score2et-g.score2)    if g.score2et.present?
+
+      rec2.goals_for     += (g.score2et-g.score2)    if g.score2et.present?
+      rec2.goals_against += (g.score1et-g.score1)    if g.score1et.present?
+
+
+      recs[ g.team1.key ] = rec1
+      recs[ g.team2.key ] = rec2
+    end  # each game
+
+    recs # return records; hash indexed by team key
+  end # method calc
+
+
+  def self.update_ranking( recs )
+    #############################
+    ### calc ranking / pos
+    ##
+    ## fix/allow sampe pos e.g. all 1 or more than one team 3rd etc.
+    ##   see sportbook for an example
+
+    # build array from hash
+    ary = []
+    recs.each do |k,v|
+      ary << [k,v]
+    end
+
+    ary.sort! do |l,r|
+      ## note: reverse order (thus, change l,r to r,l)
+      value =  r[1].pts <=> l[1].pts
+      if value == 0    # same pts try goal diff
+        value =   (r[1].goals_for-r[1].goals_against) <=> (l[1].goals_for-l[1].goals_against)
+        if value == 0  # same goal diff too; try assume more goals better for now
+          value =   r[1].goals_for <=> l[1].goals_for
+        end
+      end
+      value
+    end
+
+    ## update pos using ordered array
+    ary.each_with_index  do |rec,i|
+      k = rec[0]
+      v = rec[1]
+      v.pos = i+1    ## add ranking (e.g. 1,2,3 etc.)  - note: i starts w/ zero (0)
+      recs[ k ] = v   ## update recs
+    end
+    
+    recs
+  end # method update_ranking
+
+  
+end # module StandingsHelper
+
+end # module SportDb

data/lib/sportdb/deleter.rb

@@ -10,6 +10,13 @@ module SportDb
     def run
       # for now delete all tables
       
+      ## stats
+      AlltimeStandingEntry.delete_all
+      AlltimeStanding.delete_all
+      GroupStandingEntry.delete_all
+      GroupStanding.delete_all
+
+
       Goal.delete_all
       Record.delete_all
 

data/lib/sportdb/models/stats/alltime_standing.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+
+module SportDb
+  module Model
+
+
+class AlltimeStanding < ActiveRecord::Base
+
+  self.table_name = 'alltime_standings'
+
+  has_many :entries,  class_name: 'SportDb::Model::AlltimeStandingEntry', foreign_key: 'alltime_standing_id', :dependent => :delete_all
+
+
+  def recalc_for_league!( league )
+
+    recs = StandingsHelper.calc_for_events( league.events )
+
+    ## - remove (if exit) old entries and add new entries
+    entries.delete_all    # note: assoc dependent set to :delete_all (defaults to :nullify)
+
+    recs.each do |team_key,rec|
+     
+      team = Team.find_by_key!( team_key )
+      entries.create!(
+                team_id: team.id,
+                pos:     rec.pos,
+                played:  rec.played,
+                won:     rec.won,
+                drawn:   rec.drawn,
+                lost:    rec.lost,
+                goals_for: rec.goals_for,
+                goals_against: rec.goals_against,
+                pts:     rec.pts  )
+    end
+  end  # method recalc_for_league!
+
+
+end # class AlltimeStanding
+
+
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/stats/alltime_standing_entry.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+module SportDb
+  module Model
+
+
+class AlltimeStandingEntry < ActiveRecord::Base
+
+  self.table_name = 'alltime_standing_entries'
+
+  belongs_to :standing, class_name: 'SportDb::Model::AlltimeStanding', foreign_key: 'alltime_standing_id'
+  belongs_to :team
+
+  ## note:
+  ##  map standing_id to alltime_standing_id - convenience alias
+  def standing_id=(value)  write_attribute(:alltime_standing_id, value);  end
+
+
+end # class AlltimeStandingEntry
+
+
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/stats/event_standing.rb

@@ -0,0 +1,55 @@
+# encoding: utf-8
+
+module SportDb
+  module Model
+
+
+class EventStanding < ActiveRecord::Base
+
+  self.table_name = 'event_standings'
+
+  has_many   :entries, class_name: 'SportDb::Model::EventStandingEntry', foreign_key: 'event_standing_id', :dependent => :delete_all
+  belongs_to :event
+
+  ## convenience helper; recalcs all records
+  def self.recalc!()  self.order(:id).each { |rec| rec.recalc! };  end
+
+
+  def recalc!
+    ##  will calculate event standing e.g.
+
+    ## calc points (pts) - loop over all group games/matches
+    # group.games.each do |game|
+    # end
+
+    #  todo/fix!!!!!!!!!!:
+    # skip knockout rounds  - why? why not?
+    #   make it configure-able?
+
+    recs = StandingsHelper.calc( event.games )
+
+    ## - remove (if exit) old entries and add new entries
+    entries.delete_all    # note: assoc dependent set to :delete_all (defaults to :nullify)
+
+    ## add empty entries
+    event.teams.each do |team|
+      puts "   adding entry for team #{team.title} (#{team.code})"
+      rec = recs[ team.key ]  # find  (in-memory) stats records
+      entries.create!(
+                team_id: team.id,
+                pos:     rec.pos,
+                played:  rec.played,
+                won:     rec.won,
+                drawn:   rec.drawn,
+                lost:    rec.lost,
+                goals_for: rec.goals_for,
+                goals_against: rec.goals_against,
+                pts:     rec.pts  )
+    end
+  end  # method recalc!
+
+
+end # class EventStanding
+  end # module Model
+
+end # module SportDb

data/lib/sportdb/models/stats/event_standing_entry.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+module SportDb
+  module Model
+
+class EventStandingEntry < ActiveRecord::Base
+
+  self.table_name = 'event_standing_entries'
+
+  belongs_to :standing, class_name: 'SportDb::Model::EventStanding', foreign_key: 'event_standing_id'
+  belongs_to :team
+
+  ## note:
+  ##  map standing_id to group_standing_id - convenience alias
+  def standing_id=(value)  write_attribute(:event_standing_id, value);  end
+
+end # class EventStandingEntry
+
+
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/stats/group_standing.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+
+module SportDb
+  module Model
+
+
+class GroupStanding < ActiveRecord::Base
+
+  self.table_name = 'group_standings'
+
+  has_many   :entries, class_name: 'SportDb::Model::GroupStandingEntry', foreign_key: 'group_standing_id', :dependent => :delete_all
+  belongs_to :group
+
+  ## convenience helper; recalcs all records
+  def self.recalc!()  self.order(:id).each { |rec| rec.recalc! };  end
+
+
+  def recalc!
+    ##  will calculate group standing e.g.
+ 
+    ## calc points (pts) - loop over all group games/matches
+    # group.games.each do |game|
+    # end
+    recs = StandingsHelper.calc( group.games )
+
+    ## - remove (if exit) old entries and add new entries
+    entries.delete_all    # note: assoc dependent set to :delete_all (defaults to :nullify)
+
+    ## add empty entries
+    group.teams.each do |team|
+      puts "   adding entry for team #{team.title} (#{team.code})"
+      rec = recs[ team.key ]  # find  (in-memory) stats records
+      entries.create!(
+                team_id: team.id,
+                pos:     rec.pos,
+                played:  rec.played,
+                won:     rec.won,
+                drawn:   rec.drawn,
+                lost:    rec.lost,
+                goals_for: rec.goals_for,
+                goals_against: rec.goals_against,
+                pts:     rec.pts  )
+    end
+  end  # method recalc!
+
+
+end # class GroupStanding
+  end # module Model
+
+end # module SportDb

data/lib/sportdb/models/stats/group_standing_entry.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+
+module SportDb
+  module Model
+
+
+class GroupStandingEntry < ActiveRecord::Base
+
+  self.table_name = 'group_standing_entries'
+
+  belongs_to :standing, class_name: 'SportDb::Model::GroupStanding', foreign_key: 'group_standing_id'
+  belongs_to :team
+
+  ## note:
+  ##  map standing_id to group_standing_id - convenience alias
+  def standing_id=(value)  write_attribute(:group_standing_id, value);  end
+
+end # class GroupStandingEntry
+
+
+  end # module Model
+end # module SportDb

data/lib/sportdb/schema.rb

@@ -297,6 +297,80 @@ create_table :badges do |t|
   t.timestamps
 end
 
+
+############################################
+# stats tables
+
+# use tables for standings e.g group_tables? - why? why not?
+#
+# todo: add group_standings per round with pos diffs e.g +1,+2, -3 etc.
+
+create_table :group_standings do |t|
+  t.references  :group,    null: false
+  t.timestamps
+end
+
+create_table :group_standing_entries do |t|
+  t.references  :group_standing,  null: false
+  t.references  :team,            null: false
+  t.integer     :pos
+  t.integer     :played
+  t.integer     :won
+  t.integer     :lost
+  t.integer     :drawn
+  t.integer     :goals_for             # todo: find a short name - gf? why? why not?
+  t.integer     :goals_against         # todo: find a shorter name - ga? why? why not?
+  t.integer     :pts
+  t.string      :comments
+  t.timestamps
+end
+
+
+create_table :event_standings do |t|
+  t.references  :event,   null: false
+  t.timestamps
+end
+
+create_table :event_standing_entries do |t|
+  t.references  :event_standing,  null: false
+  t.references  :team,            null: false
+  t.integer     :pos
+  t.integer     :played
+  t.integer     :won
+  t.integer     :lost
+  t.integer     :drawn
+  t.integer     :goals_for             # todo: find a short name - gf? or for? why? why not?
+  t.integer     :goals_against         # todo: find a shorter name - ga? or against? why? why not?
+  t.integer     :pts
+  t.string      :comments
+  t.timestamps
+end
+
+
+## flex (free-style/form) standings table - lets you add as many events as you like (not bound to single event/season/etc.)
+##  -use (find a better) a different name? why? why not?
+create_table :alltime_standings do |t|
+  t.string    :key,   null: false
+  t.string    :title, null: false
+  t.timestamps
+end
+
+create_table :alltime_standing_entries do |t|
+  t.references  :alltime_standing,  null: false
+  t.references  :team,              null: false
+  t.integer     :pos
+  t.integer     :played    # todo: use a different name - why? why not?
+  t.integer     :won
+  t.integer     :lost
+  t.integer     :drawn
+  t.integer     :goals_for             # todo: find a short name - gf? why? why not?
+  t.integer     :goals_against         # todo: find a shorter name - ga? why? why not?
+  t.integer     :pts
+  t.string      :comments
+  t.timestamps
+end
+
+
   end  # Schema.define
 end # method up
 

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.26'
+  VERSION = '1.8.27'
 end
 
 

data/test/helper.rb

@@ -26,10 +26,20 @@ Team       = SportDb::Model::Team
 Roster     = SportDb::Model::Roster
 
 Round      = SportDb::Model::Round
+Group      = SportDb::Model::Group
 Game       = SportDb::Model::Game
 GameCursor = SportDb::Model::GameCursor
 
 
+EventStanding        = SportDb::Model::EventStanding
+EventStandingEntry   = SportDb::Model::EventStandingEntry
+GroupStanding        = SportDb::Model::GroupStanding
+GroupStandingEntry   = SportDb::Model::GroupStandingEntry
+AlltimeStanding      = SportDb::Model::AlltimeStanding
+AlltimeStandingEntry = SportDb::Model::AlltimeStandingEntry
+
+
+
 ####################
 # Reader shortcuts
 

data/test/test_standings.rb

@@ -0,0 +1,250 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_standings.rb
+#  or better
+#     rake -I ./lib test
+
+
+require 'helper'
+
+
+
+class TestStandings < MiniTest::Unit::TestCase
+
+  def setup
+    WorldDb.delete!
+    SportDb.delete!
+    ## SportDb.read_builtin
+
+    add_countries
+    add_world_cup_1974
+  end
+
+  def add_countries
+    countries = [
+      ['cd', 'Congo DR',       'COD' ],
+      ['kr', 'South Korea',    'KOR' ],
+      ['au', 'Australia',      'AUS' ],
+
+      ['ar', 'Argentina',      'ARG' ],
+      ['br', 'Brazil',         'BRA' ],
+      ['bo', 'Bolivia',        'BOL' ],
+      ['cl', 'Chile',          'CHI' ],
+      ['co', 'Colombia',       'COL' ],
+      ['uy', 'Uruguay',        'URU' ],
+      ['pe', 'Peru',           'PER' ],
+      ['py', 'Paraguay',       'PAR' ],
+ 
+      ['mx', 'Mexico',         'MEX' ],
+      ['us', 'United States',  'USA' ],
+      ['ht', 'Haiti',          'HAI' ],
+
+      ['at', 'Austria',        'AUT' ],
+      ['be', 'Belgium',        'BEL' ],
+      ['fr', 'France',         'FRA' ],
+      ['rs', 'Serbia',         'SRB' ],
+      ['ro', 'Romania',        'ROU' ],
+      ['bg', 'Bulgaria',       'BUL' ],
+      ['cz', 'Czech Republic', 'CZE' ],
+      ['en', 'England',        'ENG' ],
+      ['de', 'Germany',        'GER' ], 
+      ['hu', 'Hungary',        'HUN' ],
+      ['it', 'Italy',          'ITA' ],
+      ['ru', 'Russia',         'RUS' ],
+      ['es', 'Spain',          'ESP' ],
+      ['ch', 'Switzerland',    'SUI' ],
+      ['sc', 'Scotland',       'SCO' ],
+      ['tr', 'Turkey',         'TUR' ],
+      ['nl', 'Netherlands',    'NED' ],
+      ['pl', 'Poland',         'POL' ],
+      ['se', 'Sweden',         'SWE' ],
+    ]
+
+    countries.each do |country|
+      key   = country[0]
+      name  = country[1]
+      code  = country[2]
+      Country.create!( key: key, name: name, code: code, pop: 1, area: 1)
+    end
+  end
+
+
+  def add_world_cup_1974
+    teamreader = TeamReader.new( SportDb.test_data_path )
+    teamreader.read( 'world-cup/teams_1974' )
+    
+    seasonreader = SeasonReader.new( SportDb.test_data_path )
+    seasonreader.read( 'world-cup/seasons_1974')
+
+    leaguereader = LeagueReader.new( SportDb.test_data_path )
+    leaguereader.read( 'world-cup/leagues' )
+
+    gamereader = GameReader.new( SportDb.test_data_path )
+    gamereader.read( 'world-cup/1974/cup' )
+
+    ev = Event.find_by_key!( 'world.1974' )
+
+    assert_equal  16, ev.teams.count
+    assert_equal  38, ev.games.count
+    assert_equal  12, ev.rounds.count
+  end # method add_world_cup_1974
+
+
+  def test_alltime_standings
+    st = AlltimeStanding.create!( key: 'worldcup', title: 'All Time World Cup' )
+
+    assert_equal 1, AlltimeStanding.count
+    assert_equal 0, st.entries.count
+
+    ## add some team entries
+
+    arg = Team.find_by_key!( 'arg' )
+    bra = Team.find_by_key!( 'bra' )
+    ita = Team.find_by_key!( 'ita' )
+
+    AlltimeStandingEntry.create!( standing_id: st.id, team_id: arg.id )
+    AlltimeStandingEntry.create!( standing_id: st.id, team_id: bra.id )
+    AlltimeStandingEntry.create!( standing_id: st.id, team_id: ita.id )
+
+    assert_equal 3, st.entries.count
+    assert_equal 3, AlltimeStandingEntry.count
+
+    st2 = AlltimeStandingEntry.first.standing    # check back/parent ref w/ standing belongs_to assoc
+    assert_equal 'worldcup',            st2.key 
+    assert_equal 'All Time World Cup',  st2.title
+
+  end # test_alltime_standings
+
+
+  def test_alltime_standings_recalc
+    st = AlltimeStanding.create!( key: 'worldcup', title: 'All Time World Cup' )
+
+    assert_equal 1, AlltimeStanding.count
+    assert_equal 0, st.entries.count
+
+    league = League.find_by_key!( 'world' )
+
+    st.recalc_for_league!( league )
+    assert_equal 16, st.entries.count
+    assert_equal 16, AlltimeStandingEntry.count
+
+    st.recalc_for_league!( league )
+    assert_equal 16, st.entries.count
+    assert_equal 16, AlltimeStandingEntry.count
+  end # test_alltime_standings_recalc
+
+
+  def test_event_standings_recalc
+    ev = Event.find_by_key!( 'world.1974' )
+    
+    assert_equal 16, ev.teams.count
+
+    st = EventStanding.create!( event_id: ev.id )
+
+    assert_equal 1, EventStanding.count
+    assert_equal 0, st.entries.count
+
+    st.recalc!
+    assert_equal 16, st.entries.count
+
+    st.recalc!  ## try again (check update)
+    assert_equal 16, st.entries.count
+
+    ## try global recalc
+    EventStandingEntry.delete_all
+    assert_equal 1, EventStanding.count
+    assert_equal 0, EventStandingEntry.count
+
+    EventStanding.recalc!
+    assert_equal 1, EventStanding.count
+    assert_equal 16, EventStandingEntry.count
+
+  end # test_event_standings_recalc
+  
+
+  def test_group_standings_recalc
+    g2 = Group.find_by_pos!( 2 )   ##  Group 2  |  Yugoslavia     Brazil          Scotland      Zaire
+
+    assert_equal 4, g2.teams.count
+
+    st2 = GroupStanding.create!( group_id: g2.id )
+
+    assert_equal 1, GroupStanding.count
+    assert_equal 0, st2.entries.count
+
+    st2.recalc!
+    assert_equal 4, st2.entries.count
+
+    st2.recalc!  ## try again (check update)
+    assert_equal 4, st2.entries.count
+
+    ## try global recalc
+    GroupStandingEntry.delete_all
+    assert_equal 1, GroupStanding.count
+    assert_equal 0, GroupStandingEntry.count
+
+    GroupStanding.recalc!
+    assert_equal 1, GroupStanding.count
+    assert_equal 4, GroupStandingEntry.count
+
+  end # test_group_standings_recalc
+
+
+  def test_group_standings
+    ## Group 1  |  East Germany   West Germany    Chile         Australia
+    ## Group 2  |  Yugoslavia     Brazil          Scotland      Zaire
+    ## Group 3  |  Netherlands    Sweden          Bulgaria      Uruguay
+    ## Group 4  |  Poland         Argentina       Italy         Haiti
+    
+    g2 = Group.find_by_pos!( 2 )
+    g4 = Group.find_by_pos!( 4 )
+
+    assert_equal 4, g2.teams.count
+    assert_equal 4, g4.teams.count
+
+    st2 = GroupStanding.create!( group_id: g2.id )
+    st4 = GroupStanding.create!( group_id: g4.id )
+    
+    assert_equal 2, GroupStanding.count
+    assert_equal 0, st2.entries.count
+    assert_equal 0, st4.entries.count
+
+    ## add some team entries
+    bra = Team.find_by_key!( 'bra' )
+    arg = Team.find_by_key!( 'arg' )
+    ita = Team.find_by_key!( 'ita' )
+    
+    GroupStandingEntry.create!( standing_id: st2.id, team_id: bra.id )
+    GroupStandingEntry.create!( standing_id: st4.id, team_id: arg.id )
+    GroupStandingEntry.create!( standing_id: st4.id, team_id: ita.id )
+
+    assert_equal 1, st2.entries.count
+    assert_equal 2, st4.entries.count
+    assert_equal 3, GroupStandingEntry.count
+    
+    st2ii = st2.entries.first.standing    # check back/parent ref w/ standing belongs_to assoc
+    assert_equal g2.title, st2ii.group.title
+
+
+    ## Group I  |  Netherlands     Brazil     East Germany     Argentina
+    ## Group J  |  West Germany    Poland     Sweden           Yugoslavia
+
+    gi = Group.find_by_pos!( 9 )   # note: I maps to 9
+    gj = Group.find_by_pos!( 10 )  # note: J maps to 10
+
+    assert_equal 4, gi.teams.count
+    assert_equal 4, gj.teams.count
+    
+    sti = GroupStanding.create!( group_id: gi.id )
+    stj = GroupStanding.create!( group_id: gj.id )
+
+    assert_equal 4, GroupStanding.count
+    assert_equal 0, sti.entries.count
+    assert_equal 0, stj.entries.count
+
+  end # test_group_standings
+
+
+end # class TestStandings

metadata

@@ -1,183 +1,148 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.26
+  version: 1.8.27
+  prerelease: 
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &86161750 !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: *86161750
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &86161430 !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: *86161430
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &86204100 !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: *86204100
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &86203610 !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: *86203610
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &86203300 !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: *86203300
 - !ruby/object:Gem::Dependency
   name: persondb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &86202890 !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: *86202890
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &86202550 !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: *86202550
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &86202050 !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: *86202050
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &86201700 !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: *86201700
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &86201380 !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: *86201380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &86200880 !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: *86200880
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &86200580 !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: *86200580
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -203,6 +168,7 @@ files:
 - data/seasons.txt
 - data/setups/all.txt
 - lib/sportdb.rb
+- lib/sportdb/calc.rb
 - lib/sportdb/cli/main.rb
 - lib/sportdb/cli/opts.rb
 - lib/sportdb/console.rb
@@ -231,6 +197,12 @@ files:
 - lib/sportdb/models/round.rb
 - lib/sportdb/models/run.rb
 - lib/sportdb/models/season.rb
+- lib/sportdb/models/stats/alltime_standing.rb
+- lib/sportdb/models/stats/alltime_standing_entry.rb
+- lib/sportdb/models/stats/event_standing.rb
+- lib/sportdb/models/stats/event_standing_entry.rb
+- lib/sportdb/models/stats/group_standing.rb
+- lib/sportdb/models/stats/group_standing_entry.rb
 - lib/sportdb/models/team.rb
 - lib/sportdb/models/track.rb
 - lib/sportdb/models/utils.rb
@@ -338,13 +310,13 @@ files:
 - test/test_round_def.rb
 - test/test_round_header.rb
 - test/test_scores.rb
+- test/test_standings.rb
 - test/test_utils.rb
 - test/test_winner.rb
 - .gemtest
 homepage: https://github.com/geraldb/sport.db.ruby
 licenses:
 - Public Domain
-metadata: {}
 post_install_message: ! '******************************************************************************
 
 
@@ -362,32 +334,35 @@ 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_load.rb
-- test/test_national_team_reader.rb
-- test/test_reader.rb
-- test/test_round_auto.rb
-- test/test_round_def.rb
-- test/test_round_header.rb
+- test/test_cursor.rb
+- test/test_standings.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: 60505f010e0ff11e3eedb1593fb94f0ae4bb8174
-  data.tar.gz: 4e299e94a2d5811f79f8029b4f541ba5ae150775
-SHA512:
-  metadata.gz: 11e59f6662a2a51c98af2f0300c6d78cb4ab86c0c1fa09f71cc9a43603c903c3a3d4ac9876ebb80f42b1266cbb05668de1d6b073ffe7ad6cd5ebf25223a5ace4
-  data.tar.gz: fae8ee08187bd216298366aef6ae904abfa7f8f05e2cd93e44183879257048c621b220ead087ab9b8cc4ec709ee0ffbc05133f888bfb8907a91885bc0ddb2f1f