sportdb 1.7.6 → 1.7.7

data/Manifest.txt

@@ -41,6 +41,7 @@ lib/sportdb/models/run.rb
 lib/sportdb/models/season.rb
 lib/sportdb/models/team.rb
 lib/sportdb/models/track.rb
+lib/sportdb/models/utils.rb
 lib/sportdb/reader.rb
 lib/sportdb/schema.rb
 lib/sportdb/service.rb
@@ -80,6 +81,11 @@ lib/sportdb/utils.rb
 lib/sportdb/version.rb
 tasks/test.rb
 test/helper.rb
+test/test_changes.rb
+test/test_cursor.rb
+test/test_date.rb
 test/test_lang.rb
 test/test_round.rb
+test/test_scores.rb
 test/test_utils.rb
+test/test_winner.rb

data/lib/sportdb.rb

@@ -53,6 +53,7 @@ require 'sportdb/models/run'
 require 'sportdb/models/season'
 require 'sportdb/models/team'
 require 'sportdb/models/track'
+require 'sportdb/models/utils'   # e.g. GameCursor
 require 'sportdb/schema'       # NB: requires sportdb/models (include SportDB::Models)
 require 'sportdb/utils'
 require 'sportdb/reader'
@@ -79,7 +80,7 @@ require 'sportdb/data/models'     # add convenience finders for known fixtures
 module SportDb
 
   def self.banner
-    "sportdb #{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+    "sportdb/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
   end
 
   def self.root
@@ -96,6 +97,9 @@ module SportDb
 
   def self.lang
     # todo/fix: find a better way for single instance ??
+    #  will get us ruby warning:  instance variable @lang not initialized   => find a better way!!!
+    #   just use @lang w/o .nil?  e.g.
+    #  @lang =|| Lang.new   why? why not??  or better use @@lang =|| Lang.new  for class variable!!!
      if @lang.nil?
        @lang = Lang.new
      end

data/lib/sportdb/console.rb

@@ -14,6 +14,9 @@ require 'yaml'
 
 ## shortcuts for models
 
+##
+##  todo/fix: just use include SportDb::Models  - why? why not? is it possible/working?
+
 Badge   = SportDb::Models::Badge
 Event   = SportDb::Models::Event
 Game    = SportDb::Models::Game

data/lib/sportdb/models/game.rb

@@ -11,7 +11,78 @@ class Game < ActiveRecord::Base
   
   has_many :goals
 
-  before_save :calc_toto12x
+  before_save :calc_winner
+
+
+  def toto12x() toto1x2; end # alias for toto12x - todo/fix: use ruby alias helper
+  def toto1x2
+    ## note: will return string e.g. 1-X-2 (winner will return int e.g. 1-0-2)
+    
+    ## fix: use switch/when expr/stmt instead of ifs
+    value = winner90   # 1 0 2  1 => team 1 0 => draw 2 => team
+    if value == 0
+      'X'
+    elsif value == 1
+      '1'
+    elsif value == 2
+      '2'
+    elsif value == -1
+      nil  # ??? - unknown -- include --??? why? why not??
+    else
+      nil
+    end
+  end
+
+
+  def winner1?() winner == 1; end
+  def winner2?() winner == 2; end
+  def draw?   () winner == 0; end    # use different name; use an alias (any better names more speaking???)
+
+
+  def calc_winner
+    if score1.nil? || score2.nil?
+      self.winner90 = nil
+      self.winner   = nil
+    else
+      if score1 > score2
+        self.winner90 = 1
+      elsif score1 < score2
+        self.winner90 = 2
+      else # assume score1 == score2 - draw
+        self.winner90 = 0
+      end
+
+      ## todo/fix:
+      #  check for next-game/pre-game !!!
+      #    use 1st leg and 2nd leg - use for winner too
+      #  or add new winner_total or winner_aggregated method ???
+
+      ## check for penalty  - note: some games might only have penalty and no extra time (e.g. copa liberatadores)
+      if score1p.present? && score2p.present?
+        if score1p > score2p
+          self.winner = 1
+        elsif score1p < score2p
+          self.winner = 2
+        else
+          # issue warning! - should not happen; penalty goes on until winner found!
+          puts "*** warn: should not happen; penalty goes on until winner found"
+        end
+      ## check for extra time
+      elsif score1et.present? && score2et.present?
+        if score1et > score2et
+          self.winner = 1
+        elsif score1et < score2et
+          self.winner = 2
+        else # assume score1et == score2et - draw
+          self.winner = 0
+        end
+      else
+        # assume no penalty and no extra time; same as 90min result
+        self.winner = self.winner90
+      end
+    end
+  end
+
 
   ### getter/setters for deprecated attribs (score3,4,5,6) n national
   
@@ -196,20 +267,6 @@ class Game < ActiveRecord::Base
   end
 
 
-      
-  def calc_toto12x
-    if score1.nil? || score2.nil?
-      self.toto12x = nil
-    elsif score1 == score2
-      self.toto12x = 'X'
-    elsif score1 > score2
-      self.toto12x = '1'
-    elsif score1 < score2
-      self.toto12x = '2'
-    end
-  end
-
-
   def over?   # game over?
     play_at <= Time.now
   end
@@ -218,33 +275,56 @@ class Game < ActiveRecord::Base
   def knockout?
     knockout == true
   end
-  
+
   def complete?
     score1.present? && score2.present?
   end
 
+
 ############# convenience helpers for styling
 ##
 
   def team1_style_class
     buf = ''
     ## NB: remove if calc?
-    buf << 'game-team-winner '  if complete? && (score1 >  score2)
-    buf << 'game-team-draw '    if complete? && (score1 == score2)
+
+    ### fix: loser
+    ## - add method for checking winner/loser on ko pairs using (1st leg/2nd leg totals) ??
+    ## use new winner_total method ??
+ 
+    if complete?
+      if winner1?
+        buf << 'game-team-winner '
+      elsif winner2?
+        buf << 'game-team-loser '
+      else # assume draw
+        buf << 'game-team-draw '
+      end
+    end
+    
     buf << 'game-knockout '     if knockout?
-    ### fix: loser - add method for checking winner/loser on ko pairs using (1st leg/2nd leg totals)
-    buf << 'game-team-loser '   if complete? && (score1 < score2)
     buf
   end
-  
+
   def team2_style_class
     buf = ''
     ## NB: remove if calc?
-    buf << 'game-team-winner '  if complete? && (score2 >  score1)
-    buf << 'game-team-draw '    if complete? && (score2 == score1)
+
+    ### fix: loser
+    ## - add method for checking winner/loser on ko pairs using (1st leg/2nd leg totals) ??
+    ## use new winner_total method ??
+
+    if complete?
+      if winner1?
+        buf << 'game-team-loser '
+      elsif winner2?
+        buf << 'game-team-winner '
+      else # assume draw
+        buf << 'game-team-draw '
+      end
+    end
+
     buf << 'game-knockout '     if knockout?
-    ### fix: loser - add method for checking winner/loser on ko pairs using (1st leg/2nd leg totals)
-    buf << 'game-team-loser '   if complete? && (score2 < score1)
     buf
   end
 
@@ -262,25 +342,51 @@ class Game < ActiveRecord::Base
 
 
   def score_str
-    return ' - ' if score1.blank? && score2.blank?
-    
-    if score1p.present? && score2p.present?    # im Elfmeterschiessen i.E.?
-      "#{score1_str} : #{score2_str} / #{score1et} : #{score2et} n.V. / #{score1p} : #{score2p} i.E."
-    elsif score1et.present? && score2et.present?  # nach Verlaengerung n.V.?
-      "#{score1_str} : #{score2_str} / #{score1et} : #{score2et} n.V."
-    else
-      "#{score1_str} : #{score2_str}"
-    end
-  end
+    ## return ' - ' if score1.nil? && score2.nil?
 
-  def score1_str
-    if score1.blank? then '-' else score1.to_s end
-  end
+    # note: make after extra time optional;
+    # e.g. copa liberatadores only has regular time plus penalty, for example
+
+    buf = ""
 
-  def score2_str
-    if score2.blank? then '-' else score2.to_s end
+    buf << "#{score1_str} : #{score2_str}"
+    buf << " / #{score1et_str} : #{score2et_str} n.V."  if score1et.present? || score2et.present?
+    buf << " / #{score1p_str} : #{score2p_str} i.E."    if score1p.present?  || score2p.present?
+
+    buf
   end
 
+  def score1_str()  score1.nil? ? '-' : score1.to_s;  end
+  def score2_str()  score2.nil? ? '-' : score2.to_s;  end
+
+  def score1et_str()  score1et.nil? ? '-' : score1et.to_s;  end
+  def score2et_str()  score2et.nil? ? '-' : score2et.to_s;  end
+
+  def score1p_str()  score1p.nil? ? '-' : score1p.to_s;  end
+  def score2p_str()  score2p.nil? ? '-' : score2p.to_s;  end
+
+
+
+  ## todo/fix: find a better name?
+  ##  todo: move to utils for reuse?
+  
+  def check_for_changes( new_attributes )
+    changes_counter = 0
+    new_attributes.each do |key,new_value|
+      old_value = attributes[ key.to_s ]
+      ## todo/fix: also check for class/type matching ????
+      if new_value == old_value
+        # do nothing
+      else
+        changes_counter +=1
+        puts "change #{changes_counter} for #{key} old:>#{old_value}< : #{old_value.class.name} new:>#{new_value}< : #{new_value.class.name}"
+      end
+    end
+    
+    # no changes found for counter==0;
+    # -- otherwise x changes found; return true
+    changes_counter == 0 ? false : true
+  end
 
 end # class Game
 

data/lib/sportdb/models/team.rb

@@ -16,11 +16,20 @@ class Team < ActiveRecord::Base
   has_many :event_teams, :class_name => 'EventTeam'  # join table (events+teams)
   has_many :events, :through => :event_teams
 
-  ### fix - how to do it with has_many macro? use finder_sql?
+  ### fix!!! - how to do it with has_many macro? use finder_sql?
   def games
-    Game.where( 'team1_id = ? or team2_id = ?', id, id ).order( 'play_at' ).all
+    Game.where( 'team1_id = ? or team2_id = ?', id, id ).order( 'play_at' )
   end
-  
+
+  def upcoming_games
+    Game.where( 'team1_id = ? or team2_id = ?', id, id ).where( 'play_at > ?', Time.now ).order( 'play_at' )
+  end
+
+  def past_games
+    Game.where( 'team1_id = ? or team2_id = ?', id, id ).where( 'play_at < ?', Time.now ).order( 'play_at desc' )
+  end
+
+
   has_many :badges   # Winner, 2nd, Cupsieger, Aufsteiger, Absteiger, etc.
 
   belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'

data/lib/sportdb/models/utils.rb

@@ -0,0 +1,78 @@
+module SportDb
+  module Models
+
+
+class GameCursor
+
+  def initialize( games )
+    @games = games
+  end
+
+  def each
+    state = GameCursorState.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.
+    end
+  end # method each
+end # class GameCursor
+
+
+class GameCursorState
+
+  def initialize
+    @last_play_at  = DateTime.new( 1971, 1, 1 )
+    @new_date      = true
+    @new_year      = true
+    @new_week      = true
+    @index         = -1   # zero-based index; thus start off with -1 (e.g. -1+=1 => 0)
+  end
+
+  attr_reader :index
+
+  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 )
+    @index += 1   # zero-based index; start off with -1 (undefined/uninitialized)
+    game_play_at = game.play_at  # cache play_at 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
+      @new_date = false
+    else
+      @new_date = true
+        
+      # check for new_year
+      if @last_play_at.year == game_play_at.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')
+        @new_week = false
+      else
+        @new_week = true
+      end
+    end
+
+    @last_play_at = game.play_at
+  end # method next
+    
+end # class GameCursorState
+
+
+  end # module Models
+end # module SportDb

data/lib/sportdb/reader.rb

@@ -816,31 +816,38 @@ private
       group_id:  @group.present? ? @group.id : nil
     }
 
-    game_attribs[ :pos ]      = pos        if pos.present?
+    game_attribs[ :pos ] = pos   if pos.present?
 
-    if game.present?
-      logger.debug "update game #{game.id}:"
+    ####
+    # note: only update if any changes (or create if new record)
+    if game.present? &&
+       game.check_for_changes( game_attribs ) == false
+          logger.debug "  skip update game #{game.id}; no changes found"
     else
-      logger.debug "create game:"
-      game = Game.new
-
-      more_game_attribs = {
-        round_id:  @round.id,
-        team1_id: team1.id,
-        team2_id: team2.id
-      }
+      if game.present?
+        logger.debug "update game #{game.id}:"
+      else
+        logger.debug "create game:"
+        game = Game.new
+
+        more_game_attribs = {
+          round_id:  @round.id,
+          team1_id: team1.id,
+          team2_id: team2.id
+        }
           
-      ## NB: use round.games.count for pos
-      ##  lets us add games out of order if later needed
-      more_game_attribs[ :pos ] = @round.games.count+1  if pos.nil? 
+        ## NB: use round.games.count for pos
+        ##  lets us add games out of order if later needed
+        more_game_attribs[ :pos ] = @round.games.count+1   if pos.nil? 
 
-      game_attribs = game_attribs.merge( more_game_attribs )
-    end
+        game_attribs = game_attribs.merge( more_game_attribs )
+      end
 
-    logger.debug game_attribs.to_json
+      logger.debug game_attribs.to_json
+      game.update_attributes!( game_attribs )
+    end
 
-    game.update_attributes!( game_attribs )
-  end
+  end # method parse_game
 
 
   def parse_fixtures( reader )

data/lib/sportdb/schema.rb

@@ -194,12 +194,9 @@ create_table :games do |t|
   t.integer    :score2ii  # second third - team2 (opt)
   t.references :next_game  # for hinspiel bei rueckspiel in knockout game
   t.references :prev_game
-  
-  
-  
-  ### todo> find a better name (toto is not international/english?)
-  ## rename to score12x or pt12x or result12x
-  t.string     :toto12x      # 1,2,X,nil  calculate on save
+
+  t.integer    :winner      # 1,2,0,nil  calculate on save  - "real" winner (after 90 or extra time or penalty, aggregated first+second leg?)
+  t.integer    :winner90    # 1,2,0,nil  calculate on save  - winner after 90 mins (or regugular play time depending on sport - add alias or find  a better name!) 
 
   t.timestamps
 end

data/lib/sportdb/utils.rb

@@ -387,8 +387,13 @@ module SportDb::FixtureHelpers
     find_leading_pos!( line )
   end
 
+
   def find_scores!( line )
 
+    # note: always call after find_dates !!!
+    #  scores match date-like patterns!!  e.g. 10-11  or 10:00 etc.
+    #   -- note: score might have two digits too
+
     ### fix: depending on language allow 1:1 or 1-1
     ##   do NOT allow mix and match
     ##  e.g. default to en is  1-1
@@ -399,17 +404,31 @@ module SportDb::FixtureHelpers
     # and return it
     # NB: side effect - removes date from line string
     
+    # note: regex should NOT match regex extra time or penalty
+    #  thus, we do NOT any longer allow spaces for now between
+    #   score and marker (e.g. nV,iE, etc.)
+
     # e.g. 1:2 or 0:2 or 3:3 // 1-1 or 0-2 or 3-3
-    regex = /\b(\d)[:\-](\d)\b/
-    
-    # e.g. 1:2nV  => overtime
-    regex_ot = /\b(\d)[:\-](\d)[ \t]?[nN][vV]\b/
-    
-    # e.g. 5:4iE  => penalty
-    regex_p = /\b(\d)[:\-](\d)[ \t]?[iI][eE]\b/
-    
+    regex = /\b(\d{1,2})[:\-](\d{1,2})\b/
+
+    ## todo: add/allow english markers e.g. aet ??
+
+    ## fix: use case insansitive flag instead e.g. /i
+    #    instead of [nN] etc.
+
+    # e.g. 1:2nV  => after extra time a.e.t
+    regex_et = /\b(\d{1,2})[:\-](\d{1,2})[nN][vV]\b/
+
+    # e.g. 5:4iE  => penalty / after penalty a.p
+    regex_p = /\b(\d{1,2})[:\-](\d{1,2})[iI][eE]\b/
+
     scores = []
-    
+
+    ## todo: how to handle game w/o extra time
+    #   but w/ optional penalty ???  e.g. used in copa liberatores, for example
+    #    retrun 0,0 or nil,nil for extra time score ?? or -1, -1 ??
+    #    for now use nil,nil
+
     if line =~ regex
       logger.debug "   score: >#{$1}-#{$2}<"
       
@@ -417,24 +436,35 @@ module SportDb::FixtureHelpers
 
       scores << $1.to_i
       scores << $2.to_i
-      
-      if line =~ regex_ot
-        logger.debug "   score.ot: >#{$1}-#{$2}<"
-      
-        line.sub!( regex_ot, '[SCORE.OT]' )
+    end
+
+    ## todo:
+    ##   reverse matching order ??? allows us to support spaces for nV and iE
+    ##    why? why not??
 
-        scores << $1.to_i
-        scores << $2.to_i
+    if line =~ regex_et
+      logger.debug "   score.et: >#{$1}-#{$2}<"
       
-        if line =~ regex_p
-          logger.debug "   score.p: >#{$1}-#{$2}<"
+      line.sub!( regex_et, '[SCORE.ET]' )
+
+      ## check scores empty? - fill with nil,nil
+      scores += [nil,nil]  if scores.size == 0
+
+      scores << $1.to_i
+      scores << $2.to_i
+    end
+
+    if line =~ regex_p
+      logger.debug "   score.p: >#{$1}-#{$2}<"
       
-          line.sub!( regex_p, '[SCORE.P]' )
+      line.sub!( regex_p, '[SCORE.P]' )
 
-          scores << $1.to_i
-          scores << $2.to_i
-        end
-      end
+      ## check scores empty? - fill with nil,nil
+      scores += [nil,nil]  if scores.size == 0
+      scores += [nil,nil]  if scores.size == 2
+
+      scores << $1.to_i
+      scores << $2.to_i
     end
     scores
   end # methdod find_scores!

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.7.6'
+  VERSION = '1.7.7'
 end
 
 

data/test/helper.rb

@@ -9,8 +9,45 @@ require 'minitest/autorun'
 # include MiniTest::Unit  # lets us use TestCase instead of MiniTest::Unit::TestCase
 
 
-## our own code
+require 'pp'
+
+
+# ruby gems
 
+require 'active_record'
+
+require 'worlddb'
 require 'logutils'
+require 'logutils/db'   # NB: explict require required for LogDb (not automatic) 
+
+## our own code
+
 require 'sportdb'
 
+
+def setup_in_memory_db
+  # Database Setup & Config
+
+  db_config = {
+    adapter:  'sqlite3',
+    database: ':memory:'
+  }
+
+  pp db_config
+
+  ActiveRecord::Base.logger = Logger.new( STDOUT )
+  ## ActiveRecord::Base.colorize_logging = false  - no longer exists - check new api/config setting?
+
+  ## NB: every connect will create a new empty in memory db
+  ActiveRecord::Base.establish_connection( db_config )
+
+
+  ## build schema
+
+  LogDb.create
+  WorldDb.create
+  SportDb.create
+end
+
+
+setup_in_memory_db()

data/test/test_changes.rb

@@ -0,0 +1,74 @@
+# encoding: utf-8
+
+require 'helper'
+
+class TestChanges < MiniTest::Unit::TestCase
+
+  def test_scores
+    game1 = SportDb::Models::Game.new
+    game1.score1 = 1
+    game1.score2 = 2
+
+    game2 = SportDb::Models::Game.new
+    game2.score1   = 1
+    game2.score2   = 1
+    game2.score1p  = 5
+    game2.score2p  = 3
+
+    game_attribs = {
+      score1: 1,
+      score2: 2,
+      score1et: nil,
+      score2et: nil,
+      score1p:  nil,
+      score2p:  nil
+    }
+    
+    assert_equal  false, game1.check_for_changes( game_attribs )
+    assert_equal  true,  game2.check_for_changes( game_attribs )
+  end
+  
+  def test_play_at
+    game1 = SportDb::Models::Game.new
+    game1.score1 = 1
+    game1.score2 = 2
+    game1.play_at = DateTime.new( 2012, 11, 5 )
+
+    game2 = SportDb::Models::Game.new
+    game2.score1   = 1
+    game2.score2   = 2
+    game2.play_at = DateTime.new( 2012, 12, 24 )
+
+    game_attribs = {
+      score1:  1,
+      score2:  2,
+      play_at: DateTime.new( 2012, 11, 5 )
+    }
+    
+    assert_equal  false, game1.check_for_changes( game_attribs )
+    assert_equal  true,  game2.check_for_changes( game_attribs )
+  end
+
+  def test_group_id
+    game1 = SportDb::Models::Game.new
+    game1.score1 = 1
+    game1.score2 = 2
+    game1.group_id = 1
+
+    game2 = SportDb::Models::Game.new
+    game2.score1   = 1
+    game2.score2   = 2
+    game2.group_id = 2
+
+    game_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 )
+  end
+
+  
+end # class TestChanges

data/test/test_cursor.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+
+require 'helper'
+
+class TestCursor < MiniTest::Unit::TestCase
+
+  def test_games
+    games = []
+    
+    games << SportDb::Models::Game.new( score1: 3, score2: 1, play_at: DateTime.new(2013, 8, 9) )
+    games << SportDb::Models::Game.new( score1: 1, score2: 3, play_at: DateTime.new(2013, 8, 10) )
+    games << SportDb::Models::Game.new( score1: 2, score2: 0, play_at: DateTime.new(2013, 8, 10) )
+    games << SportDb::Models::Game.new( score1: 3, score2: 2, play_at: DateTime.new(2013, 8, 12) )  # new_week
+
+    SportDb::Models::GameCursor.new( games ).each do |game,state|
+      if state.index == 0
+        assert_equal 3, game.score1
+        assert_equal 1, game.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 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 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 true,  state.new_date?
+        assert_equal true,  state.new_week?
+        assert_equal false, state.new_year?
+      end
+    end
+  end
+
+end # class TestCursor

data/test/test_date.rb

@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+require 'helper'
+
+class TestDate < MiniTest::Unit::TestCase
+
+  def test_date
+    assert_datetime DateTime.new( 2013, 1, 19, 22 ),     parse_date( '19.01.2013 22.00' )
+    assert_datetime DateTime.new( 2013, 1, 21, 21, 30 ), parse_date( '21.01.2013 21.30' )
+
+    assert_date     DateTime.new( 2013, 1, 26 ),         parse_date( '26.01.2013' )
+  end
+
+private
+
+  ## todo: check if assert_datetime or assert_date exist already? what is the best practice to check dates ???
+  def assert_date( exp, act )
+    assert_equal exp.year,  act.year
+    assert_equal exp.month, act.month 
+    assert_equal exp.day,   act.day
+  end
+  
+  def assert_time( exp, act )
+    assert_equal exp.hour, act.hour
+    assert_equal exp.min,  act.min
+  end
+
+  def assert_datetime( exp, act )
+    assert_date( exp, act )
+    assert_time( exp, act )
+  end
+
+  class Reader
+    include LogUtils::Logging      # add logger
+    include SportDb::FixtureHelpers
+  end
+
+  def parse_date( line, opts={} )
+     # e.g. lets you pass in opts[:start_at] ???
+     reader = Reader.new
+     reader.find_date!( line, opts )
+  end
+
+end # class TestScores

data/test/test_round.rb

@@ -18,28 +18,29 @@ class TestRound < MiniTest::Unit::TestCase
 
     pos, title, title2, group_pos, group_title, ko = parse_round( line )
 
-    assert( pos == 2 )
-    assert( title == "2. Round" )
-    assert( title2 == nil )
-    assert( ko == false )
+    assert_equal 2, pos
+    assert_equal '2. Round', title
+    assert_equal nil, title2
+    assert_equal false, ko
 
     line = "(1) Matchday P.1  /  1st Leg  //   January 22-24"
 
     pos, title, title2, group_pos, group_title, ko = parse_round( line )
 
-    assert( pos == 1 )
-    assert( title == "Matchday P.1  /  1st Leg" )
-    assert( title2 == "January 22-24" )
-    assert( ko == false )
+    assert_equal 1, pos
+    assert_equal 'Matchday P.1  /  1st Leg', title
+    assert_equal 'January 22-24', title2
+    assert_equal false, ko
 
     line = "(4) Matchday 2 / Group 1  //  February 19-21"
 
     pos, title, title2, group_pos, group_title, ko = parse_round( line )
 
-    assert( pos == 4 )
-    assert( title == "Matchday 2" )
-    assert( title2 == "February 19-21" )
-    assert( ko == false )
+    assert_equal 4, pos
+    assert_equal 'Matchday 2', title 
+    assert_equal 'February 19-21', title2
+    assert_equal false, ko
+
 
     line = "(13) Round of 16 / 1st Leg   //  April 25, May 1-3"
 
@@ -101,7 +102,7 @@ class TestRound < MiniTest::Unit::TestCase
 
     pos, title, title2, group_pos, group_title, ko = parse_round( line )
 
-    assert( pos = 2 )
+    assert( pos == 2 )
     assert( title == 'Jornada 2' )
     assert( title2 == '27, 28 y 29 de julio' )
     assert( ko == false )
@@ -110,7 +111,7 @@ class TestRound < MiniTest::Unit::TestCase
 
     pos, title, title2, group_pos, group_title, ko = parse_round( line )
 
-    assert( pos = 18 )
+    assert( pos == 18 )
     assert( title == 'Cuartos de Final / Ida' )
     assert( title2 == '14/15 de noviembre' )
     assert( ko == false )
@@ -119,7 +120,7 @@ class TestRound < MiniTest::Unit::TestCase
 
     pos, title, title2, group_pos, group_title, ko = parse_round( line )
 
-    assert( pos = 19 )
+    assert( pos == 19 )
     assert( title == 'Cuartos de Final / Vuelta' )
     assert( title2 == '17/18 de noviembre' )
     assert( ko == true )
@@ -133,7 +134,7 @@ class TestRound < MiniTest::Unit::TestCase
     
     pos, title, title2, group_pos, group_title, ko = parse_round( line )
 
-    assert( pos = 5 )
+    assert( pos == 5 )
     assert( title == 'Spieltag 5' )
     assert( title2 == 'Di./Mi., 20.+21. Nov 2012' )
     assert( ko == false )
@@ -142,7 +143,7 @@ class TestRound < MiniTest::Unit::TestCase
 
     pos, title, title2, group_pos, group_title, ko = parse_round( line )
 
-    assert( pos = 8 )
+    assert( pos == 8 )
     assert( title == 'Achtelfinale Rückspiele' )
     assert( title2 == 'Di./Mi., 5.+6./12.+13. Mär 2013' )
     assert( ko == true )

data/test/test_scores.rb

@@ -0,0 +1,45 @@
+# encoding: utf-8
+
+require 'helper'
+
+class TestScores < MiniTest::Unit::TestCase
+
+
+  def test_scores
+    assert_equal [10,0], parse_scores( '10:0' )
+    assert_equal [1,22], parse_scores( '1:22' )
+    assert_equal [1,22], parse_scores( '1-22' )
+
+    assert_equal [], parse_scores( '1-222' )   # do not support three digits
+    assert_equal [], parse_scores( '111-0' )   # do not support three digits
+    assert_equal [], parse_scores( '1:222' )   # do not support three digits
+    assert_equal [], parse_scores( '111:0' )   # do not support three digits
+
+    ## penality only
+    assert_equal [nil,nil,nil,nil,3,4], parse_scores( '3-4iE' )
+    assert_equal [nil,nil,nil,nil,3,4], parse_scores( '3:4iE' )
+
+    ## extra time only - allow ?? why not ?? only allow penalty w/ missing extra time?
+    ## todo/fix: issue warning or error in parser!!!
+    assert_equal [nil,nil,3,4], parse_scores( '3-4nV' )
+    assert_equal [nil,nil,3,4], parse_scores( '3:4nV' )
+
+    assert_equal [1,1,3,4], parse_scores( '3:4nV 1:1' )
+    assert_equal [1,1,3,4], parse_scores( '1:1 3:4nV' )
+
+    assert_equal [1,1,nil,nil,3,4], parse_scores( '3:4iE 1:1' )
+    assert_equal [1,1,nil,nil,3,4], parse_scores( '1:1 3:4iE' )
+  end
+
+private
+  class Reader
+    include LogUtils::Logging      # add logger
+    include SportDb::FixtureHelpers
+  end
+
+  def parse_scores( line )
+     reader = Reader.new
+     reader.find_scores!( line )
+  end
+
+end # class TestScores

data/test/test_winner.rb

@@ -0,0 +1,95 @@
+# encoding: utf-8
+
+require 'helper'
+
+class TestWinner < MiniTest::Unit::TestCase
+
+  def test_1_2
+    game = SportDb::Models::Game.new
+    game.score1 = 1
+    game.score2 = 2
+    game.calc_winner
+    
+    assert_equal 2,     game.winner90
+    assert_equal 2,     game.winner
+    assert_equal true,  game.winner2?
+    assert_equal false, game.winner1?
+    assert_equal false, game.draw?
+  end
+
+  def test_1_1
+    game = SportDb::Models::Game.new
+    game.score1 = 1
+    game.score2 = 1
+    game.calc_winner
+    
+    assert_equal 0,     game.winner90
+    assert_equal 0,     game.winner
+    assert_equal true,  game.draw?
+    assert_equal false, game.winner1?
+    assert_equal false, game.winner2?
+  end
+
+  def test_2_1
+    game = SportDb::Models::Game.new
+    game.score1 = 2
+    game.score2 = 1
+    game.calc_winner
+    
+    assert_equal 1,     game.winner90
+    assert_equal 1,     game.winner
+    assert_equal true,  game.winner1?
+    assert_equal false, game.winner2?
+    assert_equal false, game.draw?
+  end
+
+  def test_1_1__2_1
+    game = SportDb::Models::Game.new
+    game.score1   = 1
+    game.score2   = 1
+    game.score1et = 2
+    game.score2et = 1
+    game.calc_winner
+    
+    assert_equal 0,     game.winner90
+    assert_equal 1,     game.winner
+    assert_equal true,  game.winner1?
+    assert_equal false, game.winner2?
+    assert_equal false, game.draw?
+  end
+
+  def test_1_1__2_2__3_5
+    game = SportDb::Models::Game.new
+    game.score1   = 1
+    game.score2   = 1
+    game.score1et = 2
+    game.score2et = 2
+    game.score1p  = 3
+    game.score2p  = 5
+    game.calc_winner
+
+    assert_equal 0,     game.winner90
+    assert_equal 2,     game.winner
+    assert_equal true,  game.winner2?
+    assert_equal false, game.winner1?
+    assert_equal false, game.draw?
+  end
+
+  def test_1_1_x_3_5
+    game = SportDb::Models::Game.new
+    game.score1   = 1
+    game.score2   = 1
+    game.score1et = nil
+    game.score2et = nil
+    game.score1p  = 3
+    game.score2p  = 5
+    game.calc_winner
+
+    assert_equal 0,     game.winner90
+    assert_equal 2,     game.winner
+    assert_equal true,  game.winner2?
+    assert_equal false, game.winner1?
+    assert_equal false, game.draw?
+  end
+
+end # class TestWinner

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &81394750 !ruby/object:Gem::Requirement
+  requirement: &70825440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *81394750
+  version_requirements: *70825440
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &81394520 !ruby/object:Gem::Requirement
+  requirement: &70825170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *81394520
+  version_requirements: *70825170
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &81394270 !ruby/object:Gem::Requirement
+  requirement: &70824860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *81394270
+  version_requirements: *70824860
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &81394020 !ruby/object:Gem::Requirement
+  requirement: &70824550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *81394020
+  version_requirements: *70824550
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &81393780 !ruby/object:Gem::Requirement
+  requirement: &70824310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *81393780
+  version_requirements: *70824310
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -117,6 +117,7 @@ files:
 - lib/sportdb/models/season.rb
 - lib/sportdb/models/team.rb
 - lib/sportdb/models/track.rb
+- lib/sportdb/models/utils.rb
 - lib/sportdb/reader.rb
 - lib/sportdb/schema.rb
 - lib/sportdb/service.rb
@@ -156,9 +157,14 @@ files:
 - lib/sportdb/version.rb
 - tasks/test.rb
 - test/helper.rb
+- test/test_changes.rb
+- test/test_cursor.rb
+- test/test_date.rb
 - test/test_lang.rb
 - test/test_round.rb
+- test/test_scores.rb
 - test/test_utils.rb
+- test/test_winner.rb
 - .gemtest
 homepage: https://github.com/geraldb/sport.db.ruby
 licenses:
@@ -198,6 +204,11 @@ signing_key:
 specification_version: 3
 summary: sportdb - sport.db command line tool
 test_files:
+- test/test_date.rb
 - test/test_lang.rb
+- test/test_cursor.rb
 - test/test_round.rb
+- test/test_scores.rb
+- test/test_winner.rb
 - test/test_utils.rb
+- test/test_changes.rb