sportdb-readers 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d51d795ec384d281363b3af32bb6560bb0e7707a
-  data.tar.gz: 6579ab0a20f45673f24ae4b444bc01d5c0f43d19
+  metadata.gz: b92858d91cd8a8229f492aba44a58e3dd6be1b40
+  data.tar.gz: 36d490bff1de4f88216e4092abc73927a1fb0de6
 SHA512:
-  metadata.gz: 5b5ca27813390ab7fe3aa41e63897bbd0aa03c39d78dabed8a321eb3853528a2c1700c8dea4be57fe7fd3eb6122631878bdfb2beeed03ac81e545b4c9049dd4f
-  data.tar.gz: 5c2a40f3fd42a0ec3eac82e942088a00bd2e7a6bf4bd07a2d993d217ac2b17a3503ac41d7befd1016a90511ded5c8ea2d4df7a577bbd1ec3dd994f84c4ea1113
+  metadata.gz: 8b509fe042ac69758777e838f245d929807c23ccc3276d1216d0dc127fd54f1758a3474a56469b5c42fb073862431a96bcd85fa78b15979e61272251cfb61237
+  data.tar.gz: cb9b1868690d2cd36c9ae2cc50a2cef6962192f072bf5cd70710f9942439d62dbfbb8f6fa67908eddb69853f6a1284840a6502f5daf237864059a716aaf2511e

data/Rakefile

@@ -20,7 +20,7 @@ Hoe.spec 'sportdb-readers' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-sync',    '>= 1.1.0'],
+    ['sportdb-sync',    '>= 1.1.1'],
   ]
 
   self.spec_extras = {

data/lib/sportdb/readers/match_reader.rb

@@ -36,8 +36,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,6 +70,8 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
                 end
               end
 
+
+      ### todo/check: make sure team include teams from group def too!!!!!
       auto_conf_teams, _ = AutoConfParser.parse( lines,
                                                  start: start )
 
@@ -81,7 +84,10 @@ 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',
@@ -133,12 +139,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

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

data/test/helper.rb

@@ -1,6 +1,6 @@
 ## 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-catalogs/lib' ))
 $LOAD_PATH.unshift( File.expand_path( '../sportdb-models/lib' ))
 $LOAD_PATH.unshift( File.expand_path( '../sportdb-sync/lib' ))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2020-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-sync
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement