footballdata-api 0.4.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eef9e220606c9f5c1642b1b6f2dbec9aa1ebe1f21b27c79e5f7d6d3f46808f0
-  data.tar.gz: b6a3c80beec2d05fec8f5095ef312a7c203c42285b8335ee9c98302c3a17b7ce
+  metadata.gz: 1f57e1559b42ee3e85f0ebeca5f1886110fe4964e48b0c58c2f7bd6713c167b7
+  data.tar.gz: 1e2e40dd8ab8b2cb4c33f10331e9019116ef5453bec5d6f58a64567947f9121b
 SHA512:
-  metadata.gz: e8df71833510a8d936b40ab02d49d2a1f16b6d94d2dbd2b8c94bc90fc960c2ee0fb29d5adf74d3645f30a620d8327d9c6ed078b869524503fb9641d5581a849d
-  data.tar.gz: '098ed870e9c081485ac45f1cf3a3c697bbc922dd9f96f85ef046b1e1a8829bf07a6041761a10062cc47f28c9471c93bbb93a05f7bcf3c1e99228b438571cdad3'
+  metadata.gz: 84d991d2f3a18b440da187df5ac140db10a763f51a07b42a6d7f0c120976ce7db64b155f33c02d0901eb81b788ff6dfb163c1076840261ca1a46aa30b41b93b1
+  data.tar.gz: aafab943f237494592d78238acdb44f84cd66f48170463a5a624f195eed0f8954770963334e287de5262390578abc6110abe3c89b75f4024418f580ff70de88b

data/CHANGELOG.md

@@ -1,5 +1,4 @@
-### 0.4.5
-
+### 0.5.1
 ### 0.0.1 / 2024-07-03
 
 * Everything is new. First release.

data/Rakefile

@@ -18,7 +18,7 @@ Hoe.spec 'footballdata-api' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['football-timezones'],
+    ['leagues'],
     ['fifa'],
     ['webget'],
   ]

data/bin/fbdat

@@ -190,36 +190,20 @@ end
 ## note - only use "generic" uniform league codes for now!!
 
 
+autofiller = ->(league_query) {
+                   seasons = find_league_seasons!( league_query ) || []
+                   seasons[ 0 ]  ## assume first is latest season
+               }
+
+
+
 datasets = if opts[:file]
-              read_datasets( opts[:file] )
+              read_leagueset( opts[:file], autofill: autofiller )
            else
-              parse_datasets_args( args )
+              parse_leagueset_args( args, autofill: autofiller )
            end
 
 
-## step 0 - validate and fill-up seasons etc.
-datasets.each do |dataset|
-  league_key, seasons = dataset
-
-  ##  todo - find a better name
-  ##  use internal_league_code or such - why? why not?
-  ###  convenience helpers - lets you use eng.1, euro, etc.
-  ## check if mapping for league_code
-  metal_league_code = find_league!( league_key )
-
-  ## note - default to latest season of league
-  ##              might be 2024/25 or 2024 or
-  #                 for world cup 2022 or such
-  if seasons.empty?
-     seasons = case league_key
-               when  'world'          then [Season('2022')]
-               when  'euro'           then [Season('2024')]
-               when  'br.1', 'copa.l' then [Season('2024')]
-               else                        [Season('2024/25')]
-               end
-    dataset[1] = seasons
-  end
-end
 
 ## step 1 - download
 datasets.each do |league_key, seasons|

data/config/leagues_tier1.csv

@@ -24,7 +24,7 @@ fr.1,     FL1,    2024/25 2023/24 2022/23 2021/22 2020/21
 it.1,      SA,    2024/25 2023/24 2022/23 2021/22 2020/21
     # SA  - Serie A, Italy          15 seasons | 2019-08-24 - 2020-08-02 / matchday 27
 
-br.1,       BSA,     2024 2023 2022 2021 2020
+br.1,       BSA,     2025 2024 2023 2022 2021 2020
 
 
 ########
@@ -34,7 +34,7 @@ uefa.cl,    CL,    2024/25 2023/24 2022/23 2021/22 2020/21
     ##  was europe.cl / cl
     ## todo/check: use champs and NOT cl - why? why not?
 
-copa.l,     CLI,    2024 2023 2022 2021
+copa.l,     CLI,    2025 2024 2023 2022 2021
    ## Copa Libertadores
 
 

data/lib/footballdata/convert.rb

@@ -67,6 +67,7 @@ def self.convert( league:, season: )
 
   season = Season( season )   ## cast (ensure) season class (NOT string, integer, etc.)
 
+  ### note - find_league returns the metal_league_code 
   league_code = find_league!( league )
 
   matches_url = Metal.competition_matches_url( league_code, season.start_year )
@@ -76,7 +77,14 @@ def self.convert( league:, season: )
   data_teams     = Webcache.read_json( teams_url )
 
 
-  ## note - for internation club tournaments
+  ###
+  ## todo/fix - use find_by!  - add upstream!!!
+  league_info = LeagueCodes.find_by( code: league, season: season )
+  ## check for time zone
+  tz  = league_info['tz']
+  pp tz
+
+  ## note - for international club tournaments
   ##         auto-add (fifa) country code e.g.
   ##      Liverpool FC  => Liverpool FC (ENG)
   ##
@@ -85,10 +93,6 @@ def self.convert( league:, season: )
                   'copa.l'].include?(league.downcase) ? true : false
 
 
-  ## check for time zone
-  tz  = find_zone!( league: league,
-                    season: season )
-  pp tz
 
   ## build a (reverse) team lookup by name
   puts "#{data_teams['teams'].size} teams"

data/lib/footballdata/leagues.rb

@@ -20,5 +20,32 @@ module Footballdata
      end
      code
   end
+
+###
+#  quick (and dirty) hack - return seasons by league code
+#     - todo/fix - use one find_league_info method for all or such
+ def self.find_league_seasons!( league )
+     @league_seasons ||= begin
+                     recs = read_csv( "#{FootballdataApi.root}/config/leagues_tier1.csv" )
+                     leagues = {}
+                     recs.each do |rec|
+                        leagues[ rec['key'] ] = rec['seasons']
+                     end
+                     leagues
+                  end
+
+     key = league.downcase
+     seasons =  @league_seasons[ key ]
+     if seasons.nil?
+        puts "!! ERROR - no code/mapping found for league >#{league}<"
+        puts "     mappings include:"
+        pp @league_seasons
+        exit 1
+     end
+
+     ### split string into array
+     seasons = seasons.split( /[ ]+/ )
+     seasons
+  end
 end   #  module Footballdata
 

data/lib/footballdata/version.rb

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

data/lib/footballdata.rb

@@ -1,5 +1,5 @@
 ## 3rd party (our own)
-require 'football/timezones'  # note - pulls in season/formats, cocos & tzinfo
+require 'leagues'          # note - pulls in season/formats, cocos & tzinfo
 require 'webget'           ## incl. webget, webcache, webclient, etc.
 require 'fifa'
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: footballdata-api
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-07 00:00:00.000000000 Z
+date: 2025-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: football-timezones
+  name: leagues
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 description: footballdata-api - get football data via Daniel Freitag's football-data.org
   api v4
 email: gerald.bauer@gmail.com
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: footballdata-api - get football data via Daniel Freitag's football-data.org