sportdb-formats 1.0.5 → 1.1.3

data/test/test_country_reader.rb

@@ -75,13 +75,13 @@ TXT
     assert_equal 'Czechoslovakia (-1992)', recs[0].name
     assert_equal 'TCH',                    recs[0].code
     assert_equal 'czechoslovakia',         recs[0].key
-    assert_equal ['Czechoslovakia'],       recs[0].alt_names
+    assert_equal [],                       recs[0].alt_names
     assert_equal [],                       recs[0].tags
 
     assert_equal 'East Germany (-1989)',   recs[3].name
     assert_equal 'GDR',                    recs[3].code
     assert_equal 'eastgermany',            recs[3].key
-    assert_equal ['East Germany'],         recs[3].alt_names
+    assert_equal [],                       recs[3].alt_names
     assert_equal [],                       recs[3].tags
   end
 

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_regex.rb

@@ -9,9 +9,27 @@ require 'helper'
 
 class TestRegex < MiniTest::Test
 
+  HEADER_SEP_RE    = SportDb::MatchParser::HEADER_SEP_RE
+
+  def test_header_sep
+    assert_equal ['Round',    'Fr+Sa Dec 11+12'], 'Round    // Fr+Sa Dec 11+12'.split( HEADER_SEP_RE )
+    assert_equal ['Round 11', 'Fr+Sa Dec 11+12'], 'Round 11 /// Fr+Sa Dec 11+12'.split( HEADER_SEP_RE )
+    assert_equal ['Round 11', 'Fr+Sa Dec 11+12'], 'Round 11 -- Fr+Sa Dec 11+12'.split( HEADER_SEP_RE )
+    assert_equal ['Round 11', 'Fr+Sa Dec 11+12'], 'Round 11 --- Fr+Sa Dec 11+12'.split( HEADER_SEP_RE )
+    assert_equal ['Round 11', 'Fr+Sa Dec 11+12'], 'Round 11 ++ Fr+Sa Dec 11+12'.split( HEADER_SEP_RE )
+    assert_equal ['Round 11', 'Fr+Sa Dec 11+12'], 'Round 11 +++ Fr+Sa Dec 11+12'.split( HEADER_SEP_RE )
+    assert_equal ['Round 11', 'Fr+Sa Dec 11+12'], 'Round 11 || Fr+Sa Dec 11+12'.split( HEADER_SEP_RE )
+
+    assert_equal ['Final - Leg 1'], 'Final - Leg 1'.split( HEADER_SEP_RE  )
+    assert_equal ['Final | Leg 1'], 'Final | Leg 1'.split( HEADER_SEP_RE  )
+    assert_equal ['Final / Leg 1'], 'Final / Leg 1'.split( HEADER_SEP_RE  )
+    assert_equal ['Final, Leg 1'],  'Final, Leg 1'.split( HEADER_SEP_RE  )
+  end
+
+
   ADDR_MARKER_RE   = SportDb::Import::ClubReader::ADDR_MARKER_RE
   B_TEAM_MARKER_RE = SportDb::Import::ClubReader::B_TEAM_MARKER_RE
-  
+
   def test_addr
     assert  '~ Wien' =~ ADDR_MARKER_RE
     assert  'Wien ~' =~ ADDR_MARKER_RE
@@ -22,13 +40,13 @@ class TestRegex < MiniTest::Test
     assert 'Fischhofgasse 12 /// 1100 Wien' =~ ADDR_MARKER_RE
 
     assert_nil 'Fischhofgasse 12 + 1100 Wien' =~ ADDR_MARKER_RE
-    assert_nil 'Fischhofgasse 12++1100 Wien' =~ ADDR_MARKER_RE
+    assert_nil 'Fischhofgasse 12++1100 Wien' =~ ADDR_MARKER_RE   ## todo/fix: make it a match!!! why? why not?
     assert_nil 'Fischhofgasse 12 / 1100 Wien' =~ ADDR_MARKER_RE
-    assert_nil 'Fischhofgasse 12//1100 Wien' =~ ADDR_MARKER_RE
-    
+    assert_nil 'Fischhofgasse 12//1100 Wien' =~ ADDR_MARKER_RE   ## todo/fix: make it a match!!! why? why not?
+
     assert_nil 'Atlanta United FC, 2017,  Atlanta   › Georgia' =~ ADDR_MARKER_RE
   end
-  
+
   def test_b_team
     assert 'b)    Rapid Wien II' =~ B_TEAM_MARKER_RE
     assert '(b)   Rapid Wien II' =~ B_TEAM_MARKER_RE
@@ -38,12 +56,12 @@ class TestRegex < MiniTest::Test
     assert '(ii.) Rapid Wien II' =~ B_TEAM_MARKER_RE
     assert '2)    Rapid Wien II' =~ B_TEAM_MARKER_RE
     assert '(2)   Rapid Wien II' =~ B_TEAM_MARKER_RE
- 
+
     assert_nil '(3)   Rapid Wien II' =~ B_TEAM_MARKER_RE
     assert_nil '(iii) Rapid Wien II' =~ B_TEAM_MARKER_RE
     assert_nil 'iii)  Rapid Wien II' =~ B_TEAM_MARKER_RE
     assert_nil 'c)    Rapid Wien II' =~ B_TEAM_MARKER_RE
     assert_nil '(c)   Rapid Wien II' =~ B_TEAM_MARKER_RE
   end
-  
+
 end # class TestRegex

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]],

data/test/test_season.rb

@@ -9,25 +9,35 @@ require 'helper'
 
 class TestSeason < MiniTest::Test
 
-  Season = SportDb::Import::Season
-
-  def test_path
-    assert_equal '2010-11',       Season.new( '2010-11' ).path
-    assert_equal '2010-11',       Season.new( '2010-2011' ).path
-    assert_equal '2010-11',       Season.new( '2010/11' ).path
-    assert_equal '2010-11',       Season.new( '2010/1' ).path
-    assert_equal '2010-11',       Season.new( '2010/2011' ).path
-    assert_equal '2010',          Season.new( '2010' ).path
-
-    assert_equal '2010s/2010-11', Season.new( '2010-11' ).path( format: 'long' )
-    assert_equal '2010s/2010-11', Season.new( '2010-2011' ).path( format: 'long' )
-    assert_equal '2010s/2010',    Season.new( '2010' ).path( format: 'long' )
-
-    assert_equal '1999-00',       Season.new( '1999-00' ).path
-    assert_equal '1999-00',       Season.new( '1999-2000' ).path
-    assert_equal '1990s/1999-00', Season.new( '1999-00' ).path( format: 'long' )
-    assert_equal '1990s/1999-00', Season.new( '1999-2000' ).path( format: 'long' )
-  end  # method test_path
+
+  def test_to_path
+    assert_equal '2010-11',       Season.new( '2010-11' ).to_path
+    assert_equal '2010-11',       Season.new( '2010-2011' ).to_path
+    assert_equal '2010-11',       Season.new( '2010/11' ).to_path
+    assert_equal '2010-11',       Season.new( '2010/1' ).to_path
+    assert_equal '2010-11',       Season.new( '2010/2011' ).to_path
+    assert_equal '2010',          Season.new( '2010' ).to_path
+
+    assert_equal '2010-11',       Season.new( 2010, 2011 ).to_path
+    assert_equal '2010',          Season.new( 2010 ).to_path
+
+    assert_equal '2010s/2010-11', Season.new( '2010-11' ).to_path( :decade )
+    assert_equal '2010s/2010-11', Season.new( '2010-2011' ).to_path( :decade )
+    assert_equal '2010s/2010',    Season.new( '2010' ).to_path( :decade )
+
+    assert_equal '1999-00',       Season.new( '1999-00' ).to_path
+    assert_equal '1999-00',       Season.new( '1999-2000' ).to_path
+    assert_equal '1990s/1999-00', Season.new( '1999-00' ).to_path( :decade )
+    assert_equal '1990s/1999-00', Season.new( '1999-2000' ).to_path( :decade )
+
+    assert_equal '2000s/2010-11', Season.new( '2010-11' ).to_path( :century )
+    assert_equal '2000s/2010-11', Season.new( '2010-2011' ).to_path( :century )
+    assert_equal '2000s/2010',    Season.new( '2010' ).to_path( :century )
+
+    assert_equal '1900s/1999-00', Season.new( '1999-00' ).to_path( :century )
+    assert_equal '1900s/1999-00', Season.new( '1999-2000' ).to_path( :century )
+  end  # method test_to_path
+
 
   def test_key
     assert_equal '2010/11',       Season.new( '2010-11' ).key
@@ -59,4 +69,43 @@ class TestSeason < MiniTest::Test
     assert_equal '1998/99',       Season.new( '1999-00' ).prev.key
     assert_equal '1998/99',       Season.new( '1999-2000' ).prev.key
   end
+
+  def test_next
+    assert_equal '2009/10',       Season.new( '2008-09' ).next.key
+    assert_equal '2009/10',       Season.new( '2008-2009' ).next.key
+    assert_equal '2009',          Season.new( '2008' ).next.key
+
+    assert_equal '1998/99',       Season.new( '1997-98' ).next.key
+    assert_equal '1998/99',       Season.new( '1997-1998' ).next.key
+  end
+
+
+  def test_range
+    s2010 = Season.new( '2010' )..Season.new( '2019' )
+    pp s2010.to_a
+# => [2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019]
+
+    s2010 = Season.new( '2010-11')..Season.new( '2019-20')
+    pp s2010.to_a
+# => [2010/11, 2011/12, 2012/13, 2013/14, 2014/15,
+#     2015/16, 2016/17, 2017/18, 2018/19, 2019/20]
+
+    puts s2010 === Season.new( '2015-16' )  # true
+    puts s2010 === Season.new( '2015' )     # false  - why? if using >= <=
+    puts s2010 === Season.new( '1999-00' )  # false
+    puts s2010 === Season.new( '2020-21' )  # false
+
+    puts Season.new( '2010-11' ) < Season.new( '2015' )   # true
+    puts Season.new( '2015' )    < Season.new( '2019-20') # true
+
+    puts Season.new( '2015' ) == Season.new( '2015-16') # false
+    puts Season.new( '2015' ) < Season.new( '2015-16') # true
+    puts Season.new( '2015' ) == Season.new( '2015')    # true
+
+    puts
+    puts s2010.include? Season.new( '2015-16' )  # true
+    puts s2010.include? Season.new( '2015' )     # false
+    puts s2010.include? Season.new( '1999-00' )  # false
+  end
+
 end # class TestSeason

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-formats
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-18 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
@@ -127,6 +127,8 @@ files:
 - lib/sportdb/formats/country/country_reader.rb
 - lib/sportdb/formats/datafile.rb
 - lib/sportdb/formats/datafile_package.rb
+- lib/sportdb/formats/event/event_index.rb
+- lib/sportdb/formats/event/event_reader.rb
 - lib/sportdb/formats/goals.rb
 - lib/sportdb/formats/league/league_index.rb
 - lib/sportdb/formats/league/league_outline_reader.rb
@@ -137,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
@@ -155,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
@@ -163,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
@@ -179,14 +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_worldcup.rb
-- test/test_match_champs.rb
-- test/test_match_eng.rb
-- test/test_match_euro.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