leagues 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51f3a37d90c06b3b6fb5237d9a83b8f01d045be5f07f8854ece891e58c1d58ae
-  data.tar.gz: bb4ce11c4cba0efb9718516428eac848089a275ab12bfab1e951c77d5b89d93f
+  metadata.gz: 1b61c5794e4e1aa3657c553c73bdb0d912b909097ce06aabe098fb013b142113
+  data.tar.gz: cac21b539d073c7061f7138c2a0935771ee81d7dd4321362c524e2a9953c14e8
 SHA512:
-  metadata.gz: 1b36074ee4903210002c28b7e440464ac95c5415dc76dbd71081d6966a665d81a67bd8915cc2d4d1d9f15a4af7a7f063aa0419076950d7b7b5341747cc32cfdd
-  data.tar.gz: 96b993022a5b071393cb569c49ec99b0c57d0e30e7cf7a54858f3570c79ccd38f807bb8522a222aec94b7301a2ec13a6c137a3caa02358fe575a71cc2d56e13b
+  metadata.gz: 1af29b03971fa6708f9ca33ae6072a0b11899a544d7fc0d72e6198f80ec1fbcca87a9fcc28483bf3c52895064680e70af126ccba2127cc0bdd6b12dad76cf30c
+  data.tar.gz: 5843bc59ba35cafce9c095008d6501e43630284c26b742aaa429260ef71224c921c0bfeb39344bb1999a5e47a46997ce5950b2ddc00a495ba2c5d2c14ce2c7c8

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.1.1
+### 0.2.1
 
 ### 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/Rakefile

@@ -18,8 +18,8 @@ Hoe.spec 'leagues' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['tzinfo'],
-    ['season-formats'],
+    ['tzinfo'],    ## note - check if tzinfo-data or such is required too???
+    ['season-formats', '>= 0.1.0'],
     ['cocos'],
   ]
 

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 =  Season.parse_line( 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 errors
+        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 errors
+    else
+        puts
+        puts "OK  no error(s) found"
+    end
+end
+
+
+
+path = args[0]
+check_leagueset( path )
+
+puts 'bye'

data/config/codes_alt.csv

@@ -62,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

@@ -139,6 +139,9 @@ def find_by( code:, season: )
 
   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
 

data/lib/leagues/leagueset.rb

@@ -70,35 +70,19 @@ def self.parse_args( args, autofill: nil )
 end
 
 
+
 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
+        seasons =  Season.parse_line( seasons_str )
+
+        datasets << [key, seasons]
+  end 
 
     new(datasets, autofill: autofill)
 end

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 = 1
     VERSION = [MAJOR,MINOR,PATCH].join('.')
 

data/lib/leagues.rb

@@ -41,7 +41,9 @@ end
 
 
 
-
+##
+## todo/check
+##  note - move FileHelper upstream to cocos (code commons) - why? why not?
 module FileHelper
   def find_file( filename, path: )
     path.each do |src_dir|
@@ -56,6 +58,7 @@ end
 
 
 
+
 ####
 ### note - make find_zone! public/global by default - why? why not?
 module Kernel

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leagues
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-02 00:00:00.000000000 Z
+date: 2025-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: cocos
   requirement: !ruby/object:Gem::Requirement
@@ -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