sportdb-readers 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f272d4ffee7d8d56aa09bc05ec0280ab252ef793cc26090206e4dad41824cd43
-  data.tar.gz: 3343b9b089991220fa61584f166a229ce1bd35aad695a0aef76ac692fc62825e
+  metadata.gz: 5e288d917f0333c7d12ae67eac1c8f16eeb6499cb40b9b4d6e40b45d3e617dc1
+  data.tar.gz: 1eb4d7e7cbf14e67141edc1043cf64cb2f3bb77fdaf1532f4f7017e95df2adaf
 SHA512:
-  metadata.gz: 665bd28de289348d82f8bb3157e08601f20ebe35794c3e1694802fb77df34151bb15589a784c615c3c83fb3c1ad30a0e66f51a0c4a34a366dd666be3b1249d41
-  data.tar.gz: d330593cd5ae11a2a887ef365e69c3cd02486623e9a0fbca132466eef7408b65a455ab9ee1cad6f55f6f1d706c7f901f816f23bb01060fd28457ca6df5879092
+  metadata.gz: 1ad5a423fb07514b374aae88cb7e858446ed75131c1aa9530b4037e521c3a8b3be9b7746cc3a13cb1010e1fa76f002f8b968858145ee593cb53f90eff28e3ef0
+  data.tar.gz: 19d85196f34037b618d1bbb560cc5f2b42cc4d2d006f60b7428d7bb1d72b4dc770f7c9ae2ac0f86d01eea307d36eb80bf5e4ae0511df8c5f55692c4b306e3f2c

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 2.1.0
+### 2.2.0
 
 ### 0.0.1 / 2019-10-29
 

data/lib/sportdb/readers/match_reader.rb

@@ -9,16 +9,6 @@ module SportDb
 class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? why not?
 
 
-  ### fix - remove catalog reference!!!
-  ##     use classes with "augmented" static methods
-  ##       e.g. Club.match_by etc.
-  def catalog
-     puts "[deprecated] do NOT use catalog reference; use classes with enhanced search static methods!"
-    Import.catalog
-  end
-
-
-
   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 }
     parse( txt, season: season )
@@ -73,8 +63,8 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
 
       ### check if event info available - use start_date;
       ##    otherwise we have to guess (use a "synthetic" start_date)
-      event_info = catalog.events.find_by( season: season,
-                                           league: league )
+      event_info = Import::EventInfo.find_by( season: season,
+                                              league: league )
 
       start = if event_info && event_info.start_date
                   puts "event info found:"
@@ -116,8 +106,8 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
        puts "league:"
        pp league
 
-       teams = catalog.teams.find_by!( name:   auto_conf_teams,
-                                       league: league )
+       teams = Import::Team.find_by!( name:   auto_conf_teams,
+                                      league: league )
 
        puts " [debug] teams:"
        pp teams
@@ -213,8 +203,8 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
 
       matches.each do |match|
         ## note: pass along stage (if present): stage  - optional from heading!!!!
-        match = match.update( stage: stage )   if stage
-        match_rec = Sync::Match.create_or_update( match, event: event_rec )
+        match = match.update( stage: stage )    if stage
+        match_rec = Sync::Match.create!( match, event: event_rec )
       end
     end
 

data/lib/sportdb/readers/sync/match.rb

@@ -2,10 +2,7 @@ module SportDb
 module Sync
 
   class Match
-    ### todo/fix: rename to create!!   (add update support later) !!!!
-    ##    use update_by_round  or update_by_date or update_by_teams or such
-    ##      NO easy (unique always auto-id match) possible!!!!!!
-    def self.create_or_update( match, event: )
+    def self.create!( match, event: )
        ## note: MUST find round, thus, use bang (!)
 
        ## todo/check: allow strings too - why? why not?
@@ -36,10 +33,11 @@ module Sync
        ##    || Team.find_or_create( team1 )  -- note: does NOT work for string (only recs) - what to do?
        ##    || Model::Team.find_by!( name: team1_name )
        team1_name   = match.team1.is_a?( String ) ? match.team1 : match.team1.name
-       team1_rec    = Team.cache[ team1_name ]
        team2_name   = match.team2.is_a?( String ) ? match.team2 : match.team2.name
+       team1_rec    = Team.cache[ team1_name ]
        team2_rec    = Team.cache[ team2_name ]
 
+
        ## check optional group (e.g. Group A, etc.)
        group_rec = if match.group
                      group_name = match.group.is_a?( String ) ? match.group : match.group.name
@@ -58,30 +56,10 @@ module Sync
                      nil
                    end
 
-       ### todo/check: what happens if there's more than one match? exception raised??
-       rec = if ['N. N.', 'N.N.'].include?( team1_name ) && ## some special cases - always assume new record for now (to avoid ambigious update conflict)
-                ['N. N.', 'N.N.'].include?( team2_name )
-               ## always assume new record for now
-               ##   check for date or such - why? why not?
-               nil
-             elsif round_rec
-               ## add match status too? allows [abandoned] and [replay] in same round
-               find_attributes = { round_id: round_rec.id,
-                                   team1_id: team1_rec.id,
-                                   team2_id: team2_rec.id }
-
-               ## add stage if present to query
-               find_attributes[ :stage_id] = stage_rec.id   if stage_rec
-
-               Model::Match.find_by( find_attributes )
-             else
-               ## always assume new record for now
-               ##   check for date or such - why? why not?
-               nil
-             end
-
-       if rec.nil?
-        ## find last pos - check if it can be nil?  yes, is nil if no records found
+
+        rec = nil   ## match record
+
+         ## find last pos - check if it can be nil?  yes, is nil if no records found
          max_pos = Model::Match.where( event_id: event.id ).maximum( 'pos' )
          max_pos = max_pos ? max_pos+1 : 1
 
@@ -90,7 +68,6 @@ module Sync
                      team2_id: team2_rec.id,
                      pos:      max_pos,
                      num:      match.num,   ## note - might be nil (not nil for euro, world cup, etc.)
-                     # date:     match.date.to_date,  ## todo/fix: split and add date & time!!!!
                      date:     match.date,  # assume iso format as string e.g. 2021-07-10 !!!
                      time:     match.time,  # assume iso format as string e.g. 21:00 !!!
                      score1:   match.score1,
@@ -136,16 +113,8 @@ module Sync
                )
             end
           end
-       else
-         # update - todo
-         puts "!! ERROR - match updates not yet supported (only inserts); sorry"
-         pp match
-         puts "---"
-         puts "found match record:"
-         pp rec
-         exit 1
-       end
-       rec
+
+        rec
     end
   end # class Match
 

data/lib/sportdb/readers/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-26 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-formats