sportdb-readers 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d51d795ec384d281363b3af32bb6560bb0e7707a
-  data.tar.gz: 6579ab0a20f45673f24ae4b444bc01d5c0f43d19
+SHA256:
+  metadata.gz: 40a0db453b48c9bed47b6370c44249d5c8197df2fddc90a911653f2ddd145357
+  data.tar.gz: 8792558c03345ba1662249e5239f5b6122324740f353be4143c420f482486742
 SHA512:
-  metadata.gz: 5b5ca27813390ab7fe3aa41e63897bbd0aa03c39d78dabed8a321eb3853528a2c1700c8dea4be57fe7fd3eb6122631878bdfb2beeed03ac81e545b4c9049dd4f
-  data.tar.gz: 5c2a40f3fd42a0ec3eac82e942088a00bd2e7a6bf4bd07a2d993d217ac2b17a3503ac41d7befd1016a90511ded5c8ea2d4df7a577bbd1ec3dd994f84c4ea1113
+  metadata.gz: 342de18d45ec3be01a528be68e2e77d18866911cef7fbad17424179c648eda816170e77ea39987bfa66b48af9627284080535eab292c0e9798e3ca25ad09118a
+  data.tar.gz: 5861f675107c90fdd10f865396df5b43f30df1df63ff3e437f409612853b393d575f96df0b59a86d23c2773791a2a63d57db1df9949ebb4e0845768b088a9654

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+### 1.2.0
+
 ### 0.0.1 / 2019-10-29
 
 * Everything is new. First release.

data/Manifest.txt

@@ -8,12 +8,3 @@ lib/sportdb/readers/conf_reader.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

data/README.md

@@ -5,7 +5,6 @@
 * bugs  :: [github.com/sportdb/sport.db/issues](https://github.com/sportdb/sport.db/issues)
 * gem   :: [rubygems.org/gems/sportdb-readers](https://rubygems.org/gems/sportdb-readers)
 * rdoc  :: [rubydoc.info/gems/sportdb-readers](http://rubydoc.info/gems/sportdb-readers)
-* forum :: [opensport](http://groups.google.com/group/opensport)
 
 
 
@@ -20,9 +19,7 @@ as an example:
 ``` ruby
 require 'sportdb/readers'
 
-SportDb.connect( adapter:  'sqlite3',
-                 database: './england.db' )
-SportDb.create_all       ## build database schema (tables, indexes, etc.)
+SportDb.open( './england.db' )
 ```
 
 **Step 2**
@@ -83,14 +80,14 @@ pl_2015_16.teams.count  #=> 20
 #      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
+pl_2015_16.matches.count  #=> 380
+#=>  SELECT COUNT(*) FROM matches
+#      INNER JOIN rounds ON matches.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
+pl_2015_16.matches.count  #=> 380
 
 # -or-
 
@@ -151,6 +148,8 @@ Use it as you please with no restrictions whatsoever.
 
 ## Questions? Comments?
 
-Send them along to the
-[Open Sports & Friends Forum/Mailing List](http://groups.google.com/group/opensport).
-Thanks!
+Yes, you can. More than welcome.
+See [Help & Support »](https://github.com/openfootball/help)
+
+
+

data/Rakefile

@@ -8,10 +8,10 @@ Hoe.spec 'sportdb-readers' do
   self.summary = "sportdb-readers - sport.db readers for leagues, seasons, clubs, match schedules and results, and more"
   self.description = summary
 
-  self.urls = ['https://github.com/sportdb/sport.db']
+  self.urls = { home: 'https://github.com/sportdb/sport.db' }
 
   self.author = 'Gerald Bauer'
-  self.email = 'opensport@googlegroups.com'
+  self.email = 'gerald.bauer@gmail.com'
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'
@@ -20,7 +20,7 @@ Hoe.spec 'sportdb-readers' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-sync',    '>= 1.1.0'],
+    ['sportdb-sync',    '>= 1.2.0'],
   ]
 
   self.spec_extras = {

data/lib/sportdb/readers/conf_reader.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 module SportDb
 
@@ -43,8 +42,8 @@ class ConfReader    ## todo/check: rename to EventsReaderV2 (use plural?) why? w
         else
           conf.each do |name, _|
             ## note: rank and standing gets ignored (not used) for now
-            teams << catalog.clubs.find_by!( name: name,
-                                            country: league.country )
+            teams << catalog.clubs.find_by!( name:  name,
+                                             league: league )
           end
         end
       else   ### assume national teams

data/lib/sportdb/readers/match_reader.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 module SportDb
 
@@ -36,8 +35,9 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
       'it' => 'it', ## it - Italian
       'es' => 'es', ## es - Español (Spanish)
       'mx' => 'es',
+      'ar' => 'es', ## Argentina
       'pt' => 'pt', ## pt -  Português (Portuguese)
-      'br' => 'br'    ## !!! todo/check - br exists?? use pt portuges??
+      'br' => 'pt',
     }
 
     secs.each do |sec|   ## sec(tion)s
@@ -69,9 +69,16 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
                 end
               end
 
-      auto_conf_teams, _ = AutoConfParser.parse( lines,
-                                                 start: start )
 
+      ### todo/check: make sure team include teams from group def too!!!!!
+      ###
+      ###             note - only use teams and grounds for now
+      auto_conf_teams, 
+      _rounds, _groups, _round_defs, _group_defs, 
+      auto_conf_grounds, 
+      _  = AutoConfParser.parse( lines, start: start )
+    
+                                    
       ## step 1: map/find teams
 
       ## note: loop over keys (holding the names); values hold the usage counter!! e.g. 'Arsenal' => 2, etc.
@@ -81,20 +88,34 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
                 ##    todo/fix: make more generic / reuseable!!!!
                 mods = {}
                 ## europa league uses same mods as champions league
-                mods[ 'uefa.el' ] = mods[ 'uefa.cl' ] = catalog.clubs.build_mods(
+                mods[ 'uefa.el.quali' ] =
+                mods[ 'uefa.cl.quali' ] =
+                mods[ 'uefa.el' ] =
+                mods[ 'uefa.cl' ] = catalog.clubs.build_mods(
                   { 'Liverpool | Liverpool FC' => 'Liverpool FC, ENG',
                     'Arsenal  | Arsenal FC'    => 'Arsenal FC, ENG',
                     'Barcelona'                => 'FC Barcelona, ESP',
                     'Valencia'                 => 'Valencia CF, ESP'  })
        end
 
+       # puts " [debug] auto_conf_teams:"
+       # pp auto_conf_teams
+
+
        teams = catalog.teams.find_by!( name:   auto_conf_teams.keys,
                                        league: league,
                                        mods:   mods )
 
+       # puts " [debug] teams:"
+       # pp teams
+
        ## build mapping - name => team struct record
        team_mapping =  auto_conf_teams.keys.zip( teams ).to_h
 
+       # puts " [debug] team_mapping:"
+       # pp team_mapping
+
+    
 
       parser = MatchParser.new( lines,
                                 team_mapping,
@@ -133,12 +154,32 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
      end
 
 
-      rounds.each do |round|
-        round_rec = Sync::Round.find_or_create( round, event: event_rec )  ## check: use/rename to EventRound why? why not?
-      end
+       ## build a lookup cache for team_recs  (used by group lookup)
+       ##   lookup by "canonical" name
+       cache_team_recs = new_team_recs.reduce({}) { |h,rec| h[rec.name] = rec; h }
 
       groups.each do |group|
         group_rec = Sync::Group.find_or_create( group, event: event_rec )   ## check: use/rename to EventGroup why? why not?
+
+        ########
+        ## add/update teams  - todo/fix/clean-up - find a better way or move to sync? - possible?
+        ##   e.g. group.teams assumes an array of team names e.g.
+        ##      ["Spain", "Czech Republic", "Turkey", "Croatia"]
+        group_team_ids = []
+        group.teams.each do |team_name|
+          team_rec = cache_team_recs[ team_name ]
+          if team_rec.nil? ## assume team MUST always be present/known in mapping (via autoconfig parser)
+            puts "!! ERROR - no (cached) team rec found for team in group >#{group.name}< for >#{team_name}<"
+            exit 1
+          end
+          group_team_ids << team_rec.id
+        end
+        group_rec.team_ids = group_team_ids   ## reset/update all teams at once (via ids)
+      end
+
+
+      rounds.each do |round|
+        round_rec = Sync::Round.find_or_create( round, event: event_rec )  ## check: use/rename to EventRound why? why not?
       end
 
       matches.each do |match|

data/lib/sportdb/readers/version.rb

@@ -1,12 +1,11 @@
-# encoding: utf-8
 
 
 module SportDb
 module Readers
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
-  MINOR = 1
-  PATCH = 1
+  MINOR = 2
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -14,7 +13,7 @@ module Readers
   end
 
   def self.banner
-    "sportdb-readers/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+    "sportdb-readers/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] in (#{root})"
   end
 
   def self.root

data/lib/sportdb/readers.rb

@@ -1,14 +1,14 @@
-# encoding: utf-8
 
 require 'sportdb/sync'
 
 
 ###
 # our own code
-require 'sportdb/readers/version' # let version always go first
-require 'sportdb/readers/conf_reader'
-require 'sportdb/readers/match_reader'
-require 'sportdb/readers/package'
+require_relative 'readers/version' # let version always go first
+require_relative 'readers/conf_reader'
+require_relative 'readers/match_reader'
+require_relative 'readers/package'
+
 
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Gerald Bauer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2024-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-sync
@@ -16,45 +16,51 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '4.1'
 description: sportdb-readers - sport.db readers for leagues, seasons, clubs, match
   schedules and results, and more
-email: opensport@googlegroups.com
+email: gerald.bauer@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -73,20 +79,11 @@ files:
 - 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
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -103,9 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: sportdb-readers - sport.db readers for leagues, seasons, clubs, match schedules
   and results, and more

data/test/helper.rb

@@ -1,23 +0,0 @@
-## note: use the local version of sportdb gems
-$LOAD_PATH.unshift( File.expand_path( '../sportdb-formats/lib' ))
-$LOAD_PATH.unshift( File.expand_path( '../sportdb-config/lib' ))
-$LOAD_PATH.unshift( File.expand_path( '../sportdb-models/lib' ))
-$LOAD_PATH.unshift( File.expand_path( '../sportdb-sync/lib' ))
-
-
-## minitest setup
-require 'minitest/autorun'
-
-
-
-## our own code
-require 'sportdb/readers'
-
-## use (switch to) "external" datasets
-SportDb::Import.config.leagues_dir = "../../../openfootball/leagues"
-SportDb::Import.config.clubs_dir   = "../../../openfootball/clubs"
-
-
-COUNTRIES = SportDb::Import.catalog.countries
-LEAGUES   = SportDb::Import.catalog.leagues
-CLUBS     = SportDb::Import.catalog.clubs

data/test/test_conf_reader.rb

@@ -1,78 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_conf_reader.rb
-
-
-require 'helper'
-
-
-class TestConfReader < 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
-    # path = "../../../openfootball/austria/2018-19/.conf.txt"
-    path = "../../../openfootball/england/2015-16/.conf.txt"
-    # path = "../../../openfootball/england/2017-18/.conf.txt"
-    # path = "../../../openfootball/england/2018-19/.conf.txt"
-    # path = "../../../openfootball/england/2019-20/.conf.txt"
-    SportDb::ConfReader.read( path )
-  end  # method test_read
-
-
-  def test_read_champs
-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 )
-  end
-end  # class TestConfReader