sportdb 1.9.16 → 1.10.0

data/lib/sportdb/deleter.rb

@@ -1,52 +0,0 @@
-
-module SportDb
-
-  class Deleter
-    ######
-    # NB: make models available in sportdb module by default with namespace
-    #  e.g. lets you use Team instead of Model::Team
-    include SportDb::Models
-
-    def run
-      # for now delete all tables
-      
-      ## stats
-      AlltimeStandingEntry.delete_all
-      AlltimeStanding.delete_all
-      GroupStandingEntry.delete_all
-      GroupStanding.delete_all
-
-
-      Goal.delete_all
-
-      Game.delete_all
-      Event.delete_all
-      EventTeam.delete_all
-      EventGround.delete_all
-      Group.delete_all
-      GroupTeam.delete_all
-      Round.delete_all
-      Badge.delete_all
-
-      Roster.delete_all
-
-      Team.delete_all
-      
-      League.delete_all
-      Season.delete_all
-      
-      Ground.delete_all   # stadiums
-      
-      Assoc.delete_all       # associations / organizations
-      AssocAssoc.delete_all  # associations / organizations
-
-## note: moved to racing.db - delete/remove!!!
-##      Record.delete_all
-##      Run.delete_all
-##      Race.delete_all
-##      Track.delete_all
-    end
-    
-  end # class Deleter
-  
-end # module SportDb

data/lib/sportdb/finders/date.rb

@@ -1,374 +0,0 @@
-# encoding: utf-8
-
-#### fix: move to textutils for reuse !!!!!
-
-
-module SportDb
-
-class DateFinder
-
-  include LogUtils::Logging
-
-  # todo: make more generic for reuse
-  ### fix:
-  ### move to textutils
-  ##     date/fr.yml  en.yml etc. ???
-  ##  why? why not?
-
-  MONTH_FR = 'Janvier|Janv|Jan|' +
-             'Février|Févr|Fév|' +
-             'Mars|Mar|' +
-             'Avril|Avri|Avr|' +
-             'Mai|'  +
-             'Juin|' +
-             'Juillet|Juil|' +
-             'Août|' +
-             'Septembre|Sept|' +
-             'Octobre|Octo|Oct|' +
-             'Novembre|Nove|Nov|' +
-             'Décembre|Déce|Déc'
-  MONTH_FR_TO_MM = {
-        'Janvier' => '1', 'Janv' => '1', 'Jan' => '1',   ## check janv in use??
-        'Février' => '2', 'Févr' => '2', 'Fév' => '2',   ## check fevr in use???
-        'Mars'    => '3', 'Mar' => '3',
-        'Avril'   => '4', 'Avri' => '4', 'Avr' => '4',   ## check avri in use??? if not remove
-        'Mai'     => '5',
-        'Juin'    => '6',
-        'Juillet' => '7', 'Juil' => '7',
-        'Août'    => '8',
-        'Septembre' => '9', 'Sept' => '9',
-        'Octobre' => '10',  'Octo' => '10', 'Oct' => '10',  ### check octo in use??
-        'Novembre' => '11', 'Nove' => '11', 'Nov' => '11',  ##  check nove in use??
-        'Décembre' => '12', 'Déce' => '12', 'Déc' => '12' } ## check dece in use??
-  WEEKDAY_FR = 'Lundi|Lun|L|' +
-           'Mardi|Mar|Ma|' +
-           'Mercredi|Mer|Me|' +
-           'Jeudi|Jeu|J|' +
-           'Vendredi|Ven|V|' +
-           'Samedi|Sam|S|' +
-           'Dimanche|Dim|D|'
-
-
-  MONTH_EN = 'January|Jan|'+
-             'February|Feb|'+
-             'March|Mar|'+
-             'April|Apr|'+
-             'May|'+
-             'June|Jun|'+
-             'July|Jul|'+
-             'August|Aug|'+
-             'September|Sept|Sep|'+
-             'October|Oct|'+
-             'November|Nov|'+
-             'December|Dec'
-  MONTH_EN_TO_MM = {
-        'Jan' => '1', 'January' => '1',
-        'Feb' => '2', 'February' => '2',
-        'Mar' => '3', 'March' => '3',
-        'Apr' => '4', 'April' => '4',
-        'May' => '5',
-        'Jun' => '6', 'June' => '6',
-        'Jul' => '7', 'July' => '7',
-        'Aug' => '8', 'August' => '8',
-        'Sep' => '9', 'Sept' => '9', 'September' => '9',
-        'Oct' => '10', 'October' => '10',
-        'Nov' => '11', 'November' => '11',
-        'Dec' => '12', 'December' =>'12' }
-
-###
-## todo: add days
-## 1. Sunday - Sun.	2. Monday - Mon.
-## 3. Tuesday - Tu., Tue., or Tues.	4. Wednesday - Wed.
-## 5. Thursday - Th., Thu., Thur., or Thurs.	6. Friday - Fri.
-## 7. Saturday - Sat.
-
-
-  MONTH_ES = 'Enero|Ene|Feb|Marzo|Mar|Abril|Abr|Mayo|May|Junio|Jun|Julio|Jul|Agosto|Ago|Sept|Set|Sep|Oct|Nov|Dic'
-  MONTH_ES_TO_MM  = {
-        'Ene' => '1', 'Enero' => '1',
-        'Feb' => '2',
-        'Mar' => '3', 'Marzo' => '3',
-        'Abr' => '4', 'Abril' => '4',
-        'May' => '5', 'Mayo' => '5',
-        'Jun' => '6', 'Junio' => '6',
-        'Jul' => '7', 'Julio' => '7',
-        'Ago' => '8', 'Agosto' => '8',
-        'Sep' => '9', 'Set' => '9', 'Sept' => '9',
-        'Oct' => '10',
-        'Nov' => '11',
-        'Dic' => '12' }
-
-  # todo/fix - add de and es too!!
-  # note: in Austria - Jänner - in Deutschland Januar allow both ??
-  # MONTH_DE = 'J[aä]n|Feb|Mär|Apr|Mai|Jun|Jul|Aug|Sep|Okt|Nov|Dez'
-
-
-  # e.g. 2012-09-14 20:30   => YYYY-MM-DD HH:MM
-  #  nb: allow 2012-9-3 7:30 e.g. no leading zero required
-  # regex_db
-  DB__DATE_TIME_REGEX = /\b
-                 (?<year>\d{4})
-                   -
-                 (?<month>\d{1,2})
-                   -
-                 (?<day>\d{1,2})
-                  \s+
-                 (?<hours>\d{1,2})
-                   :
-                 (?<minutes>\d{2})
-                  \b/x
-
-  # e.g. 2012-09-14  w/ implied hours (set to 12:00)
-  #  nb: allow 2012-9-3 e.g. no leading zero required
-  # regex_db2
-  DB__DATE_REGEX = /\b
-                    (?<year>\d{4})
-                       -
-                    (?<month>\d{1,2})
-                       -
-                    (?<day>\d{1,2})
-                     \b/x
-
-  # e.g. 14.09.2012 20:30   => DD.MM.YYYY HH:MM
-  #  nb: allow 2.3.2012 e.g. no leading zero required
-  #  nb: allow hour as 20.30
-  # regex_de
-  DD_MM_YYYY__DATE_TIME_REGEX = /\b
-                          (?<day>\d{1,2})
-                            \.
-                          (?<month>\d{1,2})
-                            \.
-                          (?<year>\d{4})
-                            \s+
-                          (?<hours>\d{1,2})
-                            [:.]
-                          (?<minutes>\d{2})
-                            \b/x
-
-  # e.g. 14.09. 20:30  => DD.MM. HH:MM
-  #  nb: allow 2.3.2012 e.g. no leading zero required
-  #  nb: allow hour as 20.30  or 3.30 instead of 03.30
-  # regex_de2
-  DD_MM__DATE_TIME_REGEX = /\b
-                        (?<day>\d{1,2})
-                           \.
-                        (?<month>\d{1,2})
-                           \.
-                           \s+
-                        (?<hours>\d{1,2})
-                           [:.]
-                        (?<minutes>\d{2})
-                          \b/x
-
-  # e.g. 14.09.2012  => DD.MM.YYYY w/ implied hours (set to 12:00)
-  # regex_de3
-  DD_MM_YYYY__DATE_REGEX = /\b
-                    (?<day>\d{1,2})
-                      \.
-                    (?<month>\d{1,2})
-                      \.
-                    (?<year>\d{4})
-                      \b/x
-
-  # e.g. 14.09.  => DD.MM. w/ implied year and implied hours (set to 12:00)
-  #  note: allow end delimiter ] e.g. [Sa 12.01.] or end-of-string ($) too
-  #  note: we use a lookahead for last part e.g. (?:\s+|$|[\]]) - do NOT cosume
-  # regex_de4 (use lookahead assert)
-  DD_MM__DATE_REGEX = /\b
-                     (?<day>\d{1,2})
-                        \.
-                     (?<month>\d{1,2})
-                        \.
-                     (?=\s+|$|[\]])/x  ## note: allow end-of-string/line too
-
-
-  # e.g. 12 May 2013 14:00  => D|DD.MMM.YYYY H|HH:MM
-  EN__DD_MONTH_YYYY__DATE_TIME_REGEX = /\b
-                (?<day>\d{1,2})
-                   \s
-                (?<month_en>#{MONTH_EN})
-                   \s
-                (?<year>\d{4})
-                   \s+
-                (?<hours>\d{1,2})
-                  :
-                (?<minutes>\d{2})
-                  \b/x
-
-###
-# fix: pass in lang (e.g. en or es)
-#  only process format for lang plus fallback to en?
-#   e.g.  EN__DD_MONTH and ES__DD_MONTH depend on order for match (first listed will match)
-
-  # e.g. 12 May  => D|DD.MMM  w/ implied year and implied hours
-  EN__DD_MONTH__DATE_REGEX = /\b
-                (?<day>\d{1,2})
-                   \s
-                (?<month_en>#{MONTH_EN})
-                   \b/x
-
-
-  # e.g.  Jun/12 2011 14:00
-  EN__MONTH_DD_YYYY__DATE_TIME_REGEX = /\b
-                   (?<month_en>#{MONTH_EN})
-                     \/
-                   (?<day>\d{1,2})
-                     \s
-                   (?<year>\d{4})
-                     \s+
-                   (?<hours>\d{1,2})
-                     :
-                   (?<minutes>\d{2})
-                     \b/x
-
-  # e.g.  Jun/12 14:00  w/ implied year H|HH:MM
-  EN__MONTH_DD__DATE_TIME_REGEX = /\b
-                   (?<month_en>#{MONTH_EN})
-                     \/
-                   (?<day>\d{1,2})
-                     \s+
-                   (?<hours>\d{1,2})
-                     :
-                   (?<minutes>\d{2})
-                     \b/x
-
-  # e.g. Jun/12 2013  w/ implied hours (set to 12:00)
-  EN__MONTH_DD_YYYY__DATE_REGEX = /\b
-                (?<month_en>#{MONTH_EN})
-                   \/
-                (?<day>\d{1,2})
-                   \s
-                (?<year>\d{4})
-                  \b/x
-
-  # e.g.  Jun/12  w/ implied year and implied hours (set to 12:00)
-  EN__MONTH_DD__DATE_REGEX = /\b
-                   (?<month_en>#{MONTH_EN})
-                      \/
-                   (?<day>\d{1,2})
-                     \b/x
-
-
-  # e.g.  12 Ene  w/ implied year and implied hours (set to 12:00)
-  ES__DD_MONTH__DATE_REGEX = /\b
-                   (?<day>\d{1,2})
-                     \s
-                   (?<month_es>#{MONTH_ES})
-                     \b/x
-
-  # e.g. Ven 8 Août  or [Ven 8 Août] or Ven 8. Août  or [Ven 8. Août]
-  ### note: do NOT consume [] in regex (use lookahead assert)
-  FR__WEEKDAY_DD_MONTH__DATE_REGEX = /\b
-       (?:#{WEEKDAY_FR})   # note: skip weekday for now; do NOT capture
-         \s+
-       (?<day>\d{1,2})
-         \.?        # note: make dot optional
-         \s+
-       (?<month_fr>#{MONTH_FR})
-         (?=\s+|$|[\]])/x  ## note: allow end-of-string/line too
-
-
-
-
-  # map table - 1) tag, 2) regex - note: order matters; first come-first matched/served
-  FORMATS = [
-    [ '[YYYY_MM_DD_hh_mm]',        DB__DATE_TIME_REGEX         ],
-    [ '[YYYY_MM_DD]',              DB__DATE_REGEX              ],
-    [ '[DD_MM_YYYY_hh_mm]',        DD_MM_YYYY__DATE_TIME_REGEX ],
-    [ '[DD_MM_hh_mm]',             DD_MM__DATE_TIME_REGEX ],
-    [ '[DD_MM_YYYY]',              DD_MM_YYYY__DATE_REGEX ],
-    [ '[DD_MM]',                   DD_MM__DATE_REGEX ],
-    [ '[FR_WEEKDAY_DD_MONTH]',     FR__WEEKDAY_DD_MONTH__DATE_REGEX ],
-    [ '[EN_DD_MONTH_YYYY_hh_mm]',  EN__DD_MONTH_YYYY__DATE_TIME_REGEX ],
-    [ '[EN_MONTH_DD_YYYY_hh_mm]',  EN__MONTH_DD_YYYY__DATE_TIME_REGEX ],
-    [ '[EN_MONTH_DD_hh_mm]',       EN__MONTH_DD__DATE_TIME_REGEX ],
-    [ '[EN_MONTH_DD_YYYY]',        EN__MONTH_DD_YYYY__DATE_REGEX ],
-    [ '[EN_MONTH_DD]',             EN__MONTH_DD__DATE_REGEX ],
-    [ '[EN_DD_MONTH]',             EN__DD_MONTH__DATE_REGEX ],
-    [ '[ES_DD_MONTH]',             ES__DD_MONTH__DATE_REGEX ]
-  ]
-
-
-
-  def initialize
-    # nothing here for now
-  end
-
-  def find!( line, opts={} )
-    # fix: use more lookahead for all required trailing spaces!!!!!
-    # fix: use <name capturing group> for month,day,year etc.!!!
-
-    #
-    # fix: !!!!
-    #   date in [] will become [[DATE.DE4]] - when getting removed will keep ]!!!!
-    #   fix: change regex to \[[A-Z0-9.]\]  !!!!!!  plus add unit test too!!!
-    #
- 
-    md = nil
-    FORMATS.each do |format|
-      tag     = format[0]
-      pattern = format[1]
-      md=pattern.match( line )
-      if md
-        date = parse_date_time( md, opts )
-        ## fix: use md[0] e.g. match for sub! instead of using regex again - why? why not???
-        ## fix: use md.begin(0), md.end(0)
-        line.sub!( md[0], tag )
-        ## todo/fix: make sure match data will not get changed (e.g. using sub! before parse_date_time)
-        return date
-      end
-      # no match; continue; try next pattern
-    end
-
-    return nil  # no match found
-  end
-
-private
-  def calc_year( month, day, opts )
-    start_at = opts[:start_at]
-
-    logger.debug "   [calc_year] ????-#{month}-#{day} -- start_at: #{start_at}"
-
-    if month >= start_at.month
-      # assume same year as start_at event (e.g. 2013 for 2013/14 season)
-      start_at.year
-    else
-      # assume year+1 as start_at event (e.g. 2014 for 2013/14 season)
-      start_at.year+1
-    end
-  end
-
-  def parse_date_time( match_data, opts={} )
-    
-    # convert regex match_data captures to hash
-    # - note: cannont use match_data like a hash (e.g. raises exception if key/name not present/found)
-    h = {}
-    # - note: do NOT forget to turn name into symbol for lookup in new hash (name.to_sym)
-    match_data.names.each { |name| h[name.to_sym] = match_data[name] }  # or use match_data.names.zip( match_data.captures )  - more cryptic but "elegant"??
-
-    ## puts "[parse_date_time] match_data:"
-    ## pp h
-    logger.debug "   [parse_date_time] hash: >#{h.inspect}<"
-
-    h[ :month ] = MONTH_EN_TO_MM[ h[:month_en] ]  if h[:month_en]
-    h[ :month ] = MONTH_ES_TO_MM[ h[:month_es] ]  if h[:month_es]
-    h[ :month ] = MONTH_FR_TO_MM[ h[:month_fr] ]  if h[:month_fr]
-
-    month   = h[:month]
-    day     = h[:day]
-    year    = h[:year]     || calc_year( month.to_i, day.to_i, opts ).to_s
-
-    hours   = h[:hours]    || '12'   # default to 12:00 for HH:MM (hours:minutes)
-    minutes = h[:minutes]  || '00'
-
-    value = '%d-%02d-%02d %02d:%02d' % [year.to_i, month.to_i, day.to_i, hours.to_i, minutes.to_i]
-    logger.debug "   date: >#{value}<"
-
-    DateTime.strptime( value, '%Y-%m-%d %H:%M' )
-  end
-
-
-end # class DateFinder
-
-
-end # module SportDb

data/lib/sportdb/finders/goals.rb

@@ -1,260 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-
-
-
-class GoalsPlayerStruct
-  ##
-  # note: player with own goal (o.g) gets listed on other team
-  #  (thus, player might have two entries if also scored for its own team)
-  #
-  attr_accessor :name
-  attr_accessor :minutes   # ary of minutes e.g. 30', 45+2', 72'
-
-  def initialize
-    @minutes = []
-  end
-end
-
-
-class GoalsMinuteStruct
-  attr_accessor :minute, :offset
-  attr_accessor :penalty, :owngoal    # flags
-
-  def initialize
-    @offset  = 0
-    @penalty = false
-    @owngoal = false
-  end
-end
-
-
-class GoalStruct
-  ######
-  # flat struct for goals - one entry per goals
-  attr_accessor :name
-  attr_accessor :team   #  1 or 2 ? check/todo: add team1 or team2 flag?
-  attr_accessor :minute, :offset
-  attr_accessor :penalty, :owngoal
-  attr_accessor :score1, :score2  # gets calculated
-
-  ## add pos  for sequence number? e.g. 1,2,3,4  (1st goald, 2nd goal, etc.) ???
-
-  def initialize
-    # do nothing
-  end
-end
-
-
-
-# todo: find a better name? to avoid confusing w/ GoalsParser? use MatchGoalsParser or similar?
-class GoalsFinder
-  include LogUtils::Logging
-  include FixtureHelpers   # e.g. cut_off_end_of_line_comment!
-
-  def initialize
-    # nothing here for now
-  end
-
-  def find!( line, opts={} )
-    # remove end-of-line comments
-    #   - move to textutils ?? why? why not??
-    cut_off_end_of_line_comment!( line )     ## note: func defined in utils.rb (FixtureHelpers)
-
-    # remove [] if presents e.g. [Neymar 12']
-    line = line.gsub( /[\[\]]/, '' )
-    # remove (single match) if line starts w/ - (allow spaces)  e.g. [-;Neymar 12'] or [ - ;Neymar 12']
-    line = line.sub( /^[ ]*-[ ]*/, '' )
-
-    # split into left hand side (lhs) for team1 and
-    #            right hand side (rhs) for team2
-
-    values = line.split( ';' )
-    
-    # note: allow empty right hand side (e.g. team2 did NOT score any goals e.g. 3-0 etc.)
-    lhs = values[0]
-    rhs = values[1]
-
-    lhs = lhs.strip   unless lhs.nil?
-    rhs = rhs.strip   unless rhs.nil?
-
-    parser = GoalsParser.new
-    ## todo/check: only call if not nil?
-
-    logger.debug "  lhs (team1): >#{lhs}<"
-    lhs_data = parser.parse!( lhs )
-    pp lhs_data
-
-    logger.debug "  rhs (team2): >#{rhs}<"    
-    rhs_data = parser.parse!( rhs )
-    pp rhs_data
-
-    ### merge into flat goal structs
-    goals = []
-    lhs_data.each do |player|
-      player.minutes.each do |minute|
-        goal = GoalStruct.new
-        goal.name    = player.name
-        goal.team    = 1
-        goal.minute  = minute.minute
-        goal.offset  = minute.offset
-        goal.penalty = minute.penalty
-        goal.owngoal = minute.owngoal
-        goals << goal
-      end
-    end
-
-    rhs_data.each do |player|
-      player.minutes.each do |minute|
-        goal = GoalStruct.new
-        goal.name    = player.name
-        goal.team    = 2
-        goal.minute  = minute.minute
-        goal.offset  = minute.offset
-        goal.penalty = minute.penalty
-        goal.owngoal = minute.owngoal
-        goals << goal
-      end
-    end
-
-
-    # sort by minute + offset
-    goals = goals.sort do |l,r|
-      res = l.minute <=> r.minute
-      if res == 0 
-        res =  l.offset <=> r.offset  # pass 2: sort by offset
-      end
-      res
-    end
-
-    ## calc score1,score2
-    score1 = 0
-    score2 = 0
-    goals.each do |goal|
-      if goal.team == 1
-        score1 += 1
-      elsif goal.team == 2
-        score2 += 1
-      else
-        # todo: should not happen: issue warning
-      end
-      goal.score1 = score1
-      goal.score2 = score2
-    end
-
-    logger.debug "  #{goals.size} goals:"
-    pp goals
-
-    goals
-  end
-
-end  # class GoalsFinder
-
-
-class GoalsParser
-  include LogUtils::Logging
-
-
-  # note: use ^ for start of string only!!!
-  # - for now slurp everything up to digits (inlc. spaces - use strip to remove)
-  # todo/check: use/rename to NAME_UNTIL_REGEX ??? ( add lookahead for spaces?)
-  NAME_REGEX = /^
-                [^0-9]+
-               /x
-
-  
-  # todo/check: change to MINUTE_REGEX ??
-  # add MINUTE_SKIP_REGEX or MINUTE_SEP_REGEX /^[ ,]+/
-  # todo/fix:  split out  penalty and owngoal flag in PATTERN constant for reuse
-  MINUTES_REGEX = /^      # note: use ^ for start of string only!!!
-                    (?<minute>[0-9]{1,3})
-                    (?:\+
-                      (?<offset>[1-9]{1})
-                    )?
-                    '
-                    (?:[ ]*
-                      \(
-                      (?<type>P|pen\.|o\.g\.)
-                      \)
-                    )?
-                  /x
-
-
-
-  def initialize
-    # nothing here for now
-  end
-
-  def parse!( line, opts={} )
-
-    ## for now assume
-    ##    everything up-to  0-9 and , and () is part of player name 
-
-    ## try parsing lhs
-    ##  todo: check for  empty -    remove (make it same as empty string)
-
-    players = []
-
-    name = get_player_name!( line )
-    while name
-      logger.debug "  found player name >#{name}< - remaining >#{line}<"
-      
-      player = GoalsPlayerStruct.new
-      player.name = name
-      
-      minute_hash = get_minute_hash!( line )
-      while minute_hash
-        logger.debug "  found minutes >#{minute_hash.inspect}< - remaining >#{line}<"
-
-        minute = GoalsMinuteStruct.new
-        minute.minute = minute_hash[:minute].to_i
-        minute.offset = minute_hash[:offset].to_i  if minute_hash[:offset]
-        if minute_hash[:type]
-          minute.owngoal = true  if minute_hash[:type] =~ /o\.g\./
-          minute.penalty = true  if minute_hash[:type] =~ /P|pen\./
-        end
-        player.minutes << minute
-
-        # remove commas and spaces (note: use ^ for start of string only!!!)
-        line.sub!( /^[ ,]+/, '' )
-        minute_hash = get_minute_hash!( line )
-      end
-      
-      players << player
-      name = get_player_name!( line )
-    end
-
-    players
-  end   # method parse!
-
-private
-  def get_player_name!( line )
-    m = NAME_REGEX.match( line )
-    if m
-      ## remove from line
-      line.slice!( 0...m[0].length )
-      m[0].strip    # remove leading and trailing spaces
-    else
-      nil
-    end
-  end
-
-  def get_minute_hash!( line )
-    m = MINUTES_REGEX.match( line ) # note: use ^ for start of string only!!!
-    if m
-      h = {}
-      # - note: do NOT forget to turn name into symbol for lookup in new hash (name.to_sym)
-      m.names.each { |n| h[n.to_sym] = m[n] } # or use match_data.names.zip( match_data.captures ) - more cryptic but "elegant"??
-
-      ## remove matched string from line
-      line.slice!( 0...m[0].length )
-      h
-    else
-      nil
-    end
-  end
-
-end # class GoalsParser
-
-end # module SportDb