sportdb-readers 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46dc2a6de0074a2c9a5f007503f99d34030e4c80
-  data.tar.gz: e5cd5ae577346962dcb69361a11504fbe7540a22
+  metadata.gz: 8fdbf4230ab31efee1c3f29d51e3f447caf9b161
+  data.tar.gz: 48df0e0b7e1e28c06670431d7642bf9b0d2d6fbf
 SHA512:
-  metadata.gz: 54a9a0865d2d8af5a405f0cb9a64eea7bc2e7f6ea7cae870dded60dd51f38301c4f40b494a5833330f248b4b556daf17e81984ba8243cef3f170dd838565ef92
-  data.tar.gz: ee0035b74ada7e5d829f6778421e0c7be57728ac78aaa167edcebe44f93280310df9b09c7906580c9dca3a8b9d8360f9baf50959bbe0469a5bd3560187ee5837
+  metadata.gz: 40ce7917d320fada2dd95eb7625ea5f1ec9646729c38c9f540c6cd0e78bf5e7fe8200e82a2b6f546239faa5da120af527c867f364a4aa61fe001a3f8b2fae775
+  data.tar.gz: 581fffa22c4ffad1e1c8cb385e99307cc19a7099700a76d387e65e5cfb6194aa35ebd0e104a50473f15893b325955e25b648e429b29835241b2440a5641a7515

data/Manifest.txt

@@ -4,16 +4,12 @@ README.md
 Rakefile
 lib/sportdb/readers.rb
 lib/sportdb/readers/conf_linter.rb
-lib/sportdb/readers/conf_parser_auto.rb
 lib/sportdb/readers/conf_reader.rb
 lib/sportdb/readers/league_outline_reader.rb
 lib/sportdb/readers/match_linter.rb
-lib/sportdb/readers/match_parser.rb
 lib/sportdb/readers/match_reader.rb
 lib/sportdb/readers/package.rb
 lib/sportdb/readers/version.rb
 test/helper.rb
-test/test_conf_parser_auto.rb
-test/test_match_parser.rb
 test/test_read.rb
 test/test_reader.rb

data/Rakefile

@@ -21,7 +21,7 @@ Hoe.spec 'sportdb-readers' do
 
   self.extra_deps = [
     ['sportdb-config',  '>= 0.9.0'],
-    ['sportdb-models',  '>= 1.18.4'],
+    ['sportdb-models',  '>= 1.18.6'],
     ['sportdb-sync',    '>= 0.1.0'],
   ]
 

data/lib/sportdb/readers.rb

@@ -10,10 +10,8 @@ require 'sportdb/sync'
 # our own code
 require 'sportdb/readers/version' # let version always go first
 require 'sportdb/readers/league_outline_reader'
-require 'sportdb/readers/conf_parser_auto'
 require 'sportdb/readers/conf_reader'
 require 'sportdb/readers/conf_linter'
-require 'sportdb/readers/match_parser'
 require 'sportdb/readers/match_reader'
 require 'sportdb/readers/match_linter'
 require 'sportdb/readers/package'

data/lib/sportdb/readers/version.rb

@@ -6,7 +6,7 @@ module Readers
 
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
   MINOR = 4
-  PATCH = 7
+  PATCH = 8
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Gerald Bauer
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.4
+        version: 1.18.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.4
+        version: 1.18.6
 - !ruby/object:Gem::Dependency
   name: sportdb-sync
   requirement: !ruby/object:Gem::Requirement
@@ -96,17 +96,13 @@ files:
 - Rakefile
 - lib/sportdb/readers.rb
 - lib/sportdb/readers/conf_linter.rb
-- lib/sportdb/readers/conf_parser_auto.rb
 - lib/sportdb/readers/conf_reader.rb
 - lib/sportdb/readers/league_outline_reader.rb
 - lib/sportdb/readers/match_linter.rb
-- lib/sportdb/readers/match_parser.rb
 - lib/sportdb/readers/match_reader.rb
 - lib/sportdb/readers/package.rb
 - lib/sportdb/readers/version.rb
 - test/helper.rb
-- test/test_conf_parser_auto.rb
-- test/test_match_parser.rb
 - test/test_read.rb
 - test/test_reader.rb
 homepage: https://github.com/sportdb/sport.db

data/lib/sportdb/readers/conf_parser_auto.rb

@@ -1,171 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-
-
-class AutoConfParser
-
-  def self.parse( lines, start: )
-    ##  todo/fix: add support for txt and lines
-    ##    check if lines_or_txt is an array or just a string
-    parser = new( lines, start )
-    parser.parse
-  end
-
-
-  include LogUtils::Logging
-
-  def initialize( lines, start )
-     @lines        = lines     ## todo/check: change to text instead of array of lines - why? why not?
-     @start        = start
-  end
-
-  def parse
-    ## try to  find all clubs in match schedule
-    @last_round   = nil
-    @rounds       = {}           ## track usage counter and match (two clubs) counter
-    @clubs        = Hash.new(0)   ## keep track of usage counter
-
-
-    @lines.each do |line|
-      if is_round?( line )
-        logger.info "skipping matched round line: >#{line}<"
-
-        round = @rounds[ line ] ||= {count: 0, match_count: 0}   ## usage counter, match counter
-        round[:count] +=1
-        @last_round = round
-      elsif try_parse_game( line )
-        # do nothing here
-      else
-        logger.warn "skipping line (no match found): >#{line}<"
-      end
-    end # lines.each
-
-    [@clubs, @rounds]
-  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 try_parse_game( line )
-    # note: clone line; for possible test do NOT modify in place for now
-    # note: returns true if parsed, false if no match
-    parse_game( line.dup )
-  end
-
-  def parse_game( line )
-    logger.debug "parsing game (fixture) line: >#{line}<"
-
-    ## remove all protected text runs e.g. []
-    ##   fix: add [ to end-of-line too
-    ##  todo/fix: move remove protected text runs AFTER find date!! - why? why not?
-
-    line = line.gsub( /\[
-                        [^\]]+?
-                       \]/x, '' ).strip
-    return true if line.empty?    ## note: return true (for valid line with no match/clubs)
-
-
-    ## split by geo (@) - remove for now
-    values = line.split( '@' )
-    line = values[0]
-
-
-    ## try find date
-    date = find_date!( line, start: @start )
-    if date   ## if found remove tagged run too; note using singular sub (NOT global gsub)
-      line = line.sub( /\[
-                          [^\]]+?
-                         \]/x, '' ).strip
-
-    else
-      ##  check for leading hours only e.g.  20.30 or 20:30 or 20h30 or 20H30 or 09h00
-      ##   todo/fix: make language dependent (or move to find_date/hour etc.) - why? why not?
-      line = line.sub(  %r{^           ## MUST be anchored to beginning of line
-                            [012]?[0-9]
-                            [.:hH]
-                            [0-9][0-9]
-                           (?=[ ])    ## must be followed by space for now (add end of line too - why? why not?)
-                          }x, '' ).strip
-    end
-
-    return true if line.empty?    ## note: return true (for valid line with no match/clubs)
-
-
-    scores = find_scores!( line )
-
-    logger.debug "  line: >#{line}<"
-
-    line = line.sub( /\[
-                        [^\]]+?
-                       \]/x, '$$' )  # note: replace first score tag with $$
-    line = line.gsub( /\[
-                    [^\]]+?
-                   \]/x, '' )    # note: replace/remove all other score tags with nothing
-
-     ##  clean-up  remove all text run inside () or empty () too
-     line = line.gsub( /\(
-                     [^)]*?
-                    \)/x, '' )
-
-
-     ## check for more match separators e.g. - or vs for now
-     line = line.sub( / \s+
-                          (   -
-                            | v
-                            | vs\.?    # note: allow optional dot eg. vs.
-                          )
-                        \s+
-                       /ix, '$$' )
-
-     values = line.split( '$$' )
-     values = values.map { |value| value.strip }        ## strip spaces
-     values = values.select { |value| !value.empty? }   ## remove empty strings
-
-     return true    if values.size == 0  ## note: return true (for valid line with no match/clubs)
-
-     if values.size == 1
-       puts "(auto config) try matching clubs separated by spaces (2+):"
-       pp values
-
-       values = values[0].split( /[ ]{2,}/ )
-       pp values
-     end
-
-     return false   if values.size != 2
-
-     puts "(auto config) try matching clubs:"
-     pp values
-
-     @clubs[ values[0] ] += 1    ## update usage counters
-     @clubs[ values[1] ] += 1
-
-     @last_round[ :match_count ] += 1
-
-     true
-  end
-
-
-
-  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
-
-  def find_date!( line, start: )
-    ## 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
-    DateFormats.find!( line, start: start )
-  end
-end # class AutoConfParser
-end # module SportDb

data/lib/sportdb/readers/match_parser.rb

@@ -1,476 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-
-class MatchParserSimpleV2   ## simple match parser for club match schedules
-
-  def self.parse( lines, teams, start: )
-    ##  todo/fix: add support for txt and lines
-    ##    check if lines_or_txt is an array or just a string
-    ##   use teams: like start:  why? why not?
-    parser = new( lines, teams, start )
-    parser.parse
-  end
-
-
-  include LogUtils::Logging
-
-  def initialize( lines, teams, start )
-     @lines        = lines     ## todo/check: change to text instead of array of lines - why? why not?
-     @mapper_teams = TeamMapper.new( teams )
-     @start        = start
-
-     ## build lookup hash by (team) key
-     @teams =  teams.reduce({}) { |h,team| h[team.key]=team; h }
-
-     ## debug_dump_teams( teams )
-     ## exit 1
-  end
-
-  def debug_dump_teams( teams )
-    puts "== #{teams.size} teams"
-    teams.each do |team|
-      print "#{team.key}, "
-      print "#{team.title}, "
-      print "#{team.synonyms.split('|').join(', ')}"
-      puts
-    end
-  end
-
-
-
-  Round = Struct.new( :pos, :title )
-  ##
-  ##  todo:  change db schema
-  ##    make start and end date optional
-  ##    change pos to num - why? why not?
-  ##    make pos/num optional too
-  ##
-  ##    sort round by scheduled/planed start date
-  Match = Struct.new( :date,
-                      :team1,     :team2,      ## todo/fix: use team1_name, team2_name or similar - for compat with db activerecord version? why? why not?
-                      :score1i,   :score2i,    ## half time (first (i) part)
-                      :score1,    :score2,     ## full time
-                      :round )
-
-  def parse
-    @last_date    = nil
-    @last_round   = nil
-    @rounds  = {}
-    @matches = []
-
-
-    @lines.each do |line|
-      if is_round?( line )
-        parse_round_header( line )
-      elsif try_parse_game( line )
-        # do nothing here
-      elsif try_parse_date_header( line )
-        # do nothing here
-      else
-        logger.info "skipping line (no match found): >#{line}<"
-      end
-    end # lines.each
-
-    ## todo/fix: reverse - pass matches as first para
-    [@rounds.values, @matches]
-  end # method parse
-
-
-  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 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!
-
-  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.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 parse_round_header( line )
-    logger.debug "parsing round header line: >#{line}<"
-
-    ## todo/check/fix:
-    #   make sure  Round of 16  will not return pos 16 -- how? possible?
-    #   add unit test too to verify
-    pos = find_round_pos!( line )
-
-    title = find_round_header_title!( line )
-
-    logger.debug "  line: >#{line}<"
-
-
-    round = @rounds[ title ]
-    if round.nil?
-      round = Round.new( pos, title )
-      @rounds[ title ] = round
-    end
-    ## todo/check: if pos match (MUST always match for now)
-    @last_round = round
-
-
-    ## NB: dummy/placeholder start_at, end_at date
-    ##  replace/patch after adding all games for round
-
-=begin
-    round_attribs = {
-      title:  title,
-      title2: title2,
-      knockout: knockout_flag
-    }
-
-    if pos > 999000
-      # no pos (e.g. will get autonumbered later) - try match by title for now
-      #  e.g. lets us use title 'Group Replays', for example, multiple times
-      @round = Round.find_by_event_id_and_title( @event.id, title )
-    else
-      @round = Round.find_by_event_id_and_pos( @event.id, pos )
-    end
-
-    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,
-        start_at: Date.parse('1911-11-11'),
-        end_at:   Date.parse('1911-11-11')
-      })
-    end
-
-    logger.debug round_attribs.to_json
-
-    @round.update_attributes!( round_attribs )
-
-    @patch_round_ids_pos   << @round.id    if pos > 999000
-    ### store list of round ids for patching start_at/end_at at the end
-    @patch_round_ids_dates << @round.id   # todo/fix/check: check if round has definition (do NOT patch if definition (not auto-added) present)
-=end
-  end
-
-
-  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
-
-  def try_parse_game( line )
-    # note: clone line; for possible test do NOT modify in place for now
-    # note: returns true if parsed, false if no match
-    parse_game( line.dup )
-  end
-
-
-  def parse_game( line )
-    logger.debug "parsing game (fixture) line: >#{line}<"
-
-    @mapper_teams.map_teams!( line )   ### todo/fix: limit mapping to two(2) teams - why? why not?  might avoid matching @ Barcelona ??
-    team_keys = @mapper_teams.find_teams!( line )
-    team1_key = team_keys[0]
-    team2_key = team_keys[1]
-
-    ## note: if we do NOT find two teams; return false - no match found
-    if team1_key.nil? || team2_key.nil?
-      logger.debug "  no game match (two teams required) found for line: >#{line}<"
-      return false
-    end
-
-    ## pos = find_game_pos!( line )
-
-      date      = find_date!( line, start: @start )
-
-    ###
-    # check if date found?
-    #   NB: ruby falsey is nil & false only (not 0 or empty array etc.)
-    if date
-      ### check: use date_v2 if present? why? why not?
-      @last_date = date    # keep a reference for later use
-    else
-      date = @last_date    # no date found; (re)use last seen date
-    end
-
-
-    scores = find_scores!( line )
-
-    logger.debug "  line: >#{line}<"
-
-
-    ## todo/check: scores are integers or strings?
-    @matches << Match.new( date,
-                           @teams[ team1_key ],
-                           @teams[ team2_key ],
-                           scores[0],  ## score1i - half time (first (i) part)
-                           scores[1],  ## score2i
-                           scores[2],  ## score1  - full time
-                           scores[3],  ## score2
-                           @last_round )
-
-    ### todo: cache team lookups in hash?
-
-=begin
-    team1 = Team.find_by_key!( team1_key )
-    team2 = Team.find_by_key!( team2_key )
-
-    @last_team1 = team1    # store for later use for goals etc.
-    @last_team2 = team2
-
-
-    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)
-
-      ##
-      # note: start_at and end_at are dates ONLY (note datetime)
-      #  - do NOT pass in hours etc. in query
-      #  again use -->  date.end_of_day, date.beginning_of_day
-      #  new: not working:  date.to_date, date.to_date
-      #    will not find round if  start_at same as date !! (in theory hours do not matter)
-
-      ###
-      # hack:
-      #  special case for sqlite3 (date compare not working reliable; use casts)
-      #  fix: move to  adapter_name to activerecord_utils as sqlite? or similar?
-
-      if ActiveRecord::Base.connection.adapter_name.downcase.starts_with?( 'sqlite' )
-        logger.debug( "  [sqlite] using sqlite-specific query for date compare for rounds finder" )
-        round = Round.where( 'event_id = ? AND (    julianday(start_at) <= julianday(?)'+
-                                               'AND julianday(end_at)   >= julianday(?))',
-                               @event.id, date.to_date, date.to_date).first
-      else  # all other dbs (postgresql, mysql, etc.)
-        round = Round.where( 'event_id = ? AND (start_at <= ? AND end_at >= ?)',
-                             @event.id, date.to_date, date.to_date).first
-      end
-
-      pp round
-      if round.nil?
-        logger.warn( "  !!!! no round match found for date #{date}" )
-        pp Round.all
-
-        ###################################
-        # -- try auto-adding matchday
-        round = Round.new
-
-        round_attribs = {
-          event_id: @event.id,
-          title: "Matchday #{date.to_date}",
-          pos: 999001+@patch_round_ids_pos.length,   # e.g. 999<count> - 999001,999002,etc.
-          start_at:  date.to_date,
-          end_at:    date.to_date
-        }
-
-        logger.info( "  auto-add round >Matchday #{date.to_date}<" )
-        logger.debug round_attribs.to_json
-
-        round.update_attributes!( round_attribs )
-
-        @patch_round_ids_pos << round.id   # todo/check - add just id or "full" record as now - why? why not?
-      end
-
-      # store pos for auto-number next round if missing
-      #  - note: only if greater/bigger than last; use max
-      #  - note: last_round_pos might be nil - thus set to 0
-      if round.pos > 999000
-        # note: do NOT update last_round_pos for to-be-patched rounds
-      else
-        @last_round_pos = [round.pos,@last_round_pos||0].max
-      end
-
-      ## note: will crash (round.pos) if round is nil
-      logger.debug( "  using round #{round.pos} >#{round.title}< start_at: #{round.start_at}, end_at: #{round.end_at}" )
-    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
-    )
-
-    game_attribs = {
-      score1i:   scores[0],
-      score2i:   scores[1],
-      score1:    scores[2],
-      score2:    scores[3],
-      score1et:  scores[4],
-      score2et:  scores[5],
-      score1p:   scores[6],
-      score2p:   scores[7],
-      play_at:    date,
-      play_at_v2: date_v2,
-      postponed: postponed,
-      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
-    }
-
-    game_attribs[ :pos ] = pos   if pos.present?
-
-    ####
-    # note: only update if any changes (or create if new record)
-    if game.present? &&
-       game.check_for_changes( game_attribs ) == false
-          logger.debug "  skip update game #{game.id}; no changes found"
-    else
-      if game.present?
-        logger.debug "update game #{game.id}:"
-      else
-        logger.debug "create game:"
-        game = Game.new
-
-        more_game_attribs = {
-          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?
-
-        game_attribs = game_attribs.merge( more_game_attribs )
-      end
-
-      logger.debug game_attribs.to_json
-      game.update_attributes!( game_attribs )
-    end
-
-    @last_game = game   # store for later reference (e.g. used for goals etc.)
-=end
-
-    return true   # game match found
-  end # method parse_game
-
-
-
-  def try_parse_date_header( line )
-    # note: clone line; for possible test do NOT modify in place for now
-    # note: returns true if parsed, false if no match
-    parse_date_header( line.dup )
-  end
-
-  def find_date!( line, start: )
-    ## 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
-    DateFormats.find!( line, start: start )
-  end
-
-
-  def parse_date_header( line )
-    # note: returns true if parsed, false if no match
-
-    # line with NO teams  plus include date e.g.
-    #   [Fri Jun/17]  or
-    #   Jun/17  or
-    #   Jun/17:   etc.
-
-    @mapper_teams.map_teams!( line )
-    team_keys = @mapper_teams.find_teams!( line )
-    team1_key = team_keys[0]
-    team2_key = team_keys[1]
-
-    date = find_date!( line, start: @start )
-
-    if date && team1_key.nil? && team2_key.nil?
-      logger.debug( "date header line found: >#{line}<")
-      logger.debug( "    date: #{date}")
-
-      @last_date = date   # keep a reference for later use
-      return true
-    else
-      return false
-    end
-  end
-
-
-
-end # class MatchParserSimpleV2
-end # module SportDb

data/test/test_conf_parser_auto.rb

@@ -1,489 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_conf_parser_auto.rb
-
-
-require 'helper'
-
-
-class TestAutoConfParser < MiniTest::Test
-
-  def test_mx
-    txt= <<TXT
-Jornada 1  //  3, 4 y 5 de enero
-
-Vie 3 Ene  Monarcas Morelia      vs. Querétaro      @ Estadio Morelos
-Vie 3 Ene  Santos Laguna         vs. Guadalajara    @ Estadio Corona TSM
-Sáb 4 Ene  América               vs. Tigres UANL    @ Estadio Azteca
-Sáb 4 Ene  Monterrey             vs. Cruz Azul      @ Estadio Tecnológico
-Sáb 4 Ene  Pachuca               vs. Toluca         @ Estadio Hidalgo
-Sáb 4 Ene  Jaguares de Chiapas   vs. Veracruz       @ Estadio Víctor M. Reyna
-Sáb 4 Ene  Atlas                 vs. Tijuana        @ Estadio Jalisco
-Dom 5 Ene  Universidad Nacional  vs. Puebla         @ Estadio Olímpico Universitario
-Dom 5 Ene  Atlante               vs. León           @ Estadio Andrés Quintana Roo
-
-Jornada 2  //  10, 11 y 12 de enero
-
-Vie 10 Ene  Querétaro    vs. Universidad Nacional   @ Estadio La Corregidora
-Vie 10 Ene  Tijuana      vs. América                @ Estadio Caliente
-Sáb 11 Ene  Veracruz     vs. Atlante                @ Estadio Luis Pirata Fuente
-Sáb 11 Ene  Cruz Azul    vs. Santos Laguna          @ Estadio Azul
-Sáb 11 Ene  Tigres UANL  vs. Pachuca                @ Estadio Universitario
-Sáb 11 Ene  León         vs. Atlas                  @ Estadio Nou Camp
-Dom 12 Ene  Puebla       vs. Monterrey              @ Estadio Cuauhtémoc
-Dom 12 Ene  Toluca       vs. Monarcas Morelia       @ Estadio Nemesio Díez
-Dom 12 Ene  Guadalajara  vs. Jaguares de Chiapas    @ Estadio Omnilife
-TXT
-  clubs, rounds = parse( txt, lang: 'es' )
-
-  assert_equal Hash(
-   'Monarcas Morelia'=>2,
-   'Querétaro'=>2,
-   'Santos Laguna'=>2,
-   'Guadalajara'=>2,
-   'América'=>2,
-   'Tigres UANL'=>2,
-   'Monterrey'=>2,
-   'Cruz Azul'=>2,
-   'Pachuca'=>2,
-   'Toluca'=>2,
-   'Jaguares de Chiapas'=>2,
-   'Veracruz'=>2,
-   'Atlas'=>2,
-   'Tijuana'=>2,
-   'Universidad Nacional'=>2,
-   'Puebla'=>2,
-   'Atlante'=>2,
-   'León'=>2 ), clubs
-
-   assert_equal Hash(
-     'Jornada 1  //  3, 4 y 5 de enero'    => { count: 1, match_count: 9},
-     'Jornada 2  //  10, 11 y 12 de enero' => { count: 1, match_count: 9} ), rounds
-  end
-
-  def test_br
-    txt= <<TXT
-1ª Rodada
-29/03/2003 - Sábado
-16h00  Guarani       4x2 Vasco          @ Brinco de Ouro
-       Atlético-PR   2x0 Grêmio         @ Arena da Baixada
-
-30/03/2003 - Domingo
-09h00  Flamengo      1x1 Coritiba       @ Maracanã
-16h00  Goiás         2x2 Paysandu       @ Serra Dourada
-       Internacional 1x1 Ponte Preta    @ Beira Rio
-       Criciúma      2x0 Fluminense     @ Heriberto Hulse
-       Juventude     2x2 São Paulo      @ Alfredo Jaconi
-       Fortaleza     0x0 Bahia          @ Castelão
-       Cruzeiro      2x2 São Caetano    @ Mineirão
-       Vitória       1x1 Figueirense    @ Barradão
-18h00  Santos        2x2 Paraná         @ Vila Belmiro
-       Corinthians   0x3 Atlético-MG    @ Pacaembu
-
-2ª Rodada
-05/04/2003 - Sábado
-16h00  Fluminense    1x1 Fortaleza      @ Maracanã
-       Atlético-MG   0x0 Santos         @ Mineirão
-       Coritiba      0x1 Internacional  @ Couto Pereira
-18h00  Grêmio        3x1 Guarani        @ Olímpico
-
-06/04/2003 - Domingo
-16h00  Bahia         1x2 Flamengo       @ Fonte Nova
-       Figueirense   3x3 Corinthians    @ Orlando Scarpelli
-       Paysandu      1x2 Vitória        @ Mangueirão
-       Ponte Preta   1x0 Juventude      @ Moisés Lucarelli
-       Paraná        3x0 Atlético-PR    @ Pinheirão
-       São Caetano   3x2 Criciúma       @ Anacleto Campanella
-18h00  São Paulo     2x4 Cruzeiro       @ Morumbi
-       Vasco         6x4 Goiás          @ São Januário
-TXT
-   clubs, rounds = parse( txt, lang: 'pt' )
-
-   assert_equal Hash(
-     'Guarani'=>2,
-     'Vasco'=>2,
-     'Atlético-PR'=>2,
-     'Grêmio'=>2,
-     'Flamengo'=>2,
-     'Coritiba'=>2,
-     'Goiás'=>2,
-     'Paysandu'=>2,
-     'Internacional'=>2,
-     'Ponte Preta'=>2,
-     'Criciúma'=>2,
-     'Fluminense'=>2,
-     'Juventude'=>2,
-     'São Paulo'=>2,
-     'Fortaleza'=>2,
-     'Bahia'=>2,
-     'Cruzeiro'=>2,
-     'São Caetano'=>2,
-     'Vitória'=>2,
-     'Figueirense'=>2,
-     'Santos'=>2,
-     'Paraná'=>2,
-     'Corinthians'=>2,
-     'Atlético-MG'=>2 ), clubs
-
-     assert_equal Hash(
-       '1ª Rodada' => {count: 1, match_count: 12},
-       '2ª Rodada' => {count: 1, match_count: 12} ), rounds
-  end
-
-
-  def test_at
-    txt = <<TXT
-29. Runde
-
-Sa 7.4.
-  16.00   RB Salzburg       2:0   Wacker Innsbruck
-  18.30   SV Ried           0:1   Austria Wien
-          Kapfenberger SV   2:3   Admira Wacker
-          Rapid Wien        2:1   Wr. Neustadt
-So 8.4.
-  16.00   SV Mattersburg    0:2   Sturm Graz
-
-
-30. Runde
-
-Sa 14.4.
-  16.00   Wr. Neustadt         0:0   Kapfenberger SV
-  18.30   Admira Wacker        1:1   Wacker Innsbruck
-          Sturm Graz           2:2   RB Salzburg
-          SV Ried              2:0   SV Mattersburg
-So 15.4.
-  16.00   Austria Wien         0:0   Rapid Wien
-TXT
-
-  clubs, rounds = parse( txt, lang: 'de' )
-
-    assert_equal Hash(
-     'RB Salzburg' => 2,
-     'Wacker Innsbruck' => 2,
-     'SV Ried' => 2,
-     'Austria Wien' => 2,
-     'Kapfenberger SV' => 2,
-     'Admira Wacker' => 2,
-     'Rapid Wien' => 2,
-     'Wr. Neustadt' => 2,
-     'SV Mattersburg' => 2,
-     'Sturm Graz' => 2 ), clubs
-
-    assert_equal Hash(
-     '29. Runde' => { count: 1, match_count: 5 },
-     '30. Runde' => { count: 1, match_count: 5 } ), rounds
-  end
-
-  def test_es
-    txt = <<TXT
-Jornada 1
-
-18.08.2012   Barcelona  R. Sociedad  5-1
-18.08.2012   Levante  Atlético  1-1
-18.08.2012   Athletic  Betis  3-5
-18.08.2012   Zaragoza  Valladolid  0-1
-18.08.2012   R. Madrid  Valencia  1-1
-18.08.2012   Celta  Málaga  0-1
-18.08.2012   Sevilla  Getafe  2-1
-18.08.2012   Mallorca  Espanyol  2-1
-18.08.2012   Rayo  Granada  1-0
-18.08.2012   Deportivo  Osasuna  2-0
-
-
-Jornada 2
-
-25.08.2012   Valladolid  Levante  2-0
-25.08.2012   Espanyol  Zaragoza  1-2
-25.08.2012   Málaga  Mallorca  1-1
-25.08.2012   R. Sociedad  Celta  2-1
-25.08.2012   Osasuna  Barcelona  1-2
-25.08.2012   Valencia  Deportivo  3-3
-25.08.2012   Getafe  R. Madrid  2-1
-25.08.2012   Granada  Sevilla  1-1
-25.08.2012   Betis  Rayo  1-2
-25.08.2012   Atlético  Athletic  4-0
-TXT
-
-    clubs, rounds = parse( txt, lang: 'es' )
-
-    assert_equal Hash(
- 'Barcelona' => 2,
- 'R. Sociedad' => 2,
- 'Levante' => 2,
- 'Atlético' => 2,
- 'Athletic' => 2,
- 'Betis' => 2,
- 'Zaragoza' => 2,
- 'Valladolid' => 2,
- 'R. Madrid' => 2,
- 'Valencia' => 2,
- 'Celta' => 2,
- 'Málaga' => 2,
- 'Sevilla' => 2,
- 'Getafe' => 2,
- 'Mallorca' => 2,
- 'Espanyol' => 2,
- 'Rayo' => 2,
- 'Granada' => 2,
- 'Deportivo' => 2,
- 'Osasuna' => 2), clubs
-
-  assert_equal Hash(
-   'Jornada 1' => {count: 1, match_count: 10},
-   'Jornada 2' => {count: 1, match_count: 10} ), rounds
-  end
-
-
-  def test_fr
-    txt = <<TXT
-Journée 1
-
-Ven 8. Août
-  20h30  Stade de Reims  2-2  Paris SG
-Sam 9. Août
-  21h00  SC Bastia      3-3  Olympique de Marseille
-         Évian TG       0-3  SM Caen
-         EA Guingamp    0-2  AS Saint-Étienne
-         LOSC Lille     0-0  FC Metz
-         Montpellier Hérault SC  0-1  Girondins de Bordeaux
-         FC Nantes      1-0  RC Lens
-         OGC Nice       3-2  Toulouse FC
-Dim 10. Août
-  17h00  Olympique Lyonnais  2-0  Stade Rennais FC
-  21h00  AS Monaco FC  1-2  FC Lorient
-
-Journée 2
-
-Ven 15. Août
-  20h30  SM Caen 0-1 LOSC Lille
-Sam 16. Août
-  17h00  Paris SG 2-0 SC Bastia
-  20h00  RC Lens 0-1 EA Guingamp
-         FC Lorient 0-0 OGC Nice
-         FC Metz 1-1 FC Nantes
-         Stade Rennais FC 6-2 Évian TG
-         Toulouse FC 2-1 Olympique Lyonnais
-Dim 17. Août
-  17h00  Olympique de Marseille 0-2 Montpellier Hérault SC
-         AS Saint-Étienne 3-1 Stade de Reims
-  21h00  Girondins de Bordeaux 4-1 AS Monaco FC
-TXT
-
-    clubs, rounds = parse( txt, lang: 'fr' )
-
-    assert_equal Hash(
- 'Stade de Reims' => 2,
- 'Paris SG' => 2,
- 'SC Bastia' => 2,
- 'Olympique de Marseille' => 2,
- 'Évian TG' => 2,
- 'SM Caen' => 2,
- 'EA Guingamp' => 2,
- 'AS Saint-Étienne' => 2,
- 'LOSC Lille' => 2,
- 'FC Metz' => 2,
- 'Montpellier Hérault SC' => 2,
- 'Girondins de Bordeaux' => 2,
- 'FC Nantes' => 2,
- 'RC Lens' => 2,
- 'OGC Nice' => 2,
- 'Toulouse FC' => 2,
- 'Olympique Lyonnais' => 2,
- 'Stade Rennais FC' => 2,
- 'AS Monaco FC' => 2,
- 'FC Lorient' => 2), clubs
-
-    assert_equal Hash(
- 'Journée 1' => { count: 1, match_count: 10 },
- 'Journée 2' => { count: 1, match_count: 10 } ), rounds
-  end
-
-
-  def test_eng
-    txt = <<TXT
-Matchday 1
-
-Fri, Aug 11
-  Arsenal FC               4-3  Leicester City
-Sat, Aug 12
-  Watford FC               3-3  Liverpool FC
-  Chelsea FC               2-3  Burnley FC
-  Crystal Palace           0-3  Huddersfield Town
-  Everton FC               1-0  Stoke City
-  Southampton FC           0-0  Swansea City
-  West Bromwich Albion     1-0  AFC Bournemouth
-  Brighton & Hove Albion   0-2  Manchester City
-Sun, Aug 13
-  Newcastle United         0-2  Tottenham Hotspur
-  Manchester United        4-0  West Ham United
-
-
-Matchday 2
-
-Sat, Aug 19
-  Swansea City             0-4  Manchester United
-  AFC Bournemouth          0-2  Watford FC
-  Burnley FC               0-1  West Bromwich Albion
-  Leicester City           2-0  Brighton & Hove Albion
-  Liverpool FC             1-0  Crystal Palace
-  Southampton FC           3-2  West Ham United
-  Stoke City               1-0  Arsenal FC
-Sun, Aug 20
-  Huddersfield Town        1-0  Newcastle United
-  Tottenham Hotspur        1-2  Chelsea FC
-Mon, Aug 21
-  Manchester City          1-1  Everton FC
-TXT
-
-    clubs, rounds = parse( txt )
-
-    assert_equal Hash(
- 'Arsenal FC'     => 2,
- 'Leicester City' => 2,
- 'Watford FC'     => 2,
- 'Liverpool FC'   => 2,
- 'Chelsea FC'     => 2,
- 'Burnley FC'     => 2,
- 'Crystal Palace' => 2,
- 'Huddersfield Town' => 2,
- 'Everton FC'     => 2,
- 'Stoke City'     => 2,
- 'Southampton FC' => 2,
- 'Swansea City'   => 2,
- 'West Bromwich Albion' => 2,
- 'AFC Bournemouth' => 2,
- 'Brighton & Hove Albion' => 2,
- 'Manchester City'   => 2,
- 'Newcastle United'  => 2,
- 'Tottenham Hotspur' => 2,
- 'Manchester United' => 2,
- 'West Ham United'   => 2 ), clubs
-
-    assert_equal Hash(
- 'Matchday 1' => { count: 1, match_count: 10},
- 'Matchday 2' => { count: 1, match_count: 10} ), rounds
-
-
-    txt =<<TXT
-Round 38
-
-May/22 Aston Villa 1-0 Liverpool
-May/22 Bolton 0-2 Manchester City
-May/22 Everton 1-0 Chelsea
-May/22 Fulham 2-2 Arsenal
-May/22 Manchester United 4-2 Blackpool
-May/22 Newcastle Utd 3-3 West Brom
-May/22 Stoke City 0-1 Wigan
-May/22 Tottenham 2-1 Birmingham
-May/22 West Ham 0-3 Sunderland
-May/22 Wolves 2-3 Blackburn
-
-Round 37
-
-May/17 Manchester City 3-0 Stoke City
-May/15 Arsenal 1-2 Aston Villa
-May/15 Birmingham 0-2 Fulham
-May/15 Liverpool 0-2 Tottenham
-May/15 Wigan 3-2 West Ham
-May/15 Chelsea 2-2 Newcastle Utd
-May/14 Blackburn 1-1 Manchester United
-May/14 Blackpool 4-3 Bolton
-May/14 Sunderland 1-3 Wolves
-May/14 West Brom 1-0 Everton
-TXT
-    clubs, rounds = parse( txt )
-
-    assert_equal Hash(
-  'Aston Villa' => 2,
-  'Liverpool' => 2,
-  'Bolton' => 2,
-  'Manchester City' => 2,
-  'Everton' => 2,
-  'Chelsea' => 2,
-  'Fulham' => 2,
-  'Arsenal' => 2,
-  'Manchester United' => 2,
-  'Blackpool' => 2,
-  'Newcastle Utd' => 2,
-  'West Brom' => 2,
-  'Stoke City'=> 2,
-  'Wigan' => 2,
-  'Tottenham' => 2,
-  'Birmingham' => 2,
-  'West Ham' => 2,
-  'Sunderland' => 2,
-  'Wolves' => 2,
-  'Blackburn' => 2), clubs
-
-    assert_equal Hash(
-     'Round 38' => { count: 1, match_count: 10 },
-     'Round 37' => { count: 1, match_count: 10 } ), rounds
-  end   # method test_parse
-
-
-  def test_mauritius
-    txt = <<TXT
-Preliminary Round
-Mon Jun 22
-  Pointe-aux-Sables Mates      3-4  AS Port-Louis 2000              @ St. François Xavier Stadium, Port Louis
-
-Quarterfinals
-Wed Jun 24
-  Rivière du Rempart           3-1 pen (1-1) La Cure Sylvester      @ Auguste Vollaire Stadium, Central Flacq
-  Chamarel SC                  3-4           Petite Rivière Noire   @ Germain Comarmond Stadium, Bambous
-Thu Jun 25
-  Pamplemousses                2-0  AS Port-Louis 2000              @ Auguste Vollaire Stadium, Central Flacq
-Sat Jun 27
-  Savanne SC                   3-6  Entente Boulet Rouge            @ Anjalay Stadium, Mapou
-
-Semifinals
-Wed Jul 15
-  Rivière du Rempart           2-3  Petite Rivière Noire            @  New George V Stadium, Curepipe
-  Entente Boulet Rouge         0-2  Pamplemousses                   @  Germain Comarmond Stadium, Bambous
-
-Final
-Sun Jul 19
-  Petite Rivière Noire         2-0  Pamplemousses                   @ New George V Stadium, Curepipe
-TXT
-
-    clubs, rounds = parse( txt )
-
-    assert_equal Hash(
-     'Pointe-aux-Sables Mates' => 1,
-     'AS Port-Louis 2000'      => 2,
-     'Rivière du Rempart'      => 2,
-     'La Cure Sylvester'       => 1,
-     'Chamarel SC'             => 1,
-     'Petite Rivière Noire'    => 3,
-     'Pamplemousses'           => 3,
-     'Savanne SC'              => 1,
-     'Entente Boulet Rouge'    => 2), clubs
-
-    assert_equal Hash(
- 'Preliminary Round' => {count: 1, match_count: 1},
- 'Quarterfinals'     => {count: 1, match_count: 4},
- 'Semifinals'        => {count: 1, match_count: 2},
- 'Final'             => {count: 1, match_count: 1} ), rounds
-  end
-
-
-################
-## helper
-def parse( txt, lang: 'en' )
-  lines = txt.split( /\n+/ )    # note: removes/strips empty lines
-  pp lines
-
-  start = Date.new( 2017, 7, 1 )
-
-  DateFormats.lang  = lang  # e.g. 'en'
-  SportDb.lang.lang = lang
-
-  parser = SportDb::AutoConfParser.new( lines, start )
-  clubs, rounds = parser.parse
-  pp rounds
-  pp clubs
-  [clubs, rounds]
-end
-end   # class AutoConfParser

data/test/test_match_parser.rb

@@ -1,107 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_match_parser.rb
-
-
-require 'helper'
-
-
-
-class TestMatchParser < MiniTest::Test
-
-    ## build ActiveRecord-like club records/structs
-    Club = Struct.new( :key, :title, :synonyms )
-    def Club.read( txt )
-      recs = []
-      txt.each_line do |line|
-        values = line.split( '|' )
-        values = values.map { |value| value.strip }
-
-        title    = values[0]
-        ## note: quick hack - auto-generate key, that is, remove all non-ascii chars and downcase
-        key      = title.downcase.gsub( /[^a-z]/, '' )
-        synonyms = values.size > 1 ? values[1..-1].join( '|' ) : nil
-
-        recs << Club.new( key, title, synonyms )
-      end
-      recs
-    end
-
-
-  def test_parse
-    txt = <<TXT
-Matchday 1
-
-[Fri Aug/11]
-  Arsenal FC               4-3  Leicester City
-[Sat Aug/12]
-  Watford FC               3-3  Liverpool FC
-  Chelsea FC               2-3  Burnley FC
-  Crystal Palace           0-3  Huddersfield Town
-  Everton FC               1-0  Stoke City
-  Southampton FC           0-0  Swansea City
-  West Bromwich Albion     1-0  AFC Bournemouth
-  Brighton & Hove Albion   0-2  Manchester City
-[Sun Aug/13]
-  Newcastle United         0-2  Tottenham Hotspur
-  Manchester United        4-0  West Ham United
-
-
-Matchday 2
-
-[Sat Aug/19]
-  Swansea City             0-4  Manchester United
-  AFC Bournemouth          0-2  Watford FC
-  Burnley FC               0-1  West Bromwich Albion
-  Leicester City           2-0  Brighton & Hove Albion
-  Liverpool FC             1-0  Crystal Palace
-  Southampton FC           3-2  West Ham United
-  Stoke City               1-0  Arsenal FC
-[Sun Aug/20]
-  Huddersfield Town        1-0  Newcastle United
-  Tottenham Hotspur        1-2  Chelsea FC
-[Mon Aug/21]
-  Manchester City          1-1  Everton FC
-TXT
-
-    clubs_txt = <<TXT
-Arsenal FC | Arsenal | FC Arsenal
-Leicester City FC | Leicester | Leicester City
-Watford FC | Watford | FC Watford
-Liverpool FC | Liverpool | FC Liverpool
-Chelsea FC | Chelsea | FC Chelsea
-Burnley FC | Burnley | FC Burnley
-Crystal Palace FC | Crystal Palace | C Palace | Palace | Crystal P
-Huddersfield Town AFC | Huddersfield | Huddersfield Town
-Everton FC | Everton | FC Everton
-Stoke City FC | Stoke | Stoke City
-Southampton FC | Southampton | FC Southampton
-Swansea City FC | Swansea | Swansea City | Swansea City AFC
-West Bromwich Albion FC | West Brom | West Bromwich Albion | West Bromwich | Albion
-AFC Bournemouth | Bournemouth | A.F.C. Bournemouth | Bournemouth FC
-Brighton & Hove Albion FC | Brighton | Brighton & Hove | Brighton & Hove Albion
-Manchester City FC | Man City | Manchester City | Man. City | Manchester C
-Newcastle United FC | Newcastle | Newcastle Utd | Newcastle United
-Tottenham Hotspur FC | Tottenham | Tottenham Hotspur | Spurs
-Manchester United FC | Man Utd | Man. United | Manchester U. | Manchester Utd | Manchester United
-West Ham United FC | West Ham | West Ham United
-TXT
-
-
-    clubs = Club.read( clubs_txt )
-    pp clubs
-
-    lines = txt.split( /\n+/ )    # note: removes/strips empty lines
-    pp lines
-
-    start = Date.new( 2017, 7, 1 )
-
-    DateFormats.lang = 'en'
-    parser = SportDb::MatchParserSimpleV2.new( lines, clubs, start )
-    rounds, matches = parser.parse
-    pp rounds
-    pp matches
-  end   # method test_parse
-end   # class TestMatchParser