sportdb-readers 1.1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b92858d91cd8a8229f492aba44a58e3dd6be1b40
-  data.tar.gz: 36d490bff1de4f88216e4092abc73927a1fb0de6
+SHA256:
+  metadata.gz: 1298cb753fdadf33ad2bc2a8c756b16fc9abc06d12ba54705a9d8dc970f0fb5d
+  data.tar.gz: 4b367725fe4e6c18d77bc822152d9da086aa713519f2d676a26ef23ee2e48714
 SHA512:
-  metadata.gz: 8b509fe042ac69758777e838f245d929807c23ccc3276d1216d0dc127fd54f1758a3474a56469b5c42fb073862431a96bcd85fa78b15979e61272251cfb61237
-  data.tar.gz: cb9b1868690d2cd36c9ae2cc50a2cef6962192f072bf5cd70710f9942439d62dbfbb8f6fa67908eddb69853f6a1284840a6502f5daf237864059a716aaf2511e
+  metadata.gz: 202056abc1d45c64ae2ce8855841b71a130e80db244d5d2b2e279b77c4f839588dee9094cdb2780d20678c36bf3e1eb3b340946f23f7e7ab48db8966238d1f5f
+  data.tar.gz: '062494236d53dd2fa51209a520cfd0c3507a3750a802864f462b749d1188d0c13c68fa3679f1fe6839daed570589399ef34407566bb95a7d7fce038abd15d290'

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+### 1.2.1
+
 ### 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**
@@ -53,15 +50,14 @@ Matchday 1
 ...
 ```
 
-(Source: [england/2015-16/1-premierleague-i.txt](https://github.com/openfootball/england/blob/master/2015-16/1-premierleague-i.txt))
+(Source: [england/2015-16/1-premierleague.txt](https://github.com/openfootball/england/blob/master/2015-16/1-premierleague.txt))
 
 and let's try:
 
 ``` ruby
 ## assumes football.db datasets for England in ./england directory
 ##   see github.com/openfootball/england
-SportDb.read( './england/2015-16/1-premierleague-i.txt' )
-SportDb.read( './england/2015-16/1-premierleague-ii.txt' )
+SportDb.read( './england/2015-16/1-premierleague.txt' )
 
 ## let's try another season
 SportDb.read( './england/2019-20/1-premierleague.txt' )
@@ -83,14 +79,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-
 
@@ -139,7 +135,7 @@ Round, Date,              Team 1,               FT,  HT,  Team 2
 ```
 (Source: [england/2019-20/eng.1.csv](https://github.com/footballcsv/england/blob/master/2010s/2019-20/eng.1.csv))
 
-Yes, you can. See the [sportdb-importers library / gem »](https://github.com/sportdb/sport.db/tree/master/sportdb-importers) 
+Yes, you can. See the [sportdb-importers library / gem »](https://github.com/sportdb/sport.db/tree/master/sportdb-importers)
 
 
 
@@ -151,6 +147,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,11 +20,11 @@ Hoe.spec 'sportdb-readers' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-sync',    '>= 1.1.1'],
+    ['sportdb-sync',    '>= 1.2.2'],
   ]
 
   self.spec_extras = {
-   required_ruby_version: '>= 2.2.2'
+   required_ruby_version: '>= 3.1.0'
   }
 
 end

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
 
@@ -24,43 +23,22 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
     secs = LeagueOutlineReader.parse( @txt, season: season )
     pp secs
 
-
-    ###
-    ## todo/check/fix:  move to LeagueOutlineReader for (re)use - why? why not?
-    ##                    use sec[:lang] or something?
-    langs = {    ## map country keys to lang codes
-      'de' => 'de', ## de - Deutsch (German)
-      'at' => 'de',
-      'ch' => 'de',
-      'fr' => 'fr', ## fr - French
-      'it' => 'it', ## it - Italian
-      'es' => 'es', ## es - Español (Spanish)
-      'mx' => 'es',
-      'ar' => 'es', ## Argentina
-      'pt' => 'pt', ## pt -  Português (Portuguese)
-      'br' => 'pt',
-    }
-
     secs.each do |sec|   ## sec(tion)s
       season = sec[:season]
       league = sec[:league]
       stage  = sec[:stage]
       lines  = sec[:lines]
 
-      ## hack for now: switch lang
-      ## todo/fix: set lang for now depending on league country!!!
-      if league.intl?   ## todo/fix: add intl? to ActiveRecord league!!!
-        Import.config.lang = 'en'
-      else  ## assume national/domestic
-        Import.config.lang = langs[ league.country.key ] || 'en'
-      end
-
       ### check if event info availabe - use start_date;
       ##    otherwise we have to guess (use a "synthetic" start_date)
       event_info = catalog.events.find_by( season: season,
                                            league: league )
 
       start = if event_info && event_info.start_date
+                  puts "event info found:"
+                  puts "  using start date from event: "
+                  pp event_info
+                  pp event_info.start_date
                   event_info.start_date
               else
                 if season.year?
@@ -71,45 +49,101 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
               end
 
 
-      ### todo/check: make sure team include teams from group def too!!!!!
-      auto_conf_teams, _ = AutoConfParser.parse( lines,
-                                                 start: start )
+      parser = MatchParser.new( lines,
+                                start )   ## note: keep season start_at date for now (no need for more specific stage date need for now)
+
+      auto_conf_teams,  matches, rounds, groups = parser.parse
+
+      puts ">>> #{auto_conf_teams.size} teams:"
+      pp auto_conf_teams
+      puts ">>> #{matches.size} matches:"
+      ## pp matches
+      puts ">>> #{rounds.size} rounds:"
+      pp rounds
+      puts ">>> #{groups.size} groups:"
+      pp groups
+
+
 
       ## step 1: map/find teams
 
       ## note: loop over keys (holding the names); values hold the usage counter!! e.g. 'Arsenal' => 2, etc.
       mods = nil
       if league.clubs? && league.intl?    ## todo/fix: add intl? to ActiveRecord league!!!
+
+        ## quick hack - use "dynamic" keys for keys
+          uefa_el_q = catalog.leagues.match_by( code: 'uefa.el.quali' )[0]
+          uefa_cl_q = catalog.leagues.match_by( code: 'uefa.cl.quali' )[0]
+          uefa_cl   = catalog.leagues.match_by( code: 'uefa.cl' )[0]
+          uefa_el   = catalog.leagues.match_by( code: 'uefa.el' )[0]
+
+          pp [uefa_el_q, uefa_cl_q, uefa_cl, uefa_el]
+
                 ### quick hack mods for popular/known ambigious club names
                 ##    todo/fix: make more generic / reuseable!!!!
                 mods = {}
                 ## europa league uses same mods as champions league
-                mods[ 'uefa.el.quali' ] =
-                mods[ 'uefa.cl.quali' ] =
-                mods[ 'uefa.el' ] =
-                mods[ 'uefa.cl' ] = catalog.clubs.build_mods(
+                mods[ uefa_el_q.key ] =
+                mods[ uefa_cl_q.key ] =
+                mods[ uefa_el.key ] =
+                mods[ uefa_cl.key ] = catalog.clubs.build_mods(
                   { 'Liverpool | Liverpool FC' => 'Liverpool FC, ENG',
                     'Arsenal  | Arsenal FC'    => 'Arsenal FC, ENG',
                     'Barcelona'                => 'FC Barcelona, ESP',
-                    'Valencia'                 => 'Valencia CF, ESP'  })
+                    'Valencia'                 => 'Valencia CF, ESP',
+                    'Rangers FC'               => 'Rangers FC, SCO',
+                  })
        end
 
-       teams = catalog.teams.find_by!( name:   auto_conf_teams.keys,
+       # puts " [debug] auto_conf_teams:"
+       # pp auto_conf_teams
+
+
+ ## todo/fix
+ ##  ** !!! ERROR - too many matches (2) for club >Barcelona<:
+ ## [<Club: FC Barcelona (ESP)>, <Club: Barcelona Guayaquil (ECU)>]
+
+       puts "league:"
+       pp league
+
+       teams = catalog.teams.find_by!( name:   auto_conf_teams,
                                        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
+       team_mapping =  auto_conf_teams.zip( teams ).to_h
 
+       puts " [debug] team_mapping:"
+       pp team_mapping
 
-      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)
 
-      matches, rounds, groups = parser.parse
+        ## quick (and dirty) hack
+        ##   update all team strings with mapped records
+        matches.each do |match|
+            match.update( team1: team_mapping[ match.team1 ] )
+            match.update( team2: team_mapping[ match.team2 ] )
+        end
 
-      pp rounds
-      pp groups
+        ## quick hack cont.
+        ##  rebuild groups with all team strings with mapped records
+        groups = groups.map do |old_group|
+                                group = Import::Group.new(
+                                          name: old_group.name,
+                                          teams: old_group.teams.map {|team| team_mapping[team] }
+                                        )
+                                group
+                            end
+        puts "groups:"
+        pp groups
+
+## fix
+##  !! ERROR - no (cached) team rec found for team in group >Group A<
+##   for >#<Sports::Club:0x000002c7e1686040><
+###    update sync group to check for records (use .name) !!!
 
 
      ######################################################
@@ -151,10 +185,10 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
         ##   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 ]
+        group.teams.each do |team|
+          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}<"
+            puts "!! ERROR - no (cached) team rec found for team in group >#{group.name}< for >#{team}<"
             exit 1
           end
           group_team_ids << team_rec.id
@@ -167,6 +201,7 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
         round_rec = Sync::Round.find_or_create( round, event: event_rec )  ## check: use/rename to EventRound why? why not?
       end
 
+
       matches.each do |match|
         ## note: pass along stage (if present): stage  - optional from heading!!!!
         match = match.update( stage: stage )   if stage

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 = 2
+  MINOR = 2
+  PATCH = 1
   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.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Gerald Bauer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-01 00:00:00.000000000 Z
+date: 2024-08-22 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.1
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.2
 - !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
@@ -96,16 +93,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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-catalogs/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