leagues 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3e154b72da0c4677b811ac922b37fee501f25cb28aa57dbbba608a0bd2787ff
-  data.tar.gz: be12dab4eceae8bcf4f375baf1680917257b1c0ccd1849004eb9357be0200b33
+  metadata.gz: 7de33794f4721fff69b19475defc328a33a8f245d259d26326a2238681cd8255
+  data.tar.gz: 4bd10a37c73aef136805a5377c9765ba30a6842257ee8193840cbb2c1651e25f
 SHA512:
-  metadata.gz: 20fd53b2c9c5bbeed88ba3148cb7b6e2f92af0fb8aa6c0c5e6e9e6b8e648ba44b16dffbe33f09eb7b5cab331b258d2e94f4aeed5727cb6c5b184847208add4a9
-  data.tar.gz: afcc3bed4307de477823689ba1d255e63815cddaa7ff5062dac7ca2a2a07cc21b049bc8c92ffe4a7a0694cfd122fd9eff8e06a308e122d6e8db704f6631f8a92
+  metadata.gz: 1dec15278cd269eb43327ef227bfb277f5865d48469e20833e6aba0e53167bb792b2761865ecaf0b3bc7889444f496cdbe4348216d6c8fab7572f58bd2dc6e22
+  data.tar.gz: 398b9bf89c963c0e60087be743f709c7c4f42c1417cf66b4b22980e6d42f8fc918328efcec2e782d42861324f2763aaf7375681a7c5edd342a1bfa457704ae61

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.1.0
+### 0.2.0
 
 ### 0.0.1 / 2025-04-01
 

data/Manifest.txt

@@ -2,6 +2,7 @@ CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
+bin/fbok
 config/codes_alt.csv
 config/leagues.csv
 config/leagues_more.csv

data/bin/fbok

@@ -0,0 +1,94 @@
+#!/usr/bin/env ruby
+
+## tip: to test run:
+##   ruby -I ./lib bin/fbok
+
+require 'leagues'
+
+
+def read_raw_leagueset( path )
+  ## no - normalize and autofill etc.  
+  datasets = []
+  recs = read_csv( path )
+  recs.each do |rec|
+        key     = rec['league']
+        seasons =  SportDb::Leagueset._parse_seasons( rec['seasons'] )
+
+        datasets << [key, seasons]
+  end 
+  datasets
+end
+
+args = ARGV
+
+args = ['/sports/tmp/classic.csv' ]    if args.size == 0
+
+
+
+def check_leagueset( path )
+    datasets = read_raw_leagueset( path )
+    pp datasets    
+
+    puts "==> #{path} - #{datasets.size} record(s)"
+    
+    ## pass 1 - league code quick check
+    errors = []
+    datasets.each do |league_query, _|
+        if LeagueCodes.valid?( league_query )
+            puts "OK #{league_query}"
+        else
+            puts "!! #{league_query}"
+            errors << "league code #{league_query} NOT valid"
+        end
+    end
+
+    if errors.size > 0
+        puts "#{errors.size} error(s):"
+        pp errrors
+        exit 1
+    end
+
+    ## pass 2 - league code check by season
+    datasets.each_with_index do |(league_query, seasons),i|
+        puts "-- [#{i+1}/#{datasets.size}] #{league_query}, #{seasons.size} seasons(s)"
+
+        last_league_info = nil
+        seasons.each_with_index do |season,j|
+          league_info = LeagueCodes.find_by( code: league_query, season: season )
+          
+          if league_info.nil?
+             puts "!! #{season}"
+             errors << "no league info for #{league_query} #{season} found"
+             next
+          end
+
+          ## only print league info (if changed from last season)
+          if last_league_info.nil? || 
+             last_league_info['code'] != league_info['code'] || 
+             last_league_info['name'] != league_info['name'] ||
+             last_league_info['tz']   != league_info['tz']  
+             print "\n"   if j != 0    ## if new league info MUST start new line
+             pp league_info
+          end
+          print "  #{season}"
+
+          last_league_info = league_info
+        end
+        print "\n"
+    end
+
+    if errors.size > 0
+        puts "#{errors.size} error(s):"
+        pp errrors
+    else
+        puts
+        puts "OK  no error(s) found"
+    end
+end
+
+
+
+path = args[0]
+check_leagueset( path )
+
+puts 'bye'

data/config/codes_alt.csv

@@ -8,6 +8,11 @@ code,alt,start_season,end_season,comments
 ##
 
 at.1,      aut.bl,,,    ## Bundesliga
+### todo/fix - allow multiple alt codes at once e.g.
+##         aut.bl | ö.1 etc.
+at.1,      ö.1,,,
+
+
 at.2,      aut.2,,,
 at.3.o,    aut.rlo,,,   ## Regionalliga Ost
 
@@ -57,5 +62,5 @@ se.2,  swe.2,,,
 il.1,  isr.1,,,
 ro.1,  rou.1,,,
 
-br.1,  bra.1,,,
+br.1,    bra.1,,,
 

data/config/leagues_more.csv

@@ -38,3 +38,9 @@ eng.efl.cup,English EFL Cup,eflcup,,
 ###  fix - upstream uses world.club !!! 
 world.clubs,Club World Cup,clubworldcup,2000,
 
+
+### quick hack
+###   alternate codes (duplicates); use/settle on one canonical league code!!!
+br.cup,Copa do Brasil,cup,,      ## br.copa
+
+

data/config/timezones_middle_east.csv

@@ -1,5 +1,4 @@
 key, zone
 
 il,  	Asia/Jerusalem
-
-
+sa,     Asia/Riyadh

data/lib/leagues/league_codes.rb

@@ -6,6 +6,7 @@
 module SportDb
 class LeagueCodes 
     
+
 ####
 ## (public) api
 def self.valid?( code )   
@@ -135,6 +136,16 @@ def find_by( code:, season: )
     end
   end
 
+
+  if rec   ## (quick hack for now) auto-add timezone
+      ## use canoncial (league) code
+      ##   note - if timezone changes MUST auto-create a NEW record
+      ##              thus, for now always create a new copy (via dup)!!!
+     rec = rec.dup  
+     rec['tz'] = find_zone!( league: rec['code'], season: season )
+  end
+
+
   rec   ## return nil if no code record/item found
 end
 

data/lib/leagues/leagueset.rb

@@ -1,5 +1,4 @@
 
-
 ##
 # use/find a better name
 #    League Set, League Sheet,
@@ -19,13 +18,43 @@
 module SportDb
 class Leagueset
 
-def self.parse_args( args )
+
+##  autofiller helper
+##  - simple heuristic to find current (latest) season
+##
+##   maybe move autofiller to fbup or such - why? why not?
+
+def self.autofiller( league_query, source_path: ['.'] )
+      [ Season('2024/25'), 
+        Season('2025') 
+      ].each do |season|
+           league_info = LeagueCodes.find_by( code: league_query, season: season )
+           league_code = league_info['code']
+           
+           filename = "#{season.to_path}/#{league_code}.csv"
+           path = find_file( filename, path: source_path )
+           if path
+              return season
+           end
+      end
+      nil  ## return nil if not found
+end
+
+
+
+
+###
+## note - requires autofill (for seasons)
+##         if league querykey without season/empty season
+def self.parse_args( args, autofill: nil )
     ### split args in datasets with leagues and seasons
+    ##   e.g.  at1 eng1    or
+    ##         at1 2024/25 br1 2025    etc.
     datasets = []
     args.each do |arg|
        if arg =~ %r{^[0-9/-]+$}   ##  season
            if datasets.empty?
-             puts "!! ERROR - league required before season arg; sorry"
+             puts "!! ERROR [leagueset.parse_args] - league required before season arg; sorry"
              exit 1
            end
 
@@ -36,50 +65,122 @@ def self.parse_args( args )
            datasets << [key, []]
        end
     end
-    new(datasets)
+
+    new(datasets, autofill: autofill)
+end
+
+
+#  todo/fix - (maybe) move "upstream" later
+#     e.g.  Season.parse_list or parse_lst
+#                             or parse_line  or ???
+#                             or parse_multi(ple) - why? why not?
+def self._parse_seasons( str )   
+   ## helper to parse seasons string/column
+   ##   note: ALWAYS returns an array of seaons (even if only one)
+   result  = []
+   seasons = str.split( /[ ]+/ )
+
+   seasons.each do |season_str|
+       ## note - add support for ranges e.g. 2001/02..2010/11
+       if season_str.index( '..' )
+               fst,snd = season_str.split( '..' )
+               # pp [fst,snd]
+               fst = Season.parse( fst )
+               snd = Season.parse( snd )
+               if fst < snd && fst.year? == snd.year?
+                   result += (fst..snd).to_a
+               else
+                  raise ArgumentError, "parse error - invalid season range >#{season_str}<, 1) two seasons required, 2) first < second, 3) same (year/academic) type"
+               end
+       else
+          season = Season.parse( season_str )  ## check season
+          result << season
+       end
+   end
+
+   result
 end
 
 
-def self.parse( txt )
+
+def self.parse( txt, autofill: nil )
     ### split args in datasets with leagues and seasons
     datasets = []
     recs = parse_csv( txt )
     recs.each do |rec|
         key = rec['league'].downcase
-        datasets << [key, []]
-
+  
         seasons_str = rec['seasons']
-        seasons = seasons_str.split( /[ ]+/ )
-
-        seasons.each do |season_str|
-            ## note - add support for ranges e.g. 2001/02..2010/11
-            if season_str.index( '..' )
-                    fst,snd = season_str.split( '..' )
-                    # pp [fst,snd]
-                    fst = Season.parse( fst )
-                    snd = Season.parse( snd )
-                    if fst < snd && fst.year? == snd.year?
-                        datasets[-1][1] += (fst..snd).to_a
-                    else
-                       raise ArgumentError, "parse error - invalid season range >#{str}<, 1) two seasons required, 2) first < second, 3) same (year/academic) type"
-                    end
-            else
-               season = Season.parse( season_str )  ## check season
-               datasets[-1][1] << season
-            end
-        end
-    end
-    new(datasets)
+        seasons =  _parse_seasons( seasons_str )
+
+        datasets << [key, seasons]
+  end 
+
+    new(datasets, autofill: autofill)
 end
 
-def self.read( path ) parse( read_text( path )); end
+def self.read( path, autofill: nil ) 
+   parse( read_text( path ), autofill: autofill )
+end
 
 
 
-def initialize( recs )
-    @recs = recs
+def initialize( recs, autofill: nil )
+    ### @org_recs = recs    ## keep a record of orginal (MUST clone) - why? why not?
+
+    ##### check for empty seasons
+    recs      = _autofill( recs, autofill: autofill )
+    @recs     = _norm( recs )
 end
 
+
+def _norm( recs )
+  datasets = {}
+ 
+  recs.each do |league_query, seasons| 
+    unless LeagueCodes.valid?( league_query ) 
+      puts "!! ERROR - (leagueset) no league (config) found for code >#{league_query}<; sorry"
+      exit 1
+    end
+
+    seasons.each do |season|
+         ## check league code config too - why? why not?
+         league_info = LeagueCodes.find_by( code: league_query, season: season )
+         if league_info.nil?
+           puts "!! ERROR - (leagueset) no league config found for code #{league_query} AND season #{season}; sorry"
+           exit 1
+         end
+ 
+         rec = datasets[ league_info['code'] ] ||= []
+         rec << season
+    end
+  end # each record
+
+  datasets.to_a  ## convert hash to array
+end
+
+def _autofill( datasets, autofill: )
+  ##### check for empty seasons
+  datasets.each do |league_query, seasons|
+    ### try autofill
+    if seasons.empty? && autofill.is_a?(Proc)
+         season = autofill.call( league_query )
+         if season 
+              ## note - all season as string for autfiller too
+            seasons << Season(season)   
+         end 
+    end     
+        
+    if seasons.empty?
+      puts "!! ERROR [leagueset] - empty seasons; autofill found no latest season for #{league_query}; sorry"
+      exit 1
+    end
+  end
+end
+
+
+
+
 def size() @recs.size; end
 
 def each( &blk )
@@ -89,10 +190,20 @@ def each( &blk )
 end
 
 
+
+
+
+
 ### use a function for (re)use
 ###   note - may add seasons in place!! (if seasons is empty)
 ##
 ##   todo/check - change source_path to (simply) path - why? why not?
+##
+##
+##  add a flag for allowing empty/auto-fill of seasons - why? why not?
+##     or make it a separate method e.g. complete/fix_seasons or such? - why? why not?
+
+
 def validate!( source_path: ['.'] )
     each do |league_key, seasons|
   
@@ -101,25 +212,6 @@ def validate!( source_path: ['.'] )
         exit 1
       end
   
-  
-      if seasons.empty?
-        ## simple heuristic to find current season
-        [ Season( '2024/25'), Season( '2025') ].each do |season|
-           league_info = LeagueCodes.find_by( code: league_key, season: season )
-           filename = "#{season.to_path}/#{league_info['code']}.csv"
-           path = find_file( filename, path: source_path )
-           if path
-              seasons << season
-              break
-           end
-        end
-  
-        if seasons.empty?
-          puts "!! ERROR - (leagueset) no latest auto-season via source found for #{league_key}; sorry"
-          exit 1
-        end
-      end
-  
       ## check source path too upfront - why? why not?
       seasons.each do |season|
            ## check league code config too - why? why not?

data/lib/leagues/timezones.rb

@@ -159,11 +159,13 @@ def find_zone( league:, season: )
                  zones
               end
 
-
+   season      = Season( season )
+   league_code = league.to_s.downcase
+   
+=begin
    ###
    ##  map code here - why? why not?
    ##   or (always) require canoncial code???
-   season      = Season( season )
    league_info = LeagueCodes.find_by( code: league, season: season )
 
    league_code = if league_info
@@ -174,6 +176,7 @@ def find_zone( league:, season: )
                     ##    or report error in the future - why? why not?
                     league.to_s.downcase
                  end
+=end
 
 
    ##  e.g. world+2022, etc.

data/lib/leagues/version.rb

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

data/lib/leagues.rb

@@ -28,13 +28,20 @@ LeagueSet = Leagueset
 module LeaguesetHelper
   ###
   ### note - make read_leagueset & friends public/global by default - why? why not?
-  def read_leagueset( path )       Leagueset.read( path ); end
-  def parse_leagueset( txt )       Leagueset.parse( txt ); end
-  def parse_leagueset_args( args ) Leagueset.parse_args( args ); end
+  def read_leagueset( path, autofill: nil )       
+      Leagueset.read( path, autofill: autofill )
+  end
+  def parse_leagueset( txt, autofill: nil )       
+      Leagueset.parse( txt, autofill: autofill )
+  end
+  def parse_leagueset_args( args, autofill: nil ) 
+      Leagueset.parse_args( args, autofill: autofill )
+  end
 end
 
 
 
+
 module FileHelper
   def find_file( filename, path: )
     path.each do |src_dir|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leagues
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -88,7 +88,8 @@ dependencies:
         version: '4.2'
 description: leagues - football leagues & timezone helpers
 email: gerald.bauer@gmail.com
-executables: []
+executables:
+- fbok
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
@@ -99,6 +100,7 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- bin/fbok
 - config/codes_alt.csv
 - config/leagues.csv
 - config/leagues_more.csv