sports 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ff86ce7425d973d8bb3adc8235bc0889c050fbd
-  data.tar.gz: 82decba8bbf6f6964612ca0913086224abfdeb1f
+  metadata.gz: 831dacee645acf5dea757570924ad7c9e1e2212f
+  data.tar.gz: 676b1114696241c5113854fc523821da2a8155ad
 SHA512:
-  metadata.gz: '039b38b1e98a51a30390b88dbda7d35035134938af42767f96c7cf0ecf043c70a6ec2c58a99f59e9f0fe98a636755bbff8310def3431ada51a4a142dd668e956'
-  data.tar.gz: fe78d06e9c4aa9a44ef1bcc26859da1884fa191b1ea4a28d3bd059c2198f91c875a4182b3a65aa569591ef47e0db92123cc96f5ec331e9fe832fb2a7226bf321
+  metadata.gz: 61ad3469162b1c9269166ec3e4ed8fa739be3e181e7e0fa74bd3440ef631f046a293fe63752c4c28d9f5c4a856ddc83e6f15b94b347c3c50b773adb2b4b98768
+  data.tar.gz: 3cde3acf5f4a7756f0b68d5c4686f374f6cf45f967f4070c8b952e7747e0bf51ebb32d464a4e71b9e887dcac40b7b9ac12e1f6cf3aa1cdb8c270982d2ba73d75

data/Manifest.txt

@@ -4,6 +4,7 @@ README.md
 Rakefile
 lib/sports.rb
 lib/sports/config.rb
+lib/sports/goal_parser_csv.rb
 lib/sports/match_parser_csv.rb
 lib/sports/match_status_parser.rb
 lib/sports/name_helper.rb

data/README.md

@@ -1,4 +1,4 @@
-# sports - sport data structures for matches, scores, leagues, seasons, rounds, groups, teams, clubs and more"
+# sports - sport data structures for matches, scores, leagues, seasons, rounds, groups, teams, clubs and more
 
 
 * home  :: [github.com/sportdb/sport.db](https://github.com/sportdb/sport.db)
@@ -11,7 +11,285 @@
 
 ## Usage
 
-To be done
+
+### Working with CSV Datafiles
+
+Let's build the standings table for the English Premier League (EPL) for the 2019/20 season from all matches
+in the comma-separated values (.csv) format.
+Example:
+
+```
+                                        - Home -          - Away -            - Total -
+                                 Pld   W  D  L   F:A     W  D  L   F:A      F:A   +/-  Pts
+ 1. Liverpool FC                  38  18  1  0  52:16   14  2  3  33:17    85:33  +52   99
+ 2. Manchester City FC            38  15  2  2  57:13   11  1  7  45:22   102:35  +67   81
+ 3. Manchester United FC          38  10  7  2  40:17    8  5  6  26:19    66:36  +30   66
+ 4. Chelsea FC                    38  11  3  5  30:16    9  3  7  39:38    69:54  +15   66
+ 5. Leicester City FC             38  11  4  4  35:17    7  4  8  32:24    67:41  +26   62
+ 6. Tottenham Hotspur FC          38  12  3  4  36:17    4  8  7  25:30    61:47  +14   59
+ 7. Wolverhampton Wanderers FC    38   8  7  4  27:19    7  7  5  24:21    51:40  +11   59
+ 8. Arsenal FC                    38  10  6  3  36:24    4  8  7  20:24    56:48   +8   56
+ 9. Sheffield United FC           38  10  3  6  24:15    4  9  6  15:24    39:39        54
+10. Burnley FC                    38   8  4  7  24:23    7  5  7  19:27    43:50   -7   54
+11. Southampton FC                38   6  3 10  21:35    9  4  6  30:25    51:60   -9   52
+12. Everton FC                    38   8  7  4  24:21    5  3 11  20:35    44:56  -12   49
+13. Newcastle United FC           38   6  8  5  20:21    5  3 11  18:37    38:58  -20   44
+14. Crystal Palace FC             38   6  5  8  15:20    5  5  9  16:30    31:50  -19   43
+15. Brighton & Hove Albion FC     38   5  7  7  20:27    4  7  8  19:27    39:54  -15   41
+16. West Ham United FC            38   6  4  9  30:33    4  5 10  19:29    49:62  -13   39
+17. Aston Villa FC                38   7  3  9  22:30    2  5 12  19:37    41:67  -26   35
+18. AFC Bournemouth               38   5  6  8  22:30    4  1 14  18:35    40:65  -25   34
+19. Watford FC                    38   6  6  7  22:27    2  4 13  14:37    36:64  -28   34
+20. Norwich City FC               38   4  3 12  19:37    1  3 15   7:38    26:75  -49   21
+```
+
+
+Step 0: Download the free public domain [`/england`](https://github.com/footballcsv/england) dataset package / archive from the [football.csv org](https://footballcsv.github.io).
+
+What's the comma-separated values (.csv) format?
+It's the world's most popular tabular data interchange format in text.
+Values are separated - surprise, surprise - by commas (that is, `,`).
+One line is one record, that is, one match :-).
+Example:
+
+```
+Team 1,               FT,  HT,  Team 2
+Liverpool FC,         4-1, 4-0, Norwich City FC
+West Ham United FC,   0-5, 0-1, Manchester City FC
+AFC Bournemouth,      1-1, 0-0, Sheffield United FC
+Burnley FC,           3-0, 0-0, Southampton FC
+Crystal Palace FC,    0-0, 0-0, Everton FC
+Watford FC,           0-3, 0-1, Brighton & Hove Albion FC
+Tottenham Hotspur FC, 3-1, 0-1, Aston Villa FC
+Leicester City FC,    0-0, 0-0, Wolverhampton Wanderers FC
+Newcastle United FC,  0-1, 0-0, Arsenal FC
+Manchester United FC, 4-0, 1-0, Chelsea FC
+...
+```
+
+Let's use the [`eng.1.csv`](https://github.com/footballcsv/england/blob/master/2010s/2019-20/eng.1.csv), that is, the English Premier League datafile in the `/2010s/2019-20` folder.
+Read in all matches with the `Match.read_csv` method from the sports library / gem:
+
+
+``` ruby
+require 'sports'
+
+include Sports     ## include Match, Team, Standings, etc. data classes
+
+
+matches = Match.read_csv( 'england/2010s/2019-20/eng.1.csv' )
+pp matches.size  #=> 380
+pp matches
+```
+
+will pretty print (pp):
+
+```
+[#<Sports::Match
+  @date    = "2019-08-09",
+  @score1  = 4,
+  @score1i = 4,
+  @score2  = 1,
+  @score2i = 0,
+  @team1   = "Liverpool FC",
+  @team2   = "Norwich City FC">,
+ #<Sports::Match
+  @date    = "2019-08-10",
+  @score1  = 0,
+  @score1i = 0,
+  @score2  = 5,
+  @score2i = 1,
+  @team1   = "West Ham United FC",
+  @team2   = "Manchester City FC">,
+  ...]
+```
+
+Now tally up all matches for the standings table with the standings helper class:
+
+``` ruby
+standings = Standings.new( matches )
+pp standings
+```
+
+will pretty print (pp):
+
+```
+#<Sports::Standings @lines=[
+   #<Sports::StandingsLine
+     @away_drawn         = 0,
+     @away_goals_against = 1,
+     @away_goals_for     = 5,
+     @away_lost          = 0,
+     @away_played        = 2,
+     @away_pts           = 6,
+     @away_won           = 2,
+     @drawn              = 0,
+     @goals_against      = 3,
+     @goals_for          = 12,
+     @home_drawn         = 0,
+     @home_goals_against = 2,
+     @home_goals_for     = 7,
+     @home_lost          = 0,
+     @home_played        = 2,
+     @home_pts           = 6,
+     @home_won           = 2,
+     @lost               = 0,
+     @played             = 4,
+     @pts                = 12,
+     @rank               = 1,
+     @team               = "Liverpool FC",
+     @won                = 4>,
+   #<Sports::StandingsLine
+     @away_drawn         = 0,
+     @away_goals_against = 6,
+     @away_goals_for     = 1,
+     @away_lost          = 2,
+     @away_played        = 2,
+     @away_pts           = 0,
+     @away_won           = 0,
+     @drawn              = 0,
+     @goals_against      = 10,
+     @goals_for          = 6,
+     @home_drawn         = 0,
+     @home_goals_against = 4,
+     @home_goals_for     = 5,
+     @home_lost          = 1,
+     @home_played        = 2,
+     @home_pts           = 3,
+     @home_won           = 1,
+     @lost               = 3,
+     @played             = 4,
+     @pts                = 3,
+     @rank               = 19,
+     @team               = "Norwich City FC",
+     @won                = 1>,
+   ... ]>
+```
+
+Now let's format the standings for humans :-) in the classic more compact table format.
+Let's start with
+showing only totals - no home/away break outs yet -
+in the first simple version:
+
+``` ruby
+standings.each do |l|
+  print '%2d. '     % l.rank
+  print '%-28s  '   % l.team
+  print '%2d '      % l.played
+  print '%3d '      % l.won
+  print '%3d '      % l.drawn
+  print '%3d '      % l.lost
+  print '%3d:%-3d ' % [l.goals_for,l.goals_against]
+  print '%3d'       % l.pts
+  print "\n"
+end
+```
+
+resulting in:
+
+```
+ 1. Liverpool FC                  38  32   3   3  85:33   99
+ 2. Manchester City FC            38  26   3   9 102:35   81
+ 3. Manchester United FC          38  18  12   8  66:36   66
+ 4. Chelsea FC                    38  20   6  12  69:54   66
+ 5. Leicester City FC             38  18   8  12  67:41   62
+ 6. Tottenham Hotspur FC          38  16  11  11  61:47   59
+ 7. Wolverhampton Wanderers FC    38  15  14   9  51:40   59
+ 8. Arsenal FC                    38  14  14  10  56:48   56
+ 9. Sheffield United FC           38  14  12  12  39:39   54
+10. Burnley FC                    38  15   9  14  43:50   54
+11. Southampton FC                38  15   7  16  51:60   52
+12. Everton FC                    38  13  10  15  44:56   49
+13. Newcastle United FC           38  11  11  16  38:58   44
+14. Crystal Palace FC             38  11  10  17  31:50   43
+15. Brighton & Hove Albion FC     38   9  14  15  39:54   41
+16. West Ham United FC            38  10   9  19  49:62   39
+17. Aston Villa FC                38   9   8  21  41:67   35
+18. AFC Bournemouth               38   9   7  22  40:65   34
+19. Watford FC                    38   8  10  20  36:64   34
+20. Norwich City FC               38   5   6  27  26:75   21
+```
+
+To wrap up let's break out the standings for home and away matches for a deluxe version:
+
+``` ruby
+print "                                        - Home -          - Away -            - Total -\n"
+print "                                 Pld   W  D  L   F:A     W  D  L   F:A      F:A   +/-  Pts\n"
+
+standings.each do |l|
+  print '%2d. '      % l.rank
+  print '%-28s  '    % l.team
+  print '%2d  '      % l.played
+
+  print '%2d '       % l.home_won
+  print '%2d '       % l.home_drawn
+  print '%2d '       % l.home_lost
+  print '%3d:%-3d  ' % [l.home_goals_for,l.home_goals_against]
+
+  print '%2d '       % l.away_won
+  print '%2d '       % l.away_drawn
+  print '%2d '       % l.away_lost
+  print '%3d:%-3d  ' % [l.away_goals_for,l.away_goals_against]
+
+  print '%3d:%-3d '  % [l.goals_for,l.goals_against]
+
+  goals_diff = l.goals_for-l.goals_against
+  if goals_diff > 0
+    print '%3s  '  %  "+#{goals_diff}"
+  elsif goals_diff < 0
+    print '%3s  '  %  "#{goals_diff}"
+  else ## assume 0
+    print '     '
+  end
+
+  print '%3d'  % l.pts
+  print "\n"
+end
+```
+
+resulting in:
+
+```
+                                        - Home -          - Away -            - Total -
+                                 Pld   W  D  L   F:A     W  D  L   F:A      F:A   +/-  Pts
+ 1. Liverpool FC                  38  18  1  0  52:16   14  2  3  33:17    85:33  +52   99
+ 2. Manchester City FC            38  15  2  2  57:13   11  1  7  45:22   102:35  +67   81
+ 3. Manchester United FC          38  10  7  2  40:17    8  5  6  26:19    66:36  +30   66
+ 4. Chelsea FC                    38  11  3  5  30:16    9  3  7  39:38    69:54  +15   66
+ 5. Leicester City FC             38  11  4  4  35:17    7  4  8  32:24    67:41  +26   62
+ 6. Tottenham Hotspur FC          38  12  3  4  36:17    4  8  7  25:30    61:47  +14   59
+ 7. Wolverhampton Wanderers FC    38   8  7  4  27:19    7  7  5  24:21    51:40  +11   59
+ 8. Arsenal FC                    38  10  6  3  36:24    4  8  7  20:24    56:48   +8   56
+ 9. Sheffield United FC           38  10  3  6  24:15    4  9  6  15:24    39:39        54
+10. Burnley FC                    38   8  4  7  24:23    7  5  7  19:27    43:50   -7   54
+11. Southampton FC                38   6  3 10  21:35    9  4  6  30:25    51:60   -9   52
+12. Everton FC                    38   8  7  4  24:21    5  3 11  20:35    44:56  -12   49
+13. Newcastle United FC           38   6  8  5  20:21    5  3 11  18:37    38:58  -20   44
+14. Crystal Palace FC             38   6  5  8  15:20    5  5  9  16:30    31:50  -19   43
+15. Brighton & Hove Albion FC     38   5  7  7  20:27    4  7  8  19:27    39:54  -15   41
+16. West Ham United FC            38   6  4  9  30:33    4  5 10  19:29    49:62  -13   39
+17. Aston Villa FC                38   7  3  9  22:30    2  5 12  19:37    41:67  -26   35
+18. AFC Bournemouth               38   5  6  8  22:30    4  1 14  18:35    40:65  -25   34
+19. Watford FC                    38   6  6  7  22:27    2  4 13  14:37    36:64  -28   34
+20. Norwich City FC               38   4  3 12  19:37    1  3 15   7:38    26:75  -49   21
+```
+
+
+That's it.
+Bonus: Why not build a standings table for the Bundesliga, La Liga, Ligue 1, Seria A, or your very own league? Yes, you can.
+
+
+
+## Installation
+
+Use
+
+    gem install sports
+
+or add the gem to your Gemfile
+
+    gem 'sports'
+
 
 ## License
 

data/Rakefile

@@ -3,7 +3,7 @@ require './lib/sports/version.rb'
 
 Hoe.spec 'sports' do
 
-  self.version = Sports::VERSION
+  self.version = SportDb::Module::Sports::VERSION
 
   self.summary = "sports - sport data structures for matches, scores, leagues, seasons, rounds, groups, teams, clubs and more"
   self.description = summary
@@ -22,7 +22,7 @@ Hoe.spec 'sports' do
   self.extra_deps = [
     ['alphabets',      '>= 1.0.0'],
     ['date-formats',   '>= 1.0.1'],
-    ['score-formats',  '>= 0.0.1'],
+    ['score-formats',  '>= 0.1.0'],
     ['csvreader',      '>= 1.2.4'],
   ]
 

data/lib/sports.rb

@@ -46,10 +46,37 @@ require 'sports/structs/team_usage'
 
 require 'sports/match_status_parser'
 require 'sports/match_parser_csv'
-
-
-
-
-puts Sports.banner   # say hello
+require 'sports/goal_parser_csv'
+
+
+### add convenience shortcut helpers
+module Sports
+  class Match
+    def self.read_csv( path, headers: nil, filters: nil, converters: nil, sep: nil )
+       SportDb::CsvMatchParser.read( path,
+                                       headers:    headers,
+                                       filters:    filters,
+                                       converters: converters,
+                                       sep:        sep )
+    end
+
+    def self.parse_csv( txt, headers: nil, filters: nil, converters: nil, sep: nil )
+       SportDb::CsvMatchParser.parse( txt,
+                                        headers:    headers,
+                                        filters:    filters,
+                                        converters: converters,
+                                        sep:        sep )
+    end
+  end # class Match
+end # module Sports
+
+
+#####
+# note: add Sport and Football convenience alias - why? why not?
+
+Sport    = Sports
+Football = Sports
+
+puts SportDb::Module::Sports.banner   # say hello
 
 

data/lib/sports/config.rb

@@ -1,25 +1,40 @@
 
-module Sports
-
-class Configuration
-
-  attr_reader   :lang
-  def lang=(value)
-    ## check/todo: always use to_sym - why? needed?
-    DateFormats.lang  = value
-    ScoreFormats.lang = value
+module SportDb
+  module Import
+    class Configuration
+
+      attr_reader   :lang
+      def lang=(value)
+        ## check/todo: always use to_sym - why? needed?
+        DateFormats.lang  = value
+        ScoreFormats.lang = value
+      end
+
+      ## lets you use
+      ##   SportDb.configure do |config|
+      ##      config.lang = 'it'
+      ##   end
+
+    def self.configure()  yield( config ); end
+
+    end # class Configuration
+    def self.config()  @config ||= Configuration.new;  end
   end
+end
 
-end # class Configuration
 
 
+module Sports
+
 ## lets you use
 ##   Sports.configure do |config|
 ##      config.lang = 'it'
 ##   end
 
+## note: just forward to SportDb::Import configuration!!!!!
+##  keep Sports module / namespace "clean"
+##    that is, only include data structures (e.g. Match,League,etc) for now - why? why not?
 def self.configure()  yield( config ); end
-
-def self.config()  @config ||= Configuration.new;  end
+def self.config()  SportDb::Import.config; end
 
 end   # module Sports

data/lib/sports/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

data/lib/sports/match_parser_csv.rb

@@ -1,5 +1,5 @@
 
-module Sports
+module SportDb
   class CsvMatchParser
 
   #############
@@ -88,6 +88,7 @@ module Sports
          headers_mapping[:team1]  = find_header( headers, ['Team 1'] )
          headers_mapping[:team2]  = find_header( headers, ['Team 2'] )
          headers_mapping[:date]   = find_header( headers, ['Date'] )
+         headers_mapping[:time]   = find_header( headers, ['Time'] )
 
          ## check for all-in-one full time (ft) and half time (ht9 scores?
          headers_mapping[:score]  = find_header( headers, ['FT'] )
@@ -120,6 +121,7 @@ module Sports
          headers_mapping[:team1]  = find_header( headers, ['HomeTeam', 'HT', 'Home'] )
          headers_mapping[:team2]  = find_header( headers, ['AwayTeam', 'AT', 'Away'] )
          headers_mapping[:date]   = find_header( headers, ['Date'] )
+         headers_mapping[:time]   = find_header( headers, ['Time'] )
 
          ## note: FT = Full Time, HG = Home Goal, AG = Away Goal
          headers_mapping[:score1] = find_header( headers, ['FTHG', 'HG'] )
@@ -197,6 +199,37 @@ module Sports
 
 
 
+      col = row[ headers_mapping[ :time ]]
+
+      if col.nil?
+        time = nil
+      else
+        col = col.strip     # make sure not leading or trailing spaces left over
+
+        if col.empty?
+          col =~ /^-{1,}$/ ||      # e.g.  - or ---
+          col =~ /^\?{1,}$/        # e.g. ? or ???
+          ## note: allow missing / unknown date for match
+          time = nil
+        else
+          if col =~ /^\d{1,2}:\d{2}$/
+            time_fmt = '%H:%M'   # e.g. 17:00 or 3:00
+          elsif col =~ /^\d{1,2}.\d{2}$/
+            time_fmt = '%H.%M'   # e.g. 17:00 or 3:00
+          else
+            puts "*** !!! wrong (unknown) time format >>#{col}<<; cannot continue; fix it; sorry"
+            ## todo/fix: add to errors/warns list - why? why not?
+            exit 1
+          end
+
+          ## todo/check: use date object (keep string?) - why? why not?
+          ##  todo/fix: yes!! use date object!!!! do NOT use string
+          time = Time.strptime( col, time_fmt ).strftime( '%H:%M' )
+        end
+      end
+
+
+
       col = row[ headers_mapping[ :date ]]
       col = col.strip   # make sure not leading or trailing spaces left over
 
@@ -387,6 +420,7 @@ module Sports
       ## puts 'match attributes:'
       attributes = {
         date:     date,
+        time:     time,
         team1:    team1,    team2:    team2,
         score1:   score1,   score2:   score2,
         score1i:  score1i,  score2i:  score2i,
@@ -400,7 +434,7 @@ module Sports
       }
       ## pp attributes
 
-      match = Match.new( **attributes )
+      match = Sports::Match.new( **attributes )
       matches << match
     end
 
@@ -451,6 +485,6 @@ end # method parse_score
 
 
 
-end # class CsvMatchParser
+  end # class CsvMatchParser
 end # module Sports
 

data/lib/sports/match_status_parser.rb

@@ -7,7 +7,10 @@
 #    etc.
 
 
-module Sports
+module SportDb
+
+
+  ### todo/fix: move Status inside Match struct - why? why not?
 
   class Status
 # note: use a class as an "enum"-like namespace for now - why? why not?
@@ -81,7 +84,7 @@ module Sports
 
       status
     end # method find!
- end # class StatusParser
+  end # class StatusParser
 
-end # module Sports
+end # module SportDb
 

data/lib/sports/name_helper.rb

@@ -1,5 +1,5 @@
 
-module Sports
+module SportDb
   module NameHelper
 
 

data/lib/sports/season.rb

@@ -85,7 +85,7 @@ class Season
               :end_year
 
   def initialize( *args )   ## change args to years - why? why not?
-     if args.size == 1 && args[0].is_a?( Integer )
+    if args.size == 1 && args[0].is_a?( Integer )
       @start_year = args[0]
       @end_year   = args[0]
     elsif args.size == 2 && args[0].is_a?( Integer ) &&

data/lib/sports/structs/goal.rb

@@ -47,8 +47,8 @@ class GoalEvent
                 )?
                 ['.]
           $}x.match( row['Minute'])
-      minute = $1.to_i
-      offset = $2 ? $2.to_i : nil
+      minute = m[1].to_i
+      offset = m[2] ? m[2].to_i : nil
     else
       puts "!! ERROR - unsupported minute (goal) format >#{row['Minute']}<"
       exit 1
@@ -174,8 +174,8 @@ class Goal  ### nested (non-freestanding) inside match (match is parent)
         minute:  event.minute,
         offset:  event.offset,
         player:  event.player,
-        owngoal: event.owngoal?,
-        penalty: event.penalty?,
+        owngoal: event.owngoal,
+        penalty: event.penalty,
         notes:   event.notes
       }
 

data/lib/sports/structs/match.rb

@@ -5,6 +5,7 @@ module Sports
 class Match
 
   attr_reader :date,
+              :time,
               :team1,     :team2,      ## todo/fix: use team1_name, team2_name or similar - for compat with db activerecord version? why? why not?
               :score1,    :score2,     ## full time
               :score1i,   :score2i,    ## half time (first (i) part)
@@ -26,12 +27,20 @@ class Match
   attr_accessor :goals  ## todo/fix: make goals like all other attribs!!
 
   def initialize( **kwargs )
+    @score1    =  @score2    = nil  ## full time
+    @score1i   =  @score2i   = nil  ## half time (first (i) part)
+    @score1et  =  @score2et  = nil  ## extra time
+    @score1p   =  @score2p   = nil  ## penalty
+    @score1agg =  @score2agg = nil  ## full time (all legs) aggregated
+
+
     update( kwargs )  unless kwargs.empty?
   end
 
   def update( **kwargs )
     ## note: check with has_key?  because value might be nil!!!
     @date     = kwargs[:date]     if kwargs.has_key? :date
+    @time     = kwargs[:time]     if kwargs.has_key? :time
 
     ## 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
@@ -114,15 +123,17 @@ class Match
     ##
 
     ##  for now score1 and score2 must be present
-    if @score1.nil? || @score2.nil?
-      puts "** WARN: missing scores for match:"
-      pp kwargs
-      ## exit 1
-    end
+    ## if @score1.nil? || @score2.nil?
+    ##  puts "** WARN: missing scores for match:"
+    ##  pp kwargs
+    ##  ## exit 1
+    ## end
 
     ## todo/fix: auto-calculate winner
     # return 1,2,0   1 => team1, 2 => team2, 0 => draw/tie
     ### calculate winner - use 1,2,0
+    ##
+    ##  move winner calc to score class - why? why not?
     if @score1 && @score2
        if @score1 > @score2
           @winner = 1
@@ -145,13 +156,23 @@ class Match
   def complete?()  true; end  ## for now all scores are complete - in the future check scores; might be missing - not yet entered
 
 
-  def score_str    # pretty print (full time) scores; convenience method
-    "#{@score1}-#{@score2}"
+  def score
+    Score.new( @score1i,   @score2i,    ## half time (first (i) part)
+               @score1,    @score2,     ## full time
+               @score1et,  @score2et,   ## extra time
+               @score1p,   @score2p )   ## penalty
   end
 
-  def scorei_str    # pretty print (half time) scores; convenience method
-    "#{@score1i}-#{@score2i}"
-  end
+
+  ####
+  ##  deprecated - use score.to_s and friends - why? why not?
+  # def score_str    # pretty print (full time) scores; convenience method
+  #  "#{@score1}-#{@score2}"
+  # end
+
+  # def scorei_str    # pretty print (half time) scores; convenience method
+  #  "#{@score1i}-#{@score2i}"
+  # end
 end  # class Match
 
 end # module Sports

data/lib/sports/structs/matchlist.rb

@@ -82,13 +82,13 @@ private
 
      def has_dates?()  @start_date && @end_date; end
      def dates_str
-      ## note: start_date/end_date might be optional/missing
-      if has_dates?
-        "#{start_date.strftime( '%a %d %b %Y' )} - #{end_date.strftime( '%a %d %b %Y' )}"
-      else
-        "??? - ???"
-      end
-    end
+       ## note: start_date/end_date might be optional/missing
+       if has_dates?
+         "#{start_date.strftime( '%a %d %b %Y' )} - #{end_date.strftime( '%a %d %b %Y' )}"
+       else
+         "??? - ???"
+       end
+     end
 
     def days() end_date.jd - start_date.jd; end
 

data/lib/sports/structs/round.rb

@@ -1,6 +1,6 @@
 module Sports
 
-   class Round
+  class Round
       attr_reader   :name, :start_date, :end_date, :knockout
       attr_accessor :num   # note: make read & writable - why? why not?
 
@@ -17,7 +17,7 @@ module Sports
         @knockout   = knockout
         @auto       = auto        # auto-created (inline reference/header without proper definition before)
       end
-    end  # class Round
+  end  # class Round
 
 end # module Sports
 

data/lib/sports/structs/standings.rb

@@ -37,7 +37,7 @@ class Standings
   end # (nested) class StandingsLine
 
 
-  def initialize( opts={} )
+  def initialize( match_or_matches=nil, opts={} )
     ## fix:
     # passing in e.g. pts for win (3? 2? etc.)
     # default to 3 for now
@@ -46,6 +46,9 @@ class Standings
     @pts_won = opts[:pts_won] || 3
 
     @lines = {}   # StandingsLines cached by team name/key
+
+    ## add init and update all-in-one convenience shortcut
+    update( match_or_matches )  if match_or_matches
   end
 
 
@@ -65,6 +68,10 @@ class Standings
   end
 
 
+  ## note: add a convenience shortcut
+  ##  to_a  will sort and add rank (1,2,3) to standing lines
+  def each( &block ) to_a.each( &block ); end
+
   def to_a
     ## return lines; sort and add rank
     ## note: will update rank!!!! (side effect)
@@ -184,7 +191,7 @@ private
     team1 = m.team1.is_a?( String ) ? m.team1 : m.team1.name
     team2 = m.team2.is_a?( String ) ? m.team2 : m.team2.name
 
-    score = m.score_str
+    score = m.score.to_s
 
     ##  puts "   #{team1} - #{team2} #{score}"
 

data/lib/sports/structs/team.rb

@@ -66,7 +66,7 @@ class Team
   ##############################
   ## helper methods for import only??
   ## check for duplicates
-  include NameHelper
+  include SportDb::NameHelper
 
   def duplicates?
     names = [name] + alt_names + alt_names_auto

data/lib/sports/version.rb

@@ -1,8 +1,10 @@
 
-module Sports
+module SportDb
+  module Module
+    module Sports
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
-  MINOR = 0
-  PATCH = 1
+  MINOR = 1
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -16,4 +18,7 @@ module Sports
   def self.root
     File.expand_path( File.dirname(File.dirname(__FILE__)) )
   end
-end   # module Sports
+
+    end   # module Sports
+  end
+end

data/test/test_match_status_parser.rb

@@ -8,8 +8,8 @@ require 'helper'
 
 class TestMatchStatusParser < MiniTest::Test
 
-   Status       = Sports::Status
-   StatusParser = Sports::StatusParser
+   Status       = SportDb::Status
+   StatusParser = SportDb::StatusParser
 
   def test_find
     [['awarded [cancelled] canceled [ddd]',                        Status::CANCELLED],
@@ -24,7 +24,11 @@ class TestMatchStatusParser < MiniTest::Test
        puts "line (after): >#{line}<"
        puts
 
-       assert_equal status_exp, status
+       if status_exp.nil?
+        assert_nil status
+       else
+        assert_equal status_exp, status
+       end
     end
   end # method test_find
 
@@ -38,7 +42,13 @@ class TestMatchStatusParser < MiniTest::Test
     ].each do |rec|
       str        = rec[0]
       status_exp = rec[1]
-      assert_equal status_exp, StatusParser.parse( str )
+      status     = StatusParser.parse( str )
+
+      if status_exp.nil?     ##  for "silencing" minitest warning - Use assert_nil if expecting nil
+        assert_nil status
+      else
+        assert_equal status_exp, status
+      end
     end
   end
 

data/test/test_name_helper.rb

@@ -8,7 +8,7 @@ require 'helper'
 
 class TestNameHelper < MiniTest::Test
 
-  include Sports::NameHelper
+  include SportDb::NameHelper
 
 
   def test_strip_norm    ## strip (remove) non-norm characters e.g. ()'- etc.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sports
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alphabets
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: csvreader
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +110,7 @@ files:
 - Rakefile
 - lib/sports.rb
 - lib/sports/config.rb
+- lib/sports/goal_parser_csv.rb
 - lib/sports/match_parser_csv.rb
 - lib/sports/match_status_parser.rb
 - lib/sports/name_helper.rb