sportdb-sync 0.1.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9189544ea7204fc5b6f2f11ee1c73dfc6c052a26
-  data.tar.gz: 22c9e9825e8af300213bdaa222bcf1ee457477fe
+  metadata.gz: 397b58e2e8ed6c6c747f9ac04885cf7040152e83
+  data.tar.gz: 99f0d69e4f45a7c000325268e4d63bec53af8941
 SHA512:
-  metadata.gz: fdb749934627aeca879237a42ba50f7284a8c25eef611208b8aea00f9209655e705dbab01c5ae2a0a7bc51509db2c3ed465a26dfc0c60a12e8e73b6dac26caf6
-  data.tar.gz: 5a4005e89e00f18b339198f545b2fa3402531fcc6e4798399defcbc0d2d42f1c7a79f6757e10e85a2667c77d421883d4f80f976240bfeb5e2d2f02f2d5b85740
+  metadata.gz: cb1cb72c8ee98549af0ed85879ba8e5490afae58747a2ddd25356f3886e5d72672a0f1badda739baed05646e5b2ceceefe2f0b7a4bfb932ff6425a4a7dedccc6
+  data.tar.gz: 93cee1c25615d5fcce27b414f2bd964f411ddf3f110ca15863631c44ae38b14b11585e206dbd966a68f68391a1ae116cb5b584105f341a4f2ba38aa9565587df

data/Manifest.txt

@@ -3,7 +3,14 @@ Manifest.txt
 README.md
 Rakefile
 lib/sportdb/sync.rb
+lib/sportdb/sync/club.rb
+lib/sportdb/sync/country.rb
+lib/sportdb/sync/event.rb
+lib/sportdb/sync/league.rb
+lib/sportdb/sync/season.rb
 lib/sportdb/sync/sync.rb
 lib/sportdb/sync/version.rb
 test/helper.rb
-test/test_sync.rb
+test/test_country.rb
+test/test_league.rb
+test/test_misc.rb

data/Rakefile

@@ -3,7 +3,7 @@ require './lib/sportdb/sync/version.rb'
 
 Hoe.spec 'sportdb-sync' do
 
-  self.version = SportDb::Sync::VERSION
+  self.version = SportDb::Module::Sync::VERSION
 
   self.summary = "sportdb-sync - sport.db sync helpers for leagues, seasons, clubs, match schedules and results, and more"
   self.description = summary
@@ -20,9 +20,8 @@ Hoe.spec 'sportdb-sync' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-clubs',   '>= 0.2.3'],
-    ['sportdb-leagues', '>= 0.2.1'],
-    ['sportdb-models',  '>= 1.18.2'],
+    ['sportdb-config',  '>= 1.1.0'],
+    ['sportdb-models',  '>= 2.0.1'],
   ]
 
   self.spec_extras = {

data/lib/sportdb/sync.rb

@@ -1,10 +1,6 @@
 # encoding: utf-8
 
-
-require 'sportdb/clubs'
-require 'sportdb/leagues'
-
-
+require 'sportdb/config'
 require 'sportdb/models'   ## add sql database support
 
 
@@ -12,7 +8,12 @@ require 'sportdb/models'   ## add sql database support
 ###
 # our own code
 require 'sportdb/sync/version' # let version always go first
+require 'sportdb/sync/country'
+require 'sportdb/sync/league'
+require 'sportdb/sync/season'
+require 'sportdb/sync/event'
+require 'sportdb/sync/club'
 require 'sportdb/sync/sync'
 
 
-puts SportDb::Sync.banner   # say hello
+puts SportDb::Module::Sync.banner   # say hello

data/lib/sportdb/sync/club.rb

@@ -0,0 +1,87 @@
+module SportDb
+  module Sync
+    class Club
+
+      ## auto-cache all clubs by find_or_create for later mapping / lookup
+      def self.cache() @cache ||= {}; end
+
+
+      def self.club( q, league: nil)   ## "internal" search helper using catalog
+        ## note: league.country might return nil (e.g. for intl leagues)
+        country = league ? league.country : nil
+        club = Import.catalog.clubs.find_by( name: q, country: country )
+
+        if club.nil?
+           ## todo/check: exit if no match - why? why not?
+           puts "!!! *** ERROR *** no matching club found for >#{q}< - add to clubs setup"
+           exit 1
+        end
+        club
+      end
+
+      #############################
+      #  searchers
+
+      ## todo/fix - move array support for now to attic!!!
+
+      def self.search_or_create_by!( name:, league: nil, season: nil )
+        ## note: season is for now optional (and unused) - add/use in the future!!!
+
+        ## note: allow search by single name/q
+        ##   or  allow search by list/array of names/qs tooo!!!
+        if name.is_a?( Array )
+          ## assume batch search return array of mappings
+          club_recs = []
+          name.each do |q|
+            club        = club( q, league: league )
+            clubs_recs << find_or_create( club )
+          end
+          club_recs
+        else
+          ## assume single search
+          q = name
+          club = club( q, league: league )
+          find_or_create( club )
+        end
+      end
+
+
+      ##################################
+      #  finders
+
+      def self.find_or_create( club )
+        ## 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)!!!!!!
+          ## check if key is present otherwise generate e.g. remove all non-ascii a-z chars
+          key  =  club.key || club.name.downcase.gsub( /[^a-z]/, '' )
+          puts "add club: #{key}, #{club.name}, #{club.country.name} (#{club.country.key})"
+
+          attribs = {
+              key:        key,
+              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?
+              ## todo/fix: add city if present - why? why not?
+          }
+
+          attribs[:code] = club.code   if club.code   ## add code (abbreviation) if present
+
+          if club.alt_names.empty? == false
+            attribs[:alt_names] = club.alt_names.join('|')
+          end
+
+          rec = Model::Team.create!( attribs )
+        end
+        ## auto-add to cache
+        cache[club.name] = rec
+
+        rec
+      end
+
+    end # class Club
+  end # module Sync
+end # module SportDb

data/lib/sportdb/sync/country.rb

@@ -0,0 +1,72 @@
+module SportDb
+  module Sync
+    class Country
+
+    ### todo/fix:
+    ##  add ALTERNATE / ALTERNATIVE COUNTRY KEYS!!!!
+    ##   e.g. d => de, a => at, en => eng, etc.
+    ##   plus  add all fifa codes too   aut => at, etc.  - why? why not?
+
+    def self.country( q )
+       ## note: use built-in countries for mapping country keys/codes
+       country = Import.catalog.countries.find( q )
+       if country
+        ## todo/check:  keep key mapping warning - useful? why? why not?
+         if country.key != q.to_s
+          puts "** note: mapping (normalizing) country key >#{q}< to >#{country.key}<"
+         end
+       else
+         puts "** !!! ERROR !!! unknown / invalid country for key >#{q}<; sorry - add to COUNTRIES table"
+         exit 1
+       end
+       country
+    end
+
+    ########################
+    #  searchers
+
+    def self.search!( q )
+      country = country( q )
+      find!( country )
+    end
+
+    def self.search_or_create!( q )
+      country = country( q )
+      find_or_create( country )
+    end
+
+    #############################
+    #  finders
+
+      def self.find( country )
+        WorldDb::Model::Country.find_by( key: country.key )
+      end
+
+      def self.find!( country )
+        rec = find( country )
+        if rec.nil?
+            puts "** !!! ERROR !!! - country for key >#{country.key}< not found; sorry - add to COUNTRIES table"
+            exit 1
+        end
+        rec
+     end
+
+     def self.find_or_create( country )
+      rec = find( country )
+      if rec.nil?
+        attribs = {
+          key:  country.key,
+          name: country.name,
+          code: country.code,  ## fix:  uses fifa code now (should be iso-alpha3 if available)
+          ## fifa: country.fifa,
+          area: 1,
+          pop:  1
+        }
+        rec = WorldDb::Model::Country.create!( attribs )
+      end
+      rec
+    end
+    end # class Country
+
+  end # module Sync
+end # module SportDb

data/lib/sportdb/sync/event.rb

@@ -0,0 +1,97 @@
+module SportDb
+  module Sync
+
+    class Event
+      def self.league( q ) League.league( q ); end
+      def self.season( q ) Season.season( q ); end
+
+      ############################################
+      #  searchers
+
+      def self.search_by!( league:, season: )
+        raise ArgumentError.new( "league query string expected; got #{league.class.name}" ) unless league.is_a?( String )
+        raise ArgumentError.new( "season query string expected; got #{season.class.name}" ) unless season.is_a?( String )
+
+        league = league( league )
+        season = season( season )
+
+        find_by( league: league, season: season )
+      end
+
+      def self.search_or_create_by!( league:, season: )
+        raise ArgumentError.new( "league query string expected; got #{league.class.name}" ) unless league.is_a?( String )
+        raise ArgumentError.new( "season query string expected; got #{season.class.name}" ) unless season.is_a?( String )
+
+        league = league( league )
+        season = season( season )
+
+        find_or_create_by( league: league, season: season )
+     end
+
+      ##################################################
+      #  finders
+
+      def self.find_by( league:, season: )
+        ## note: allow passing in of activerecord db records too - why? why not?
+        raise ArgumentError.new( "league struct record expected; got #{league.class.name}" ) unless league.is_a?( Import::League )
+        raise ArgumentError.new( "season struct record expected; got #{season.class.name}" ) unless season.is_a?( Import::Season )
+
+        ##  auto-create league and season (db) records if missing? - why? why not?
+        season_rec = Season.find( season )
+        league_rec = League.find( league )
+
+        rec = nil
+        rec = Model::Event.find_by( league_id: league_rec.id,
+                                    season_id: season_rec.id )  if season_rec && league_rec
+        rec
+      end
+
+      def self.find_by!( league:, season: )
+        rec = find_by( league: league, season: season )
+        if rec.nil?
+          puts "** !!!ERROR!!! db sync - no event match found for:"
+          pp league
+          pp season
+          exit 1
+        end
+        rec
+      end
+
+      def self.find_or_create_by( league:, season: )
+        ## note: allow passing in of activerecord db records too - why? why not?
+        raise ArgumentError.new( "league struct record expected; got #{league.class.name}" ) unless league.is_a?( Import::League )
+        raise ArgumentError.new( "season struct record expected; got #{season.class.name}" ) unless season.is_a?( Import::Season )
+
+        ## note: auto-creates league and season (db) records if missing - why? why not?
+        season_rec = Season.find_or_create( season )
+        league_rec = League.find_or_create( league )
+
+        rec = Model::Event.find_by( league_id: league_rec.id,
+                                    season_id: season_rec.id )
+        if rec.nil?
+          attribs = {
+            league_id: league_rec.id,
+            season_id: season_rec.id,
+          }
+
+          ## quick hack/change later !!
+          ##  todo/fix: check season  - if is length 4 (single year) use 2017, 1, 1
+          ##                               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_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 )
+                                end
+
+          rec = Model::Event.create!( attribs )
+        end
+        rec
+      end
+    end  # class Event
+
+  end   # module Sync
+end   # module SportDb
+

data/lib/sportdb/sync/league.rb

@@ -0,0 +1,58 @@
+module SportDb
+  module Sync
+    class League
+
+      def self.league( q )   ## todo/check: find a better or "generic" alias name e.g. convert/builtin/etc. - why? why not?
+        Import.catalog.leagues.find!( q )     ## todo/fix: change find to search!!!
+      end
+
+
+      ################################
+      #  searchers
+
+      def self.search!( q )   ## note: use search for passing in string queries (and find for records/structs only)
+        league = league( q )
+        find( league )
+      end
+
+      def self.search_or_create!( q )
+        league = league( q )
+        find_or_create( league )
+      end
+
+      ###################################
+      #   finders
+
+    def self.find( league )
+      Model::League.find_by( key: league.key )
+    end
+
+    def self.find!( league )
+      rec = find( league )
+      if rec.nil?
+        puts "** !!!ERROR!!! db sync - no league match found for:"
+        pp league
+        exit 1
+      end
+      rec
+    end
+
+    def self.find_or_create( league )
+      rec = find( league )
+      if rec.nil?
+         attribs = { key:   league.key,
+                     name:  league.name }
+
+        if league.country
+           attribs[ :country_id ] = Sync::Country.find_or_create( league.country ).id
+         end
+
+         rec = Model::League.create!( attribs )
+       end
+       rec
+    end
+
+  end # class League
+end   # module Sync
+end   # module SportDb
+

data/lib/sportdb/sync/season.rb

@@ -0,0 +1,54 @@
+module SportDb
+  module Sync
+    class Season
+      def self.season( q )    ## helper for season key (rename to norm_key ???)
+        Import::Season.new( q )
+      end
+
+
+      ###########
+      #  searchers
+
+      def self.search( q )   ## e.g. '2017/18'
+        season = season( q )
+        find( season )
+      end
+
+      ## todo/fix: remove builtin marker? - there are no "builtin" seasons like numbers all excepted for now
+      def self.search_or_create( q )  ## e.g. '2017-18'
+        season = season( q )
+        find_or_create( season )
+      end
+
+      ################
+      #  finders
+
+      def self.find( season )
+        season = season( season )  if season.is_a?( String )   ## auto-convert for now (for old compat) - why? why not?
+        Model::Season.find_by( key: season.key )
+      end
+
+      def self.find!( season )
+        season = season( season )  if season.is_a?( String )   ## auto-convert for now (for old compat) - why? why not?
+        rec = find( season )
+        if rec.nil?
+          puts "** !!!ERROR!!! db sync - no season match found for >#{season.key}<:"
+          exit 1
+        end
+        rec
+      end
+
+      def self.find_or_create( season )
+        season = season( season )  if season.is_a?( String )   ## auto-convert for now (for old compat) - why? why not?
+        rec = find( season )
+        if rec.nil?
+           attribs = { key:   season.key,
+                       name:  season.name  }
+           rec = Model::Season.create!( attribs )
+        end
+        rec
+      end
+    end # class Season
+  end   # module Sync
+end   # module SportDb
+

data/lib/sportdb/sync/sync.rb

@@ -1,191 +1,115 @@
 # encoding: utf-8
 
-
 module SportDb
-
-module Sync
-  class Country
-    def self.find_or_create( country )
-       rec = WorldDb::Model::Country.find_by( key: country.key )
-       if rec.nil?
-         attribs = {
-           key:  country.key,
-           name: country.name,
-           code: country.fifa,  ## fix:  uses fifa code now (should be iso-alpha3 if available)
-           fifa: country.fifa,
-           area: 1,
-           pop:  1
-         }
-         rec = WorldDb::Model::Country.create!( attribs )
-       end
-       rec
-    end
-  end # class Country
+  module Sync
 
 
-  class League
-    def self.find( league )
-      SportDb::Model::League.find_by( key: league.key )
-    end
-    def self.find!( league )
-      rec = find( league )
+  class NationalTeam
+    def self.find_or_create( team )
+      rec = Model::Team.find_by( name: team.name )
       if rec.nil?
-        puts "** !!!ERROR!!! db sync - no league match found for:"
-        pp league
-        exit 1
-      end
-      rec
-    end
+        puts "add national team: #{team.key}, #{team.name}, #{team.country.name} (#{team.country.key})"
 
-    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 }
-         if league.country
-           attribs[ :country_id ] = Country.find_or_create( league.country ).id
-         end
-
-         rec = SportDb::Model::League.create!( attribs )
-       end
-       rec
-    end
-  end # class League
-
-
-  class Season
-    def self.normalize_key( key )    ## helper for season key (rename to norm_key ???)
-      ## note:  "normalize" season key
-      ##   always use 2017/18  (and not 2017-18 or 2017-2018 or 2017/2018)
-      ## 1) change 2017-18 to 2017/18
-      key = key.tr( '-', '/' )
-      ## 2) check for 2017/2018 - change to 2017/18
-      if key.length == 9
-        key = "#{key[0..3]}/#{key[7..8]}"
-      end
-      key
-    end
+        ### 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!!!
+          name:       team.name,
+          code:       team.code,
+          country_id: Sync::Country.find_or_create( team.country ).id,
+          club:       false,
+          national:   true  ## check -is default anyway - use - why? why not?
+        }
 
-    def self.find( key )
-      key = normalize_key( key )
-      SportDb::Model::Season.find_by( key: key )
-    end
-    def self.find!( key )
-      rec = find( key )
-      if rec.nil?
-        puts "** !!!ERROR!!! db sync - no season match found for >#{normalize_key(key)}<:"
-        pp key
-        exit 1
-      end
-      rec
-    end
+        if team.alt_names.empty? == false
+          attribs[:alt_names] = team.alt_names.join('|')
+        end
 
-    def self.find_or_create( key )  ## e.g. key = '2017/18'
-      rec = find( key )
-      if rec.nil?
-         key = normalize_key( key )  ## note: do NOT forget to normalize key e.g. always use slash (2019/20) etc.
-         attribs = { key:   key,
-                     title: key  }
-         rec = SportDb::Model::Season.create!( attribs )
+        rec = Model::Team.create!( attribs )
       end
       rec
     end
-  end # class Season
-
-  class Club
-    def self.find_or_create( club )
-      rec = SportDb::Model::Team.find_by( title: club.name )
-      if rec.nil?
-        ## check if key is present otherwise generate e.g. remove all non-ascii a-z chars
-        key  =  club.key || club.name.downcase.gsub( /[^a-z]/, '' )
-        puts "add club: #{key}, #{club.name}, #{club.country.name} (#{club.country.key})"
-
-        attribs = {
-          key:        key,
-          title:      club.name,
-          country_id: Country.find_or_create( club.country ).id,
-          club:       true,
-          national:   false  ## check -is default anyway - use - why? why not?
-          ## todo/fix: add city if present - why? why not?
-        }
+  end # class NationalTeam
 
-        attribs[:code] = club.code   if club.code   ## add code (abbreviation) if present
 
+  class Team
+    ## auto-cache all clubs by find_or_create for later mapping / lookup
+    def self.cache() @cache ||= {}; end
 
-        if club.alt_names.empty? == false
-          attribs[:synonyms] = club.alt_names.join('|')
+    def self.find_or_create( team_or_teams )
+      if team_or_teams.is_a?( Array )
+        recs = []
+        teams = team_or_teams
+        teams.each do |team|
+          recs << __find_or_create( team )
         end
-
-        rec = SportDb::Model::Team.create!( attribs )
+        recs
+      else  # assome single rec
+        team = team_or_teams
+        __find_or_create( team )
       end
-      rec
     end
-  end # class Club
 
-  class Event
-    def self.find( league:, season: )
-      SportDb::Model::Event.find_by( league_id: league.id, season_id: season.id  )
-    end
-    def self.find!( league:, season: )
-      rec = find( league: league, season: season )
-      if rec.nil?
-        puts "** !!!ERROR!!! db sync - no event match found for:"
-        pp league
-        pp season
-        exit 1
-      end
-      rec
+    def self.__find_or_create( team )  ## todo/check: use find_or_create_worker instead of _find - why? why not?
+       rec = if team.is_a?( Import::NationalTeam )
+               NationalTeam.find_or_create( team )
+             else ## assume Club
+               Club.find_or_create( team )
+             end
+       cache[ team.name ] = rec    ## note: assume "canonical" unique team name
+       rec
     end
+  end # class Team
 
-    def self.find_or_create( league:, season: )
-      rec = find( league: league, season: season )
-      if rec.nil?
-        ## quick hack/change later !!
-        ##  todo/fix: check season  - if is length 4 (single year) use 2017, 1, 1
-        ##                               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
-        if season.key.size == '4'   ## e.g. assume 2018 etc.
-          year = season.key.to_i
-          start_at = Date.new( year, 1, 1 )
-        else  ## assume 2014/15 etc.
-          year = season.key[0..3].to_i
-          start_at = Date.new( year, 7, 1 )
-        end
-
-        attribs = {
-          league_id: league.id,
-          season_id: season.id,
-          start_at:  start_at  }
 
-        rec = SportDb::Model::Event.create!( attribs )
-      end
-      rec
-    end
-  end  # class Event
 
   class Round
     def self.find_or_create( round, event: )
-       rec = SportDb::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
                    }
-         rec = SportDb::Model::Round.create!( attribs )
+
+         ## 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
     end
   end # class Round
 
 
+  class Group
+    def self.find_or_create( group, event: )
+       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,
+                     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!!!!!
+       rec
+    end
+  end # class Group
+
+
   class Stage
     def self.find( name, event: )
-      SportDb::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  )
@@ -201,12 +125,10 @@ module Sync
     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 = SportDb::Model::Stage.create!( attribs )
+         rec = Model::Stage.create!( attribs )
        end
        rec
     end
@@ -214,26 +136,68 @@ module Sync
 
 
 
-  class Match   ## todo/check:  add alias for Game class - why? why not?
+  class Match
     def self.create_or_update( match, event: )
        ## note: MUST find round, thus, use bang (!)
-       round_rec = SportDb::Model::Round.find_by!( event_id: event.id,
-                                                   title:    match.round.title )
 
-       rec = SportDb::Model::Game.find_by( round_id: round_rec.id,
-                                           team1_id: match.team1.id,
-                                           team2_id: match.team2.id )
+       ## 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,
+                                            name:     round_name )
+
+       ## 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!( 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
+       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
+                     Model::Group.find_by!( event_id: event.id,
+                                            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 once match? exception raised??
+       rec = Model::Match.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,
-                     team1_id: match.team1.id,
-                     team2_id: match.team2.id,
-                     pos:      999,    ## make optional why? why not? - change to num?
-                     play_at:  match.date.to_date,
+        ## 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,
+                     date:     match.date.to_date,  ## todo/fix: split and add date & time!!!!
                      score1:   match.score1,
                      score2:   match.score2,
                      score1i:  match.score1i,
                      score2i:  match.score2i }
-         rec = SportDb::Model::Game.create!( attribs )
+
+         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
        end

data/lib/sportdb/sync/version.rb

@@ -2,9 +2,10 @@
 
 
 module SportDb
+module Module
 module Sync
 
-  MAJOR = 0    ## todo: namespace inside version or something - why? why not??
+  MAJOR = 1    ## todo: namespace inside version or something - why? why not??
   MINOR = 1
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
@@ -22,4 +23,5 @@ module Sync
   end
 
 end # module Sync
+end # module Module
 end # module SportDb

data/test/helper.rb

@@ -1,4 +1,8 @@
-## $:.unshift(File.dirname(__FILE__))
+## 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-models/lib' ))
+
 
 ## minitest setup
 require 'minitest/autorun'
@@ -6,3 +10,23 @@ require 'minitest/autorun'
 
 ## our own code
 require 'sportdb/sync'
+
+
+## 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
+
+
+SportDb.connect( adapter: 'sqlite3', database: ':memory:' )
+SportDb.create_all   ## build schema
+
+## turn on logging to console
+## ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+
+

data/test/test_country.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_country.rb
+
+
+require 'helper'
+
+
+class TestCountry < MiniTest::Test
+
+  Country = SportDb::Sync::Country
+
+  def test_find  # note: find uses "data" structs
+    at  = SportDb::Import::Country.new( key: 'at',  name: 'Austria', code: 'AUT' )
+    eng = SportDb::Import::Country.new( key: 'eng', name: 'England', code: 'ENG' )
+
+    rec  = Country.find_or_create( at )
+    rec2 = Country.find_or_create( at )
+
+    rec  = Country.find_or_create( eng )
+    rec2 = Country.find_or_create( eng )
+  end  # method test_find
+
+
+  def test_search  # note: search uses query strings
+    rec = Country.search_or_create!( 'at' )  ## try (iso-alpha2) key
+    assert_equal 'Austria', rec.name
+    assert_equal 'at',      rec.key
+    assert_equal 'AUT',     rec.code
+
+    rec = Country.search_or_create!( 'aut' )  ## try fifa code
+    assert_equal 'Austria', rec.name
+    assert_equal 'at',      rec.key
+    assert_equal 'AUT',     rec.code
+
+
+    rec = Country.search_or_create!( 'eng' )
+    assert_equal 'England', rec.name
+    assert_equal 'eng',     rec.key
+    assert_equal 'ENG',     rec.code
+
+    rec = Country.search_or_create!( 'eng' )
+    assert_equal 'England', rec.name
+    assert_equal 'eng',     rec.key
+    assert_equal 'ENG',     rec.code
+  end
+
+end  # class TestCountry

data/test/test_league.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_league.rb
+
+
+require 'helper'
+
+class TestLeague < MiniTest::Test
+
+  League = SportDb::Sync::League
+
+
+  def test_search
+    rec = League.search_or_create!( 'eng' )
+    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.clubs
+
+    rec = League.search!( 'eng' )
+    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.clubs
+
+    ## try 2nd call (just lookup)
+    rec = League.search_or_create!( 'eng' )
+    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.clubs
+  end
+end # class TestLeague

data/test/test_misc.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_misc.rb
+
+
+require 'helper'
+
+class TestMisc < MiniTest::Test
+
+  Season = SportDb::Sync::Season
+
+
+  def test_season
+    rec = Season.search_or_create( '2017-18' )
+    assert_equal '2017/18', rec.name
+    assert_equal '2017/18', rec.key
+
+    rec = Season.search_or_create( '2017/2018' )
+    assert_equal '2017/18', rec.name
+    assert_equal '2017/18', rec.key
+
+    rec = Season.search_or_create( '2017/8' )
+    assert_equal '2017/18', rec.name
+    assert_equal '2017/18', rec.key
+  end
+
+end # class TestMisc

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-sync
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sportdb-clubs
+  name: sportdb-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
-- !ruby/object:Gem::Dependency
-  name: sportdb-leagues
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: sportdb-models
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.2
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.2
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -95,10 +81,17 @@ files:
 - README.md
 - Rakefile
 - lib/sportdb/sync.rb
+- lib/sportdb/sync/club.rb
+- lib/sportdb/sync/country.rb
+- lib/sportdb/sync/event.rb
+- lib/sportdb/sync/league.rb
+- lib/sportdb/sync/season.rb
 - lib/sportdb/sync/sync.rb
 - lib/sportdb/sync/version.rb
 - test/helper.rb
-- test/test_sync.rb
+- test/test_country.rb
+- test/test_league.rb
+- test/test_misc.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain

data/test/test_sync.rb

@@ -1,29 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_sync.rb
-
-
-require 'helper'
-
-
-class TestSync < MiniTest::Test
-
-  def test_sync
-    SportDb.connect( adapter: 'sqlite3', database: ':memory:' )
-    SportDb.create_all   ## build schema
-
-    ## turn on logging to console
-    ActiveRecord::Base.logger = Logger.new(STDOUT)
-
-    at_rec  = SportDb::Import::Country.new( 'at',  'Austria', fifa: 'AUT' )
-    eng_rec = SportDb::Import::Country.new( 'eng', 'England', fifa: 'ENG' )
-
-    at    = SportDb::Sync::Country.find_or_create( at_rec )
-    at2   = SportDb::Sync::Country.find_or_create( at_rec )
-
-    eng   = SportDb::Sync::Country.find_or_create( eng_rec )
-    eng2  = SportDb::Sync::Country.find_or_create( eng_rec )
-  end  # method test_sync
-end  # class TestSync