sportdb-formats 1.1.2 → 1.1.3

data/test/test_club_reader_history.rb

@@ -0,0 +1,212 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_club_reader_history.rb
+
+
+require 'helper'
+
+
+class TestClubHistoryReader < MiniTest::Test
+
+  def test_parse_eng
+    txt =<<TXT
+=  England
+
+##  note: use history log by season (instead of by year) - why? why not?
+##
+##  note/warn/remember !! a line starting with arrow (=>)
+##    will get turned into a heading 1!!!
+##    as an ascii-alternative to ⇒   use >> or -> or ??? - why? why not?
+
+
+
+== 1958/9
+RENAME      Scunthorpe & Lindsey United FC, Scunthorpe  ⇒  Scunthorpe United FC
+
+== 1946/7
+RENAME      Clapton Orient FC, London  ⇒  Leyton Orient FC
+
+== 1945/6
+RENAME      Birmingham FC, Birmingham  ⇒  Birmingham City FC
+
+== 1930/1
+MOVE        South Shields FC, South Shields  ⇒  Gateshead FC, Gateshead
+
+
+
+== 1929/30
+RENAME     The Wednesday FC, Sheffield   ⇒  Sheffield Wednesday
+
+== 1927/8
+RENAME     The Arsenal FC, London   ⇒  Arsenal FC
+
+== 1925/6
+RENAME      Millwall Athletic FC, London   ⇒  Millwall FC
+            Stoke FC, Stoke-on-Trent       ⇒  Stoke City FC
+
+MERGE       Rotherham County FC, Rotherham
+            Rotherham Town FC,   Rotherham
+              ⇒ Rotherham United FC
+
+== 1914/5
+RENAME     Woolwich Arsenal FC, London   ⇒  The Arsenal FC
+
+
+== 1911/2
+REFORM     Burslem Port Vale FC, Burslem  ⇒  Port Vale FC, Stoke-on-Trent
+  ## the towns of Burslem having been merged in 1910 with the towns of Fenton, Hanley,
+  ## Longton, Stoke-upon-Trent and Tunstall as the city of Stoke-on-Trent
+
+
+== 1909/10
+RENAME      Chesterfield Town FC, Chesterfield  ⇒  Chesterfield FC
+
+
+== 1905/6
+RENAME      Chesterfield FC, Chesterfield ⇒ Chesterfield Town FC
+            Small Heath FC, Birmingham    ⇒ Birmingham FC
+
+== 1902/3
+REFORM      Newton Heath FC, Manchester  ⇒  Manchester United
+
+== 1901/2
+MERGE       Burton Swifts FC,    Burton-upon-Trent
+            Burton Wanderers FC, Burton-upon-Trent
+              ⇒ Burton United FC
+
+BANKRUPT    Newton Heath FC, Manchester
+
+
+== 1899/00
+RENAME     Barnsley St. Peter's FC, Barnsley  ⇒  Barnsley FC
+
+MERGE      Blackpool FC,   Blackpool
+           South Shore FC, Blackpool
+             ⇒ Blackpool FC
+
+== 1898/9
+RENAME     Glossop North End FC, Glossop  ⇒  Glossop FC
+
+
+== 1895/6
+RENAME      Walsall Town Swifts FC, Walsall  ⇒  Walsall FC
+
+
+== 1894/5
+REFORM      Ardwick FC, Manchester  ⇒  Manchester City FC
+
+== 1893/4
+BANKRUPT    Ardwick FC, Manchester
+
+MERGE      Newcastle West End FC, Newcastle-upon-Tyne
+           Newcastle East End FC, Newcastle-upon-Tyne
+            ⇒ Newcastle United FC
+
+== 1892/3
+RENAME     Royal Arsenal FC, London  ⇒  Woolwich Arsenal FC
+TXT
+
+    recs = SportDb::Import::ClubHistoryReader.parse( txt )
+
+    pp recs
+
+    exp = [["RENAME", "1958/59",
+             ["Scunthorpe & Lindsey United FC, Scunthorpe", "eng"],
+             ["Scunthorpe United FC", "eng"]],
+          ["RENAME", "1946/47",
+            ["Clapton Orient FC, London", "eng"],
+            ["Leyton Orient FC", "eng"]],
+         ["RENAME", "1945/46",
+            ["Birmingham FC, Birmingham", "eng"],
+            ["Birmingham City FC", "eng"]],
+         ["MOVE", "1930/31",
+            ["South Shields FC, South Shields", "eng"],
+            ["Gateshead FC, Gateshead", "eng"]],
+   ["RENAME",
+    "1929/30",
+    ["The Wednesday FC, Sheffield", "eng"],
+    ["Sheffield Wednesday", "eng"]],
+   ["RENAME",
+    "1927/28",
+    ["The Arsenal FC, London", "eng"],
+    ["Arsenal FC", "eng"]],
+   ["RENAME",
+    "1925/26",
+    ["Millwall Athletic FC, London", "eng"],
+    ["Millwall FC", "eng"]],
+   ["RENAME",
+    "1925/26",
+    ["Stoke FC, Stoke-on-Trent", "eng"],
+    ["Stoke City FC", "eng"]],
+   ["MERGE",
+    "1925/26",
+    [["Rotherham County FC, Rotherham", "eng"],
+     ["Rotherham Town FC, Rotherham", "eng"]],
+    ["Rotherham United FC", "eng"]],
+   ["RENAME",
+    "1914/15",
+    ["Woolwich Arsenal FC, London", "eng"],
+    ["The Arsenal FC", "eng"]],
+   ["REFORM",
+    "1911/12",
+    ["Burslem Port Vale FC, Burslem", "eng"],
+    ["Port Vale FC, Stoke-on-Trent", "eng"]],
+   ["RENAME",
+    "1909/10",
+    ["Chesterfield Town FC, Chesterfield", "eng"],
+    ["Chesterfield FC", "eng"]],
+   ["RENAME",
+    "1905/06",
+    ["Chesterfield FC, Chesterfield", "eng"],
+    ["Chesterfield Town FC", "eng"]],
+   ["RENAME",
+    "1905/06",
+    ["Small Heath FC, Birmingham", "eng"],
+    ["Birmingham FC", "eng"]],
+   ["REFORM",
+    "1902/03",
+    ["Newton Heath FC, Manchester", "eng"],
+    ["Manchester United", "eng"]],
+   ["MERGE",
+    "1901/02",
+    [["Burton Swifts FC, Burton-upon-Trent", "eng"],
+     ["Burton Wanderers FC, Burton-upon-Trent", "eng"]],
+    ["Burton United FC", "eng"]],
+   ["BANKRUPT", "1901/02", ["Newton Heath FC, Manchester", "eng"]],
+   ["RENAME",
+    "1899/00",
+    ["Barnsley St. Peter's FC, Barnsley", "eng"],
+    ["Barnsley FC", "eng"]],
+   ["MERGE",
+    "1899/00",
+    [["Blackpool FC, Blackpool", "eng"], ["South Shore FC, Blackpool", "eng"]],
+    ["Blackpool FC", "eng"]],
+   ["RENAME",
+    "1898/99",
+    ["Glossop North End FC, Glossop", "eng"],
+    ["Glossop FC", "eng"]],
+   ["RENAME",
+    "1895/96",
+    ["Walsall Town Swifts FC, Walsall", "eng"],
+    ["Walsall FC", "eng"]],
+   ["REFORM",
+    "1894/95",
+    ["Ardwick FC, Manchester", "eng"],
+    ["Manchester City FC", "eng"]],
+   ["BANKRUPT", "1893/94", ["Ardwick FC, Manchester", "eng"]],
+   ["MERGE",
+    "1893/94",
+    [["Newcastle West End FC, Newcastle-upon-Tyne", "eng"],
+     ["Newcastle East End FC, Newcastle-upon-Tyne", "eng"]],
+    ["Newcastle United FC", "eng"]],
+   ["RENAME",
+    "1892/93",
+    ["Royal Arsenal FC, London", "eng"],
+    ["Woolwich Arsenal FC", "eng"]]]
+
+  assert_equal exp, recs
+  end
+
+end # class TestClubHistoryReader

data/test/test_datafile_package.rb

@@ -16,7 +16,7 @@ class TestDatafilePackage < MiniTest::Test
     ].each do |eng|
        assert eng.find( '2015-16/.conf.txt' ).read.start_with?( '= English Premier League 2015/16' )
        assert eng.find( '2017-18/.conf.txt' ).read.start_with?( '= English Premier League 2017/18' )
-       assert eng.find( '2015-16/1-premierleague-i.txt' ).read.start_with?( '= English Premier League 2015/16' )
+       assert eng.find( '2015-16/1-premierleague.txt' ).read.start_with?( '= English Premier League 2015/16' )
     end
 
     [Datafile::DirPackage.new( '../../../openfootball/austria' ),

data/test/test_match_status_parser.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_match_status_parser.rb
+
+
+require 'helper'
+
+
+class TestMatchStatusParser < MiniTest::Test
+
+   Status       = SportDb::Status
+   StatusParser = SportDb::StatusParser
+
+  def test_find
+    [['awarded [cancelled] canceled [ddd]',                        Status::CANCELLED],
+     ['awarded [bbb; canceled] canceled [awarded; comments] eeee', Status::AWARDED],
+     ['aaa bbb ccc ddd eeee',                                      nil],
+    ].each do |rec|
+      line       = rec[0]
+      status_exp = rec[1]
+       puts "line (before): >#{line}<"
+       status = StatusParser.find!( line )
+       puts "status: >#{status}<"
+       puts "line (after): >#{line}<"
+       puts
+
+       assert_equal status_exp, status
+    end
+  end # method test_find
+
+  def test_parse
+    [['cancelled ddd',        Status::CANCELLED],
+     ['CANCELLED',            Status::CANCELLED],
+     ['can.',                 Status::CANCELLED],
+     ['awarded; comments',    Status::AWARDED],
+     ['awd. - comments',      Status::AWARDED],
+     ['aaa bbb ccc ddd eeee', nil],
+    ].each do |rec|
+      str        = rec[0]
+      status_exp = rec[1]
+      assert_equal status_exp, StatusParser.parse( str )
+    end
+  end
+
+end   # class TestMatchStatusParser
+
+

data/test/test_scores.rb

@@ -80,12 +80,14 @@ class TestScores < MiniTest::Test
      [ '2-1aet (1-1, 0-0)',     [0,0, 1,1, 2,1]],
      [ '2-1 A.E.T. (1-1, 0-0)', [0,0, 1,1, 2,1]],
      [ '2-1AET (1-1, 0-0)',     [0,0, 1,1, 2,1]],
+     [ '2-1 a.e.t.',            [nil,nil,nil,nil, 2,1]],
 
      [ '3-4 pen. 2-2 a.e.t. (1-1, 1-1)', [1,1, 1,1, 2,2, 3,4]],
      [ '3-4 pen 2-2 a.e.t. (1-1, 1-1)',  [1,1, 1,1, 2,2, 3,4]],
      [ '3-4 pen 2-2 a.e.t. (1-1, 1-1)',  [1,1, 1,1, 2,2, 3,4]],
      [ '3-4p 2-2aet (1-1, 1-1)',         [1,1, 1,1, 2,2, 3,4]],
      [ '3-4PSO 2-2AET (1-1, 1-1)',       [1,1, 1,1, 2,2, 3,4]],
+     [ '3-4 pen. 2-2 a.e.t.',            [nil,nil,nil,nil, 2,2, 3,4]],
 
      [ '4-3 pen. 1-0 a.e.t. (1-0, )', [nil,nil, 1,0, 1,0, 4,3]],
      [ '3-4 pen. 2-1 a.e.t. (2-1, )', [nil,nil, 2,1, 2,1, 3,4]],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-formats
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2020-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alphabets
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,7 @@ files:
 - lib/sportdb/formats/match/match_parser.rb
 - lib/sportdb/formats/match/match_parser_auto_conf.rb
 - lib/sportdb/formats/match/match_parser_csv.rb
+- lib/sportdb/formats/match/match_status_parser.rb
 - lib/sportdb/formats/name_helper.rb
 - lib/sportdb/formats/outline_reader.rb
 - lib/sportdb/formats/package.rb
@@ -157,7 +158,9 @@ files:
 - lib/sportdb/formats/structs/team.rb
 - lib/sportdb/formats/structs/team_usage.rb
 - lib/sportdb/formats/team/club_index.rb
+- lib/sportdb/formats/team/club_index_history.rb
 - lib/sportdb/formats/team/club_reader.rb
+- lib/sportdb/formats/team/club_reader_history.rb
 - lib/sportdb/formats/team/club_reader_props.rb
 - lib/sportdb/formats/team/national_team_index.rb
 - lib/sportdb/formats/team/team_index.rb
@@ -165,14 +168,13 @@ files:
 - lib/sportdb/formats/version.rb
 - test/helper.rb
 - test/test_club_index.rb
+- test/test_club_index_history.rb
 - test/test_club_reader.rb
+- test/test_club_reader_history.rb
 - test/test_club_reader_props.rb
 - test/test_clubs.rb
-- test/test_conf.rb
 - test/test_country_index.rb
 - test/test_country_reader.rb
-- test/test_csv_match_parser.rb
-- test/test_csv_match_parser_utils.rb
 - test/test_csv_reader.rb
 - test/test_datafile.rb
 - test/test_datafile_package.rb
@@ -181,16 +183,7 @@ files:
 - test/test_league_outline_reader.rb
 - test/test_league_reader.rb
 - test/test_match.rb
-- test/test_match_auto.rb
-- test/test_match_auto_champs.rb
-- test/test_match_auto_euro.rb
-- test/test_match_auto_relegation.rb
-- test/test_match_auto_worldcup.rb
-- test/test_match_champs.rb
-- test/test_match_eng.rb
-- test/test_match_euro.rb
-- test/test_match_start_date.rb
-- test/test_match_worldcup.rb
+- test/test_match_status_parser.rb
 - test/test_name_helper.rb
 - test/test_outline_reader.rb
 - test/test_package.rb

data/test/test_conf.rb

@@ -1,65 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_conf.rb
-
-
-require 'helper'
-
-
-class TestConf < MiniTest::Test
-
-  COUNTRY_RE = SportDb::ConfParser::COUNTRY_RE
-  TABLE_RE   = SportDb::ConfParser::TABLE_RE
-
-  def test_re
-    m=COUNTRY_RE.match( 'Manchester United › ENG' )
-    pp m
-    pp m[0]
-    assert_equal  'ENG', m[:country]
-
-    m=COUNTRY_RE.match( 'Manchester United›ENG' )
-    pp m
-    pp m[0]
-    assert_equal  'ENG', m[:country]
-
-
-    m=TABLE_RE.match( '1  Manchester City         38  32  4  2 106-27 100' )
-    pp m
-    assert_equal 'Manchester City', m[:team]
-
-    m=TABLE_RE.match( '1.  Manchester City         38  32  4  2 106:27 100' )
-    pp m
-    assert_equal 'Manchester City', m[:team]
-
-    m=TABLE_RE.match( '-  Manchester City         38  32  4  2 106 - 27 100' )
-    pp m
-    assert_equal 'Manchester City', m[:team]
-
-
-    m=TABLE_RE.match( '1.  1. FC Mainz           38  32  4  2 106-27 100  [-7]' )
-    pp m
-    assert_equal '1. FC Mainz', m[:team]
-  end
-
-
-  def test_conf
-    %w[conf/at_cup.txt
-       conf/at_reg.txt
-       conf/at_champs.txt
-       conf/eng.txt
-       conf/champs.txt
-      ].each do |path|
-         txt, exp = read_test( path )
-
-         puts "testing conf #{path}..."
-         teams = parse_conf( txt )
-
-         ## note: json always returns hash tables with string keys (not symbols),
-         ##        thus, always stringify keys before comparing!!!!
-         assert_equal exp, teams.deep_stringify_keys
-      end
-  end
-
-end   # class TestConf

data/test/test_csv_match_parser.rb

@@ -1,114 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_csv_match_parser.rb
-
-
-require 'helper'
-
-
-class TestCsvMatchParser < MiniTest::Test
-
-##
-# Div,Date,HomeTeam,AwayTeam,FTHG,FTAG,FTR,HTHG,HTAG,HTR,
-#   Referee,HS,AS,HST,AST,HF,AF,HC,AC,HY,AY,HR,AR,
-#    B365H,B365D,B365A,BWH,BWD,BWA,IWH,IWD,IWA,LBH,LBD,LBA,PSH,PSD,PSA,
-#    WHH,WHD,WHA,VCH,VCD,VCA,
-#    Bb1X2,BbMxH,BbAvH,BbMxD,BbAvD,BbMxA,BbAvA,BbOU,BbMx>2.5,BbAv>2.5,BbMx<2.5,BbAv<2.5,
-#    BbAH,BbAHh,BbMxAHH,BbAvAHH,BbMxAHA,BbAvAHA,PSCH,PSCD,PSCA
-  def test_eng_filters
-    path = "#{SportDb::Test.data_dir}/england/2017-18/E0.csv"
-
-    matches = SportDb::CsvMatchParser.read( path,
-                                            filters: { 'HomeTeam' => 'Arsenal' } )
-
-    pp path
-    pp matches[0..2]
-
-    m=matches[0]
-    assert_equal '2017-08-11', m.date
-    assert_equal 4, m.score1
-    assert_equal 3, m.score2
-    assert_equal 2, m.score1i
-    assert_equal 2, m.score2i
-    assert_equal 'Arsenal',    m.team1
-    assert_equal 'Leicester',  m.team2
-
-    m=matches[1]
-    assert_equal '2017-09-09', m.date
-    assert_equal 3, m.score1
-    assert_equal 0, m.score2
-    assert_equal 2, m.score1i
-    assert_equal 0, m.score2i
-    assert_equal 'Arsenal',     m.team1
-    assert_equal 'Bournemouth', m.team2
-  end
-
-
-  def test_eng_headers
-    path = "#{SportDb::Test.data_dir}/england/2017-18/E0.csv"
-
-    headers = { team1:  'HomeTeam',
-                team2:  'AwayTeam',
-                date:   'Date',
-                score1: 'FTHG',
-                score2: 'FTAG' }
-
-    matches = SportDb::CsvMatchParser.read( path, headers: headers )
-
-    pp path
-    pp matches[0..2]
-
-    m=matches[0]
-    assert_equal '2017-08-11', m.date
-    assert_equal 4, m.score1
-    assert_equal 3, m.score2
-    assert_nil   m.score1i      ## todo/fix: missing half time (ht) score !!!!
-    assert_nil   m.score2i      ## todo/fix: missing half time (ht) score !!!!
-    assert_equal 'Arsenal',   m.team1
-    assert_equal 'Leicester', m.team2
-
-    m=matches[1]
-    assert_equal '2017-08-12', m.date
-    assert_equal 0, m.score1
-    assert_equal 2, m.score2
-    assert_nil   m.score1i      ## todo/fix: missing half time (ht) score !!!!
-    assert_nil   m.score2i      ## todo/fix: missing half time (ht) score !!!!
-    assert_equal 'Brighton', m.team1
-    assert_equal 'Man City', m.team2
-  end
-
-
-###
-# Country,League,Season,Date,Time,Home,Away,HG,AG,
-#  Res,PH,PD,PA,MaxH,MaxD,MaxA,AvgH,AvgD,AvgA
-  def test_at
-    path = "#{SportDb::Test.data_dir}/austria/AUT.csv"
-
-    matches = SportDb::CsvMatchParser.read( path, filters: { 'Season' => '2017/2018' } )
-
-    pp matches[0..2]
-    pp path
-
-    m=matches[0]
-    assert_equal '2017-07-22', m.date
-    assert_equal 2, m.score1
-    assert_equal 2, m.score2
-    assert_nil      m.score1i  ## todo/fix: missing half time (ht) score !!!!
-    assert_nil      m.score2i  ## todo/fix: missing half time (ht) score !!!!
-    assert_equal 'Rapid Vienna', m.team1
-    assert_equal 'Mattersburg',  m.team2
-
-    m=matches[1]
-    assert_equal '2017-07-22', m.date
-    assert_equal 0, m.score1
-    assert_equal 2, m.score2
-    assert_nil   m.score1i    ## todo/fix: missing half time (ht) score !!!!
-    assert_nil   m.score2i    ## todo/fix: missing half time (ht) score !!!!
-    assert_equal 'AC Wolfsberger', m.team1
-    assert_equal 'Salzburg',       m.team2
-  end
-
-
-end # class TestCsvMatchParser