sportdb 1.9.1 → 1.9.2

data/Manifest.txt

@@ -21,6 +21,7 @@ lib/sportdb/data/keys.rb
 lib/sportdb/data/models.rb
 lib/sportdb/deleter.rb
 lib/sportdb/finders/date.rb
+lib/sportdb/finders/goals.rb
 lib/sportdb/finders/scores.rb
 lib/sportdb/lang.rb
 lib/sportdb/matcher.rb
@@ -89,6 +90,7 @@ lib/sportdb/stats.rb
 lib/sportdb/updater.rb
 lib/sportdb/utils.rb
 lib/sportdb/utils_date.rb
+lib/sportdb/utils_goals.rb
 lib/sportdb/utils_group.rb
 lib/sportdb/utils_map.rb
 lib/sportdb/utils_record.rb
@@ -114,6 +116,8 @@ test/data/players/europe/de-deutschland/players.txt
 test/data/players/south-america/br-brazil/players.txt
 test/data/world-cup/1930/cup.txt
 test/data/world-cup/1930/cup.yml
+test/data/world-cup/1930/cup_goals.txt
+test/data/world-cup/1930/cup_goals.yml
 test/data/world-cup/1954/cup.txt
 test/data/world-cup/1954/cup.yml
 test/data/world-cup/1962/cup.txt
@@ -140,6 +144,7 @@ test/test_assoc_reader.rb
 test/test_changes.rb
 test/test_cursor.rb
 test/test_date.rb
+test/test_goals.rb
 test/test_lang.rb
 test/test_load.rb
 test/test_national_team_reader.rb

data/lib/sportdb.rb

@@ -88,9 +88,11 @@ require 'sportdb/utils_record'
 require 'sportdb/utils_round'
 require 'sportdb/utils_scores'
 require 'sportdb/utils_teams'
+require 'sportdb/utils_goals'
 require 'sportdb/matcher'
 require 'sportdb/calc'
 
+require 'sportdb/finders/goals'   # no: requires FixturesHelpers
 
 require 'sportdb/readers/assoc'
 require 'sportdb/readers/event'

data/lib/sportdb/finders/goals.rb

@@ -0,0 +1,260 @@
+# 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

data/lib/sportdb/models/game.rb

@@ -14,7 +14,7 @@ class Game < ActiveRecord::Base
   belongs_to :ground  # ground is optional
   belongs_to :city,  class_name: 'WorldDb::Model::City', foreign_key: 'city_id'   # city   is optioanl (remove?? redundant?? use ground ??)
 
-  has_many :goals
+  has_many :goals, :dependent => :delete_all
 
 
   before_save :calc_winner

data/lib/sportdb/readers/game.rb

@@ -109,6 +109,10 @@ class GameReader
     @group         = nil     ## fix: change/rename to @last_group !!!
     @last_date     = nil
 
+    @last_team1    = nil    # used for goals (to match players via squads)
+    @last_team2    = nil
+    @last_game     = nil
+
 
     #####
     #  fix: move to read and share event/known_teams
@@ -429,6 +433,9 @@ class GameReader
     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
@@ -556,6 +563,8 @@ class GameReader
       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.)
 
     return true   # game match found
   end # method parse_game
@@ -594,12 +603,126 @@ class GameReader
   end
 
 
+  def parse_goals( line )
+    logger.debug "parsing goals (fixture) line: >#{line}<"
+
+    goals = GoalsFinder.new.find!( line )
+
+    ## check if squads/rosters present for player mappings
+    #
+    squad1_count = Roster.where( event_id: @event.id, team_id: @last_team1 ).count
+    if squad1_count > 0
+       squad1 = Roster.where( event_id: @event.id, team_id: @last_team1 ) 
+    else
+       squad1 = []
+    end
+
+    squad2_count = Roster.where( event_id: @event.id, team_id: @last_team2 ).count 
+    if squad2_count > 0
+      squad2 = Roster.where( event_id: @event.id, team_id: @last_team2 )
+    else
+      squad2 = []
+    end
+
+    #####
+    # todo/fix: try lookup by squads first!!!
+    #   issue warning if player not included in squad!!
+
+    ##########
+    # try mapping player names to player
+
+    ## note: first delete all goals for match (and recreate new ones
+    #     no need to figure out update/merge strategy)
+    @last_game.goals.delete_all
+
+
+    goals.each do |goal|
+      player_name = goal.name
+
+      player = Person.where( name: player_name ).first
+      if player
+        logger.info "  player match (name eq) - using player key #{player.key}"
+      else
+        # try like match (player name might only include part of name e.g. Messi)
+        #  try three variants
+        # try %Messi
+        # try Messi%
+        # try %Messi%   -- check if there's an easier way w/ "one" where clause?
+        player = Person.where( 'name LIKE ? OR name LIKE ? OR name LIKE ?',
+                              "%#{player_name}",
+                              "#{player_name}%",
+                              "%#{player_name}%"
+                             ).first
+
+        if player
+          logger.info "  player match (name like) - using player key #{player.key}"
+        else
+           # try synonyms
+           player = Person.where( 'synonyms LIKE ? OR synonyms LIKE ? OR synonyms LIKE ?',
+                              "%#{player_name}",
+                              "#{player_name}%",
+                              "%#{player_name}%"
+                             ).first
+           if player
+             logger.info "  player match (synonyms like) - using player key #{player.key}"
+           else
+             # auto-create player (player not found)
+             logger.info "  player NOT found >#{player_name}< - auto-create"
+             
+             ## fix: add auto flag (for auto-created persons/players)
+             ## fix: move title_to_key logic to person model etc.
+             player_key = TextUtils.title_to_key( player_name )
+             player_attribs = {
+               key:   player_key,
+               title: player_name
+             }
+             logger.info "   using attribs: #{player_attribs.inspect}"
+             
+             player = Person.create!( player_attribs )
+           end
+        end
+      end
+
+      goal_attribs = {
+        game_id:   @last_game.id,
+        team_id:   goal.team == 1 ? @last_team1.id : @last_team2.id, 
+        person_id: player.id,
+        minute:    goal.minute,
+        offset:    goal.offset,
+        penalty:   goal.penalty,
+        owngoal:   goal.owngoal,
+        score1:    goal.score1,
+        score2:    goal.score2
+      }
+
+      logger.info "  adding goal using attribs: #{goal_attribs.inspect}"
+      Goal.create!( goal_attribs )
+    end # each goals
+
+  end # method parse_goals
+
+
+=begin
+###### add to person and use!!!
+def self.create_or_update_from_values( values, more_attribs={} )
+    ## key & title required
+
+    attribs, more_values = find_key_n_title( values )
+    attribs = attribs.merge( more_attribs )
+
+    ## check for optional values
+    Person.create_or_update_from_attribs( attribs, more_values )
+  end
+=end
+
 
   def parse_fixtures( reader )
       
     reader.each_line do |line|
 
-      if is_round_def?( line ) 
+      if is_goals?( line )
+        parse_goals( line )
+      elsif is_round_def?( line ) 
         ## todo/fix:  add round definition (w begin n end date)
         ## todo: do not patch rounds with definition (already assume begin/end date is good)
         ##  -- how to deal with matches that get rescheduled/postponed?

data/lib/sportdb/schema.rb

@@ -60,8 +60,11 @@ add_index :grounds, :key, unique: true
 create_table :goals do |t|
   t.references  :person,   null: false
   t.references  :game,     null: false
+  t.references  :team,     null: false     ##  use integer instead w/ values 1 or 2  for team1 or team2 ?? why? why not?
+
   t.integer   :minute
-  t.integer   :offset    # e.g. 45' +3 or 90' +2
+  t.integer   :offset,  null: false, default: 0    # e.g. 45' +3 or 90' +2
+
   t.integer   :score1
   t.integer   :score2
   

data/lib/sportdb/utils_goals.rb

@@ -0,0 +1,20 @@
+# 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/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.9.1'
+  VERSION = '1.9.2'
 end
 
 

data/test/data/world-cup/1930/cup_goals.txt

@@ -0,0 +1,47 @@
+##############################################
+# World Cup 1930 Uruguay, 13 July - 30 July
+
+
+Group 1 | Argentina      Chile     France   Mexico
+Group 2 | Yugoslavia     Brazil    Bolivia
+Group 3 | Uruguay        Romania   Peru
+Group 4 | United States  Paraguay  Belgium
+
+
+Matchday 1 | 13 July
+Matchday 2 | 14 July
+Matchday 3 | 15 July
+Matchday 4 | 16 July
+Matchday 5 | 17 July
+Matchday 6 | 18 July
+Matchday 7 | 19 July
+Matchday 8 | 20 July
+Matchday 9 | 21 July
+Matchday 10 | 22 July
+
+### - test auto-numbering (do NOTE predefine)
+## (11) Semi-finals | 26 July - 27 July
+## (12) Final | 30 July
+
+
+
+Group 1:
+
+(1) 13 July   France 4-1 Mexico @ Estadio Pocitos, Montevideo
+                  [L. Laurent 19' Langiller 40' Maschinot 43', 87'; Carreño 70']
+
+(5) 15 July   Argentina 1-0 France @ Estadio Parque Central, Montevideo
+                  [Monti 81']
+
+(6) 16 July   Chile 3-0 Mexico @ Estadio Parque Central, Montevideo
+                  [Vidal 3', 65' M. Rosas 51' (o.g.)]
+
+(10) 19 July   Chile 1-0 France @ Estadio Centenario, Montevideo
+                   [Subiabre 65']
+
+(11) 19 July   Argentina 6-3 Mexico @ Estadio Centenario, Montevideo
+                   [Stábile 8', 17', 80' Zumelzú 12', 55' Varallo 53';  M. Rosas 42' (pen.), 65' Gayón 75']
+
+(15) 22 July   Argentina 3-1 Chile @ Estadio Centenario, Montevideo
+                   [Stábile 12', 13'  M. Evaristo 81';  Subiabre 15']
+

data/test/data/world-cup/1930/cup_goals.yml

@@ -0,0 +1,23 @@
+##############################################
+# World Cup 1930 Uruguay, 13 July - 30 July
+
+league: world
+season: 1930
+start_at: 1930-07-13
+
+# 13 Teams
+
+teams:
+- arg # Argentina
+- bra # Brazil
+- bol # Bolivia
+- chi # Chile
+- uru # Uruguay
+- per # Peru
+- par # Paraguay
+- mex # Mexico
+- usa # United States
+- fra # France
+- yug # Yugoslavia (-2003)
+- bel # Belgium
+- rou # Romania

data/test/test_goals.rb

@@ -0,0 +1,109 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_goals.rb
+#  or better
+#     rake -I ./lib test
+
+
+require 'helper'
+
+class TestGoals < MiniTest::Unit::TestCase
+
+  def setup
+    WorldDb.delete!
+    SportDb.delete!
+    ## SportDb.read_builtin
+
+    add_countries
+  end
+
+  def add_countries
+    countries = [
+      ['cd', 'Congo DR',       'COD' ],
+      ['kr', 'South Korea',    'KOR' ],
+      ['au', 'Australia',      'AUS' ],
+
+      ['ar', 'Argentina',      'ARG' ],
+      ['br', 'Brazil',         'BRA' ],
+      ['bo', 'Bolivia',        'BOL' ],
+      ['cl', 'Chile',          'CHI' ],
+      ['co', 'Colombia',       'COL' ],
+      ['uy', 'Uruguay',        'URU' ],
+      ['pe', 'Peru',           'PER' ],
+      ['py', 'Paraguay',       'PAR' ],
+ 
+      ['mx', 'Mexico',         'MEX' ],
+      ['us', 'United States',  'USA' ],
+      ['ht', 'Haiti',          'HAI' ],
+
+      ['at', 'Austria',        'AUT' ],
+      ['be', 'Belgium',        'BEL' ],
+      ['fr', 'France',         'FRA' ],
+      ['rs', 'Serbia',         'SRB' ],
+      ['ro', 'Romania',        'ROU' ],
+      ['bg', 'Bulgaria',       'BUL' ],
+      ['cz', 'Czech Republic', 'CZE' ],
+      ['en', 'England',        'ENG' ],
+      ['de', 'Germany',        'GER' ], 
+      ['hu', 'Hungary',        'HUN' ],
+      ['it', 'Italy',          'ITA' ],
+      ['ru', 'Russia',         'RUS' ],
+      ['es', 'Spain',          'ESP' ],
+      ['ch', 'Switzerland',    'SUI' ],
+      ['sc', 'Scotland',       'SCO' ],
+      ['tr', 'Turkey',         'TUR' ],
+      ['nl', 'Netherlands',    'NED' ],
+      ['pl', 'Poland',         'POL' ],
+      ['se', 'Sweden',         'SWE' ],
+    ]
+
+    countries.each do |country|
+      key   = country[0]
+      name  = country[1]
+      code  = country[2]
+      Country.create!( key: key, name: name, code: code, pop: 1, area: 1)
+    end
+  end
+
+
+  def test_world_cup_1930
+    teamreader = TeamReader.new( SportDb.test_data_path )
+    teamreader.read( 'world-cup/teams_1930' )
+
+    assert_equal  13, Team.count
+
+    seasonreader = SeasonReader.new( SportDb.test_data_path )
+    seasonreader.read( 'world-cup/seasons_1930')
+
+    assert_equal 1, Season.count
+
+    y = Season.find_by_key!( '1930' )
+    assert_equal '1930', y.title
+
+
+    leaguereader = LeagueReader.new( SportDb.test_data_path )
+    leaguereader.read( 'world-cup/leagues' )
+
+    assert_equal 1, League.count
+
+    l = League.find_by_key!( 'world' )
+    assert_equal 'World Cup', l.title
+
+
+    gamereader = GameReader.new( SportDb.test_data_path )
+    gamereader.read( 'world-cup/1930/cup_goals' )
+
+    assert_equal 1, Event.count
+
+    w = Event.find_by_key!( 'world.1930' )
+
+    assert_equal  13, w.teams.count
+    ## assert_equal  18, w.games.count
+    ## assert_equal  12, w.rounds.count
+
+  end  # method test_world_cup_1930
+
+
+end # class TestGoals

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &78635870 !ruby/object:Gem::Requirement
+  requirement: &72505740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78635870
+  version_requirements: *72505740
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &78635550 !ruby/object:Gem::Requirement
+  requirement: &72505490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78635550
+  version_requirements: *72505490
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &78635320 !ruby/object:Gem::Requirement
+  requirement: &72505260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78635320
+  version_requirements: *72505260
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &78635060 !ruby/object:Gem::Requirement
+  requirement: &72521250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *78635060
+  version_requirements: *72521250
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &78634820 !ruby/object:Gem::Requirement
+  requirement: &72520820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78634820
+  version_requirements: *72520820
 - !ruby/object:Gem::Dependency
   name: persondb
-  requirement: &78634560 !ruby/object:Gem::Requirement
+  requirement: &72520360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78634560
+  version_requirements: *72520360
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: &78634350 !ruby/object:Gem::Requirement
+  requirement: &72519880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78634350
+  version_requirements: *72519880
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &78634090 !ruby/object:Gem::Requirement
+  requirement: &72518680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *78634090
+  version_requirements: *72518680
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &78633850 !ruby/object:Gem::Requirement
+  requirement: &72517660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *78633850
+  version_requirements: *72517660
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &78653900 !ruby/object:Gem::Requirement
+  requirement: &72516940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78653900
+  version_requirements: *72516940
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &78653640 !ruby/object:Gem::Requirement
+  requirement: &72516180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *78653640
+  version_requirements: *72516180
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &78653390 !ruby/object:Gem::Requirement
+  requirement: &72514980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: *78653390
+  version_requirements: *72514980
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -176,6 +176,7 @@ files:
 - lib/sportdb/data/models.rb
 - lib/sportdb/deleter.rb
 - lib/sportdb/finders/date.rb
+- lib/sportdb/finders/goals.rb
 - lib/sportdb/finders/scores.rb
 - lib/sportdb/lang.rb
 - lib/sportdb/matcher.rb
@@ -244,6 +245,7 @@ files:
 - lib/sportdb/updater.rb
 - lib/sportdb/utils.rb
 - lib/sportdb/utils_date.rb
+- lib/sportdb/utils_goals.rb
 - lib/sportdb/utils_group.rb
 - lib/sportdb/utils_map.rb
 - lib/sportdb/utils_record.rb
@@ -269,6 +271,8 @@ files:
 - test/data/players/south-america/br-brazil/players.txt
 - test/data/world-cup/1930/cup.txt
 - test/data/world-cup/1930/cup.yml
+- test/data/world-cup/1930/cup_goals.txt
+- test/data/world-cup/1930/cup_goals.yml
 - test/data/world-cup/1954/cup.txt
 - test/data/world-cup/1954/cup.yml
 - test/data/world-cup/1962/cup.txt
@@ -295,6 +299,7 @@ files:
 - test/test_changes.rb
 - test/test_cursor.rb
 - test/test_date.rb
+- test/test_goals.rb
 - test/test_lang.rb
 - test/test_load.rb
 - test/test_national_team_reader.rb
@@ -359,6 +364,7 @@ test_files:
 - test/test_round_header.rb
 - test/test_round_auto.rb
 - test/test_national_team_reader.rb
+- test/test_goals.rb
 - test/test_reader.rb
 - test/test_assoc_reader.rb
 - test/test_changes.rb