sportdb-readers 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40a0db453b48c9bed47b6370c44249d5c8197df2fddc90a911653f2ddd145357
-  data.tar.gz: 8792558c03345ba1662249e5239f5b6122324740f353be4143c420f482486742
+  metadata.gz: cdad0e950d6144fe9de65be3f4a87057b05e1f03e168237c44c5f0c9f2d3f0b3
+  data.tar.gz: 541e0de0a923297dc7b1b7349319e77bcaa31ac5405bb3f2cdd111f522230985
 SHA512:
-  metadata.gz: 342de18d45ec3be01a528be68e2e77d18866911cef7fbad17424179c648eda816170e77ea39987bfa66b48af9627284080535eab292c0e9798e3ca25ad09118a
-  data.tar.gz: 5861f675107c90fdd10f865396df5b43f30df1df63ff3e437f409612853b393d575f96df0b59a86d23c2773791a2a63d57db1df9949ebb4e0845768b088a9654
+  metadata.gz: d36e0affcfc3fbdd5fbb50fabcbaebce34935f48a257c7ab7e918cf2cf1a96bdf3b7d2737f05adf75f9094ade927c88806d1fef5ce9d792feaac852534125e86
+  data.tar.gz: 797fd4250e078bf2255e38830358cedeea761ea85236e7084f08fd04ba71b2831890267c7a2268cc92312556149dda33a7ef893d0a5878ce9474be221ba50d9b

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 1.2.0
+### 2.0.0
 
 ### 0.0.1 / 2019-10-29
 

data/Manifest.txt

@@ -7,4 +7,11 @@ lib/sportdb/readers.rb
 lib/sportdb/readers/conf_reader.rb
 lib/sportdb/readers/match_reader.rb
 lib/sportdb/readers/package.rb
+lib/sportdb/readers/sync/club.rb
+lib/sportdb/readers/sync/country.rb
+lib/sportdb/readers/sync/event.rb
+lib/sportdb/readers/sync/league.rb
+lib/sportdb/readers/sync/match.rb
+lib/sportdb/readers/sync/more.rb
+lib/sportdb/readers/sync/season.rb
 lib/sportdb/readers/version.rb

data/README.md

@@ -50,15 +50,14 @@ Matchday 1
 ...
 ```
 
-(Source: [england/2015-16/1-premierleague-i.txt](https://github.com/openfootball/england/blob/master/2015-16/1-premierleague-i.txt))
+(Source: [england/2015-16/1-premierleague.txt](https://github.com/openfootball/england/blob/master/2015-16/1-premierleague.txt))
 
 and let's try:
 
 ``` ruby
 ## assumes football.db datasets for England in ./england directory
 ##   see github.com/openfootball/england
-SportDb.read( './england/2015-16/1-premierleague-i.txt' )
-SportDb.read( './england/2015-16/1-premierleague-ii.txt' )
+SportDb.read( './england/2015-16/1-premierleague.txt' )
 
 ## let's try another season
 SportDb.read( './england/2019-20/1-premierleague.txt' )
@@ -136,7 +135,7 @@ Round, Date,              Team 1,               FT,  HT,  Team 2
 ```
 (Source: [england/2019-20/eng.1.csv](https://github.com/footballcsv/england/blob/master/2010s/2019-20/eng.1.csv))
 
-Yes, you can. See the [sportdb-importers library / gem »](https://github.com/sportdb/sport.db/tree/master/sportdb-importers) 
+Yes, you can. See the [sportdb-importers library / gem »](https://github.com/sportdb/sport.db/tree/master/sportdb-importers)
 
 
 

data/Rakefile

@@ -3,7 +3,7 @@ require './lib/sportdb/readers/version.rb'
 
 Hoe.spec 'sportdb-readers' do
 
-  self.version = SportDb::Readers::VERSION
+  self.version = SportDb::Module::Readers::VERSION
 
   self.summary = "sportdb-readers - sport.db readers for leagues, seasons, clubs, match schedules and results, and more"
   self.description = summary
@@ -20,11 +20,13 @@ Hoe.spec 'sportdb-readers' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-sync',    '>= 1.2.0'],
+    ['sportdb-formats',   '>= 2.0.0'],
+    ['sportdb-catalogs',  '>= 1.2.1'],
+    ['sportdb-models',    '>= 2.1.0'],
   ]
 
   self.spec_extras = {
-   required_ruby_version: '>= 2.2.2'
+   required_ruby_version: '>= 3.1.0'
   }
 
 end

data/lib/sportdb/readers/match_reader.rb

@@ -1,8 +1,18 @@
 
 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 )
@@ -23,43 +33,22 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
     secs = LeagueOutlineReader.parse( @txt, season: season )
     pp secs
 
-
-    ###
-    ## todo/check/fix:  move to LeagueOutlineReader for (re)use - why? why not?
-    ##                    use sec[:lang] or something?
-    langs = {    ## map country keys to lang codes
-      'de' => 'de', ## de - Deutsch (German)
-      'at' => 'de',
-      'ch' => 'de',
-      'fr' => 'fr', ## fr - French
-      'it' => 'it', ## it - Italian
-      'es' => 'es', ## es - Español (Spanish)
-      'mx' => 'es',
-      'ar' => 'es', ## Argentina
-      'pt' => 'pt', ## pt -  Português (Portuguese)
-      'br' => 'pt',
-    }
-
     secs.each do |sec|   ## sec(tion)s
       season = sec[:season]
       league = sec[:league]
       stage  = sec[:stage]
       lines  = sec[:lines]
 
-      ## hack for now: switch lang
-      ## todo/fix: set lang for now depending on league country!!!
-      if league.intl?   ## todo/fix: add intl? to ActiveRecord league!!!
-        Import.config.lang = 'en'
-      else  ## assume national/domestic
-        Import.config.lang = langs[ league.country.key ] || 'en'
-      end
-
       ### check if event info availabe - use start_date;
       ##    otherwise we have to guess (use a "synthetic" start_date)
       event_info = catalog.events.find_by( season: season,
                                            league: league )
 
       start = if event_info && event_info.start_date
+                  puts "event info found:"
+                  puts "  using start date from event: "
+                  pp event_info
+                  pp event_info.start_date
                   event_info.start_date
               else
                 if season.year?
@@ -70,61 +59,101 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
               end
 
 
-      ### todo/check: make sure team include teams from group def too!!!!!
-      ###
-      ###             note - only use teams and grounds for now
-      auto_conf_teams, 
-      _rounds, _groups, _round_defs, _group_defs, 
-      auto_conf_grounds, 
-      _  = AutoConfParser.parse( lines, start: start )
-    
-                                    
+      parser = MatchParser.new( lines,
+                                start )   ## note: keep season start_at date for now (no need for more specific stage date need for now)
+
+      auto_conf_teams,  matches, rounds, groups = parser.parse
+
+      puts ">>> #{auto_conf_teams.size} teams:"
+      pp auto_conf_teams
+      puts ">>> #{matches.size} matches:"
+      ## pp matches
+      puts ">>> #{rounds.size} rounds:"
+      pp rounds
+      puts ">>> #{groups.size} groups:"
+      pp groups
+
+
+
       ## step 1: map/find teams
 
       ## note: loop over keys (holding the names); values hold the usage counter!! e.g. 'Arsenal' => 2, etc.
       mods = nil
       if league.clubs? && league.intl?    ## todo/fix: add intl? to ActiveRecord league!!!
+
+        ## quick hack - use "dynamic" keys for keys
+          uefa_el_q = Import::League.match_by( code: 'uefa.el.quali' )[0]
+          uefa_cl_q = Import::League.match_by( code: 'uefa.cl.quali' )[0]
+          uefa_cl   = Import::League.match_by( code: 'uefa.cl' )[0]
+          uefa_el   = Import::League.match_by( code: 'uefa.el' )[0]
+
+          pp [uefa_el_q, uefa_cl_q, uefa_cl, uefa_el]
+
                 ### quick hack mods for popular/known ambigious club names
                 ##    todo/fix: make more generic / reuseable!!!!
                 mods = {}
                 ## europa league uses same mods as champions league
-                mods[ 'uefa.el.quali' ] =
-                mods[ 'uefa.cl.quali' ] =
-                mods[ 'uefa.el' ] =
-                mods[ 'uefa.cl' ] = catalog.clubs.build_mods(
+                mods[ uefa_el_q.key ] =
+                mods[ uefa_cl_q.key ] =
+                mods[ uefa_el.key ] =
+                mods[ uefa_cl.key ] = catalog.clubs.build_mods(
                   { 'Liverpool | Liverpool FC' => 'Liverpool FC, ENG',
                     'Arsenal  | Arsenal FC'    => 'Arsenal FC, ENG',
                     'Barcelona'                => 'FC Barcelona, ESP',
-                    'Valencia'                 => 'Valencia CF, ESP'  })
+                    'Valencia'                 => 'Valencia CF, ESP',
+                    'Rangers FC'               => 'Rangers FC, SCO',
+                  })
        end
 
        # puts " [debug] auto_conf_teams:"
        # pp auto_conf_teams
 
 
-       teams = catalog.teams.find_by!( name:   auto_conf_teams.keys,
+ ## todo/fix
+ ##  ** !!! ERROR - too many matches (2) for club >Barcelona<:
+ ## [<Club: FC Barcelona (ESP)>, <Club: Barcelona Guayaquil (ECU)>]
+
+       puts "league:"
+       pp league
+
+       teams = catalog.teams.find_by!( name:   auto_conf_teams,
                                        league: league,
                                        mods:   mods )
 
-       # puts " [debug] teams:"
-       # pp teams
+       puts " [debug] teams:"
+       pp teams
+
 
        ## build mapping - name => team struct record
-       team_mapping =  auto_conf_teams.keys.zip( teams ).to_h
+       team_mapping =  auto_conf_teams.zip( teams ).to_h
 
-       # puts " [debug] team_mapping:"
-       # pp team_mapping
+       puts " [debug] team_mapping:"
+       pp team_mapping
 
-    
 
-      parser = MatchParser.new( lines,
-                                team_mapping,
-                                start )   ## note: keep season start_at date for now (no need for more specific stage date need for now)
+        ## quick (and dirty) hack
+        ##   update all team strings with mapped records
+        matches.each do |match|
+            match.update( team1: team_mapping[ match.team1 ] )
+            match.update( team2: team_mapping[ match.team2 ] )
+        end
 
-      matches, rounds, groups = parser.parse
+        ## quick hack cont.
+        ##  rebuild groups with all team strings with mapped records
+        groups = groups.map do |old_group|
+                                group = Import::Group.new(
+                                          name: old_group.name,
+                                          teams: old_group.teams.map {|team| team_mapping[team] }
+                                        )
+                                group
+                            end
+        puts "groups:"
+        pp groups
 
-      pp rounds
-      pp groups
+## fix
+##  !! ERROR - no (cached) team rec found for team in group >Group A<
+##   for >#<Sports::Club:0x000002c7e1686040><
+###    update sync group to check for records (use .name) !!!
 
 
      ######################################################
@@ -166,10 +195,10 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
         ##   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 ]
+        group.teams.each do |team|
+          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}<"
+            puts "!! ERROR - no (cached) team rec found for team in group >#{group.name}< for >#{team}<"
             exit 1
           end
           group_team_ids << team_rec.id
@@ -182,6 +211,7 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
         round_rec = Sync::Round.find_or_create( round, event: event_rec )  ## check: use/rename to EventRound why? why not?
       end
 
+
       matches.each do |match|
         ## note: pass along stage (if present): stage  - optional from heading!!!!
         match = match.update( stage: stage )   if stage
@@ -193,10 +223,5 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
   end # method parse
 
 
-  ######################
-  # (convenience) helpers
-
-  def catalog() Import.catalog; end
-
 end # class MatchReader
 end # module SportDb

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

@@ -0,0 +1,47 @@
+module SportDb
+  module Sync
+    class Club
+
+      ## auto-cache all clubs by find_or_create for later mapping / lookup
+      def self.cache() @cache ||= {}; end
+
+
+      ##################################
+      #  finders
+
+      def self.find_or_create( club )
+        ## note: assume "canonical unique" 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/readers/sync/country.rb

@@ -0,0 +1,39 @@
+module SportDb
+  module Sync
+    class Country
+
+    #############################
+    #  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/readers/sync/event.rb

@@ -0,0 +1,72 @@
+module SportDb
+  module Sync
+
+    class Event
+
+      ##################################################
+      #  finders
+      def self.find_by( league:, season: )
+        ## note: allow passing in of activerecord db records too - why? why not?
+        ##   fix - change ArgumentError to TypeError !! (if TypeError exists)
+        raise ArgumentError, "league struct record expected; got #{league.class.name}"   unless league.is_a?( Import::League )
+        raise ArgumentError, "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, "league struct record expected; got #{league.class.name}"  unless league.is_a?( Import::League )
+        raise ArgumentError, "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/readers/sync/league.rb

@@ -0,0 +1,40 @@
+module SportDb
+  module Sync
+    class League
+
+      ###################################
+      #   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/readers/sync/match.rb

@@ -0,0 +1,147 @@
+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: )
+       ## note: MUST find round, thus, use bang (!)
+
+       ## todo/check: allow strings too - why? why not?
+
+
+       ## 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!( 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 one match? exception raised??
+       rec = if ['N. N.'].include?( team1_name ) && ## some special cases - always assume new record for now (to avoid ambigious update conflict)
+                ['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
+         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:      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,
+                     score2:   match.score2,
+                     score1i:  match.score1i,
+                     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 )
+
+
+         #############################################
+         ### try to update goals
+         ####   quick & dirty v0 - redo !!!!
+         goals = match.goals
+          if goals && goals.size > 0
+            goals.each do |goal|
+               person_rec = Model::Person.find_by(
+                                           name: goal.player )
+               if person_rec.nil?
+                 person_rec = Model::Person.create!(
+                                key:  goal.player.downcase.gsub( /[^a-z]/, '' ),
+                                name: goal.player
+                 )
+               end
+               Model::Goal.create!(
+                  match_id:  rec.id,
+                  person_id: person_rec.id,
+                  team_id:   goal.team == 1 ? rec.team1.id
+                                            : rec.team2.id,
+                  minute:    goal.minute,
+                  offset:    goal.offset || 0,
+                  penalty:   goal.penalty,
+                  owngoal:   goal.owngoal,
+               )
+            end
+          end
+       else
+         # update - todo
+         puts "!! ERROR - match updates not yet supported (only inserts); sorry"
+         exit 1
+       end
+       rec
+    end
+  end # class Match
+
+end # module Sync
+end # module SportDb

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

@@ -0,0 +1,136 @@
+
+module SportDb
+  module Sync
+
+
+  class NationalTeam
+    def self.find_or_create( team )
+      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!!!
+          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?
+        }
+
+        if team.alt_names.empty? == false
+          attribs[:alt_names] = team.alt_names.join('|')
+        end
+
+        rec = Model::Team.create!( attribs )
+      end
+      rec
+    end
+  end # class NationalTeam
+
+
+  class Team
+    ## auto-cache all clubs by find_or_create for later mapping / lookup
+    def self.cache() @cache ||= {}; end
+
+    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
+        recs
+      else  # assome single rec
+        team = team_or_teams
+        __find_or_create( team )
+      end
+    end
+
+    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
+
+
+
+  class Round
+    def self.find_or_create( round, event: )
+       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,
+                     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
+    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: )
+      Model::Stage.find_by( name: name, event_id: event.id  )
+    end
+    def self.find!( name, event: )
+      rec = find( name, event: event  )
+      if rec.nil?
+        puts "** !!!ERROR!!! db sync - no stage match found for:"
+        pp name
+        pp event
+        exit 1
+      end
+      rec
+    end
+
+    def self.find_or_create( name, event: )
+       rec = find( name, event: event )
+       if rec.nil?
+         attribs = { event_id: event.id,
+                     name:     name,
+                   }
+         rec = Model::Stage.create!( attribs )
+       end
+       rec
+    end
+  end # class Stage
+end # module Sync
+end # module SportDb

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

@@ -0,0 +1,36 @@
+module SportDb
+  module Sync
+    class Season
+
+      ################
+      #  finders
+
+      def self.find( season )
+        season = Season( season )     ## 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 )     ## 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 )    ## 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/readers/version.rb

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

data/lib/sportdb/readers.rb

@@ -1,10 +1,22 @@
-
-require 'sportdb/sync'
+require 'sportdb/formats'
+require 'sportdb/catalogs'
+require 'sportdb/models'
 
 
 ###
 # our own code
 require_relative 'readers/version' # let version always go first
+
+## add sync stuff
+require_relative 'readers/sync/country'
+require_relative 'readers/sync/league'
+require_relative 'readers/sync/season'
+require_relative 'readers/sync/event'
+require_relative 'readers/sync/club'
+require_relative 'readers/sync/more'
+require_relative 'readers/sync/match'  ## note  - let match sync go last
+
+## add readers & friends
 require_relative 'readers/conf_reader'
 require_relative 'readers/match_reader'
 require_relative 'readers/package'
@@ -12,7 +24,6 @@ require_relative 'readers/package'
 
 
 
-
 ##
 ##  add convenience shortcut helpers
 module SportDb
@@ -57,4 +68,4 @@ end # module SportDb
 
 
 
-puts SportDb::Readers.banner   # say hello
+puts SportDb::Module::Readers.banner   # say hello

metadata

@@ -1,29 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-23 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sportdb-sync
+  name: sportdb-formats
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: sportdb-catalogs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: sportdb-models
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +106,13 @@ files:
 - lib/sportdb/readers/conf_reader.rb
 - lib/sportdb/readers/match_reader.rb
 - lib/sportdb/readers/package.rb
+- lib/sportdb/readers/sync/club.rb
+- lib/sportdb/readers/sync/country.rb
+- lib/sportdb/readers/sync/event.rb
+- lib/sportdb/readers/sync/league.rb
+- lib/sportdb/readers/sync/match.rb
+- lib/sportdb/readers/sync/more.rb
+- lib/sportdb/readers/sync/season.rb
 - lib/sportdb/readers/version.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
@@ -93,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="