leagues 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3e154b72da0c4677b811ac922b37fee501f25cb28aa57dbbba608a0bd2787ff
-  data.tar.gz: be12dab4eceae8bcf4f375baf1680917257b1c0ccd1849004eb9357be0200b33
+  metadata.gz: 51f3a37d90c06b3b6fb5237d9a83b8f01d045be5f07f8854ece891e58c1d58ae
+  data.tar.gz: bb4ce11c4cba0efb9718516428eac848089a275ab12bfab1e951c77d5b89d93f
 SHA512:
-  metadata.gz: 20fd53b2c9c5bbeed88ba3148cb7b6e2f92af0fb8aa6c0c5e6e9e6b8e648ba44b16dffbe33f09eb7b5cab331b258d2e94f4aeed5727cb6c5b184847208add4a9
-  data.tar.gz: afcc3bed4307de477823689ba1d255e63815cddaa7ff5062dac7ca2a2a07cc21b049bc8c92ffe4a7a0694cfd122fd9eff8e06a308e122d6e8db704f6631f8a92
+  metadata.gz: 1b36074ee4903210002c28b7e440464ac95c5415dc76dbd71081d6966a665d81a67bd8915cc2d4d1d9f15a4af7a7f063aa0419076950d7b7b5341747cc32cfdd
+  data.tar.gz: 96b993022a5b071393cb569c49ec99b0c57d0e30e7cf7a54858f3570c79ccd38f807bb8522a222aec94b7301a2ec13a6c137a3caa02358fe575a71cc2d56e13b

data/CHANGELOG.md

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

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
 

data/lib/leagues/league_codes.rb

@@ -6,6 +6,7 @@
 module SportDb
 class LeagueCodes 
     
+
 ####
 ## (public) api
 def self.valid?( code )   
@@ -135,6 +136,13 @@ def find_by( code:, season: )
     end
   end
 
+
+  if rec   ## (quick hack for now) auto-add timezone
+      ## use canoncial (league) code
+     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,11 +65,12 @@ def self.parse_args( args )
            datasets << [key, []]
        end
     end
-    new(datasets)
+
+    new(datasets, autofill: autofill)
 end
 
 
-def self.parse( txt )
+def self.parse( txt, autofill: nil )
     ### split args in datasets with leagues and seasons
     datasets = []
     recs = parse_csv( txt )
@@ -69,17 +99,72 @@ def self.parse( txt )
             end
         end
     end
-    new(datasets)
+
+    new(datasets, autofill: autofill)
+end
+
+def self.read( path, autofill: nil ) 
+   parse( read_text( path ), autofill: autofill )
+end
+
+
+
+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 self.read( path ) parse( read_text( path )); 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 initialize( recs )
-    @recs = recs
+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 +174,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 +196,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

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

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.1.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo