sportdb-sync 1.0.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 348a66cb30ccc072d2f6e0a82f61af6234e193d2
-  data.tar.gz: cae64f1ab5a09c9b0cd930d49a62f4b3a565eceb
+  metadata.gz: cdadfa4b00e61764c6b7b1f62ffb983f89c4a1ff
+  data.tar.gz: 3721087e4b6ff6bf0e604a00cce8658df1cb05bb
 SHA512:
-  metadata.gz: a864409290725d1ed3d6cf529ae7bf30c6091f28e76ce01fe427b1ff0cf31349d049a07e7de39c599f8e8db1b0136c2e2d7e1750aac1eab90b43e78a4153d4b4
-  data.tar.gz: b28d7dd3b5202cb3d58e1afb7e24c21f45e6b74c19391717257e16332c93470f17a78810314252bd4ce24758bc50af1d6d533ccbc41d712bb6d1282943533797
+  metadata.gz: 18c37a874743c779fabc931f8e09c14a30e3e13609242a82cc0d2d5f14319092d103f470a8541eabfef95b0f83c0c98849b54d652fc3f9ff5615299be8e7bc17
+  data.tar.gz: 2dd81facb4bbcd8a36c09d66d894288660724f058121799f5a6c29a64ece00c115eb6c257ef3075b2b8231a01e8e5a70afc6c4cb7f793e61752113acbf577344

data/Rakefile

@@ -8,7 +8,7 @@ Hoe.spec 'sportdb-sync' do
   self.summary = "sportdb-sync - sport.db sync helpers 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'
@@ -20,8 +20,8 @@ Hoe.spec 'sportdb-sync' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-config',  '>= 1.0.4'],
-    ['sportdb-models',  '>= 1.19.0'],
+    ['sportdb-catalogs',  '>= 1.0.0'],
+    ['sportdb-models',    '>= 2.0.2'],
   ]
 
   self.spec_extras = {

data/lib/sportdb/sync.rb

@@ -1,20 +1,9 @@
 # encoding: utf-8
 
-require 'sportdb/config'
+require 'sportdb/catalogs'
 require 'sportdb/models'   ## add sql database support
 
 
-##
-# fix!!!
-#   patches for worlddb/models  - move upstream!!!!
-module WorldDb
-  COUNTRY_KEY_PATTERN = '\A[a-z]{2,}\z'    # allow two AND three letter keys e.g. at, mx, eng, sco, etc.
-  COUNTRY_KEY_PATTERN_MESSAGE = "expected two or more lowercase letters a-z /#{COUNTRY_KEY_PATTERN}/"
-
-  COUNTRY_CODE_PATTERN = '\A[A-Z_]{2,}\z'
-  COUNTRY_CODE_PATTERN_MESSAGE = "expected two or more uppercase letters A-Z (and _) /#{COUNTRY_CODE_PATTERN}/"
-end  # module WorldDb
-
 
 ###
 # our own code

data/lib/sportdb/sync/club.rb

@@ -50,8 +50,8 @@ module SportDb
       #  finders
 
       def self.find_or_create( club )
-        ## note: assume "canonical uniquie" names/titles for now for clubs
-        rec = Model::Team.find_by( title: club.name )
+        ## note: assume "canonical uniquie" names for now for clubs
+        rec = Model::Team.find_by( name: club.name )
         if rec.nil?
 
           ## todo/fix:  move auto-key gen to structs for re(use)!!!!!!
@@ -61,7 +61,7 @@ module SportDb
 
           attribs = {
               key:        key,
-              title:      club.name,
+              name:       club.name,
               country_id: Sync::Country.find_or_create( club.country ).id,
               club:       true,
               national:   false  ## check -is default anyway - use - why? why not?
@@ -71,7 +71,7 @@ module SportDb
           attribs[:code] = club.code   if club.code   ## add code (abbreviation) if present
 
           if club.alt_names.empty? == false
-            attribs[:synonyms] = club.alt_names.join('|')
+            attribs[:alt_names] = club.alt_names.join('|')
           end
 
           rec = Model::Team.create!( attribs )

data/lib/sportdb/sync/event.rb

@@ -79,8 +79,8 @@ module SportDb
           ##                               otherwise use 2017, 7, 1
           ##  start_at use year and 7,1 e.g. Date.new( 2017, 7, 1 )
           ## hack:  fix/todo1!!
-          ##   add "fake" start_at date for now
-          attribs[:start_at]  = if season.year?  ## e.g. assume 2018 etc.
+          ##   add "fake" start_date for now
+          attribs[:start_date]  = if season.year?  ## e.g. assume 2018 etc.
                                    Date.new( season.start_year, 1, 1 )
                                 else  ## assume 2014/15 etc.
                                    Date.new( season.start_year, 7, 1 )

data/lib/sportdb/sync/league.rb

@@ -40,11 +40,8 @@ module SportDb
     def self.find_or_create( league )
       rec = find( league )
       if rec.nil?
-         ## use title and not name - why? why not?
-         ##  quick fix:  change name to title
-
          attribs = { key:   league.key,
-                     title: league.name }
+                     name:  league.name }
 
         if league.country
            attribs[ :country_id ] = Sync::Country.find_or_create( league.country ).id

data/lib/sportdb/sync/season.rb

@@ -43,7 +43,7 @@ module SportDb
         rec = find( season )
         if rec.nil?
            attribs = { key:   season.key,
-                       title: season.name  }
+                       name:  season.name  }
            rec = Model::Season.create!( attribs )
         end
         rec

data/lib/sportdb/sync/sync.rb

@@ -6,14 +6,14 @@ module SportDb
 
   class NationalTeam
     def self.find_or_create( team )
-      rec = Model::Team.find_by( title: team.name )
+      rec = Model::Team.find_by( name: team.name )
       if rec.nil?
         puts "add national team: #{team.key}, #{team.name}, #{team.country.name} (#{team.country.key})"
 
         ### note: key expected three or more lowercase letters a-z /\A[a-z]{3,}\z/
         attribs = {
           key:        team.key,   ## note: always use downcase fifa code for now!!!
-          title:      team.name,
+          name:       team.name,
           code:       team.code,
           country_id: Sync::Country.find_or_create( team.country ).id,
           club:       false,
@@ -21,7 +21,7 @@ module SportDb
         }
 
         if team.alt_names.empty? == false
-          attribs[:synonyms] = team.alt_names.join('|')
+          attribs[:alt_names] = team.alt_names.join('|')
         end
 
         rec = Model::Team.create!( attribs )
@@ -64,13 +64,20 @@ module SportDb
 
   class Round
     def self.find_or_create( round, event: )
-       rec = Model::Round.find_by( title: round.title, event_id: event.id )
+       rec = Model::Round.find_by( name: round.name, event_id: event.id )
        if rec.nil?
+         ## find last pos - check if it can be nil?
+         max_pos = Model::Round.where( event_id: event.id ).maximum( 'pos' )
+         max_pos = max_pos ? max_pos+1 : 1
+
          attribs = { event_id: event.id,
-                     title:    round.title,
-                     pos:      round.pos,
-                     start_at: event.start_at.to_date
+                     name:     round.name,
+                     pos:      max_pos
                    }
+
+         ## todo/fix:  check if round has (optional) start or end date and add!!!
+         ## attribs[ :start_date] = round.start_date.to_date
+
          rec = Model::Round.create!( attribs )
        end
        rec
@@ -80,12 +87,18 @@ module SportDb
 
   class Group
     def self.find_or_create( group, event: )
-       rec = Model::Group.find_by( title: group.title, event_id: event.id )
+       rec = Model::Group.find_by( name: group.name, event_id: event.id )
        if rec.nil?
+         ## find last pos - check if it can be nil?
+         max_pos = Model::Group.where( event_id: event.id ).maximum( 'pos' )
+         max_pos = max_pos ? max_pos+1 : 1
+
          attribs = { event_id: event.id,
-                     title:    group.title,
-                     pos:      group.pos
+                     name:     group.name,
+                     pos:      max_pos
                    }
+
+         ## todo/fix: check/add optional group key (was: pos before)!!!!
          rec = Model::Group.create!( attribs )
        end
        ## todo/fix: add/update teams in group too!!!!!
@@ -96,7 +109,7 @@ module SportDb
 
   class Stage
     def self.find( name, event: )
-      Model::Stage.find_by( title: name, event_id: event.id  )
+      Model::Stage.find_by( name: name, event_id: event.id  )
     end
     def self.find!( name, event: )
       rec = find( name, event: event  )
@@ -112,10 +125,8 @@ module SportDb
     def self.find_or_create( name, event: )
        rec = find( name, event: event )
        if rec.nil?
-         ## use title and not name - why? why not?
-         ##  quick fix:  change name to title
          attribs = { event_id: event.id,
-                     title:    name,
+                     name:     name,
                    }
          rec = Model::Stage.create!( attribs )
        end
@@ -125,21 +136,38 @@ module SportDb
 
 
 
-  class Match   ## todo/check:  add alias for Game class - why? why not?
+  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_title = match.round.is_a?( String ) ? match.round : match.round.title
-       round_rec   = Model::Round.find_by!( event_id: event.id,
-                                            title:    round_title )
+
+       ## todo/check:
+       ##   how to model "same" rounds in different stages
+       ##   e.g. Belgium
+       ##    in regular season (stage) - round 1, round 2, etc.
+       ##    in playoff        (stage) - round 1, round 2, etc.
+       ## reference same round or create a new one for each stage!!???
+       ##  and lookup by name AND stage??
+
+
+       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!
        ##    || Team.find_or_create( team1 )  -- note: does NOT work for string (only recs) - what to do?
-       ##    || Model::Team.find_by!( title: team1_name )
+       ##    || 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
@@ -147,32 +175,68 @@ module SportDb
 
        ## check optional group (e.g. Group A, etc.)
        group_rec = if match.group
-                     group_title = match.group.is_a?( String ) ? match.group : match.group.title
+                     group_name = match.group.is_a?( String ) ? match.group : match.group.name
                      Model::Group.find_by!( event_id: event.id,
-                                            title:    group_title )
+                                            name:     group_name )
+                   else
+                     nil
+                   end
+
+       ## check optional stage (e.g. Regular, Play Off, Relegation, etc. )
+       stage_rec = if match.stage
+                     stage_name = match.stage.is_a?( String ) ? match.stage : match.stage.name
+                     Model::Stage.find_by!( event_id: event.id,
+                                            name:     stage_name )
                    else
                      nil
                    end
 
+       ### 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
+               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
 
-       rec = Model::Game.find_by( round_id: round_rec.id,
-                                  team1_id: team1_rec.id,
-                                  team2_id: team2_rec.id )
        if rec.nil?
-         attribs = { round_id: round_rec.id,
+        ## 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?
                      team1_id: team1_rec.id,
                      team2_id: team2_rec.id,
-                     pos:      999,    ## make optional why? why not? - change to num?
-                     play_at:  match.date.to_date,
+                     pos:      max_pos,
+                     date:     match.date.to_date,  ## todo/fix: split and add date & time!!!!
                      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::Game.create!( attribs )
+         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

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

data/test/test_league.rb

@@ -14,25 +14,25 @@ class TestLeague < MiniTest::Test
 
   def test_search
     rec = League.search_or_create!( 'eng' )
-    assert_equal 'Premier League',  rec.title    ## fix: add name alias (rename title to name!!)
+    assert_equal 'Premier League',  rec.name
     assert_equal 'eng.1',           rec.key
     assert_equal 'eng',             rec.country.key
     assert_equal 'England',         rec.country.name
-    # assert_equal true,              rec.club
+    # assert_equal true,              rec.clubs
 
     rec = League.search!( 'eng' )
-    assert_equal 'Premier League',  rec.title    ## fix: add name alias (rename title to name!!)
+    assert_equal 'Premier League',  rec.name
     assert_equal 'eng.1',           rec.key
     assert_equal 'eng',             rec.country.key
     assert_equal 'England',         rec.country.name
-    ## assert_equal true,              rec.club
+    ## assert_equal true,              rec.clubs
 
     ## try 2nd call (just lookup)
     rec = League.search_or_create!( 'eng' )
-    assert_equal 'Premier League', rec.title    ## fix: add name alias (rename title to name!!)
+    assert_equal 'Premier League', rec.name
     assert_equal 'eng.1',          rec.key
     assert_equal 'eng',            rec.country.key
     assert_equal 'England',        rec.country.name
-    ## assert_equal true,                 rec.club
+    ## assert_equal true,                 rec.clubs
   end
 end # class TestLeague

data/test/test_misc.rb

@@ -14,15 +14,15 @@ class TestMisc < MiniTest::Test
 
   def test_season
     rec = Season.search_or_create( '2017-18' )
-    assert_equal '2017/18', rec.title    ## fix: add name alias (rename title to name!!)
+    assert_equal '2017/18', rec.name
     assert_equal '2017/18', rec.key
 
     rec = Season.search_or_create( '2017/2018' )
-    assert_equal '2017/18', rec.title    ## fix: add name alias (rename title to name!!)
+    assert_equal '2017/18', rec.name
     assert_equal '2017/18', rec.key
 
     rec = Season.search_or_create( '2017/8' )
-    assert_equal '2017/18', rec.title    ## fix: add name alias (rename title to name!!)
+    assert_equal '2017/18', rec.name
     assert_equal '2017/18', rec.key
   end
 

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-sync
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-09-15 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.0.4
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sportdb-models
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement