sportdb-models 1.18.6 → 1.19.0

data/lib/sportdb/utils_date.rb

@@ -1,26 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-  module FixtureHelpers
-
-  def is_postponed?( line )
-    # check if line include postponed marker e.g. =>
-    line =~ /=>/
-  end
-
-
-  def find_date!( line, opts={} )
-    ## NB: lets us pass in start_at/end_at date (for event)
-    #   for auto-complete year
-
-    # extract date from line
-    # and return it
-    # NB: side effect - removes date from line string
-    
-    finder = DateFinder.new
-    finder.find!( line, opts )
-  end
-
-  end # module FixtureHelpers
-end # module SportDb
-

data/lib/sportdb/utils_goals.rb

@@ -1,20 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-  module FixtureHelpers
-
-  def is_goals?( line )
-    # check if is goals line
-    #  e.g. looks like
-    #   Neymar 29', 71' (pen.) Oscar 90+1';  Marcelo 11' (o.g.)
-    #  check for
-    #    <space>90'  or
-    #    <space>90+1'
-
-    line =~ /[ ](\d{1,3}\+)?\d{1,3}'/
-  end
-
-
-  end # module FixtureHelpers
-end # module SportDb
-

data/lib/sportdb/utils_group.rb

@@ -1,63 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-  module FixtureHelpers
-
-  def is_group_def?( line )
-    # NB: check after is_round? (round may contain group reference!)
-    ## must include bar (|) marker (make required)
-    line =~ /\|/ && is_group?( line )
-  end
-
-  def is_group?( line )
-    # NB: check after is_round? (round may contain group reference!)
-    ## note: =~ return nil if not match found, and 0,1, etc for match
-    (line =~ SportDb.lang.regex_group) != nil
-  end
-
-  def find_group_title_and_pos!( line )
-    ## group pos - for now support single digit e.g 1,2,3 or letter e.g. A,B,C or HEX
-    ## nb:  (?:)  = is for non-capturing group(ing)
-
-    ## fix:
-    ##   get Group|Gruppe|Grupo from lang!!!! do NOT hardcode in place
-
-    ## todo:
-    ##   check if Group A:  or [Group A]  works e.g. : or ] get matched by \b ???
-    regex = /(?:Group|Gruppe|Grupo)\s+((?:\d{1}|[A-Z]{1,3}))\b/
-
-    match = regex.match( line )
-    
-    return [nil,nil] if match.nil?
-
-    pos = case match[1]
-          when 'A' then 1
-          when 'B' then 2
-          when 'C' then 3
-          when 'D' then 4
-          when 'E' then 5
-          when 'F' then 6
-          when 'G' then 7
-          when 'H' then 8
-          when 'I' then 9
-          when 'J' then 10
-          when 'K' then 11
-          when 'L' then 12
-          when 'HEX' then 666    # HEX for Hexagonal - todo/check: map to something else ??
-          else  match[1].to_i
-          end
-
-    title = match[0]
-
-    logger.debug "   title: >#{title}<"
-    logger.debug "   pos: >#{pos}<"
-      
-    line.sub!( regex, '[GROUP.TITLE+POS]' )
-
-    return [title,pos]
-  end
-
-
-
-  end # module FixtureHelpers
-end # module SportDb

data/lib/sportdb/utils_map.rb

@@ -1,44 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-  module FixtureHelpers
-
-
-  def find_ground!( line )
-    TextUtils.find_key_for!( 'ground', line )
-  end
-
-  ## todo/fix: pass in known_grounds as a parameter? why? why not?
-  ### todo/fix:
-  ##    remove =nil in para - make param required w/o fallback
-
-  def map_ground!( line, known_grounds=nil )
-    if known_grounds.nil?
-      puts "depreciated API call map_ground! (pass in mapping table as 2nd param)"
-      known_grounds = @known_grounds
-    end
-
-    TextUtils.map_titles_for!( 'ground', line, known_grounds )
-  end
-
-
-
-  def find_person!( line )
-    TextUtils.find_key_for!( 'person', line )
-  end
-
-  ### todo/fix:
-  ##    remove =nil in para - make param required w/o fallback
-  def map_person!( line, known_persons=nil )
-    if known_persons.nil?
-      puts "depreciated API call map_person! (pass in mapping table as 2nd param)"
-      known_persons = @known_persons
-    end
-    
-    TextUtils.map_titles_for!( 'person', line, known_persons )
-  end
-
-
-  end # module FixtureHelpers
-end # module SportDb
-

data/lib/sportdb/utils_round.rb

@@ -1,165 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-  module FixtureHelpers
-
-  def is_round_def?( line )
-    ## must include bar (|) marker (make required)
-    line =~ /\|/ && is_round?( line ) 
-  end
-
-  def is_round?( line )
-    ## note: =~ return nil if not match found, and 0,1, etc for match
-    (line =~ SportDb.lang.regex_round) != nil
-  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
-    elsif line =~ SportDb.lang.regex_knockout_round
-      logger.debug "   setting knockout flag to true"
-      true
-    elsif line =~ /K\.O\.|K\.o\.|Knockout/
-        ## NB: add two language independent markers, that is, K.O. and Knockout
-      logger.debug "   setting knockout flag to true (lang independent marker)"
-      true
-    else
-      false
-    end
-  end
-
-
-  ##
-  ## 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]' )
-      return $1
-    else
-      return nil    # no round title2 found (title2 is optional)
-    end
-  end
-
-
-  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_header_title! line-before: >>#{buf}<<"
-
-    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]' )
-
-    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
-
-
-  def find_round_pos!( line )
-    # pass #1) extract optional round pos from line
-    # e.g.  (1)   - must start line 
-    regex_pos = /^[ \t]*\((\d{1,3})\)[ \t]+/
-
-    # pass #2) find free standing number  e.g. Matchday 3 or Round 5 or 3. Spieltag etc.
-    # 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}<"
-      
-      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)
-
-      num = $1.to_i  # note: clone capture; keep a copy (another regex follows; will redefine $1)
-
-      #### fix:
-      #  use/make keywords required
-      #  e.g. Round of 16  -> should NOT match 16!
-      #    Spiel um Platz 3  (or 5) etc -> should NOT match 3!
-      #  Round 16 - ok
-      #  thus, check for required keywords
-
-      ## quick hack for round of 16
-      # todo: mask match e.g. Round of xxx ... and try again - might include something
-      #  reuse pattern for Group XX Replays for example
-      if line =~ /^\s*Round of \d{1,3}\b/
-         return nil
-      end
-
-      logger.debug "   pos: >#{num}<"
-      return num
-    else
-      ## fix: add logger.warn no round pos found in line
-      return nil
-    end
-  end # method find_round_pos!
-
-
-  end # module FixtureHelpers
-end # module SportDb

data/lib/sportdb/utils_scores.rb

@@ -1,17 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-  module FixtureHelpers
-
-
-  def find_scores!( line, opts={} )
-    # note: always call after find_dates !!!
-    #  scores match date-like patterns!!  e.g. 10-11  or 10:00 etc.
-    #   -- note: score might have two digits too
-
-    finder = ScoresFinder.new
-    finder.find!( line, opts )
-  end
-
-  end # module FixtureHelpers
-end # module SportDb

data/lib/sportdb/utils_teams.rb

@@ -1,48 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-  module FixtureHelpers
-
-
-  def find_teams!( line ) # NB: returns an array - note: plural! (teamsss)
-    puts "*** find_teams! deprecated -- use TeamMapper!!!"
-    TextUtils.find_keys_for!( 'team', line )
-  end
-  
-  def find_team!( line )  # NB: returns key (string or nil)
-    puts "*** find_team! deprecated -- use TeamMapper!!!"
-    TextUtils.find_key_for!( 'team', line )
-  end
-
-  ## todo: check if find_team1 gets used?  if not remove it!!  use find_teams!
-  def find_team1!( line )
-    puts "*** find_team1! deprecated -- use TeamMapper!!!"
-    TextUtils.find_key_for!( 'team1', line )
-  end
-
-  def find_team2!( line )
-    puts "*** find_team2! deprecated -- use TeamMapper!!!"
-    TextUtils.find_key_for!( 'team2', line )
-  end
-
-  ## todo/fix: pass in known_teams as a parameter? why? why not?
-
-  def map_teams!( line )
-    puts "*** map_teams! deprecated -- use TeamMapper!!!"
-    TextUtils.map_titles_for!( 'team', line, @known_teams )
-  end
-  
-  def map_team!( line )  # alias map_teams!
-    map_teams!( line )
-  end
-
-
-  ## depreciated methods - use map_
-  def match_teams!( line )   ## fix: rename to map_teams!! - remove match_teams!
-    ## todo: issue depreciated warning
-    map_teams!( line )
-  end # method match_teams!
-
-
-  end # module FixtureHelpers
-end # module SportDb

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

@@ -1,227 +0,0 @@
-######################################
-# Österreichische Bundesliga 2013/14
-
-
-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.
-Austria Wien         2:0  FC Admira Wacker
-SC Wiener Neustadt   1:5  RB Salzburg
-SV Grödig            0:0  SV Ried
-Wolfsberger AC       2:2  Rapid Wien
-
-(So) 21.07.
-FC Wacker Innsbruck  2:2  Sturm Graz
-
-
-# -- 2. Runde  // Sa+So 27.+28. Jul 2013
-
-(Sa) 27.07. Rapid Wien           4:0  SC Wiener Neustadt
-            FC Admira Wacker     1:2  FC Wacker Innsbruck
-            SV Ried              1:0  Wolfsberger AC
-            RB Salzburg          5:1  Austria Wien
-
-(So) 28.07. Sturm Graz           0:2  SV Grödig
-
-
-# -- 3. Runde // Sa.+So. 3.+4. Aug 2013
-
-[Sa 03.08.]
-SC Wiener Neustadt   2:1  Wolfsberger AC
-SV Grödig            7:1  FC Admira Wacker
-FC Wacker Innsbruck  1:1  RB Salzburg
-Austria Wien         3:3  SV Ried
-[So 04.08.]
-Sturm Graz           2:4  Rapid Wien
-
-
-## 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
-(Sa) 10.08. 19.00  RB Salzburg          4:1  SV Grödig
-(Sa) 10.08. 19.00  FC Admira Wacker     1:1  Sturm Graz
-
-(So) 11.08. 16.30  Rapid Wien           0:0  Austria Wien
-
-
-## 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
-(Sa) 17.08. 19.00  FC Wacker Innsbruck  2:3  SV Ried
-(Sa) 17.08. 19.00  Austria Wien         5:0  SC Wiener Neustadt
-
-(So) 18.08. 16.30  FC Admira Wacker     2:0  Rapid Wien
-
-
-## 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
-(Sa) 24.08. 16.30  Wolfsberger AC       1:4  Austria Wien
-
-(So) 25.08. 19.00  Rapid Wien           0:1  SV Grödig
-(So) 25.08. 19.00  RB Salzburg          1:0  FC Admira Wacker
-
-
-7. Runde // Sa.+So.
- 
-(Sa) 31.08. 16.30  Sturm Graz           4:2  Wolfsberger AC
-(Sa) 31.08. 19.00  SV Grödig            3:6  SC Wiener Neustadt
-(Sa) 31.08. 19.00  Austria Wien         1:1  FC Wacker Innsbruck
-(Sa) 31.08. 19.00  FC Admira Wacker     1:4  SV Ried
-
-(So) 01.09. 16.30  RB Salzburg          1:1  Rapid Wien
-
-
-8. Runde // Sa.+So.
-
-(Sa) 14.09.  FC Wacker Innsbruck 0:4  Rapid Wien
-(Sa) 14.09.  Wolfsberger AC      3:1  FC Admira Wacker
-(Sa) 14.09.  SC Wiener Neustadt  1:3  Sturm Graz
-(Sa) 14.09.  Austria Wien        2:3  SV Grödig
-
-(So) 15.09.  SV Ried             0:5  RB Salzburg
-
-
-9. Runde // Sa.+So.
-
-(Sa) 21.09.  SV Grödig           3:3  FC Wacker Innsbruck
-(Sa) 21.09.  Sturm Graz          1:2  Austria Wien
-(Sa) 21.09.  FC Admira Wacker    0:3  SC Wiener Neustadt
-
-(So) 22.09.  Rapid Wien          2:0  SV Ried
-(So) 22.09.  RB Salzburg         2:2  Wolfsberger AC
-
-
-10. Runde // Sa.+So.
-
-(Sa) 28.09.  SV Ried             4:2  SV Grödig
-(Sa) 28.09.  Sturm Graz          1:0  FC Wacker Innsbruck
-(Sa) 28.09.  Rapid Wien          2:4  Wolfsberger AC
-(Sa) 28.09.  FC Admira Wacker    1:0  Austria Wien
-
-(So) 29.09.  RB Salzburg         8:1  SC Wiener Neustadt
-
-
-11. Runde // Sa.+So.
-
-(Sa) 05.10.  Wolfsberger AC      1:1  SV Ried
-(Sa) 05.10.  SV Grödig           0:1  Sturm Graz
-(Sa) 05.10.  FC Wacker Innsbruck 3:3  FC Admira Wacker
-
-(So) 06.10.  Austria Wien        1:2  RB Salzburg
-(So) 06.10.  SC Wiener Neustadt  0:0  Rapid Wien
-
-
-12. Runde // Sa.+So.
-
-(Sa) 19.10.  FC Admira Wacker    0:4  SV Grödig
-(Sa) 19.10.  RB Salzburg         6:0  FC Wacker Innsbruck
-(Sa) 19.10.  Wolfsberger AC      1:1  SC Wiener Neustadt
-(Sa) 19.10.  SV Ried             1:1  Austria Wien
-
-(So) 20.10.  Rapid Wien          2:2  Sturm Graz
-
-
-13. Runde // Sa.+So.
-
-(Sa) 26.10.  SC Wiener Neustadt  3:3  SV Ried
-(Sa) 26.10.  FC Wacker Innsbruck 1:2  Wolfsberger AC
-(Sa) 26.10.  Sturm Graz          0:2  FC Admira Wacker
-
-(So) 27.10.  Austria Wien        0:1  Rapid Wien
-(So) 27.10.  SV Grödig           0:3  RB Salzburg
-
-
-14. Runde // Sa.+So.
-
-(Sa) 02.11.  Wolfsberger AC      1:1  SV Grödig
-(Sa) 02.11.  SV Ried             4:0  FC Wacker Innsbruck
-(Sa) 02.11.  RB Salzburg         1:0  Sturm Graz
-(Sa) 02.11.  Rapid Wien          4:2  FC Admira Wacker
-
-(So) 03.11.  SC Wiener Neustadt  0:3  Austria Wien
-
-
-15. Runde // Sa.+So.
-
-(Sa) 09.11.  Austria Wien         1:0  Wolfsberger AC
-(Sa) 09.11.  FC Wacker Innsbruck  4:0  SC Wiener Neustadt
-
-(So) 10.11.  SV Grödig            2:2  Rapid Wien
-(So) 10.11.  FC Admira Wacker     3:1  RB Salzburg
-
-09.11. => 27.11.  Sturm Graz           2:0  SV Ried
-
-
-16. Runde // Sa.+So.
-
-(Sa) 23.11.  SC Wiener Neustadt   0:2  SV Grödig
-(Sa) 23.11.  FC Wacker Innsbruck  0:5  Austria Wien
-(Sa) 23.11.  SV Ried              2:2  FC Admira Wacker
-
-(So) 24.11.  Rapid Wien           2:1  RB Salzburg
-
-23.11. => 11.12.   Wolfsberger AC       2:1  Sturm Graz
-
-
-17. Runde // Sa.+So.
-
-(Sa) 30.11.  FC Admira Wacker     3:0  Wolfsberger AC
-(Sa) 30.11.  Sturm Graz           2:3  SC Wiener Neustadt
-(Sa) 30.11.  SV Grödig            1:0  Austria Wien
-
-(So) 01.12.  RB Salzburg          4:0  SV Ried
-(So) 01.12.  Rapid Wien           3:0  FC Wacker Innsbruck
-
-
-18. Runde // Di.+Mi.
-
-(Di) 03.12.  Austria Wien         3:2  Sturm Graz
-
-(Mi) 04.12.  FC Wacker Innsbruck  5:3  SV Grödig
-(Mi) 04.12.  SV Ried              2:0  Rapid Wien
-(Mi) 04.12.  Wolfsberger AC       1:2  RB Salzburg
-(Mi) 04.12.  SC Wiener Neustadt   1:0  FC Admira Wacker
-
-
-19. Runde // Sa.+So. 
-
-(Sa) 07.12.  SV Grödig            3:0  SV Ried
-(Sa) 07.12.  FC Wacker Innsbruck  0:1  Sturm Graz
-(Sa) 07.12.  Austria Wien         2:2  FC Admira Wacker
-
-(So) 08.12.  Wolfsberger AC       2:1  Rapid Wien
-
-(Sa) 07.12. => 02.02.2014  SC Wiener Neustadt  1:5  RB Salzburg
-
-
-20. Runde // Sa.+So.
-
-(Sa) 14.12.  SV Ried              1:3  Wolfsberger AC
-(Sa) 14.12.  Sturm Graz           2:2  SV Grödig
-(Sa) 14.12.  FC Admira Wacker     3:0  FC Wacker Innsbruck
-
-(So) 15.12.  RB Salzburg          4:0  Austria Wien
-(So) 15.12.  Rapid Wien           0:0  SC Wiener Neustadt
-
-
-21. Runde // Di.+Mi.
-
-(Di) 17.12.  SV Grödig            2:1  FC Admira Wacker
-
-(Mi) 18.12.  FC Wacker Innsbruck  0:1  RB Salzburg
-(Mi) 18.12.  Sturm Graz           2:0  Rapid Wien
-(Mi) 18.12.  SC Wiener Neustadt   1:1  Wolfsberger AC
-(Mi) 18.12.  Austria Wien         1:1  SV Ried
-