sportdb 1.8.20 → 1.8.21

data/Manifest.txt

@@ -112,9 +112,17 @@ test/data/at-austria/teams.txt
 test/data/at-austria/teams_2.txt
 test/data/world-cup/1930/cup.txt
 test/data/world-cup/1930/cup.yml
+test/data/world-cup/1954/cup.txt
+test/data/world-cup/1954/cup.yml
+test/data/world-cup/1962/cup.txt
+test/data/world-cup/1962/cup.yml
 test/data/world-cup/leagues.txt
-test/data/world-cup/seasons.txt
-test/data/world-cup/teams.txt
+test/data/world-cup/seasons_1930.txt
+test/data/world-cup/seasons_1954.txt
+test/data/world-cup/seasons_1962.txt
+test/data/world-cup/teams_1930.txt
+test/data/world-cup/teams_1954.txt
+test/data/world-cup/teams_1962.txt
 test/helper.rb
 test/test_changes.rb
 test/test_cursor.rb

data/config/fixtures/en.yml

@@ -19,13 +19,13 @@ stage:    Stage|Phase|Rounds
 
 ### Knockout rounds
 
-playoffs:       Play-off|Play-offs|Play-off for quarter-finals
+playoffs:       Playoff|Playoffs|Play-off|Play-offs|Play-off for quarter-finals
 round32:        Round of 32|Last 32
 round16:        Round of 16|Last 16|8th finals
 quarterfinals:  Quarterfinals|Quarter-finals|Quarters|Quarterfinal|Last 8
 semifinals:     Semifinals|Semi-finals|Semis|Last 4
 fifthplace:     Fifth place match|Fifth place|5th place match|5th place final|5th place|Match for fifth place|Match for 5th place
-thirdplace:     Third place match|Third place|3rd place match|3rd place final|3rd place|Match for third place|Match for 3rd place|Third-place play-off|Third place play-off
+thirdplace:     Third place match|Third-place match|Third place|3rd place match|3rd place final|3rd place|Match for third place|Match for 3rd place|Third-place play-off|Third place play-off
 final:          Final|Finals
 
 

data/lib/sportdb/readers/game.rb

@@ -89,7 +89,9 @@ class GameReader
     ## NB: assume active activerecord connection
 
     ## reset cached values
-    @patch_rounds  = {}
+    @patch_round_ids_dates = []
+    @patch_round_ids_pos   = []
+
     @round         = nil     ## fix: change/rename to @last_round !!!
     @group         = nil     ## fix: change/rename to @last_group !!!
     @last_date     = nil
@@ -100,7 +102,7 @@ class GameReader
     #    for all 1-n fixture files (no need to configure every time!!)
 
     @event = Event.find_by_key!( event_key )
-    
+
     logger.debug "Event #{@event.key} >#{@event.title}<"
 
     ### fix: use build_title_table_for ??? why? why not??
@@ -118,6 +120,14 @@ class GameReader
   def parse_group_header( line )
     logger.debug "parsing group header line: >#{line}<"
 
+    # note: group header resets (last) round  (allows, for example):
+    #  e.g.
+    #  Group Playoffs/Replays       -- round header
+    #    team1 team2                -- match 
+    #  Group B:                     -- group header
+    #    team1 team2 - match  (will get new auto-matchday! not last round)
+    @round         = nil     ## fix: change/rename to @last_round !!!
+
     title, pos = find_group_title_and_pos!( line )
 
     logger.debug "    title: >#{title}<"
@@ -256,14 +266,25 @@ class GameReader
 
     ## check if pos available; if not auto-number/calculate
     if pos.nil?
-      pos = (@last_round_pos||0)+1
-      logger.debug( "  no round pos found; auto-number round - use (#{pos})" )
+      if @patch_round_ids_pos.empty?
+        pos = (@last_round_pos||0)+1
+        logger.debug( "  no round pos found; auto-number round - use (#{pos})" )
+      else
+        # note: if any rounds w/o pos already seen (add for auto-numbering at the end)
+        #  will get auto-numbered sorted by start_at date
+        pos = 999001+@patch_round_ids_pos.length   # e.g. 999<count> - 999001,999002,etc.
+        logger.debug( "  no round pos found; auto-number round w/ patch (backtrack) at the end" )
+      end
     end
 
     # store pos for auto-number next round if missing
     #  - note: only if greater/bigger than last; use max
     #  - note: last_round_pos might be nil - thus set to 0
-    @last_round_pos = [pos,@last_round_pos||0].max
+    if pos > 999000
+      # note: do NOT update last_round_pos for to-be-patched rounds
+    else
+      @last_round_pos = [pos,@last_round_pos||0].max
+    end
 
 
     title = find_round_header_title!( line )
@@ -289,8 +310,14 @@ class GameReader
       knockout: knockout_flag
     }
 
+    if pos > 999000
+      # no pos (e.g. will get autonumbered later) - try match by title for now
+      #  e.g. lets us use title 'Group Replays', for example, multiple times
+      @round = Round.find_by_event_id_and_title( @event.id, title ) 
+    else
+      @round = Round.find_by_event_id_and_pos( @event.id, pos )
+    end
 
-    @round = Round.find_by_event_id_and_pos( @event.id, pos )
     if @round.present?
       logger.debug "update round #{@round.id}:"
     else
@@ -300,8 +327,8 @@ class GameReader
       round_attribs = round_attribs.merge( {
         event_id: @event.id,
         pos:   pos,
-        start_at: Time.utc('1912-12-12'),
-        end_at:   Time.utc('1912-12-12')
+        start_at: Date.parse('1911-11-11'),
+        end_at:   Date.parse('1911-11-11')
       })
     end
 
@@ -309,8 +336,9 @@ class GameReader
    
     @round.update_attributes!( round_attribs )
 
-    ### store list of round is for patching start_at/end_at at the end
-    @patch_rounds[ @round.id ] = @round.id
+    @patch_round_ids_pos   << @round.id    if pos > 999000
+    ### store list of round ids for patching start_at/end_at at the end
+    @patch_round_ids_dates << @round.id   # todo/fix/check: check if round has definition (do NOT patch if definition (not auto-added) present)
   end
 
 
@@ -426,12 +454,35 @@ class GameReader
       if round.nil?
         logger.warn( "  !!!! no round match found for date #{date}" )
         pp Round.all
+
+        ###################################
+        # -- try auto-adding matchday
+        round = Round.new
+
+        round_attribs = {
+          event_id: @event.id,
+          title: "Matchday #{date.to_date}",
+          pos: 999001+@patch_round_ids_pos.length,   # e.g. 999<count> - 999001,999002,etc.
+          start_at:  date.to_date,
+          end_at:    date.to_date 
+        }
+
+        logger.info( "  auto-add round >Matchday #{date.to_date}<" )
+        logger.debug round_attribs.to_json
+
+        round.update_attributes!( round_attribs )
+
+        @patch_round_ids_pos << round.id   # todo/check - add just id or "full" record as now - why? why not?
       end
 
       # store pos for auto-number next round if missing
       #  - note: only if greater/bigger than last; use max
       #  - note: last_round_pos might be nil - thus set to 0
-      @last_round_pos = [round.pos,@last_round_pos||0].max
+      if round.pos > 999000
+        # note: do NOT update last_round_pos for to-be-patched rounds
+      else
+        @last_round_pos = [round.pos,@last_round_pos||0].max     
+      end
 
       ## note: will crash (round.pos) if round is nil
       logger.debug( "  using round #{round.pos} >#{round.title}< start_at: #{round.start_at}, end_at: #{round.end_at}" )
@@ -557,36 +608,71 @@ class GameReader
       end
     end # lines.each
 
+    ###########################
+    # backtrack and patch round pos and round dates (start_at/end_at)
+    #  note: patch dates must go first! (otherwise sort_by_date will not work for round pos)
 
-###
-#  fix: do NOT patch if auto flag is set to false !!!
-#   e.g. rounds got added w/ round def (not w/ round header)
+    unless @patch_round_ids_dates.empty?
+      ###
+      #  fix: do NOT patch if auto flag is set to false !!!
+      #   e.g. rounds got added w/ round def (not w/ round header)
 
-    @patch_rounds.each do |k,v|
-      logger.debug "patch start_at/end_at date for round #{k}:"
-      round = Round.find( k )
-      games = round.games.order( 'play_at asc' ).all
-      
-      ## skip rounds w/ no games
-      
-      ## todo/fix: what's the best way for checking assoc w/ 0 recs?
-      next if games.size == 0
-    
-      round_attribs = {}
-      
-      ## todo: check for no records
-      ##  e.g. if game[0].present? or just if game[0]  ??
+      # note: use uniq - to allow multiple round headers (possible?)
+
+      Round.find( @patch_round_ids_dates.uniq ).each do |r|
+        logger.debug "patch round start_at/end_at date for #{r.title}:"
 
-      # note: make sure start_at/end_at is date only (e.g. use play_at.to_date)
-      #   sqlite3 saves datetime in date field as datetime, for example (will break date compares later!)
+        ## note:
+        ## will add "scope" pos first e.g
+        #
+        ## SELECT "games".* FROM "games"  WHERE "games"."round_id" = ?
+        # ORDER BY pos, play_at asc  [["round_id", 7]]
+        #   thus will NOT order by play_at but by pos first!!!
+        # =>
+        #  need to unscope pos!!! or use unordered_games - games_by_play_at_date etc.??
+        #   thus use reorder()!!! - not just order('play_at asc')
 
-      round_attribs[:start_at] = games[0].play_at.to_date
-      round_attribs[:end_at  ] = games[-1].play_at.to_date
+        games = r.games.reorder( 'play_at asc' ).all
+
+        ## skip rounds w/ no games
+
+        ## todo/check/fix: what's the best way for checking assoc w/ 0 recs?
+        next if games.size == 0
+
+        # note: make sure start_at/end_at is date only (e.g. use play_at.to_date)
+        #   sqlite3 saves datetime in date field as datetime, for example (will break date compares later!)
+
+        round_attribs = {
+          start_at: games[0].play_at.to_date,   # use games.first ?
+          end_at:   games[-1].play_at.to_date  # use games.last ? why? why not?
+        }
 
-      logger.debug round_attribs.to_json
-      round.update_attributes!( round_attribs )
+        logger.debug round_attribs.to_json
+        r.update_attributes!( round_attribs )
+      end
     end
-    
+
+    unless @patch_round_ids_pos.empty?
+      # step 1: sort by date
+      # step 2: update pos
+      # note: use uniq - to allow multiple round headers (possible?)
+      Round.order( 'start_at asc').find( @patch_round_ids_pos.uniq ).each_with_index do |r,idx|
+        # note: starts counting w/ zero(0)
+        logger.debug "[#{idx+1}] patch round pos for #{r.title}:"
+        round_attribs = {
+          pos: idx+1
+        }
+
+        # update title if Matchday XXXX  e.g. use Matchday 1 etc.
+        if r.title.starts_with?('Matchday')
+          round_attribs[:title] = "Matchday #{idx+1}"
+        end
+
+        logger.debug round_attribs.to_json
+        r.update_attributes!( round_attribs )
+      end
+    end
+
   end # method parse_fixtures
 
 end # class GameReader

data/lib/sportdb/utils_round.rb

@@ -122,8 +122,20 @@ module SportDb
     # e.g.  (1)   - must start line 
     regex_pos = /^[ \t]*\((\d{1,3})\)[ \t]+/
 
+ 
+    #### fix:
+    ## use/make keywords required
+    # e.g. Round of 16  -> should NOT match 16!
+    # Round 16 - ok
+    #  thus, check for required keywords
+
     ## find free standing number
-    regex_num = /\b(\d{1,3})\b/
+    # note: /\b(\d{1,3})\b/
+    #   will match -12
+    #  thus, use space required - will NOT match  -2 e.g. Group-2 Play-off
+    #  note:  allow  1. Runde  n
+    #                1^ Giornata
+    regex_num = /(?:^|\s)(\d{1,3})(?:[.\^\s]|$)/
 
     if line =~ regex_pos
       logger.debug "   pos: >#{$1}<"

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.20'
+  VERSION = '1.8.21'
 end
 
 

data/test/data/world-cup/1954/cup.txt

@@ -0,0 +1,90 @@
+##################################################
+# World Cup 1954 Switzerland, 16 June - 4 July
+
+
+Group 1  |  Brazil   Yugoslavia    France          Mexico
+Group 2  |  Hungary  West Germany  Turkey          South Korea
+Group 3  |  Uruguay  Austria       Czechoslovakia  Scotland
+Group 4  |  England  Switzerland   Italy           Belgium
+
+
+Group 1:
+
+(3)  16 June    Brazil       5-0   Mexico    @ Charmilles Stadium, Geneva
+(4)  16 June    Yugoslavia   1-0   France    @ Stade Olympique de la Pontaise, Lausanne
+
+(10) 19 June    Brazil     1-1 a.e.t. 1-1  Yugoslavia  @ Stade Olympique de la Pontaise, Lausanne
+(11) 19 June    France     3-2             Mexico      @ Charmilles Stadium, Geneva
+
+
+Group 2:
+
+(5)  17 June    West Germany    4-1   Turkey         @ Wankdorf Stadium, Bern
+(8)  17 June    Hungary         9-0   South Korea    @ Hardturm Stadium, Zürich
+
+(14) 20 June    Hungary         8-3   West Germany   @ St. Jakob Stadium, Basel
+(15) 20 June    Turkey          7-0   South Korea    @ Charmilles Stadium, Geneva
+
+
+# note: hack - avoid group title match for "Group 2" for now; use "Group-2"
+#  fix: add and check group 2 match only after separator / or such
+
+Group-2 Play-off
+
+### what match number to use - fifa says 231??  - start 24+offset (24==regular matches) e.g. 24+1=25 
+
+(25) 23 June    West Germany     7-2  Turkey     @ Hardturm Stadium, Zürich
+
+
+Group 3:
+
+(1)  16 June    Uruguay          2-0  Czechoslovakia    @ Wankdorf Stadium, Bern
+(2)  16 June    Austria          1-0  Scotland          @ Hardturm Stadium, Zürich
+
+(9)  19 June    Austria          5-0  Czechoslovakia    @ Hardturm Stadium, Zürich
+(12) 19 June    Uruguay          7-0  Scotland          @ St. Jakob Stadium, Basel
+
+
+Group 4:
+
+(6)  17 June    England          4-4 a.e.t. 3-3  Belgium    @ St. Jakob Stadium, Basel
+(7)  17 June    Switzerland      2-1  Italy                 @ Stade Olympique de la Pontaise, Lausanne
+
+(13) 20 June    England          2-0  Switzerland     @ Wankdorf Stadium, Bern
+(16) 20 June    Italy            4-1  Belgium         @ Cornaredo Stadium, Lugano
+
+
+# note: hack - avoid group title match for "Group 4" for now; use "Group-4"
+#  fix: add and check group 4 match only after separator / or such
+
+Group-4 Play-off
+
+### what match number to use - fifa says 211??  - start 24+offset (24==regular matches) e.g. 24+2=26 
+
+(26) 23 June    Switzerland      4-1   Italy      @ St. Jakob Stadium, Basel
+
+
+Quarter-finals
+
+(19) 26 June    Austria          7-5   Switzerland    @ Stade Olympique de la Pontaise, Lausanne
+(20) 26 June    Uruguay          4-2   England        @ St. Jakob Stadium, Basel
+
+(17) 27 June    Yugoslavia       0-2   West Germany   @ Charmilles Stadium, Geneva
+(18) 27 June    Brazil           2-4   Hungary        @ Wankdorf Stadium, Bern
+
+
+Semi-finals
+
+(21) 30 June    West Germany     6-1         Austria        @ St. Jakob Stadium, Basel
+(22) 30 June    Hungary      4-2 a.e.t. 2-2  Uruguay        @ Stade Olympique de la Pontaise, Lausanne
+
+
+Third place match
+
+(23) 3 July     Uruguay         1-3    Austria   @ Hardturm Stadium, Zürich
+
+
+Final
+
+(24) 4 July     Hungary         2-3    West Germany    @ Wankdorf Stadium, Bern
+

data/test/data/world-cup/1954/cup.yml

@@ -0,0 +1,30 @@
+##################################################
+# World Cup 1954 Switzerland, 16 June - 4 July
+
+league: world
+season: 1954
+start_at: 1954-06-16
+
+# 16 Teams
+
+teams:
+## Asia
+- kor # Korea Republic
+## Europe
+- aut # Austria
+- bel # Belgium
+- tch # Czechoslovakia
+- eng # England
+- fra # France
+- frg # West Germany
+- hun # Hungary
+- ita # Italy
+- sco # Scotland
+- sui # Switzerland
+- tur # Turkey
+- yug # Yugoslavia
+## North and Central America
+- mex # Mexico
+## South America
+- bra # Brazil
+- uru # Uruguay

data/test/data/world-cup/1962/cup.txt

@@ -0,0 +1,86 @@
+###########################################
+# World Cup 1962 Chile, 30 May - 17 June
+
+
+Group 1  |  Soviet Union    Yugoslavia      Uruguay    Colombia
+Group 2  |  West Germany    Chile           Italy      Switzerland 
+Group 3  |  Brazil          Czechoslovakia  Mexico     Spain
+Group 4  |  Hungary         England         Argentina  Bulgaria
+
+
+Group 1:
+
+### note: try out of order e.g.  3 June before 30 May etc.
+##   should work for auto-add matchdays (order should not matter - get sorted and auto-assigned at the end)
+
+(17) 6 June    Soviet Union    2-1  Uruguay      @ Estadio Carlos Dittborn, Arica
+(21) 7 June    Yugoslavia      5-0  Colombia     @ Estadio Carlos Dittborn, Arica
+
+(9)  2 June    Yugoslavia      3-1  Uruguay      @ Estadio Carlos Dittborn, Arica
+(13) 3 June    Soviet Union    4-4  Colombia     @ Estadio Carlos Dittborn, Arica
+
+(1)  30 May    Uruguay         2-1  Colombia      @ Estadio Carlos Dittborn, Arica
+(5)  31 May    Soviet Union    2-0  Yugoslavia    @ Estadio Carlos Dittborn, Arica
+
+
+
+Group 2:
+
+(2)  30 May    Chile           3-1  Switzerland   @ Estadio Nacional, Santiago
+(6)  31 May    West Germany    0-0  Italy         @ Estadio Nacional, Santiago
+
+(10)  2 June    Chile           2-0  Italy        @ Estadio Nacional, Santiago
+(14)  3 June    West Germany    2-1  Switzerland  @ Estadio Nacional, Santiago
+
+(18)  6 June    West Germany    2-0  Chile         @ Estadio Nacional, Santiago
+(22)  7 June    Italy           3-0  Switzerland   @ Estadio Nacional, Santiago
+
+
+Group 3:
+
+(19)  6 June    Brazil           2-1  Spain            @ Estadio Sausalito, Viña del Mar
+(23)  7 June    Mexico           3-1  Czechoslovakia   @ Estadio Sausalito, Viña del Mar
+
+(11)  2 June    Brazil           0-0  Czechoslovakia  @ Estadio Sausalito, Viña del Mar
+(15)  3 June    Spain            1-0  Mexico          @ Estadio Sausalito, Viña del Mar
+
+(3)  30 May    Brazil           2-0  Mexico    @ Estadio Sausalito, Viña del Mar
+(7)  31 May    Czechoslovakia   1-0  Spain     @ Estadio Sausalito, Viña del Mar
+
+
+Group 4:
+
+(12)  2 June    England    3-1  Argentina   @ Estadio El Teniente, Rancagua
+(16)  3 June    Hungary    6-1  Bulgaria    @ Estadio El Teniente, Rancagua
+
+(20)  6 June    Hungary    0-0  Argentina   @ Estadio El Teniente, Rancagua
+(24)  7 June    England    0-0  Bulgaria    @ Estadio El Teniente, Rancagua
+
+(4)  30 May    Argentina  1-0  Bulgaria    @ Estadio El Teniente, Rancagua
+(8)  31 May    Hungary    2-1  England     @ Estadio El Teniente, Rancagua
+
+
+
+Quarter-finals
+
+(25) 10 June   Chile           2-1  Soviet Union   @ Estadio Carlos Dittborn, Arica
+(26) 10 June   Yugoslavia      1-0  West Germany   @ Estadio Nacional, Santiago
+(27) 10 June   Brazil          3-1  England        @ Estadio Sausalito, Viña del Mar
+(28) 10 June   Czechoslovakia  1-0  Hungary        @ Estadio El Teniente, Rancagua
+
+
+Semi-finals
+
+(29) 13 June   Brazil           4-2  Chile       @ Estadio Nacional, Santiago
+(30) 13 June   Czechoslovakia   3-1  Yugoslavia  @ Estadio Sausalito, Viña del Mar
+
+
+Third place match
+
+(31) 16 June   Chile            1-0  Yugoslavia  @ Estadio Nacional, Santiago
+
+
+Final
+
+(32) 17 June   Brazil           3-1  Czechoslovakia  @ Estadio Nacional, Santiago
+

data/test/data/world-cup/1962/cup.yml

@@ -0,0 +1,32 @@
+###########################################
+# World Cup 1962 Chile, 30 May - 17 June
+
+league: world
+season: 1962
+start_at: 1962-05-30
+
+##
+# fix: add edition: or num:  e.g. num: 7 or edition: 7
+
+# 16 Teams
+teams:
+## Europe
+- bul # Bulgaria
+- tch # Czechoslovakia
+- eng # England
+- frg # West Germany
+- hun # Hungary
+- ita # Italy
+- urs # Soviet Union
+- esp # Spain
+- sui # Switzerland
+- yug # Yugoslavia
+## North and Central America
+- mex # Mexico
+## South America
+- arg # Argentina
+- bra # Brazil
+- chi # Chile
+- col # Colombia
+- uru # Uruguay
+

data/test/data/world-cup/seasons_1954.txt

@@ -0,0 +1,4 @@
+#####################
+# Seasons / Years
+
+1954

data/test/data/world-cup/seasons_1962.txt

@@ -0,0 +1,4 @@
+#####################
+# Seasons / Years
+
+1962

data/test/data/world-cup/{teams.txt → teams_1930.txt}

@@ -1,6 +1,8 @@
 #############################
 # 13 Teams
 
+## -- South America
+
 arg, Argentina,     ARG, ar
 bra, Brazil,        BRA, br
 bol, Bolivia,       BOL, bo
@@ -8,9 +10,17 @@ chi, Chile,         CHI, cl
 uru, Uruguay,       URU, uy
 per, Peru,          PER, pe
 par, Paraguay,      PAR, py
+
+
+## -- North and Central America
+
 mex, Mexico,        MEX, mx
 usa, United States, USA, us
-fra, France,        FRA, fr
-yug, Yugoslavia,    YUG, rs
-rou, Romania,       ROU, ro
-bel, Belgium,       BEL, be
+
+## -- Europe
+
+fra, France,         FRA, fr
+yug, Yugoslavia,     YUG, rs
+rou, Romania,        ROU, ro
+bel, Belgium,        BEL, be
+

data/test/data/world-cup/teams_1954.txt

@@ -0,0 +1,30 @@
+##########################
+# 16 Teams
+
+## -- Asia
+
+kor, South Korea, KOR, kr
+
+## -- Europe
+
+aut, Austria,        AUT, at
+bel, Belgium,        BEL, be
+tch, Czechoslovakia, TCH, cz
+eng, England,        ENG, en
+fra, France,         FRA, fr
+frg, West Germany,   FRG, de
+hun, Hungary,        HUN, hu
+ita, Italy,          ITA, it
+sco, Scotland,       SCO, sc
+sui, Switzerland,    SUI, ch
+tur, Turkey,         TUR, tr
+yug, Yugoslavia,     YUG, rs
+
+## -- North and Central America
+
+mex, Mexico, MEX, mx
+
+## -- South America
+
+bra, Brazil,  BRA, br
+uru, Uruguay, URU, uy

data/test/data/world-cup/teams_1962.txt

@@ -0,0 +1,29 @@
+#############################
+# 16 Teams
+
+## -- South America
+
+arg, Argentina,     ARG, ar
+bra, Brazil,        BRA, br
+chi, Chile,         CHI, cl
+col, Colombia,      COL, co
+uru, Uruguay,       URU, uy
+
+
+## -- North and Central America
+
+mex, Mexico,        MEX, mx
+
+## -- Europe
+
+bul, Bulgaria,       BUL, bg
+tch, Czechoslovakia, TCH, cz
+eng, England,        ENG, en
+frg, West Germany,   FRG, de 
+hun, Hungary,        HUN, hu
+ita, Italy,          ITA, it
+urs, Soviet Union,   URS, ru
+esp, Spain,          ESP, es
+sui, Switzerland,    SUI, ch
+yug, Yugoslavia,     YUG, rs
+

data/test/test_round_auto.rb

@@ -21,19 +21,38 @@ class TestRoundAuto < MiniTest::Unit::TestCase
 
   def add_countries
     countries = [
-      ['ar', 'Argentina',     'ARG' ],
-      ['br', 'Brazil',        'BRA' ],
-      ['bo', 'Bolivia',       'BOL' ],
-      ['cl', 'Chile',         'CHI' ],
-      ['uy', 'Uruguay',       'URU' ],
-      ['pe', 'Peru',          'PER' ],
-      ['py', 'Paraguay',      'PAR' ],
-      ['mx', 'Mexico',        'MEX' ],
-      ['us', 'United States', 'USA' ],
-      ['fr', 'France',        'FRA' ],
-      ['rs', 'Serbia',        'SRB' ],
-      ['be', 'Belgium',       'BEL' ],
-      ['ro', 'Romania',       'ROU' ]]
+      ['kr', 'South Korea',    'KOR' ],
+ 
+      ['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' ],
+
+      ['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' ],
+    ]
+
 
     countries.each do |country|
       key   = country[0]
@@ -44,9 +63,74 @@ class TestRoundAuto < MiniTest::Unit::TestCase
   end
 
 
+  def test_world_cup_1954
+    teamreader = TeamReader.new( SportDb.test_data_path )
+    teamreader.read( 'world-cup/teams_1954' )
+
+    assert_equal  16, Team.count
+
+    br = Team.find_by_key!( 'bra' )
+    uy = Team.find_by_key!( 'uru' )
+    be = Team.find_by_key!( 'bel' )
+
+    assert_equal 'Brazil',    br.title
+    assert_equal 'Uruguay',   uy.title
+    assert_equal 'Belgium',   be.title
+
+    assert_equal 'BRA', br.code
+    assert_equal 'URU', uy.code
+
+
+    seasonreader = SeasonReader.new( SportDb.test_data_path )
+    seasonreader.read( 'world-cup/seasons_1954')
+
+    assert_equal 1, Season.count
+
+    y = Season.find_by_key!( '1954' )
+    assert_equal '1954', y.title
+
+
+    leaguereader = LeagueReader.new( SportDb.test_data_path )
+    leaguereader.read( 'world-cup/leagues' )
+
+    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/1954/cup' )
+
+    assert_equal 1, Event.count
+
+    w = Event.find_by_key!( 'world.1954' )
+
+    assert_equal  16, w.teams.count
+    assert_equal  26, w.games.count
+    assert_equal  10, w.rounds.count
+
+    rounds_exp = [
+      [1,  'Matchday 1',        '1954-06-16', 4],
+      [2,  'Matchday 2',        '1954-06-17', 4],
+      [3,  'Matchday 3',        '1954-06-19', 4],
+      [4,  'Matchday 4',        '1954-06-20', 4],
+      [5,  'Group-2 Play-off',  '1954-06-23', 1],
+      [6,  'Group-4 Play-off',  '1954-06-23', 1],
+      [7,  'Quarter-finals',    '1954-06-26', 4],
+      [8,  'Semi-finals',       '1954-06-30', 2],
+      [9,  'Third place match', '1954-07-03', 1],
+      [10, 'Final',             '1954-07-04', 1],
+    ]
+
+    assert_rounds( rounds_exp )
+
+  end # test_world_cup_1954
+
+
   def test_world_cup_1930
     teamreader = TeamReader.new( SportDb.test_data_path )
-    teamreader.read( 'world-cup/teams' )
+    teamreader.read( 'world-cup/teams_1930' )
 
     assert_equal  13, Team.count
 
@@ -63,7 +147,7 @@ class TestRoundAuto < MiniTest::Unit::TestCase
 
 
     seasonreader = SeasonReader.new( SportDb.test_data_path )
-    seasonreader.read( 'world-cup/seasons')
+    seasonreader.read( 'world-cup/seasons_1930')
 
     assert_equal 1, Season.count
 
@@ -91,19 +175,143 @@ class TestRoundAuto < MiniTest::Unit::TestCase
     assert_equal  18, w.games.count
     assert_equal  12, w.rounds.count
 
+    rounds_exp = [
+      [1,  'Matchday 1',        '1930-07-13', 2],
+      [2,  'Matchday 2',        '1930-07-14', 2],
+      [3,  'Matchday 3',        '1930-07-15', 1],
+      [4,  'Matchday 4',        '1930-07-16', 1],
+      [5,  'Matchday 5',        '1930-07-17', 2],
+      [6,  'Matchday 6',        '1930-07-18', 1],
+      [7,  'Matchday 7',        '1930-07-19', 2],
+      [8,  'Matchday 8',        '1930-07-20', 2],
+      [9,  'Matchday 9',        '1930-07-21', 1],
+      [10, 'Matchday 10',       '1930-07-22', 1],
+      [11, 'Semi-finals',       '1930-07-26', 2],
+      [12, 'Final' ,            '1930-07-30', 1],
+    ]
+
+    assert_rounds( rounds_exp )
+
     ##
     # auto-numbered knock-out rounds
-    r11 = Round.find_by_pos!( 11 )
+    # r11 = Round.find_by_pos!( 11 )
 
-    assert_equal 'Semi-finals', r11.title
-    assert_equal 2,             r11.games.count
+    # assert_equal 'Semi-finals', r11.title
+    # assert_equal 2,             r11.games.count
 
-    r12 = Round.find_by_pos!( 12 )
+    # r12 = Round.find_by_pos!( 12 )
 
-    assert_equal 'Final', r12.title
-    assert_equal 1,       r12.games.count
+    # assert_equal 'Final', r12.title
+    # assert_equal 1,       r12.games.count
 
   end  # method test_world_cup_1930
 
 
+  def test_world_cup_1962
+    teamreader = TeamReader.new( SportDb.test_data_path )
+    teamreader.read( 'world-cup/teams_1962' )
+
+    assert_equal  16, Team.count
+
+    ar = Team.find_by_key!( 'arg' )
+    br = Team.find_by_key!( 'bra' )
+    it = Team.find_by_key!( 'ita' )
+
+    assert_equal 'Argentina', ar.title
+    assert_equal 'Brazil',    br.title
+    assert_equal 'Italy',     it.title
+
+    assert_equal 'ARG', ar.code
+    assert_equal 'BRA', br.code
+
+
+    seasonreader = SeasonReader.new( SportDb.test_data_path )
+    seasonreader.read( 'world-cup/seasons_1962')
+
+    assert_equal 1, Season.count
+
+    y = Season.find_by_key!( '1962' )
+    assert_equal '1962', y.title
+
+
+    leaguereader = LeagueReader.new( SportDb.test_data_path )
+    leaguereader.read( 'world-cup/leagues' )
+
+    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/1962/cup' )
+
+    assert_equal 1, Event.count
+
+    w = Event.find_by_key!( 'world.1962' )
+
+    assert_equal  16,  w.teams.count
+    assert_equal  32,  w.games.count
+    assert_equal  10,  w.rounds.count
+
+    rounds_exp = [
+      [1,  'Matchday 1',        '1962-05-30', 4],
+      [2,  'Matchday 2',        '1962-05-31', 4],
+      [3,  'Matchday 3',        '1962-06-02', 4],
+      [4,  'Matchday 4',        '1962-06-03', 4],
+      [5,  'Matchday 5',        '1962-06-06', 4],
+      [6,  'Matchday 6',        '1962-06-07', 4],
+      [7,  'Quarter-finals',    '1962-06-10', 4],
+      [8,  'Semi-finals',       '1962-06-13', 2],
+      [9,  'Third place match', '1962-06-16', 1],
+      [10, 'Final' ,            '1962-06-17', 1],
+    ]
+
+    assert_rounds( rounds_exp )
+    
+    #########################
+    ## 2nd run
+    ### try update (e.g. read again - should NOT create new rounds/games/teams)
+    #
+    #  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' )
+
+    assert_equal 1, Event.count
+
+    w = Event.find_by_key!( 'world.1962' )
+
+    assert_equal  16,  w.teams.count
+    assert_equal  32,  w.games.count
+    assert_equal  10,  w.rounds.count
+
+    assert_rounds( rounds_exp )
+
+  end  # method test_world_cup_1962
+
+####
+# helpers
+
+  def assert_rounds( rounds_exp )
+    rounds_exp.each do |round_exp|
+       round = Round.find_by_pos!( round_exp[0] )
+  
+      assert_equal round_exp[1], round.title
+
+      if round_exp[2]
+        start_at = Date.parse( round_exp[2] )
+        ## puts "round.start_at.class.name: #{round.start_at.class.name}"
+        assert_equal start_at, round.start_at    ## check works for date?
+      end
+
+      if round_exp[3]
+        count = round_exp[3]
+        assert_equal( count, round.games.count, "round.games.count #{count} != #{round.games.count} - #{round.title}")
+      end
+    end
+  end # method assert_rounds
+
+
 end # class TestRoundAuto

metadata

@@ -1,155 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.20
+  version: 1.8.21
+  prerelease: 
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &74073370 !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: *74073370
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &74073050 !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: *74073050
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &74072750 !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: *74072750
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &74072350 !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: *74072350
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &74071960 !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: *74071960
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &74071660 !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: *74071660
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &74071320 !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: *74071320
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &74071090 !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: *74071090
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &74070660 !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: *74070660
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &74070340 !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: *74070340
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -274,9 +245,17 @@ files:
 - test/data/at-austria/teams_2.txt
 - test/data/world-cup/1930/cup.txt
 - test/data/world-cup/1930/cup.yml
+- test/data/world-cup/1954/cup.txt
+- test/data/world-cup/1954/cup.yml
+- test/data/world-cup/1962/cup.txt
+- test/data/world-cup/1962/cup.yml
 - test/data/world-cup/leagues.txt
-- test/data/world-cup/seasons.txt
-- test/data/world-cup/teams.txt
+- test/data/world-cup/seasons_1930.txt
+- test/data/world-cup/seasons_1954.txt
+- test/data/world-cup/seasons_1962.txt
+- test/data/world-cup/teams_1930.txt
+- test/data/world-cup/teams_1954.txt
+- test/data/world-cup/teams_1962.txt
 - test/helper.rb
 - test/test_changes.rb
 - test/test_cursor.rb
@@ -293,7 +272,6 @@ files:
 homepage: https://github.com/geraldb/sport.db.ruby
 licenses:
 - Public Domain
-metadata: {}
 post_install_message: ! '******************************************************************************
 
 
@@ -311,30 +289,32 @@ 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_reader.rb
-- test/test_round_auto.rb
-- test/test_round_def.rb
-- test/test_round_header.rb
+- test/test_cursor.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_reader.rb
+- test/test_changes.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 6b49f1d9eb1e2369fca189847d4747a36d6580f1
-  data.tar.gz: 1a9ef5c40c3e83e3d8de49afcabe0a05e59ae982
-SHA512:
-  metadata.gz: 4c6cde7744335707e17253705a4f321bdd6c08384d550ad58c7853fd3d4e5efd097c137d43d7fe5a08d078390277481c9bb0e36d2db74e60f534fac1e0f9d2c9
-  data.tar.gz: 698495bbde6338c1855414963b0fd601af31c7926492d5269dbcf7af87007dd3581c759cc3266795b70600ad31c562d31f3a6224b5edbc4e6614f7f3a8f8c9b6