sportdb 1.6.5 → 1.6.6

data/Manifest.txt

@@ -40,3 +40,7 @@ lib/sportdb/stats.rb
 lib/sportdb/utils.rb
 lib/sportdb/version.rb
 tasks/test.rb
+test/helper.rb
+test/test_lang.rb
+test/test_round.rb
+test/test_utils.rb

data/lib/sportdb/lang.rb

@@ -72,7 +72,7 @@ class Lang
   end
  
   def knockout_round
-    @knock_round ||= knockout_round_getter
+    @knockout_round ||= knockout_round_getter
   end
   
   def leg1
@@ -103,21 +103,21 @@ class Lang
   def regex_leg2
     @regex_leg2 ||= regex_leg2_getter
   end
-  
-  
-  
+
 private
   def group_getter
     h = @fixtures[ lang ]
-    values = h['group']
+    values = ""   # NB: always construct a new string (do NOT use a reference to hash value)
+    values << h['group']
     values
   end
-  
+
   def round_getter
     # e.g. Spieltag|Runde|Achtelfinale|Viertelfinale|Halbfinale|Finale
     
     h = @fixtures[ lang ]
-    values = h['round']
+    values = ""   # NB: always construct a new string (do NOT use a reference to hash value)
+    values << h['round']
     values << "|" << h['matchday']  ## todo/check: fold round n matchday into one key? why? why not??
     
     ### add knockout rounds values too
@@ -132,19 +132,22 @@ private
 
   def leg1_getter
     h = @fixtures[ lang ]
-    values = h['leg1']
+    values = ""  # NB: always construct a new string (do NOT use a reference to hash value)
+    values << h['leg1']
     values
   end
 
   def leg2_getter
     h = @fixtures[ lang ]
-    values = h['leg2']
+    values = ""  # NB: always construct a new string (do NOT use a reference to hash value)
+    values << h['leg2']
     values
   end
 
   def knockout_round_getter
     h = @fixtures[ lang ]
-    values = h['round32']
+    values = ""  # NB: always construct a new string (do NOT use a reference to hash value)
+    values << h['round32']
     values << "|" << h['round16']
     values << "|" << h['quarterfinals']
     values << "|" << h['semifinals']

data/lib/sportdb/reader.rb

@@ -475,12 +475,23 @@ private
   
   def parse_round( line )
     logger.debug "parsing round line: >#{line}<"
-    pos = find_round_pos!( line )
-        
-    @knockout_flag = is_knockout_round?( 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/ #
+
+    # NB: cut off optional title2 starting w/  //  first
+    title2 = find_round_title2!( line )
 
     group_title, group_pos = find_group_title_and_pos!( line )
 
+    pos = find_round_pos!( line )
+
+    title = find_round_title!( line )
+
+    ## NB: use extracted round title for knockout check
+    @knockout_flag = is_knockout_round?( title )
+
+
     if group_pos.present?
       @group = Group.find_by_event_id_and_pos!( @event.id, group_pos )
     else
@@ -491,12 +502,14 @@ private
         
     ## NB: dummy/placeholder start_at, end_at date
     ##  replace/patch after adding all games for round
-        
+
     round_attribs = {
-      title: "#{pos}. Runde"
+      title:  title,
+      title2: title2,
+      knockout: @knockout_flag
     }
 
-        
+
     @round = Round.find_by_event_id_and_pos( @event.id, pos )
     if @round.present?
       logger.debug "update round #{@round.id}:"

data/lib/sportdb/utils.rb

@@ -20,9 +20,9 @@ module SportDb::FixtureHelpers
   end
 
   def is_knockout_round?( line )
-    
+
     ## todo: check for adding ignore case for regex (e.g. 1st leg/1st Leg)
-    
+
     if line =~ SportDb.lang.regex_leg1
       logger.debug "  two leg knockout; skip knockout flag on first leg"
       false
@@ -73,57 +73,77 @@ module SportDb::FixtureHelpers
 
     return [title,pos]
   end
-  
-  def find_round_pos!( line )
-    
-    ## todo: let title2 go first to cut off //
-    ## todo: cut of end of line comments w/ # ???
+
+  def cut_off_end_of_line_comment!( line )
+    #  cut off (that is, remove) optional end of line comment starting w/ #
     
-    ## fix/todo:
-    ##  if no round found assume last_pos+1 ??? why? why not?
+    line = line.sub( /#.*$/, '' )
+    line
+  end
 
-    # extract optional round pos from line
-    # e.g.  (1)   - must start line 
-    regex = /^[ \t]*\((\d{1,3})\)[ \t]+/
+
+  def find_round_title2!( line )
+    # assume everything after // is title2 - strip off leading n trailing whitespaces
+    regex = /\/{2,}\s*(.+)\s*$/
     if line =~ regex
-      logger.debug "   pos: >#{$1}<"
+      logger.debug "   title2: >#{$1}<"
       
-      line.sub!( regex, '[ROUND|POS] ' )  ## NB: add back trailing space that got swallowed w/ regex -> [ \t]+
-      return $1.to_i
+      line.sub!( regex, '[ROUND|TITLE2]' )
+      return $1
+    else
+      return nil    # no round title2 found (title2 is optional)
     end
+  end
 
-    # continue; try some other options
 
-    # NB: do not search string after free standing / or //
-    #  cut-off optional trailing part w/ starting w/  / or //
-    #
-    # e.g.  Viertelfinale   //   Di+Mi 10.+11. April 2012  becomes just
-    #       Viertelfinale
-    
-    cutoff_regex = /^(.+?)[ \t]\/{1,3}[ \t]/
-    
-    if line =~ cutoff_regex
-      line = $1.to_s    # cut off the rest if regex matches
-    end
+  def find_round_title!( line )
+    # assume everything left is the round title
+    #  extract all other items first (round title2, round pos, group title n pos, etc.)
 
-    ## fix/todo: use cutoff_line for search
-    ## and use line.sub! to change original string
-    # e.g.  Jornada 3  // 1,2 y 3 febrero
-    #   only replaces match in local string w/ [ROUND|POS]
+    buf = line.dup
+    logger.debug "  find_round_title! line-before: >>#{buf}<<"
 
-    regex = /\b(\d+)\b/
-    
-    if line =~ regex
-      value = $1.to_i
-      logger.debug "   pos: >#{value}<"
-      
-      line.sub!( regex, '[ROUND|POS]' )
+    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
+
+    logger.debug "  find_round_title! line-after: >>#{buf}<<"
+
+    ### bingo - assume what's left is the round title
+
+    logger.debug "   title: >>#{buf}<<"
+    line.sub!( buf, '[ROUND|TITLE]' )
 
-      return value
+    buf
+  end
+
+
+  def find_round_pos!( line )
+    ## fix/todo:
+    ##  if no round found assume last_pos+1 ??? why? why not?
+
+    # extract optional round pos from line
+    # e.g.  (1)   - must start line 
+    regex_pos = /^[ \t]*\((\d{1,3})\)[ \t]+/
+
+    ## find free standing number
+    regex_num = /\b(\d{1,3})\b/
+
+    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]+
+      return $1.to_i
+    elsif line =~ regex_num
+      ## assume number in title is pos (e.g. Jornada 3, 3 Runde etc.)
+      ## NB: do NOT remove pos from string (will get removed by round title)
+      logger.debug "   pos: >#{$1}<"
+      return $1.to_i
     else
+      ## fix: add logger.warn no round pos found in line
       return nil
     end
-  end
+  end # method find_round_pos!
   
   def find_date!( line )
     # extract date from line

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.6.5'
+  VERSION = '1.6.6'
 end
 
 ###########################################

data/test/helper.rb

@@ -0,0 +1,16 @@
+
+## $:.unshift(File.dirname(__FILE__))
+
+## minitest setup
+
+# require 'minitest/unit'
+require 'minitest/autorun'
+
+# include MiniTest::Unit  # lets us use TestCase instead of MiniTest::Unit::TestCase
+
+
+## our own code
+
+require 'logutils'
+require 'sportdb'
+

data/test/test_lang.rb

@@ -0,0 +1,118 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_lang.rb
+#  or better
+#     rake -I ./lib test
+
+require 'helper'
+
+class TestLang < MiniTest::Unit::TestCase
+
+  def test_getters
+
+     lang = SportDb.lang
+     lang.lang = 'en'
+
+     group = 'Group'
+
+     round = 'Round'
+     round << '|Matchday'
+     round << '|Round of 32|Last 32'
+     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 << '|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 << '|Final|Finals'
+
+
+     assert( group == lang.group )
+     assert( round == lang.round )
+     assert( knockout_round == lang.knockout_round )
+
+     # NB: call twice to test caching with ||=
+     assert( group == lang.group )
+     assert( round == lang.round )
+     assert( knockout_round == lang.knockout_round )
+
+  end
+  
+  def test_getters_de
+     lang = SportDb.lang
+     lang.lang = 'de'
+
+     group = 'Gruppe'
+
+     round = 'Runde'
+     round << '|Spieltag'
+     round << '|Sechzehntelfinale|1/16 Finale'
+     round << '|Achtelfinale|1/8 Finale'
+     round << '|Viertelfinale|1/4 Finale'
+     round << '|Halbfinale|Semifinale|1/2 Finale'
+     round << '|Spiel um Platz 3'
+     round << '|Finale|Endspiel'
+
+     knockout_round = 'Sechzehntelfinale|1/16 Finale'
+     knockout_round << '|Achtelfinale|1/8 Finale'
+     knockout_round << '|Viertelfinale|1/4 Finale'
+     knockout_round << '|Halbfinale|Semifinale|1/2 Finale'
+     knockout_round << '|Spiel um Platz 3'
+     knockout_round << '|Finale|Endspiel'
+
+
+     assert( group == lang.group )
+     assert( round == lang.round )
+     assert( knockout_round == lang.knockout_round )
+
+     # NB: call twice to test caching with ||=
+
+     assert( round == lang.round )
+     assert( group == lang.group )
+     assert( knockout_round == lang.knockout_round )
+  end
+
+  def test_regex_knockout_round
+     lang = SportDb.lang
+     lang.lang = 'en'
+
+     lines = [
+      '(4) Quarter-finals',
+      '(5) Semi-finals',
+      '(6) Final'
+     ]
+     
+     lines.each do |line|
+       assert( line =~ lang.regex_knockout_round )
+     end
+
+  end
+  
+  def test_regex_knockout_round_de
+    lang = SportDb.lang
+    lang.lang = 'de'
+
+    lines = [
+      '(1)  Achtelfinale              // Di+Mi 14.+15. & 21.+22. Feb 2012',
+      '(2)  Achtelfinale Rückspiele   // Di+Mi 6.+7. & 13.+14. März 2012',
+      '(3)  Viertelfinale             // Di+Mi 27.+28. März 2012',
+      '(4)  Viertelfinale Rückspiele  // Di+Mi 3.+4.   April 2012',
+      '(5)  Halbfinale                // Di+Mi 17.+18. April 2012',
+      '(6)  Halbfinale Rückspiele     // Di+Mi 24.+25. April 2012',
+      '(7)  Finale                    // Sa 19. Mai 2012'
+    ]
+
+     lines.each do |line|
+       assert( line =~ lang.regex_knockout_round )
+     end
+
+  end
+
+end # class TestLang

data/test/test_round.rb

@@ -0,0 +1,170 @@
+# 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( pos == 2 )
+    assert( title == "2. Round" )
+    assert( title2 == nil )
+    assert( ko == false )
+
+    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 )
+
+    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 )
+
+    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

data/test/test_utils.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_lang.rb
+#  or better
+#     rake -I ./lib test
+
+require 'helper'
+
+class TestUtils < MiniTest::Unit::TestCase
+
+
+  class Reader
+    include LogUtils::Logging      # add logger
+    include SportDb::FixtureHelpers
+  end
+
+  def test_is_knockout_round
+     SportDb.lang.lang = 'en'
+
+     lines = [
+      '(4) Quarter-finals',
+      '(5) Semi-finals',
+      '(6) Final'
+     ]
+    
+     reader = Reader.new
+
+     lines.each do |line|
+       assert( reader.is_knockout_round?( line ) )
+     end
+  end
+
+
+  def test_is_knockout_round_de
+    SportDb.lang.lang = 'de'
+
+    lines = [
+      '(1)  Achtelfinale              // Di+Mi 14.+15. & 21.+22. Feb 2012',
+      '(2)  Achtelfinale Rückspiele   // Di+Mi 6.+7. & 13.+14. März 2012',
+      '(3)  Viertelfinale             // Di+Mi 27.+28. März 2012',
+      '(4)  Viertelfinale Rückspiele  // Di+Mi 3.+4.   April 2012',
+      '(5)  Halbfinale                // Di+Mi 17.+18. April 2012',
+      '(6)  Halbfinale Rückspiele     // Di+Mi 24.+25. April 2012',
+      '(7)  Finale                    // Sa 19. Mai 2012'
+    ]
+
+     reader = Reader.new
+
+     lines.each do |line|
+       assert( reader.is_knockout_round?( line ) )
+     end
+
+  end
+
+end # class TestUtils

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &74970830 !ruby/object:Gem::Requirement
+  requirement: &72206260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *74970830
+  version_requirements: *72206260
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &74970610 !ruby/object:Gem::Requirement
+  requirement: &72206040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *74970610
+  version_requirements: *72206040
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &74970390 !ruby/object:Gem::Requirement
+  requirement: &73407120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *74970390
+  version_requirements: *73407120
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &74970170 !ruby/object:Gem::Requirement
+  requirement: &73406900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *74970170
+  version_requirements: *73406900
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -105,6 +105,11 @@ files:
 - lib/sportdb/utils.rb
 - lib/sportdb/version.rb
 - tasks/test.rb
+- test/helper.rb
+- test/test_lang.rb
+- test/test_round.rb
+- test/test_utils.rb
+- .gemtest
 homepage: https://github.com/geraldb/sport.db.ruby
 licenses:
 - Public Domain
@@ -142,4 +147,7 @@ rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: sportdb - sport.db command line tool
-test_files: []
+test_files:
+- test/test_lang.rb
+- test/test_round.rb
+- test/test_utils.rb