sportdb 1.8.10 → 1.8.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 40a271851bbcc415daa4d38228107ff187b11ada
+  data.tar.gz: e8566c5664d8c3041f090450d811399633960789
+SHA512:
+  metadata.gz: ea16708dac574bd45d742d4f5621b4226b0e24511a1b88c07758acfa056ce1b6eb8bdb8fbd24dedcde57bb58e702196c5658d17c38ea0651f6c4390e05e5ed6a
+  data.tar.gz: 267916684d3cc873c8edec9796b47fda7612f40aecde32b5b12153a86394d3b27df6ed33745bae9894770ad9606ba6fb3425cb4757f5f5fcef3036a0063680e7

data/Manifest.txt

@@ -116,7 +116,8 @@ test/test_cursor.rb
 test/test_date.rb
 test/test_lang.rb
 test/test_reader.rb
-test/test_round.rb
+test/test_round_def.rb
+test/test_round_header.rb
 test/test_scores.rb
 test/test_utils.rb
 test/test_winner.rb

data/config/fixtures/en.yml

@@ -27,7 +27,7 @@ round32:        Round of 32|Last 32
 round16:        Round of 16|Last 16
 quarterfinals:  Quarterfinals|Quarter-finals|Quarters|Quarterfinal  # todo: check if singular Quaterfinal is possible??
 semifinals:     Semifinals|Semi-finals|Semis
-thirdplace:     Third-place play-off|Third place play-off|Third place|3rd place match
+thirdplace:     Third-place play-off|Third place play-off|Third place|3rd place match|Match for third place
 final:          Final|Finals
 
 ### Pair matches/games if marked with leg1 n leg2

data/lib/sportdb/readers/game.rb

@@ -87,7 +87,6 @@ class GameReader
     
     ## reset cached values
     @patch_rounds  = {}
-    @knockout_flag = false
     @round         = nil
     
     
@@ -115,8 +114,12 @@ class GameReader
     logger.debug "    title: >#{title}<"
     logger.debug "    pos: >#{pos}<"
     logger.debug "  line: >#{line}<"
+
+    # set group for games
+    @group = Group.find_by_event_id_and_pos!( @event.id, pos )
   end
 
+
   def parse_group_def( line )
     logger.debug "parsing group def line: >#{line}<"
     
@@ -160,20 +163,57 @@ class GameReader
   def parse_round_def( line )
     logger.debug "parsing round def line: >#{line}<"
 
+    ### todo/fix/check:  move cut off optional comment in reader for all lines? why? why not?
+    cut_off_end_of_line_comment!( line )  # cut off optional comment starting w/ #
+
     start_at = find_date!( line, start_at: @event.start_at )
     end_at   = find_date!( line, start_at: @event.start_at )
+    
+    # note: if end_at missing -- assume start_at is (==) end_at
+    end_at = start_at  if end_at.nil?
+
 
-    # note: if end_at nil? -- assume start_at == end_at
+    pos   = find_round_pos!( line )
+    title = find_round_def_title!( line )
+    # NB: use extracted round title for knockout check
+    knockout_flag = is_knockout_round?( title )
 
-    ## pos = find_round_pos!( line )
-    ## title = find_round_title!( line )
 
     logger.debug "    start_at: #{start_at}"
     logger.debug "    end_at:   #{end_at}"
+    logger.debug "    pos:      #{pos}"
+    logger.debug "    title:    >#{title}<"
+    logger.debug "    knockout_flag:   #{knockout_flag}"
 
     logger.debug "  line: >#{line}<"
-  end
 
+    #######################################
+    # fix: add auto flag is false !!!!
+
+    round_attribs = {
+      title:    title,
+      knockout: knockout_flag,
+      start_at: start_at,
+      end_at:   end_at
+    }
+
+    round = Round.find_by_event_id_and_pos( @event.id, pos )
+    if round.present?
+      logger.debug "update round #{round.id}:"
+    else
+      logger.debug "create round:"
+      round = Round.new
+          
+      round_attribs = round_attribs.merge( {
+        event_id: @event.id,
+        pos:   pos
+      })
+    end
+
+    logger.debug round_attribs.to_json
+   
+    round.update_attributes!( round_attribs )
+  end
 
 
   def parse_round_header( line )
@@ -183,7 +223,7 @@ class GameReader
     cut_off_end_of_line_comment!( line )  # cut off optional comment starting w/ #
 
     # NB: cut off optional title2 starting w/  //  first
-    title2 = find_round_title2!( line )
+    title2 = find_round_header_title2!( line )
 
     # todo/fix: check if it is possible title2 w/ group?
     #  add an example here
@@ -191,10 +231,10 @@ class GameReader
 
     pos = find_round_pos!( line )
 
-    title = find_round_title!( line )
+    title = find_round_header_title!( line )
 
     ## NB: use extracted round title for knockout check
-    @knockout_flag = is_knockout_round?( title )
+    knockout_flag = is_knockout_round?( title )
 
 
     if group_pos.present?
@@ -211,7 +251,7 @@ class GameReader
     round_attribs = {
       title:  title,
       title2: title2,
-      knockout: @knockout_flag
+      knockout: knockout_flag
     }
 
 
@@ -229,7 +269,7 @@ class GameReader
         end_at:   Time.utc('1912-12-12')
       })
     end
-        
+
     logger.debug round_attribs.to_json
    
     @round.update_attributes!( round_attribs )
@@ -287,10 +327,34 @@ class GameReader
     team2 = Team.find_by_key!( team2_key )
 
 
+    if @round.nil?
+      ## no round header found; calculate round from date
+      
+      ###
+      ## todo/fix: add some unit tests for round look up
+      #  fix: use date_v2 if present!! (old/original date; otherwise use date)
+      
+      #
+      # fix: check - what to do with hours e.g. start_at use 00:00 and for end_at use 23.59 ??
+      #  -- for now - remove hours (e.g. use end_of_day and beginnig_of_day)
+      
+      pp Round.all
+      
+      round = Round.where( 'event_id = ? AND (start_at <= ? AND end_at >= ?)',
+                             @event.id, date.end_of_day, date.beginning_of_day).first
+      pp round
+      logger.debug( "  using round #{round.pos} >#{round.title}< start_at: #{round.start_at}, end_at: #{round.end_at}" )
+    else
+      ## use round from last round header
+      round = @round
+    end
+    
+
+
     ### check if games exists
     ##  with this teams in this round if yes only update
     game = Game.find_by_round_id_and_team1_id_and_team2_id(
-                         @round.id, team1.id, team2.id
+                         round.id, team1.id, team2.id
     )
 
     game_attribs = {
@@ -303,7 +367,7 @@ class GameReader
       play_at:    date,
       play_at_v2: date_v2,
       postponed: postponed,
-      knockout:  @knockout_flag,
+      knockout:  round.knockout,   ## note: for now always use knockout flag from round - why? why not?? 
       ground_id: ground.present? ? ground.id : nil,
       group_id:  @group.present? ? @group.id : nil
     }
@@ -323,14 +387,14 @@ class GameReader
         game = Game.new
 
         more_game_attribs = {
-          round_id:  @round.id,
+          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? 
+        more_game_attribs[ :pos ] = round.games.count+1   if pos.nil? 
 
         game_attribs = game_attribs.merge( more_game_attribs )
       end
@@ -397,11 +461,14 @@ class GameReader
       elsif try_parse_date_header( line )
         # do nothing here
       else
-        logger.info "skipping line (no match found): ><"
+        logger.info "skipping line (no match found): >#{line}<"
       end
     end # lines.each
 
 
+###
+#  fix: do NOT patch if auto flag is set to false!!!
+
     @patch_rounds.each do |k,v|
       logger.debug "patch start_at/end_at date for round #{k}:"
       round = Round.find( k )

data/lib/sportdb/schema.rb

@@ -181,6 +181,10 @@ create_table :rounds do |t|
   t.date   :start_at, null: false     # NB: only use date (w/o time)
   t.date   :end_at    # todo: make it required e.g. :null => false    # NB: only use date (w/o time)
 
+  ## auto-added flag (e.g. start_at n end_at dates got calculated)
+  ##  if auto-added flag is false - do NOT auto-update start_at, end_at etc.
+  t.boolean    :auto, null: false, default: true
+
   t.timestamps
 end
 

data/lib/sportdb/utils_date.rb

@@ -50,7 +50,7 @@ module SportDb
     regex_de3 = /\b(\d{1,2})\.(\d{1,2})\.(\d{4})\b/
 
     # e.g. 14.09.  => DD.MM. w/ implied year and implied hours (set to 12:00)
-    regex_de4 = /\b(\d{1,2})\.(\d{1,2})\.\s+/
+    regex_de4 = /\b(\d{1,2})\.(\d{1,2})\.(?:\s+|$)/    ## note: allow end-of-string/line too
 
 
     # todo: make more generic for reuse

data/lib/sportdb/utils_group.rb

@@ -52,7 +52,7 @@ module SportDb
     logger.debug "   title: >#{title}<"
     logger.debug "   pos: >#{pos}<"
       
-    line.sub!( regex, '[GROUP|TITLE+POS]' )
+    line.sub!( regex, '[GROUP.TITLE+POS]' )
 
     return [title,pos]
   end

data/lib/sportdb/utils_round.rb

@@ -32,13 +32,26 @@ module SportDb
     end
   end
 
-  def find_round_title2!( line )
+
+  ##
+  ## fix/todo: check that [ROUND.TITLE2] and friends do NOT use pipes (|)
+  ##  change all pipes (|) to dot (.)
+  ## - pipes get used for def markers!!!
+
+  def find_round_header_title2!( line )
+    ## todo/fix:
+    ##  cleanup method
+    ##   use  buf.index( '//' ) to split string (see found_round_def)
+    ##     why? simpler why not?
+    ##  - do we currently allow groups if title2 present? add example if it works?
+
+
     # assume everything after // is title2 - strip off leading n trailing whitespaces
     regex = /\/{2,}\s*(.+)\s*$/
     if line =~ regex
       logger.debug "   title2: >#{$1}<"
       
-      line.sub!( regex, '[ROUND|TITLE2]' )
+      line.sub!( regex, '[ROUND.TITLE2]' )
       return $1
     else
       return nil    # no round title2 found (title2 is optional)
@@ -46,14 +59,20 @@ module SportDb
   end
 
 
-  def find_round_title!( line )
+  def find_round_header_title!( line )
     # assume everything left is the round title
     #  extract all other items first (round title2, round pos, group title n pos, etc.)
 
+    ## todo/fix:
+    ##  cleanup method
+    ##   use  buf.index( '//' ) to split string (see found_round_def)
+    ##     why? simpler why not?
+    ##  - do we currently allow groups if title2 present? add example if it works?
+
     buf = line.dup
-    logger.debug "  find_round_title! line-before: >>#{buf}<<"
+    logger.debug "  find_round_header_title! line-before: >>#{buf}<<"
 
-    buf.gsub!( /\[.+?\]/, '' )   # e.g. remove [ROUND|POS], [ROUND|TITLE2], [GROUP|TITLE+POS] etc.
+    buf.gsub!( /\[[^\]]+\]/, '' )   # e.g. remove [ROUND.POS], [ROUND.TITLE2], [GROUP.TITLE+POS] etc.
     buf.sub!( /\s+[\/\-]{1,}\s+$/, '' )    # remove optional trailing / or / chars (left over from group)
     buf.strip!    # remove leading and trailing whitespace
 
@@ -62,7 +81,34 @@ module SportDb
     ### bingo - assume what's left is the round title
 
     logger.debug "   title: >>#{buf}<<"
-    line.sub!( buf, '[ROUND|TITLE]' )
+    line.sub!( buf, '[ROUND.TITLE]' )
+
+    buf
+  end
+
+
+  def find_round_def_title!( line )
+    # assume everything before pipe (\) is the round title
+    #  strip [ROUND.POS],  todo:?? [ROUND.TITLE2]
+
+    # todo/fix: add title2 w/  // or /  why? why not?
+    #  -- strip / or / chars
+
+    buf = line.dup
+    logger.debug "  find_round_def_title! line-before: >>#{buf}<<"
+
+    ## cut-off everything after (including) pipe (|)
+    buf = buf[ 0...buf.index('|') ]
+
+    # e.g. remove [ROUND.POS], [ROUND.TITLE2], [GROUP.TITLE+POS] etc.
+    buf.gsub!( /\[[^\]]+\]/, '' )    ## fix: use helper for (re)use e.g. remove_match_placeholder/marker or similar?
+    # remove leading and trailing whitespace
+    buf.strip!
+
+    logger.debug "  find_round_def_title! line-after: >>#{buf}<<"
+
+    logger.debug "   title: >>#{buf}<<"
+    line.sub!( buf, '[ROUND.TITLE]' )
 
     buf
   end
@@ -82,7 +128,7 @@ module SportDb
     if line =~ regex_pos
       logger.debug "   pos: >#{$1}<"
       
-      line.sub!( regex_pos, '[ROUND|POS] ' )  ## NB: add back trailing space that got swallowed w/ regex -> [ \t]+
+      line.sub!( regex_pos, '[ROUND.POS] ' )  ## NB: add back trailing space that got swallowed w/ regex -> [ \t]+
       return $1.to_i
     elsif line =~ regex_num
       ## assume number in title is pos (e.g. Jornada 3, 3 Runde etc.)

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.10'
+  VERSION = '1.8.11'
 end
 
 

data/test/data/at-austria/2013_14/bl.txt

@@ -2,7 +2,15 @@
 # Österreichische Bundesliga 2013/14
 
 
-1. Runde  //  Sa+So 20.+21. Jul 2013
+1. Runde | Sa. 20.07. - So. 21.07.   ## Sa+So 20.+21. Jul 2013
+2. Runde | Sa. 27.07. - So. 28.07.   ## Sa+So 27.+28. Jul 2013
+3. Runde | Sa. 03.08. - So. 04.08.   ## Sa+So  3.+4. Aug 2013
+4. Runde | Sa. 10.08. - So. 11.08.
+5. Runde | Sa. 17.08. - So. 18.08.
+6. Runde | Sa. 24.08. - So. 25.08.
+
+
+## 1. Runde  //  Sa+So 20.+21. Jul 2013
 
 (Sa) 20.07. 16.30  Austria Wien         2:0  FC Admira Wacker
 (Sa) 20.07. 19.00  SC Wiener Neustadt   1:5  RB Salzburg
@@ -12,7 +20,7 @@
 (So) 21.07. 16.30  FC Wacker Innsbruck  2:2  Sturm Graz
 
 
-2. Runde  // Sa+So 27.+28. Jul 2013
+## 2. Runde  // Sa+So 27.+28. Jul 2013
 
 (Sa) 27.07. 16.30  Rapid Wien           4:0  SC Wiener Neustadt
 (Sa) 27.07. 19.00  FC Admira Wacker     1:2  FC Wacker Innsbruck
@@ -22,7 +30,7 @@
 (So) 28.07. 16.30  Sturm Graz           0:2  SV Grödig
 
 
-3. Runde // Sa.+So. 3.+4. Aug 2013
+## 3. Runde // Sa.+So. 3.+4. Aug 2013
 
 (Sa) 03.08. 16.30  SC Wiener Neustadt   2:1  Wolfsberger AC
 (Sa) 03.08. 19.00  SV Grödig            7:1  FC Admira Wacker
@@ -32,7 +40,7 @@
 (So) 04.08. 16.30  Sturm Graz           2:4  Rapid Wien
 
 
-4. Runde // Sa.+So. 10.+11. Aug 2013
+## 4. Runde // Sa.+So. 10.+11. Aug 2013
 
 (Sa) 10.08. 16.30  Wolfsberger AC       1:1  FC Wacker Innsbruck
 (Sa) 10.08. 19.00  SV Ried              1:1  SC Wiener Neustadt
@@ -42,7 +50,7 @@
 (So) 11.08. 16.30  Rapid Wien           0:0  Austria Wien
 
 
-5. Runde // Sa.+So. 17.+18. Aug 2013
+## 5. Runde // Sa.+So. 17.+18. Aug 2013
 
 (Sa) 17.08. 16.30  Sturm Graz           1:1  RB Salzburg
 (Sa) 17.08. 19.00  SV Grödig            4:3  Wolfsberger AC
@@ -52,7 +60,7 @@
 (So) 18.08. 16.30  FC Admira Wacker     2:0  Rapid Wien
 
 
-6. Runde // Sa.+So.
+## 6. Runde // Sa.+So. 24.+25. Aug 2013
  
 (Sa) 24.08. 16.30  SV Ried              3:0  Sturm Graz
 (Sa) 24.08. 19.00  SC Wiener Neustadt   1:1  FC Wacker Innsbruck

data/test/test_lang.rb

@@ -23,14 +23,14 @@ class TestLang < MiniTest::Unit::TestCase
      round << '|Round of 16|Last 16'
      round << '|Quarterfinals|Quarter-finals|Quarters|Quarterfinal'
      round << '|Semifinals|Semi-finals|Semis'
-     round << '|Third-place play-off|Third place play-off|Third place|3rd place match'
+     round << '|Third-place play-off|Third place play-off|Third place|3rd place match|Match for third place'
      round << '|Final|Finals'
 
      knockout_round = 'Round of 32|Last 32'
      knockout_round << '|Round of 16|Last 16'
      knockout_round << '|Quarterfinals|Quarter-finals|Quarters|Quarterfinal'
      knockout_round << '|Semifinals|Semi-finals|Semis'
-     knockout_round << '|Third-place play-off|Third place play-off|Third place|3rd place match'
+     knockout_round << '|Third-place play-off|Third place play-off|Third place|3rd place match|Match for third place'
      knockout_round << '|Final|Finals'
 
 

data/test/test_reader.rb

@@ -1,5 +1,12 @@
 # encoding: utf-8
 
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_reader.rb
+#  or better
+#     rake -I ./lib test
+
+
 require 'helper'
 
 class TestReader < MiniTest::Unit::TestCase
@@ -10,6 +17,26 @@ class TestReader < MiniTest::Unit::TestCase
     SportDb.read_builtin
   end
 
+  def test_bl
+    at = Country.create!( key: 'at', name: 'Austria', code: 'AUT', pop: 1, area: 1)
+    
+    teamreader = TeamReader.new( SportDb.test_data_path )
+    teamreader.read( 'at-austria/teams',   country_id: at.id )
+
+    leaguereader = LeagueReader.new( SportDb.test_data_path )
+    leaguereader.read( 'at-austria/leagues', country_id: at.id )
+
+    gamereader = GameReader.new( SportDb.test_data_path )
+    gamereader.read( 'at-austria/2013_14/bl', country_id: at.id )
+
+    bl = Event.find_by_key!( 'at.2013/14' )
+
+    assert_equal  10, bl.teams.count
+    assert_equal  36, bl.rounds.count
+    assert_equal 180, bl.games.count  # 36x5 = 180
+  end
+
+
   def test_game_reader
     at = Country.create!( key: 'at', name: 'Austria', code: 'AUT', pop: 1, area: 1)
     
@@ -47,8 +74,11 @@ class TestReader < MiniTest::Unit::TestCase
     bl = Event.find_by_key!( 'at.2013/14' )
     el = Event.find_by_key!( 'at.2.2013/14' )
 
-    assert_equal 10, bl.teams.count
-    assert_equal 10, el.teams.count
+    assert_equal  10, bl.teams.count
+    assert_equal  36, bl.rounds.count
+    assert_equal 180, bl.games.count  # 36x5 = 180
+
+    assert_equal  10, el.teams.count
   end
 
 end # class TestReader

data/test/test_round_def.rb

@@ -0,0 +1,99 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_round_def.rb
+#  or better
+#     rake -I ./lib test
+
+
+require 'helper'
+
+class TestRoundDef < MiniTest::Unit::TestCase
+
+
+  def test_round_en
+    SportDb.lang.lang = 'en'
+
+    data = [
+      [ 'Matchday 1  |  Thu Jun/12',
+        { pos:1,
+          title: 'Matchday 1',
+          ko: false,
+          start_at: Date.new( 2014, 6, 12 ) }],
+      [ 'Matchday 13 |  Tue Jun/24',
+        { pos: 13,
+          title: 'Matchday 13',
+          ko: false,
+          start_at: Date.new( 2014, 6, 24 ) }],
+      [ '(16) Round of 16  |  Sat Jun/28 - Tue Jul/1',
+        { pos: 16,
+          title: 'Round of 16',
+          ko: true,
+          start_at: Date.new( 2014, 6, 28 ),
+          end_at:   Date.new( 2014, 7, 1  ) }],
+      [ '(18) Semi-finals  |  Tue Jul/8 - Wed Jul/9',
+        { pos: 18,
+          title: 'Semi-finals',
+          ko: true,
+          start_at: Date.new( 2014, 7, 8 ),
+          end_at:   Date.new( 2014, 7, 9 ) }],
+      [ '(19) Match for third place  |  Sat Jul/12',
+        { pos: 19,
+          title: 'Match for third place',
+          ko: true,
+          start_at: Date.new( 2014, 7, 12 ) }],
+      [ '(20) Final  |  Sun Jul/13',
+        { pos: 20,
+          title: 'Final',
+          ko: true,
+          start_at: Date.new( 2014, 7, 13 ) }] ]
+
+    assert_rounds( data, Date.new( 2014, 6, 12 ))  ## starts Jun/12 2014
+  end
+
+
+private
+  class Reader
+    include LogUtils::Logging      # add logger
+    include SportDb::FixtureHelpers
+  end
+
+  def assert_rounds( data, event_start_at )
+    data.each do |rec|
+      line = rec[0]
+      hash = rec[1]
+
+      start_at, end_at, pos, title, ko = parse_round_def( line, event_start_at )
+
+      assert_equal hash[:pos],   pos, "pos expected #{hash[:pos]} is #{pos} in line >#{line}<"
+      assert_equal hash[:title], title
+      assert_equal hash[:ko],    ko
+      
+      if hash[:start_at]
+        assert_equal hash[:start_at].year,  start_at.year
+        assert_equal hash[:start_at].month, start_at.month
+        assert_equal hash[:start_at].day,   start_at.day
+      end
+
+      if hash[:end_at]
+        assert_equal hash[:end_at].year,  end_at.year
+        assert_equal hash[:end_at].month, end_at.month
+        assert_equal hash[:end_at].day,   end_at.day
+      end      
+    end
+  end
+
+  def parse_round_def( line, event_start_at )
+     reader = Reader.new
+
+     start_at = reader.find_date!( line, start_at: event_start_at )
+     end_at   = reader.find_date!( line, start_at: event_start_at )
+     pos      = reader.find_round_pos!( line )
+     title    = reader.find_round_def_title!( line )
+     knockout = reader.is_knockout_round?( title )  # NB: use title as input NOT line
+
+     [start_at, end_at, pos, title, knockout]
+  end
+
+end # class TestRoundDef

data/test/test_round_header.rb

@@ -0,0 +1,155 @@
+# encoding: utf-8
+
+
+require 'helper'
+
+class TestRoundHeader < MiniTest::Unit::TestCase
+
+
+  def test_round_en
+    SportDb.lang.lang = 'en'
+
+    data = [
+      [ "2. Round / Group B",
+         { pos:2,
+           title: '2. Round',
+           group_pos: 2,
+           group_title: 'Group B',
+           ko: false } ],
+  
+      [ "(1) Matchday P.1  /  1st Leg  //   January 22-24",
+         { pos:1,
+           title: 'Matchday P.1  /  1st Leg',
+           title2: 'January 22-24',
+           ko: false } ],
+
+      [ "(4) Matchday 2 / Group 1  //  February 19-21",
+         { pos:4,
+           title: 'Matchday 2',
+           title2: 'February 19-21',
+           group_pos: 1,
+           group_title: 'Group 1',
+           ko: false } ], 
+
+      [ "(13) Round of 16 / 1st Leg   //  April 25, May 1-3",
+        { pos:13,
+          title:  'Round of 16 / 1st Leg',
+          title2: 'April 25, May 1-3',
+          ko: false } ],  # NB: 1st Leg is NOT k.o. (only 2nd Leg)
+
+      [ "(14) Round of 16 / 2nd Leg   //  May 8-10",
+        { pos:14,
+          title:  'Round of 16 / 2nd Leg',
+          title2: 'May 8-10',
+          ko: true }] ]
+
+    assert_rounds( data )
+  end
+
+
+  def test_finals_en
+    SportDb.lang.lang = 'en'
+
+    data = [
+      [ '(4) Quarter-finals',
+        { pos: 4,
+          title: 'Quarter-finals',
+          ko: true } ],
+      
+      [ '(5) Semi-finals',
+        { pos: 5,
+          title: 'Semi-finals',
+          ko: true } ],
+
+      [ '(6) Final',
+        { pos: 6,
+          title: 'Final',
+          ko: true } ] ]
+
+    assert_rounds( data )
+  end
+
+
+  def test_round_es
+    SportDb.lang.lang = 'es'
+
+    data = [
+      [ 'Jornada 2  // 27, 28 y 29 de julio',
+        { pos:2,
+          title: 'Jornada 2',
+          title2: '27, 28 y 29 de julio',
+          ko: false } ],
+
+      [ '(18) Cuartos de Final / Ida  // 14/15 de noviembre',
+        { pos:18,
+          title: 'Cuartos de Final / Ida',
+          title2: '14/15 de noviembre',
+          ko: false } ],
+      
+      [ '(19) Cuartos de Final / Vuelta // 17/18 de noviembre',
+        { pos:19,
+          title: 'Cuartos de Final / Vuelta',
+          title2: '17/18 de noviembre',
+          ko: true } ]]
+
+    assert_rounds( data )
+  end
+
+
+  def test_round_de
+    SportDb.lang.lang = 'de'
+
+    data = [
+      [ 'Spieltag 5 / Gruppe A  // Di./Mi., 20.+21. Nov 2012',
+        { pos: 5,
+          title: 'Spieltag 5',
+          title2: 'Di./Mi., 20.+21. Nov 2012',
+          group_pos: 1,
+          group_title: 'Gruppe A',
+          ko: false } ],
+
+      [ '(8)  Achtelfinale Rückspiele  // Di./Mi., 5.+6./12.+13. Mär 2013',
+        { pos: 8,
+          title: 'Achtelfinale Rückspiele',
+          title2: 'Di./Mi., 5.+6./12.+13. Mär 2013',
+          ko: true } ]]
+
+    assert_rounds( data )
+  end
+
+
+private
+  class Reader
+    include LogUtils::Logging      # add logger
+    include SportDb::FixtureHelpers
+  end
+
+  def assert_rounds( data )
+    data.each do |rec|
+      line = rec[0]
+      hash = rec[1]
+
+      pos, title, title2, group_pos, group_title, ko = parse_round_header( line )
+
+      assert_equal hash[:pos], pos, "pos expected #{hash[:pos]} is #{pos} in line >#{line}<"
+      assert_equal hash[:title], title
+      assert_equal hash[:title2], title2
+      assert_equal hash[:ko], ko
+      assert_equal( hash[:group_pos], group_pos, "group_pos expected #{hash[:group_pos]} is #{group_pos} in line >#{line}<" )  if hash[:group_pos]
+      assert_equal( hash[:group_title], group_title)  if hash[:group_title]
+    end
+  end
+
+  def parse_round_header( line )
+     reader = Reader.new
+
+     title2 = reader.find_round_header_title2!( line )
+     group_title, group_pos = reader.find_group_title_and_pos!( line )
+     pos = reader.find_round_pos!( line )
+     title = reader.find_round_header_title!( line )
+     knockout = reader.is_knockout_round?( title )  # NB: use title as input NOT line
+
+     [pos, title, title2, group_pos, group_title, knockout]
+  end
+
+end # class TestRoundHeader

metadata

@@ -1,133 +1,164 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.10
-  prerelease: 
+  version: 1.8.11
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &70027260 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70027260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &70026730 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70026730
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &70026040 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70026040
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &70025700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70025700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &70025340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70025340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &70025010 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70025010
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70024680 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *70024680
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.6
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70024390 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70024390
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70024030 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *70024030
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70023610 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70023610
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
 - sportdb
 extensions: []
 extra_rdoc_files:
+- HISTORY.md
 - Manifest.txt
+- README.md
 files:
 - HISTORY.md
 - Manifest.txt
@@ -247,7 +278,8 @@ files:
 - test/test_date.rb
 - test/test_lang.rb
 - test/test_reader.rb
-- test/test_round.rb
+- test/test_round_def.rb
+- test/test_round_header.rb
 - test/test_scores.rb
 - test/test_utils.rb
 - test/test_winner.rb
@@ -255,6 +287,7 @@ files:
 homepage: https://github.com/geraldb/sport.db.ruby
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: ! '******************************************************************************
 
 
@@ -272,30 +305,29 @@ 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: sportdb
-rubygems_version: 1.8.17
+rubyforge_project: 
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 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_cursor.rb
-- test/test_round.rb
+- test/test_reader.rb
+- test/test_round_def.rb
+- test/test_round_header.rb
 - test/test_scores.rb
-- test/test_winner.rb
 - test/test_utils.rb
-- test/test_reader.rb
-- test/test_changes.rb
+- test/test_winner.rb

data/test/test_round.rb

@@ -1,171 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_lang.rb
-#  or better
-#     rake -I ./lib test
-
-require 'helper'
-
-class TestRound < MiniTest::Unit::TestCase
-
-
-  def test_round_en
-    SportDb.lang.lang = 'en'
-
-    line = "2. Round / Group B"
-
-    pos, title, title2, group_pos, group_title, ko = parse_round( line )
-
-    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_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_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"
-
-    pos, title, title2, group_pos, group_title, ko = parse_round( line )
-
-    assert( pos == 13 )
-    assert( title == "Round of 16 / 1st Leg" )
-    assert( title2 == "April 25, May 1-3" )
-    assert( ko == false )  # NB: 1st Leg is NOT k.o. (only 2nd Leg)
-
-    line = "(14) Round of 16 / 2nd Leg   //  May 8-10"
-    
-    pos, title, title2, group_pos, group_title, ko = parse_round( line )
-
-    assert( pos == 14 )
-    assert( title == "Round of 16 / 2nd Leg" )
-    assert( title2 == "May 8-10" )
-    assert( ko == true )
-  end
-
-
-
-  def test_finals_en
-    SportDb.lang.lang = 'en'
-
-    line = "(4) Quarter-finals"
-    
-    pos, title, title2, group_pos, group_title, ko = parse_round( line )
-
-    assert( pos == 4 )
-    assert( title == "Quarter-finals" )
-    assert( title2 == nil )
-    assert( ko == true )
-
-    line = "(5) Semi-finals"
-    
-    pos, title, title2, group_pos, group_title, ko = parse_round( line )
-
-    assert( pos == 5 )
-    assert( title == "Semi-finals" )
-    assert( title2 == nil )
-    assert( ko == true )
-
-    line = "(6) Final"
-
-    pos, title, title2, group_pos, group_title, ko = parse_round( line )
-
-    assert( pos == 6 )
-    assert( title == "Final" )
-    assert( title2 == nil )
-    assert( ko == true )
-  end
-
-
-  def test_round_es
-    SportDb.lang.lang = 'es'
-
-    line = "Jornada 2   // 27, 28 y 29 de julio"
-
-    pos, title, title2, group_pos, group_title, ko = parse_round( line )
-
-    assert( pos == 2 )
-    assert( title == 'Jornada 2' )
-    assert( title2 == '27, 28 y 29 de julio' )
-    assert( ko == false )
-
-    line = "(18) Cuartos de Final / Ida      // 14/15 de noviembre"
-
-    pos, title, title2, group_pos, group_title, ko = parse_round( line )
-
-    assert( pos == 18 )
-    assert( title == 'Cuartos de Final / Ida' )
-    assert( title2 == '14/15 de noviembre' )
-    assert( ko == false )
-
-    line = "(19) Cuartos de Final / Vuelta // 17/18 de noviembre"
-
-    pos, title, title2, group_pos, group_title, ko = parse_round( line )
-
-    assert( pos == 19 )
-    assert( title == 'Cuartos de Final / Vuelta' )
-    assert( title2 == '17/18 de noviembre' )
-    assert( ko == true )
-  end
-
-
-  def test_round_de
-    SportDb.lang.lang = 'de'
-
-    line = "Spieltag 5 / Gruppe A  // Di./Mi., 20.+21. Nov 2012"
-    
-    pos, title, title2, group_pos, group_title, ko = parse_round( line )
-
-    assert( pos == 5 )
-    assert( title == 'Spieltag 5' )
-    assert( title2 == 'Di./Mi., 20.+21. Nov 2012' )
-    assert( ko == false )
-    
-    line = "(8)  Achtelfinale Rückspiele  // Di./Mi., 5.+6./12.+13. Mär 2013"
-
-    pos, title, title2, group_pos, group_title, ko = parse_round( line )
-
-    assert( pos == 8 )
-    assert( title == 'Achtelfinale Rückspiele' )
-    assert( title2 == 'Di./Mi., 5.+6./12.+13. Mär 2013' )
-    assert( ko == true )
-  end
-
-
-private
-  class Reader
-    include LogUtils::Logging      # add logger
-    include SportDb::FixtureHelpers
-  end
-
-  def parse_round( line )
-     reader = Reader.new
-
-     title2 = reader.find_round_title2!( line )
-     group_title, group_pos = reader.find_group_title_and_pos!( line )
-     pos = reader.find_round_pos!( line )
-     title = reader.find_round_title!( line )
-     knockout = reader.is_knockout_round?( title )  # NB: use title as input NOT line
-
-     [pos, title, title2, group_pos, group_title, knockout]
-  end
-
-end # class TestRound