sportdb-formats 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51b22ea9a05b89006e8048871b2616d5a4fadd4fcb435dc1fd33c1194a6182de
-  data.tar.gz: '069b114b3679b2f0bf1fda38c4b97b52a949d7e3e0ab1e9cad41e0f08b540c28'
+  metadata.gz: e1efe8dd989cd71d6a1860f9b0845b9aa96fadab5abe9e381bcae2cb3da77d5a
+  data.tar.gz: d03be83401dec8b4ad1c09455d11c307bb4bd83e706d47c2ce8950dae1744e10
 SHA512:
-  metadata.gz: 29f00ceff229bc2e8445ee6ef6c2c0a7ecd27b00c899535130f10f480ec0526b18d5e3df30e78f1577f35f6e65fe6aafff2f99ef587eb869445b9b9ab5f20c2c
-  data.tar.gz: c97c1568d3b063ba2e25afa21c07479ac4f098df7c0bf2e5a3701a5ef2eb9d8c2c56415573191bae0cb7fbbc07e8ee229eca30fdeda9b1a0713615cdf4c46b5a
+  metadata.gz: 64e3013796d515b02564e179bb3b0eed1bc12a671f9f0615d613c9f86dc3eea465a0ff6680904c5f1465dc7b252791bc8ae4012c914599bbcddf1534aa77d705
+  data.tar.gz: f1f9ed7ec7fc1fb6af8fb143f7510e503d70d0e7ab6114763b2bdc3aef545d9dde6b0a6bdff4064e273268d5ba0b01e865aaeeebeee3d1c42ffd6767c47b2db8

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 1.2.0
+### 2.0.0
 
 ### 0.0.1 / 2019-10-28
 

data/Manifest.txt

@@ -4,23 +4,22 @@ README.md
 Rakefile
 lib/sportdb/formats.rb
 lib/sportdb/formats/country/country_reader.rb
+lib/sportdb/formats/csv/goal.rb
+lib/sportdb/formats/csv/goal_parser_csv.rb
+lib/sportdb/formats/csv/match_parser_csv.rb
+lib/sportdb/formats/csv/match_status_parser.rb
 lib/sportdb/formats/datafile.rb
 lib/sportdb/formats/datafile_package.rb
 lib/sportdb/formats/event/event_reader.rb
-lib/sportdb/formats/goals.rb
 lib/sportdb/formats/ground/ground_reader.rb
 lib/sportdb/formats/league/league_outline_reader.rb
 lib/sportdb/formats/league/league_reader.rb
-lib/sportdb/formats/lines_reader.rb
 lib/sportdb/formats/match/conf_parser.rb
-lib/sportdb/formats/match/mapper.rb
-lib/sportdb/formats/match/mapper_teams.rb
 lib/sportdb/formats/match/match_parser.rb
-lib/sportdb/formats/match/match_parser_auto_conf.rb
-lib/sportdb/formats/outline_reader.rb
+lib/sportdb/formats/name_helper.rb
 lib/sportdb/formats/package.rb
-lib/sportdb/formats/parser_helper.rb
 lib/sportdb/formats/search/sport.rb
+lib/sportdb/formats/search/structs.rb
 lib/sportdb/formats/search/world.rb
 lib/sportdb/formats/team/club_index_history.rb
 lib/sportdb/formats/team/club_reader.rb

data/Rakefile

@@ -20,12 +20,16 @@ Hoe.spec 'sportdb-formats' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-structs', '>= 0.1.1'],
+    ['sportdb-structs', '>= 0.3.0'],
+    ['sportdb-parser',  '>= 0.2.0'],
+    ['date-formats',    '>= 1.0.2'],
+    ['cocos',           '>= 0.4.0'],
+    ['logutils',        '>= 0.6.1'],
 
-    ['rubyzip',         '>= 1.2.4' ],
+    ['rubyzip',         '>= 2.3.2' ],
   ]
 
   self.spec_extras = {
-    required_ruby_version: '>= 2.2.2'
+    required_ruby_version: '>= 3.1.0'
   }
 end

data/lib/sportdb/formats/csv/goal.rb

@@ -0,0 +1,192 @@
+
+module Sports
+
+## "free-standing" goal event - for import/export  in separate event / goal datafiles
+##   returned by CsvGoalParser and others
+class GoalEvent
+
+  def self.build( row )  ## rename to parse or such - why? why not?
+
+  ## split match_id
+  team_str, more_str   = row['Match'].split( '|' )
+  team1_str, team2_str = team_str.split( ' - ' )
+
+  more_str  = more_str.strip
+  team1_str = team1_str.strip
+  team2_str = team2_str.strip
+
+   # check if more_str is a date otherwise assume round
+   date_fmt = if more_str =~ /^[A-Z]{3} [0-9]{1,2}$/i  ## Apr 4
+                '%b %d'
+              elsif more_str =~ /^[A-Z]{3} [0-9]{1,2} [0-9]{4}$/i  ## Apr 4 2019
+                '%b %d %Y'
+             else
+                nil
+             end
+
+   if date_fmt
+    date  = Date.strptime( more_str, date_fmt )
+    round = nil
+   else
+    date  = nil
+    round = more_str
+   end
+
+
+    values = row['Score'].split('-')
+    values = values.map { |value| value.strip }
+    score1 = values[0].to_i
+    score2 = values[1].to_i
+
+    minute = nil
+    offset = nil
+    if m=%r{([0-9]+)
+              (?:[ ]+
+                   \+([0-9]+)
+                )?
+                ['.]
+          $}x.match( row['Minute'])
+      minute = m[1].to_i
+      offset = m[2] ? m[2].to_i : nil
+    else
+      puts "!! ERROR - unsupported minute (goal) format >#{row['Minute']}<"
+      exit 1
+    end
+
+    attributes = {
+          team1:  team1_str,
+          team2:  team2_str,
+          date:   date,
+          round:  round,
+          score1: score1,
+          score2: score2,
+          minute: minute,
+          offset: offset,
+          player: row['Player'],
+          owngoal: ['(og)', '(o.g.)'].include?( row['Extra']),
+          penalty: ['(pen)', '(pen.)'].include?( row['Extra']),
+          notes:   (row['Notes'].nil? || row['Notes'].empty?) ? nil : row['Notes']
+        }
+
+    new( **attributes )
+  end
+
+
+  ## match id
+  attr_reader  :team1,
+               :team2,
+               :round,  ## optional
+               :date   ## optional
+
+  ## main attributes
+  attr_reader :score1,
+              :score2,
+              :player,
+              :minute,
+              :offset,
+              :owngoal,
+              :penalty,
+              :notes
+
+
+  ## todo/check: or just use match.hash or such if match mapping known - why? why not?
+  def match_id
+    if round
+      "#{@team1} - #{@team2} | #{@round}"
+    else
+      "#{@team1} - #{@team2} | #{@date}"
+    end
+  end
+
+
+  def owngoal?() @owngoal==true; end
+  def penalty?() @penalty==true; end
+
+  def initialize( team1:,
+                  team2:,
+                  round:   nil,
+                  date:    nil,
+                  score1:,
+                  score2:,
+                  player:,
+                  minute:,
+                  offset:  nil,
+                  owngoal: false,
+                  penalty: false,
+                  notes:   nil
+                )
+    @team1   = team1
+    @team2   = team2
+    @round   = round
+    @date    = date
+
+    @score1  = score1
+    @score2  = score2
+    @player  = player
+    @minute  = minute
+    @offset  = offset
+    @owngoal = owngoal
+    @penalty = penalty
+    @notes   = notes
+  end
+
+
+  ## note: lets you use normalize teams or such acts like a Match struct
+  def update( **kwargs )
+    ## todo/fix: use team1_name, team2_name or similar - for compat with db activerecord version? why? why not?
+    @team1 = kwargs[:team1]    if kwargs.has_key? :team1
+    @team2 = kwargs[:team2]    if kwargs.has_key? :team2
+  end
+end  # class GoalEvent
+
+
+### extend "basic" goal struct with goal event build
+class Goal  ### nested (non-freestanding) inside match (match is parent)
+
+  def self.build( events )  ## check/todo - rename to build_from_event/row or such - why? why not?
+    ## build an array of goal structs from (csv) recs
+    recs = []
+
+    last_score1 = 0
+    last_score2 = 0
+
+    events.each do |event|
+
+      if last_score1+1 == event.score1 && last_score2 == event.score2
+        team = 1
+      elsif last_score2+1 == event.score2 && last_score1 == event.score1
+        team = 2
+      else
+        puts "!! ERROR - unexpected score advance (one goal at a time expected):"
+        puts "  #{last_score1}-#{last_score2}=> #{event.score1}-#{event.score2}"
+        exit 1
+      end
+
+      last_score1 = event.score1
+      last_score2 = event.score2
+
+
+      attributes = {
+        score1:  event.score1,
+        score2:  event.score2,
+        team:    team,
+        minute:  event.minute,
+        offset:  event.offset,
+        player:  event.player,
+        owngoal: event.owngoal,
+        penalty: event.penalty,
+        notes:   event.notes
+      }
+
+      recs << new( **attributes )
+    end
+
+    recs
+  end
+end  # class Goal
+
+
+end # module Sports
+
+
+

data/lib/sportdb/formats/csv/goal_parser_csv.rb

@@ -0,0 +1,28 @@
+
+module SportDb
+  class CsvGoalParser
+
+
+  def self.read( path )
+     txt = File.open( path, 'r:utf-8' ) {|f| f.read }   ## note: make sure to use (assume) utf-8
+     parse( txt )
+  end
+
+  def self.parse( txt )
+     new( txt ).parse
+  end
+
+
+  def initialize( txt )
+    @txt = txt
+  end
+
+  def parse
+    rows = parse_csv( @txt )
+    recs = rows.map { |row| Sports::GoalEvent.build( row ) }
+    ## pp recs[0]
+    recs
+  end
+
+  end # class CsvGoalParser
+end # module Sports