sportdb-readers 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59763aec58a5729bbe978c4f81ac60de0b883e3f
-  data.tar.gz: 8fe8c7a0362bb664620f0392865a2435d8d54ef7
+  metadata.gz: 618fca12af08a963b2d86cbb61b377751e365092
+  data.tar.gz: fdddea7cb85f4ff6581f11f897bd1f087d9bdd4b
 SHA512:
-  metadata.gz: f700cc86b085a7b882211c0d2bc7033287e4b523403374eba95ff58ef2fe9b930fd09d6e4c57483e5b5a978aa487825b7fcdcd34ea873299a94604d443403f83
-  data.tar.gz: '08a052e7b179189c2eae987c24c6e90915a74f3666a87dd116bef60a4b7266c693d7419415df0311e91f35c287c2c19b0b5b8a7faa86c2f0345f88bd5e672090'
+  metadata.gz: 5b1a5174887fd02e6f95f1574766dde03102b034175eb610cd8b28ab30d4cba890f256ac657af15e4129355807dada2294c2b101101d861bfccef71f4fd7f40e
+  data.tar.gz: 3e200b894e12bcfa8f0b44ae1efb2e4e123b06e6fbaac920be88a99aacbb68db5ce705b5c7f9c944ec91214b1b4f8f77096e7bf3af574a2ed54f62f25abed2de

data/README.md

@@ -31,46 +31,101 @@ Let's read in some leagues, seasons, clubs, and match schedules and results.
 Let's use the public domain football.db datasets for England (see [`openfootball/england`](https://github.com/openfootball/england)), as an example:
 
 
-``` ruby
-## turn on logging to console
-ActiveRecord::Base.logger = Logger.new( STDOUT )
+```
+= English Premier League 2015/16
+
+Matchday 1
+
+[Sat Aug 8]
+  Manchester United      1-0  Tottenham Hotspur
+  AFC Bournemouth        0-1  Aston Villa
+  Everton FC             2-2  Watford FC
+  Leicester City         4-2  Sunderland AFC
+  Norwich City           1-3  Crystal Palace
+  Chelsea FC             2-2  Swansea City
+[Sun Aug 9]
+  Arsenal FC             0-2  West Ham United
+  Newcastle United       2-2  Southampton FC
+  Stoke City             0-1  Liverpool FC
+[Mon Aug 10]
+  West Bromwich Albion   0-3  Manchester City
+
+...
+```
 
+and let's try:
+
+``` ruby
 ## assumes football.db datasets for England in ./england directory
 ##   see github.com/openfootball/england
-SportDb::ConfReaderV2.read( './england/2015-16/.conf.txt' )
-SportDb::MatchReaderV2.read( './england/2015-16/1-premierleague-i.txt' )
-SportDb::MatchReaderV2.read( './england/2015-16/1-premierleague-ii.txt' )
+SportDb::MatchReader.read( './england/2015-16/1-premierleague-i.txt' )
+SportDb::MatchReader.read( './england/2015-16/1-premierleague-ii.txt' )
 
 ## let's try another season
-SportDb::ConfReaderV2.read( './england/2019-20/.conf.txt' )
-SportDb::MatchReaderV2.read( './england/2019-20/1-premierleague.txt' )
+SportDb::MatchReader.read( './england/2019-20/1-premierleague.txt' )
 ```
 
 All leagues, seasons, clubs, match days and rounds, match fixtures and results,
 and more are now in your (SQL) database of choice.
 
+The proof of the pudding - Let's query the (SQL) database using the sport.db ActiveRecord models:
+
+``` ruby
+include SportDb::Models
+
+pl_2015_16 = Event.find_by( key: 'eng.1.2015/16' )
+#=> SELECT * FROM events WHERE key = 'eng.1.2015/16' LIMIT 1
+
+pl_2015_16.teams.count  #=> 20
+#=> SELECT COUNT(*) FROM teams
+#      INNER JOIN events_teams ON teams.id = events_teams.team_id
+#      WHERE events_teams.event_id = 1
+
+pl_2015_16.games.count  #=> 380
+#=>  SELECT COUNT(*) FROM games
+#      INNER JOIN rounds ON games.round_id = rounds.id
+#      WHERE rounds.event_id = 1
+
+pl_2019_20 = Event.find_by( key: 'eng.1.2019/20' )
+pl_2015_16.teams.count  #=> 20
+pl_2015_16.games.count  #=> 380
+
+# -or-
+
+pl = League.find_by( key: 'eng.1' )
+#=> SELECT * FROM leagues WHERE key = 'eng.1' LIMIT 1
+
+pl.seasons.count   #=> 2
+#=> SELECT COUNT(*) FROM seasons
+#     INNER JOIN events ON seasons.id = events.season_id
+#     WHERE events.league_id = 1
+
+# and so on and so forth.
+```
+
+
 
 Or as an alternative use the `read` convenience all-in-one shortcut helper:
 
 ``` ruby
 ## assumes football.db datasets for England in ./england directory
 ##   see github.com/openfootball/england
-SportDb.read( './england/2015-16/.conf.txt' )
 SportDb.read( './england/2015-16/1-premierleague-i.txt' )
 SportDb.read( './england/2015-16/1-premierleague-ii.txt' )
 
 ## let's try another season
-SportDb.read( './england/2019-20/.conf.txt' )
 SportDb.read( './england/2019-20/1-premierleague.txt' )
 ```
 
-Or as an alternative pass in the "package" directory and let `read` figure
+Bonus: Or as an alternative pass in the "package" directory or a zip archive and let `read` figure
 out what datafiles to read:
 
 ``` ruby
 ## assumes football.db datasets for England in ./england directory
 ##   see github.com/openfootball/england
 SportDb.read( './england' )
+## -or-   use a zip archive download
+SportDb.read( './england.zip' )
 ```
 
 That's it.

data/lib/sportdb/readers.rb

@@ -16,12 +16,12 @@ require 'sportdb/readers/package'
 ##
 ##  add convenience shortcut helpers
 module SportDb
-  def self.read_conf( path, season: nil )  ConfReaderV2.read( path, season: season ); end
-  def self.parse_conf( txt, season: nil )  ConfReaderV2.parse( txt, season: season ); end
+  def self.read_conf( path, season: nil )  ConfReader.read( path, season: season ); end
+  def self.parse_conf( txt, season: nil )  ConfReader.parse( txt, season: season ); end
 
   ### todo/check: add alias read_matches - why? why not?
-  def self.read_match( path, season: nil )  MatchReaderV2.read( path, season: season ); end
-  def self.parse_match( txt, season: nil )  MatchReaderV2.parse( txt, season: season ); end
+  def self.read_match( path, season: nil )  MatchReader.read( path, season: season ); end
+  def self.parse_match( txt, season: nil )  MatchReader.parse( txt, season: season ); end
 
   def self.read_club_props( path )  Import::ClubPropsReader.read( path ); end
   def self.parse_club_props( txt )  Import::ClubPropsReader.parse( txt ); end

data/lib/sportdb/readers/conf_reader.rb

@@ -3,7 +3,7 @@
 module SportDb
 
 
-class ConfReaderV2    ## todo/check: rename to EventsReaderV2 (use plural?) why? why not?
+class ConfReader    ## todo/check: rename to EventsReaderV2 (use plural?) why? why not?
 
   def self.read( path, season: nil )   ## use - rename to read_file or from_file etc. - why? why not?
     txt = File.open( path, 'r:utf-8' ) {|f| f.read }
@@ -96,5 +96,5 @@ class ConfReaderV2    ## todo/check: rename to EventsReaderV2 (use plural?) why?
 
   def catalog() Import.catalog; end  ## shortcut convenience helper
 
-end # class ConfReaderV2
+end # class ConfReader
 end # module SportDb

data/lib/sportdb/readers/match_reader.rb

@@ -2,7 +2,7 @@
 
 module SportDb
 
-class MatchReaderV2    ## todo/check: rename to MatchReaderV2 (use plural?) why? why not?
+class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? why not?
 
   def self.read( path, season: nil )   ## use - rename to read_file or from_file etc. - why? why not?
     txt = File.open( path, 'r:utf-8' ) {|f| f.read }
@@ -87,7 +87,7 @@ class MatchReaderV2    ## todo/check: rename to MatchReaderV2 (use plural?) why?
        team_mapping =  auto_conf_teams.keys.zip( teams ).to_h
 
 
-      parser = MatchParserSimpleV2.new( lines,
+      parser = MatchParser.new( lines,
                                 team_mapping,
                                 start )   ## note: keep season start_at date for now (no need for more specific stage date need for now)
 
@@ -149,5 +149,5 @@ class MatchReaderV2    ## todo/check: rename to MatchReaderV2 (use plural?) why?
 
   def catalog() Import.catalog; end
 
-end # class MatchReaderV2
+end # class MatchReader
 end # module SportDb

data/lib/sportdb/readers/package.rb

@@ -49,7 +49,8 @@ module SportDb
         read_leagues()
         read_clubs()
         read_club_props()
-        read_conf( season: season )
+        ## note:  skip conf(iguration)s for now!!!!!!!
+        ## read_conf( season: season )
         read_match( season: season )
       else
         names.each do |name|

data/lib/sportdb/readers/version.rb

@@ -6,7 +6,7 @@ module Readers
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
   MINOR = 0
-  PATCH = 1
+  PATCH = 2
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/test_conf_reader.rb

@@ -25,7 +25,7 @@ class TestConfReader < MiniTest::Test
     # path = "../../../openfootball/england/2017-18/.conf.txt"
     # path = "../../../openfootball/england/2018-19/.conf.txt"
     # path = "../../../openfootball/england/2019-20/.conf.txt"
-    SportDb::ConfReaderV2.read( path )
+    SportDb::ConfReader.read( path )
   end  # method test_read
 
 
@@ -73,6 +73,6 @@ Monaco › MCO
 APOEL › CYP
 TXT
 
-    SportDb::ConfReaderV2.parse( txt )
+    SportDb::ConfReader.parse( txt )
   end
 end  # class TestConfReader

data/test/test_match_reader_champs.rb

@@ -363,7 +363,7 @@ Group H:
            [Llorente 20' Son Heung-min 37' N'Koudou 80']
 TXT
 
-    SportDb::MatchReaderV2.parse( txt )
+    SportDb::MatchReader.parse( txt )
   end
 
   def test_read_finals
@@ -480,7 +480,7 @@ Final
            [Benzema 51' Bale 64', 83'; Mané 55']
 TXT
 
-    SportDb::MatchReaderV2.parse( txt )
+    SportDb::MatchReader.parse( txt )
   end
 
 

data/test/test_match_reader_eng.rb

@@ -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

@@ -149,7 +149,7 @@ Final
 (51) Jul/10 21:00   Portugal     0:0 1:0nV        France            @ Stade de France, Saint-Denis
 TXT
 
-    SportDb::MatchReaderV2.parse( txt )
+    SportDb::MatchReader.parse( txt )
   end
 end  # class TestMatchReaderEuro
 

data/test/test_match_reader_mu.rb

@@ -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

@@ -64,7 +64,7 @@ Monaco › MCO
 APOEL › CYP
 TXT
 
-    SportDb::ConfReaderV2.parse( txt )
+    SportDb::ConfReader.parse( txt )
 
 
 txt =<<TXT
@@ -180,7 +180,7 @@ Final
            [Benzema 51' Bale 64', 83'; Mané 55']
 TXT
 
-    SportDb::MatchReaderV2.parse( txt )
+    SportDb::MatchReader.parse( txt )
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-11 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-sync