sportdb-readers 0.5.0 → 1.1.0

data/test/test_match_reader_eng.rb

@@ -20,7 +20,7 @@ class TestMatchReaderEng < MiniTest::Test
   end
 
 
-  def xxx_test_read_eng
+  def test_read_eng
 txt =<<TXT
 = English Premier League 2017/18
 
@@ -58,7 +58,7 @@ Matchday 2
   Manchester City          1-1  Everton FC
 TXT
 
-    SportDb::MatchReaderV2.parse( txt )
+    SportDb::MatchReader.parse( txt )
   end  # method test_read_eng
 
   def test_read_eng_2012_13
@@ -87,7 +87,7 @@ Matchday 20
   QPR              0-3  Liverpool
 TXT
 
-    SportDb::MatchReaderV2.parse( txt )
+    SportDb::MatchReader.parse( txt )
 
     puts SportDb::Model::Game.count
   end

data/test/test_match_reader_euro.rb

@@ -0,0 +1,156 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_match_reader_euro.rb
+
+
+require 'helper'
+
+
+class TestMatchReaderEuro < MiniTest::Test
+
+  def setup
+    SportDb.connect( adapter:  'sqlite3',
+                     database: ':memory:' )
+    SportDb.create_all   ## build schema
+
+    ## turn on logging to console
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+  end
+
+
+  def test_read
+txt = <<TXT
+= Euro 2016       # in France
+
+
+Group A | France    Romania         Albania  Switzerland
+Group B | England   Russia          Wales    Slovakia
+Group C | Germany   Ukraine         Poland   Northern Ireland
+Group D | Spain     Czech Republic  Turkey   Croatia
+Group E | Belgium   Italy           Ireland  Sweden
+Group F | Portugal  Iceland         Austria  Hungary
+
+
+#############################################
+# Group phase
+
+Matchday 1 | Jun/10 - Jun/14
+Matchday 2 | Jun/15 - Jun/18
+Matchday 3 | Jun/19 - Jun/22
+
+
+Group A:
+
+(1) Jun/10  21:00   France            2:1  Romania           @ Stade de France, Saint-Denis
+(2) Jun/11  15:00   Albania           0:1  Switzerland       @ Stade Bollaert-Delelis, Lens
+
+(14) Jun/15 18:00   Romania           1:1  Switzerland       @ Parc des Princes, Paris
+(15) Jun/15 21:00   France            2:0  Albania           @ Stade Vélodrome, Marseille
+
+(25) Jun/19 21:00   Romania           0:1  Albania           @ Stade Pierre-Mauroy, Lille
+(26) Jun/19 21:00   Switzerland       0:0  France            @ Parc Olympique Lyonnais, Lyon
+
+
+Group B:
+
+(3) Jun/11 18:00    Wales             2:1  Slovakia          @ Nouveau Stade de Bordeaux, Bordeaux
+(4) Jun/11 21:00    England           1:1  Russia            @ Stade Vélodrome, Marseille
+
+(13) Jun/15 15:00   Russia            1:2  Slovakia          @ Stade Pierre-Mauroy, Lille
+(16) Jun/16 15:00   England           2:1  Wales             @ Stade Bollaert-Delelis, Lens
+
+(27) Jun/20 21:00   Russia            0:3  Wales             @ Stadium Municipal, Toulouse
+(28) Jun/20 21:00   Slovakia          0:0  England           @ Stade Geoffroy-Guichard, Saint-Étienne
+
+
+Group C:
+
+(6) Jun/12 18:00    Poland            1:0  Northern Ireland  @ Allianz Riviera, Nice
+(7) Jun/12 21:00    Germany           2:0  Ukraine           @ Stade Pierre-Mauroy, Lille
+
+(17) Jun/16 18:00   Ukraine           0:2  Northern Ireland  @ Parc Olympique Lyonnais, Lyon
+(18) Jun/16 21:00   Germany           0:0  Poland            @ Stade de France, Saint-Denis
+
+(29) Jun/21 18:00   Northern Ireland  0:1  Germany           @ Parc des Princes, Paris
+(30) Jun/21 18:00   Ukraine           0:1  Poland            @ Stade Vélodrome, Marseille
+
+
+Group D:
+
+(5) Jun/12 15:00    Turkey            0:1  Croatia           @ Parc des Princes, Paris
+(8) Jun/13 15:00    Spain             1:0  Czech Republic    @ Stadium Municipal, Toulouse
+
+(20) Jun/17 18:00   Czech Republic    2:2  Croatia           @ Stade Geoffroy-Guichard, Saint-Étienne
+(21) Jun/17 21:00   Spain             3:0  Turkey            @ Allianz Riviera, Nice
+
+(31) Jun/21 21:00   Croatia           2:1  Spain             @ Nouveau Stade de Bordeaux, Bordeaux
+(32) Jun/21 21:00   Czech Republic    0:2  Turkey            @ Stade Bollaert-Delelis, Lens
+
+
+Group E:
+
+(10) Jun/13 21:00   Belgium           0:2  Italy             @ Parc Olympique Lyonnais, Lyon
+ (9) Jun/13 18:00   Ireland           1:1  Sweden            @ Stade de France, Saint-Denis
+
+(19) Jun/17 15:00   Italy             1:0  Sweden            @ Stadium Municipal, Toulouse
+(22) Jun/18 15:00   Belgium           3:0  Ireland           @ Nouveau Stade de Bordeaux, Bordeaux
+
+(35) Jun/21 21:00   Italy             0:1  Ireland           @ Stade Pierre-Mauroy, Lille
+(36) Jun/21 21:00   Sweden            0:1  Belgium           @ Allianz Riviera, Nice
+
+
+Group F:
+
+(11) Jun/14 18:00   Austria           0:2  Hungary           @ Nouveau Stade de Bordeaux, Bordeaux
+(12) Jun/14 21:00   Portugal          1:1  Iceland           @ Stade Geoffroy-Guichard, Saint-Étienne
+
+(23) Jun/18 18:00   Iceland           1:1  Hungary           @ Stade Vélodrome, Marseille
+(24) Jun/18 21:00   Portugal          0:0  Austria           @ Parc des Princes, Paris
+
+(33) Jun/22 18:00   Hungary           3:3  Portugal          @ Parc Olympique Lyonnais, Lyon
+(34) Jun/21 18:00   Iceland           2:1  Austria           @ Stade de France, Saint-Denis
+
+
+#############################
+# Knockout phase
+
+Round of 16
+
+(37) Jun/25 15:00   Switzerland  1:1 0:0nV 4:5iE  Poland            @ Stade Geoffroy-Guichard, Saint-Étienne
+(38) Jun/25 18:00   Wales        1:0              Northern Ireland  @ Parc des Princes, Paris
+(39) Jun/25 21:00   Croatia      0:0 0:1nV        Portugal          @ Stade Bollaert-Delelis, Lens
+
+(40) Jun/26 15:00   France       2:1              Ireland           @ Parc Olympique Lyonnais, Lyon
+(41) Jun/26 18:00   Germany      3:0              Slovakia          @ Stade Pierre-Mauroy, Lille
+(42) Jun/26 21:00   Hungary      0:4              Belgium           @ Stadium Municipal, Toulouse
+
+(43) Jun/27 18:00   Italy        2:0              Spain             @ Stade de France, Saint-Denis
+(44) Jun/27 21:00   England      1:2              Iceland           @ Allianz Riviera, Nice
+
+
+Quarter-finals
+
+(45) Jun/30 21:00   Poland       1:1 0:0nV 3:5iE  Portugal          @ Stade Vélodrome, Marseille
+(46) Jul/01 21:00   Wales        3:1              Belgium           @ Stade Pierre-Mauroy, Lille
+(47) Jul/02 21:00   Germany      1:1 0:0nV 6:5iE  Italy             @ Nouveau Stade de Bordeaux, Bordeaux
+(48) Jul/03 21:00   France       5:2              Iceland           @ Stade de France, Saint-Denis
+
+
+Semi-finals
+
+(49) Jul/06 21:00   Portugal     2:0              Wales             @ Parc Olympique Lyonnais, Lyon
+(50) Jul/07 21:00   Germany      0:2              France            @ Stade Vélodrome, Marseille
+
+
+Final
+
+(51) Jul/10 21:00   Portugal     0:0 1:0nV        France            @ Stade de France, Saint-Denis
+TXT
+
+    SportDb::MatchReader.parse( txt )
+  end
+end  # class TestMatchReaderEuro
+
+

data/test/test_match_reader_mu.rb

@@ -47,19 +47,19 @@ Savanne SC | Savanne Sporting Club
 TXT
 
     recs = SportDb::Import::LeagueReader.parse( leagues_txt )
-    SportDb::Import::config.leagues.add( recs )
+    SportDb::Import.catalog.leagues.add( recs )
 
     recs = SportDb::Import::ClubReader.parse( clubs_txt )
-    SportDb::Import::config.clubs.add( recs )
+    SportDb::Import.catalog.clubs.add( recs )
 
     pp recs
 
-    country = SportDb::Import::config.countries[ 'Mauritius']
+    country = SportDb::Import.catalog.countries.find( 'Mauritius' )
     pp country
 
-    clubs = SportDb::Import::config.clubs.match( 'Chamarel SC' )
+    clubs = SportDb::Import.catalog.clubs.match( 'Chamarel SC' )
     pp clubs
-    club = SportDb::Import::config.clubs.find_by( name: 'Chamarel SC',
+    club = SportDb::Import.catalog.clubs.find_by( name: 'Chamarel SC',
                                                   country: country )
     pp club
 
@@ -91,7 +91,7 @@ Matchday 3
   AS Port-Louis 2000    1-0  La Cure Sylvester
 TXT
 
-    SportDb::MatchReaderV2.parse( txt )
+    SportDb::MatchReader.parse( txt )
   end  # method test_read_mauritius
 
 end  # class TestMatchReaderMu

data/test/test_reader.rb

@@ -24,13 +24,13 @@ class TestReader < MiniTest::Test
     # path = "../../../openfootball/england/2017-18/.conf.txt"
     # path = "../../../openfootball/england/2018-19/.conf.txt"
     # path = "../../../openfootball/england/2019-20/.conf.txt"
-    recs = SportDb::ConfReaderV2.read( path )
+    recs = SportDb::ConfReader.read( path )
     # path = "../../../openfootball/austria/2018-19/1-bundesliga.txt"
     path = "../../../openfootball/england/2015-16/1-premierleague-i.txt"
     # path = "../../../openfootball/england/2017-18/1-premierleague-i.txt"
     # path = "../../../openfootball/england/2018-19/1-premierleague.txt"
     # path = "../../../openfootball/england/2019-20/1-premierleague.txt"
-    recs = SportDb::MatchReaderV2.read( path )
+    recs = SportDb::MatchReader.read( path )
     # path = "../../../openfootball/england/2017-18/1-premierleague-ii.txt"
     #recs = SportDb::MatchReaderV2.read( path )
   end  # method test_read

data/test/test_reader_champs.rb

@@ -0,0 +1,187 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_reader_champs.rb
+
+
+require 'helper'
+
+
+class TestReaderChamps < MiniTest::Test
+
+  def setup
+    SportDb.connect( adapter:  'sqlite3',
+                     database: ':memory:' )
+    SportDb.create_all   ## build schema
+
+    ## turn on logging to console
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+  end
+
+
+  def test_read
+txt =<<TXT
+= UEFA Champions League 2017/18
+
+Manchester United › ENG
+Liverpool         › ENG
+Chelsea           › ENG
+Manchester City   › ENG
+Tottenham Hotspur › ENG
+
+Atlético Madrid › ESP
+Barcelona       › ESP
+Sevilla         › ESP
+Real Madrid     › ESP
+
+Roma     › ITA
+Juventus › ITA
+Napoli   › ITA
+
+Bayern München    › GER
+Borussia Dortmund › GER
+RB Leipzig        › GER
+
+Benfica     › POR
+Sporting CP › POR
+Porto       › POR
+
+CSKA Moscow    › RUS
+Spartak Moscow › RUS
+
+Paris Saint-Germain › FRA
+Basel › SUI
+Celtic › SCO
+Anderlecht › BEL
+Qarabağ › AZE
+Olympiacos › GRE
+Maribor › SVN
+Shakhtar Donetsk › UKR
+Feyenoord › NED
+Beşiktaş › TUR
+Monaco › MCO
+APOEL › CYP
+TXT
+
+    SportDb::ConfReader.parse( txt )
+
+
+txt =<<TXT
+= UEFA Champions League 2017/18
+
+Round of 16 - 1st Leg
+
+[Tue Feb/13]
+  20.45  Juventus             2-2  Tottenham Hotspur    @ Juventus Stadium, Turin
+           [Higuaín 2', 9' (pen.); Kane 35' Eriksen 71']
+  20.45  Basel                0-4  Manchester City      @ St. Jakob-Park, Basel
+           [-; Gündoğan 14', 53' B. Silva 18' Agüero 23']
+
+[Wed Feb/14]
+  20.45  Porto                0-5  Liverpool            @ Estádio do Dragão, Porto
+           [-; Mané 25', 53', 85' Salah 29' Firmino 69']
+  20.45  Real Madrid          3-1  Paris Saint-Germain  @ Santiago Bernabéu, Madrid
+           [Ronaldo 45' (pen.), 83' Marcelo 86'; Rabiot 33']
+
+[Tue Feb/20]
+  20.45  Bayern München       5-0  Beşiktaş             @ Allianz Arena, München
+           [Müller 43', 66' Coman 53' Lewandowski 79', 88']
+  20.45  Chelsea              1-1  Barcelona            @ Stamford Bridge, London
+           [Willian 62'; Messi 75']
+
+[Wed Feb/21]
+  20.45  Shakhtar Donetsk     2-1  Roma                 @ Metalist Stadium, Kharkiv  [†]
+           [Ferreyra 52' Fred 71'; Ünder 41']
+  20.45  Sevilla              0-0  Manchester United    @ Ramón Sánchez Pizjuán, Seville
+
+
+Round of 16 - 2nd Leg
+
+[Tue Mar/6]
+  20.45  Liverpool            0-0  Porto                @ Anfield, Liverpool
+  20.45  Paris Saint-Germain  1-2  Real Madrid          @ Parc des Princes, Paris
+           [Cavani 71'; Ronaldo 51' Casemiro 80']
+
+[Wed Mar/7]
+  20.45  Manchester City      1-2  Basel                @ City of Manchester Stadium, Manchester
+           [Gabriel Jesus 8'; Elyounoussi 17' Lang 71']
+  20.45  Tottenham Hotspur    1-2  Juventus             @ Wembley Stadium, London
+           [Son Heung-min 39'; Higuaín 64' Dybala 67']
+
+[Tue Mar/13]
+  20.45  Roma                 1-0  Shakhtar Donetsk     @ Stadio Olimpico, Rome
+           [Džeko 52']
+  20.45  Manchester United    1-2  Sevilla              @ Old Trafford, Manchester
+           [Lukaku 84'; Ben Yedder 74', 78']
+
+[Wed Mar/14]
+  20.45  Barcelona            3-0  Chelsea              @ Camp Nou, Barcelona
+           [Messi 3', 63' Dembélé 20']
+  18.00  Beşiktaş             1-3  Bayern München       @ Vodafone Park, Istanbul
+           [Vágner Love 59'; Thiago 18' Gönül 46' (o.g.) Wagner 84']
+
+
+Quarter-finals - 1st Leg
+
+[Tue Apr/3]
+  20.45  Juventus             0-3  Real Madrid          @ Juventus Stadium, Turin
+           [-; Ronaldo 3', 64' Marcelo 72']
+  20.45  Sevilla              1-2  Bayern München       @ Ramón Sánchez Pizjuán, Seville
+           [Sarabia 31'; Navas 37' (o.g.) Thiago 68']
+
+[Wed Apr/4]
+  20.45  Barcelona            4-1  Roma                 @ Camp Nou, Barcelona
+           [De Rossi 38' (o.g.) Manolas 55' (o.g.) Piqué 59' L. Suárez 87'; Džeko 80']
+  20.45  Liverpool            3-0  Manchester City      @ Anfield, Liverpool
+           [Salah 12' Oxlade-Chamberlain 21' Mané 31']
+
+
+Quarter-finals - 2nd Leg
+
+[Tue Apr/10]
+  20.45  Roma                 3-0  Barcelona            @ Stadio Olimpico, Rome
+           [Džeko 6' De Rossi 58' (pen.) Manolas 82']
+  20.45  Manchester City      1-2  Liverpool            @ City of Manchester Stadium, Manchester
+           [Gabriel Jesus 2'; Salah 56' Firmino 77']
+
+[Wed Apr/11]
+  20.45  Real Madrid          1-3  Juventus             @ Santiago Bernabéu, Madrid
+           [Ronaldo 90+8' (pen.); Mandžukić 2', 37' Matuidi 61']
+  20.45  Bayern München       0-0  Sevilla              @ Allianz Arena, München
+
+
+
+Semi-finals - 1st Leg
+
+[Tue Apr/24]
+  20.45  Liverpool            5-2  Roma                 @ Anfield, Liverpool
+           [Salah 36', 45+1' Mané 56' Firmino 61', 69'; Džeko 81' Perotti 85' (pen.)]
+
+[Wed Apr/25]
+  20.45  Bayern München       1-2  Real Madrid          @ Allianz Arena, München
+           [Kimmich 28'; Marcelo 44' Asensio 57']
+
+
+Semi-finals - 2nd Leg
+
+[Tue May/1]
+  20.45  Real Madrid          2-2  Bayern München       @ Santiago Bernabéu, Madrid
+           [Benzema 11', 46'; Kimmich 3' Rodríguez 63']
+
+[Wed May/2]
+  20.45  Roma                 4-2  Liverpool            @ Stadio Olimpico, Rome
+           [Milner 15' (o.g.) Džeko 52' Nainggolan 86', 90+4' (pen.); Mané 9' Wijnaldum 25']
+
+Final
+
+[Sat May/26]
+  20.45  Real Madrid          3-1  Liverpool            @ NSC Olimpiyskiy Stadium, Kiev
+           [Benzema 51' Bale 64', 83'; Mané 55']
+TXT
+
+    SportDb::MatchReader.parse( txt )
+  end
+
+
+end  # class TestReaderChamps

metadata

@@ -1,57 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: sportdb-config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: sportdb-models
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.18.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.18.6
 - !ruby/object:Gem::Dependency
   name: sportdb-sync
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -88,25 +60,28 @@ extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
 - Manifest.txt
+- NOTES.md
 - README.md
 files:
 - CHANGELOG.md
 - Manifest.txt
+- NOTES.md
 - README.md
 - Rakefile
 - lib/sportdb/readers.rb
-- lib/sportdb/readers/conf_linter.rb
 - lib/sportdb/readers/conf_reader.rb
-- lib/sportdb/readers/league_outline_reader.rb
-- lib/sportdb/readers/match_linter.rb
 - lib/sportdb/readers/match_reader.rb
 - lib/sportdb/readers/package.rb
 - lib/sportdb/readers/version.rb
 - test/helper.rb
+- test/test_conf_reader.rb
+- test/test_match_reader_champs.rb
 - test/test_match_reader_eng.rb
+- test/test_match_reader_euro.rb
 - test/test_match_reader_mu.rb
 - test/test_read.rb
 - test/test_reader.rb
+- test/test_reader_champs.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain