footballdata-api 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97e75a5cbf4b952cb018a40c4ff790a201c26cbd95af1027bae3e7ac2153d1b5
-  data.tar.gz: a4d0cfd2e6ff636f030cd6c4d4d949f2173763cc39352b28b3425ad9aa077796
+  metadata.gz: b5bd4d077f49907b80638105f2152e677540431fee3cee6b9022c48c8a3daadd
+  data.tar.gz: fa80a496acc7e4d3bc2a4095543716c56cf5497b27b994dd173a468ba220b041
 SHA512:
-  metadata.gz: d1c8650effbb80caec23410ee3fc739f379976359f044b29eff3a02d7bd82f23d76f7daffd6b2cfa76dfbdcbc6be53e178a04929b02401a30641f29cb3d0bd18
-  data.tar.gz: 39d810683288fc35703f19fd1643af8bb0b8332168ae4d4e819eb681444ea4c27e7c0b36daccf27fc97d02704aa6325696579a6d5b3941988cd6bef8f400d0ec
+  metadata.gz: 51c7867e5767815a885c9ea7c45df6ae8305bcc74ac8d377ac96de8be9c9577441b5d5fb9c88d40f53af7b0ca1798673cf4c07149291dc6daaa53dd5632be384
+  data.tar.gz: 25a7b9227fe453551d5f76b9a1f0f09c255ffa75e6f3aaa36f7ad5791130ecd42474b0da8c1b5f2f11c915665e601c8749a1ae1ce5efa6920d935d32a403bef7

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.4.2
+### 0.4.4
 
 ### 0.0.1 / 2024-07-03
 

data/README.md

@@ -1,4 +1,4 @@
-# footballdata-api  - get football data via Daniel Freitag's football-data.org api v4  
+# footballdata-api  - get football data via Daniel Freitag's football-data.org api v4
 
 
 * home  :: [github.com/sportdb/sport.db](https://github.com/sportdb/sport.db)
@@ -48,14 +48,13 @@ Footballdata.schedule( league: 'eng.2', season: '2020/21' )
 
 Footballdata.schedule( league: 'de.1', season: '2020/21' )
 Footballdata.schedule( league: 'es.1', season: '2020/21' )
-
 Footballdata.schedule( league: 'fr.1', season: '2020/21' )
 Footballdata.schedule( league: 'it.1', season: '2020/21' )
 
 Footballdata.schedule( league: 'nl.1', season: '2020/21' )
 Footballdata.schedule( league: 'pt.1', season: '2020/21' )
 
-Footballdata.schedule( league: 'cl',   season: '2020/21' )
+Footballdata.schedule( league: 'uefa.cl', season: '2020/21' )
 
 # note: Brasileirão - season is a calendar year (NOT an academic year)
 Footballdata.schedule( league: 'br.1', season: '2020' )
@@ -83,7 +82,7 @@ require 'footballdata'
  'it.1',
  'nl.1',
  'pt.1',
- 'cl',
+ 'uefa.cl',
 ].each do |league|
   Footballdata.convert( league: league, season: '2020/21' )
 end

data/Rakefile

@@ -19,6 +19,7 @@ Hoe.spec 'footballdata-api' do
 
   self.extra_deps = [
     ['football-timezones'],
+    ['fifa'],
     ['webget'],
   ]
 

data/lib/footballdata/convert.rb

@@ -3,6 +3,8 @@ module Footballdata
 
 #######
 ##  map round-like to higher-level stages
+##      fix - map by league codes
+##              or * (all)
 STAGES = {
   'REGULAR_SEASON'          => ['Regular'],
 
@@ -37,6 +39,30 @@ STAGES = {
 
 
 
+
+def self.find_team_country_code( name, teams: )
+  ## add (fifa) country code e.g.
+  ##      Liverpool FC => Liverpool FC (ENG)
+  ##  or  Liverpool FC => Liverpool FC (URU)
+  rec = teams[ name ]
+  if rec.nil?
+    puts "!! ERROR - no team record found in teams.json for #{name}"
+    pp teams.keys
+    exit 1
+  end
+
+  country_name = rec['area']['name']
+  country  = Fifa.world.find_by_name( country_name )
+  if country.nil?
+    puts "!! ERROR - no country record found for #{country_name}"
+    exit 1
+  end
+
+  country.code
+end
+
+
+
 def self.convert( league:, season: )
 
   season = Season( season )   ## cast (ensure) season class (NOT string, integer, etc.)
@@ -50,6 +76,14 @@ def self.convert( league:, season: )
   data_teams     = Webcache.read_json( teams_url )
 
 
+  ## note - for internation club tournaments
+  ##         auto-add (fifa) country code e.g.
+  ##      Liverpool FC  => Liverpool FC (ENG)
+  ##
+  ##  todo/fix -  move flag to league_info via .csv config - why? why not?
+  clubs_intl  =  ['uefa.cl',
+                  'copa.l'].include?(league.downcase) ? true : false
+
 
   ## check for time zone
   tz  = find_zone!( league: league,
@@ -94,10 +128,17 @@ matches.each do |m|
   team1 = m['homeTeam']['name'] || 'N.N.'
   team2 = m['awayTeam']['name'] || 'N.N.'
 
-  score = m['score']
+   ## auto-fix copa.l 2024
+   ##  !! ERROR: unsupported match status >IN_PLAY< - sorry:
+   if m['status'] == 'IN_PLAY' &&
+      team1 == 'Club Aurora' && team2 == 'FBC Melgar'
+        m['status'] = 'FINISHED'
+   end
 
 
 
+  score = m['score']
+
   group = m['group']
   ## GROUP_A
   ##  shorten group to A|B|C etc.
@@ -151,8 +192,9 @@ matches.each do |m|
   end
 
 
-    teams[ team1 ] += 1
-    teams[ team2 ] += 1
+  teams[ team1 ] += 1
+  teams[ team2 ] += 1
+
 
     ### mods - rename club names
     unless mods.nil? || mods.empty?
@@ -160,13 +202,22 @@ matches.each do |m|
       team2 = mods[ team2 ]      if mods[ team2 ]
     end
 
+  ####
+  #   auto-add (fifa) country code if int'l club tournament
+  if clubs_intl
+    ## note - use "original" name (not moded) for lookup
+    team1_org = m['homeTeam']['name']
+    team2_org = m['awayTeam']['name']
+    if team1_org   ## note - ignore no team/placeholder (e.g. N.N)
+      country_code = find_team_country_code( team1_org, teams: teams_by_name )
+      team1 = "#{team1} (#{country_code})"
+    end
+    if team2_org   ## note - ignore no team/placeholder (e.g. N.N)
+      country_code = find_team_country_code( team2_org, teams: teams_by_name )
+      team2 = "#{team2} (#{country_code})"
+    end
+  end
 
-   ## auto-fix copa.l 2024
-   ##  !! ERROR: unsupported match status >IN_PLAY< - sorry:
-   if m['status'] == 'IN_PLAY' &&
-      team1 == 'Club Aurora' && team2 == 'FBC Melgar'
-        m['status'] = 'FINISHED'
-   end
 
 
     comments = ''
@@ -178,7 +229,7 @@ matches.each do |m|
     stats['status'][m['status']]  += 1  ## track status counts
 
     case m['status']
-    when 'SCHEDULED', 'TIMED'   ## , 'IN_PLAY'
+    when 'SCHEDULED', 'TIMED'   ## , 'IN_PLAY', 'PAUSED'
       ft = ''
       ht = ''
     when 'FINISHED'

data/lib/footballdata/mods.rb

@@ -12,6 +12,9 @@ module Footballdata
     'br.1' => {
        'América FC' => 'América Mineiro',  # in year 2018 ??
     },
+    'copa.l' => {
+       'América FC' => 'América Mineiro',  # in year 2022
+    },
     'pt.1' => {
       'Vitória SC' => 'Vitória Guimarães',  ## avoid easy confusion with Vitória SC <=> Vitória FC
       'Vitória FC' => 'Vitória Setúbal',

data/lib/footballdata/version.rb

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

data/lib/footballdata.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: footballdata-api
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-15 00:00:00.000000000 Z
+date: 2024-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: football-timezones
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fifa
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webget
   requirement: !ruby/object:Gem::Requirement