sportdb-sync 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 397b58e2e8ed6c6c747f9ac04885cf7040152e83
-  data.tar.gz: 99f0d69e4f45a7c000325268e4d63bec53af8941
+  metadata.gz: e69405f0f6aab33c299ed7479747f1adb6e90282
+  data.tar.gz: ef45575530d5b0e899ff08f69089462486fd580a
 SHA512:
-  metadata.gz: cb1cb72c8ee98549af0ed85879ba8e5490afae58747a2ddd25356f3886e5d72672a0f1badda739baed05646e5b2ceceefe2f0b7a4bfb932ff6425a4a7dedccc6
-  data.tar.gz: 93cee1c25615d5fcce27b414f2bd964f411ddf3f110ca15863631c44ae38b14b11585e206dbd966a68f68391a1ae116cb5b584105f341a4f2ba38aa9565587df
+  metadata.gz: f969dc99e13d4b5b98fddf63925e44f24e799cc5ae7d6ee8db34738e1140c9bbe8657199f389586a9ef6a16b895e39207f3e34e98b264c978934a853ee08800e
+  data.tar.gz: 51a8e71e961fdd780561a038afe381026c5aca39838f210825b72f2aafc583bc85db62e5cf6190e32ec1256a983d410de26e1033b5ed9257020819e6894f4bd2

data/Rakefile

@@ -20,8 +20,8 @@ Hoe.spec 'sportdb-sync' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-config',  '>= 1.1.0'],
-    ['sportdb-models',  '>= 2.0.1'],
+    ['sportdb-catalogs',  '>= 1.0.0'],
+    ['sportdb-models',    '>= 2.0.2'],
   ]
 
   self.spec_extras = {

data/lib/sportdb/sync.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'sportdb/config'
+require 'sportdb/catalogs'
 require 'sportdb/models'   ## add sql database support
 
 

data/lib/sportdb/sync/sync.rb

@@ -137,15 +137,22 @@ module SportDb
 
 
   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: )
        ## note: MUST find round, thus, use bang (!)
 
        ## todo/check: allow strings too - why? why not?
 
-       ## query for round - allow string or round rec
-       round_name  = match.round.is_a?( String ) ? match.round : match.round.name
-       round_rec   = Model::Round.find_by!( event_id: event.id,
+       round_rec = if match.round
+                     ## query for round - allow string or round rec
+                     round_name  = match.round.is_a?( String ) ? match.round : match.round.name
+                     Model::Round.find_by!( event_id: event.id,
                                             name:     round_name )
+                   else    # note: allow matches WITHOUT rounds too (e.g. England Football League 1888 and others)
+                     nil
+                   end
 
        ## todo/check: allow fallback with db lookup if NOT found in cache - why? why not?
        ##  or better use Sync::Team.find_or_create( team )  !!!!!!! to auto-create on first hit!
@@ -174,17 +181,24 @@ module SportDb
                      nil
                    end
 
-       ### todo/check: what happens if there's more than once match? exception raised??
-       rec = Model::Match.find_by( round_id: round_rec.id,
-                                  team1_id: team1_rec.id,
-                                  team2_id: team2_rec.id )
+       ### todo/check: what happens if there's more than one match? exception raised??
+       rec = if round_rec
+               ## add match status too? allows [abandoned] and [replay] in same round
+               Model::Match.find_by( round_id: round_rec.id,
+                                     team1_id: team1_rec.id,
+                                     team2_id: team2_rec.id )
+             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
          max_pos = Model::Match.where( event_id: event.id ).maximum( 'pos' )
          max_pos = max_pos ? max_pos+1 : 1
 
          attribs = { event_id: event.id,          ## todo/fix: change to data struct too?
-                     round_id: round_rec.id,
                      team1_id: team1_rec.id,
                      team2_id: team2_rec.id,
                      pos:      max_pos,
@@ -192,14 +206,22 @@ module SportDb
                      score1:   match.score1,
                      score2:   match.score2,
                      score1i:  match.score1i,
-                     score2i:  match.score2i }
-
+                     score2i:  match.score2i,
+                     score1et: match.score1et,
+                     score2et: match.score2et,
+                     score1p:  match.score1p,
+                     score2p:  match.score2p,
+                     status:   match.status }
+
+         attribs[ :round_id ] = round_rec.id   if round_rec
          attribs[ :group_id ] = group_rec.id   if group_rec
          attribs[ :stage_id ] = stage_rec.id   if stage_rec
 
          rec = Model::Match.create!( attribs )
        else
          # update - todo
+         puts "!! ERROR - match updates not yet supported (only inserts); sorry"
+         exit 1
        end
        rec
     end

data/lib/sportdb/sync/version.rb

@@ -7,7 +7,7 @@ module Sync
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
   MINOR = 1
-  PATCH = 0
+  PATCH = 1
   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' ))
 
 

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-sync
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-15 00:00:00.000000000 Z
+date: 2020-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sportdb-config
+  name: sportdb-catalogs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sportdb-models
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement