footballdata-api 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3350fb47d596e6d5b2e4d73582b2615020d56db38cf86d9545a10b1760494c1
-  data.tar.gz: d7ba6c51f3e12beed59df7b851e8d533a838de67e73c5b1d025ab7a1256caa7d
+  metadata.gz: 0556b03185d985c2f364151400a6dfe04ee9160e8560739e005e00a3e872b806
+  data.tar.gz: 17711037928d5c213a7915245a2d511e7fba6f4c47ff582357616c87a1ffd7cc
 SHA512:
-  metadata.gz: 2943bcf6f2da49dfc1cab26da0933957d2bde2fb13749c7ce4d4896214484bac3edcea197e01ed9b2b63f92e2e74f560ac49189f63be7644522b7b24b7cbed73
-  data.tar.gz: 945cc2d0cb9346434c6f3875c33dd153867318b73e067c5574bc6e789f7b3b293d5c7f126c80221c676998eaa0e532647b7a25b960d082097209b6a1428f879e
+  metadata.gz: d1bbeef48c5633b97e984e535857ba294a3326cddf1fd6d20ea426d33c95c0e0c7d6e9d12f9fa4a97a12291ba3c1d12e4751f57a5f0bfe3e736ebcf34be56f51
+  data.tar.gz: 2640f463715d6a0ff697502dfdd8af38e3c7cf0d6dafc0fb575d44360b548a692ff9c256d6e3ad4e9673dd108636969f372d7a2e153d872ee8c240b2e470e4c6

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.3.1
+### 0.4.1
 
 ### 0.0.1 / 2024-07-03
 

data/Manifest.txt

@@ -4,8 +4,8 @@ README.md
 Rakefile
 bin/fbdat
 config/leagues.csv
-config/timezones.csv
 lib/footballdata.rb
+lib/footballdata/convert-score.rb
 lib/footballdata/convert.rb
 lib/footballdata/download.rb
 lib/footballdata/leagues.rb
@@ -13,5 +13,4 @@ lib/footballdata/mods.rb
 lib/footballdata/prettyprint.rb
 lib/footballdata/stat.rb
 lib/footballdata/teams.rb
-lib/footballdata/timezones.rb
 lib/footballdata/version.rb

data/Rakefile

@@ -18,10 +18,8 @@ Hoe.spec 'footballdata-api' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['tzinfo'],
-    ['season-formats'],
+    ['football-timezones'],
     ['webget'],
-    ['cocos'],  ## later pull in with sportsdb-writers
   ]
 
   self.licenses = ['Public Domain']

data/bin/fbdat

@@ -20,12 +20,17 @@ Webcache.root =  if File.exist?( '/sports/cache' )
 ##              (one request every 6 seconds 6*10=60 secs)
 ##     10 API calls per minute max.
 ##  note - default sleep (delay in secs) is 3 sec(s)
-Webget.config.sleep  = 10
 
-
-Footballdata.config.convert.out_dir = '/sports/cache.api.fbdat'   if File.exist?( '/sports/cache.api.fbdat' )
+## change from 10 to 1 sec(s) for interactive use
+Webget.config.sleep  = 1
 
 
+Footballdata.config.convert.out_dir =  if File.exist?( '/sports/cache.api.fbdat' )
+                                           puts "  setting convert out_dir to >/sports/cache.api.fbdat<"
+                                           '/sports/cache.api.fbdat'
+                                       else
+                                           '.' ## use working dir
+                                       end
 
 
 require 'optparse'

data/lib/footballdata/convert-score.rb

@@ -0,0 +1,44 @@
+
+module Footballdata
+
+def self.convert_score( score )
+  ## duration: REGULAR  · PENALTY_SHOOTOUT  · EXTRA_TIME
+  ft, ht, et, pen = ["","","",""]
+
+  if score['duration'] == 'REGULAR'
+    ft  = "#{score['fullTime']['home']}-#{score['fullTime']['away']}"
+    ht  = "#{score['halfTime']['home']}-#{score['halfTime']['away']}"
+  elsif score['duration'] == 'EXTRA_TIME'
+    et  =  "#{score['regularTime']['home']+score['extraTime']['home']}"
+    et << "-"
+    et << "#{score['regularTime']['away']+score['extraTime']['away']}"
+
+    ft =  "#{score['regularTime']['home']}-#{score['regularTime']['away']}"
+    ht =  "#{score['halfTime']['home']}-#{score['halfTime']['away']}"
+  elsif score['duration'] == 'PENALTY_SHOOTOUT'
+    if score['extraTime']
+      ## quick & dirty hack - calc et via regulartime+extratime
+      pen = "#{score['penalties']['home']}-#{score['penalties']['away']}"
+      et  = "#{score['regularTime']['home']+score['extraTime']['home']}"
+      et << "-"
+      et << "#{score['regularTime']['away']+score['extraTime']['away']}"
+
+      ft = "#{score['regularTime']['home']}-#{score['regularTime']['away']}"
+      ht = "#{score['halfTime']['home']}-#{score['halfTime']['away']}"
+    else  ### south american-style (no extra time)
+        ## quick & dirty hacke - calc ft via fullTime-penalties
+        pen =  "#{score['penalties']['home']}-#{score['penalties']['away']}"
+        ft  =  "#{score['fullTime']['home']-score['penalties']['home']}"
+        ft << "-"
+        ft << "#{score['fullTime']['away']-score['penalties']['away']}"
+        ht  = "#{score['halfTime']['home']}-#{score['halfTime']['away']}"
+    end
+  else
+    puts "!! unknown score duration:"
+    pp score
+    exit 1
+  end
+
+  [ft,ht,et,pen]
+end
+end  # module Footballdata

data/lib/footballdata/convert.rb

@@ -1,49 +1,6 @@
 
 module Footballdata
 
-
-def self.convert_score( score )
-  ## duration: REGULAR  · PENALTY_SHOOTOUT  · EXTRA_TIME
-  ft, ht, et, pen = ["","","",""]
-
-  if score['duration'] == 'REGULAR'
-    ft  = "#{score['fullTime']['home']}-#{score['fullTime']['away']}"
-    ht  = "#{score['halfTime']['home']}-#{score['halfTime']['away']}"
-  elsif score['duration'] == 'EXTRA_TIME'
-    et  =  "#{score['regularTime']['home']+score['extraTime']['home']}"
-    et << "-"
-    et << "#{score['regularTime']['away']+score['extraTime']['away']}"
-
-    ft =  "#{score['regularTime']['home']}-#{score['regularTime']['away']}"
-    ht =  "#{score['halfTime']['home']}-#{score['halfTime']['away']}"
-  elsif score['duration'] == 'PENALTY_SHOOTOUT'
-    if score['extraTime']
-      ## quick & dirty hack - calc et via regulartime+extratime
-      pen = "#{score['penalties']['home']}-#{score['penalties']['away']}"
-      et  = "#{score['regularTime']['home']+score['extraTime']['home']}"
-      et << "-"
-      et << "#{score['regularTime']['away']+score['extraTime']['away']}"
-
-      ft = "#{score['regularTime']['home']}-#{score['regularTime']['away']}"
-      ht = "#{score['halfTime']['home']}-#{score['halfTime']['away']}"
-    else  ### south american-style (no extra time)
-        ## quick & dirty hacke - calc ft via fullTime-penalties
-        pen =  "#{score['penalties']['home']}-#{score['penalties']['away']}"
-        ft  =  "#{score['fullTime']['home']-score['penalties']['home']}"
-        ft << "-"
-        ft << "#{score['fullTime']['away']-score['penalties']['away']}"
-        ht  = "#{score['halfTime']['home']}-#{score['halfTime']['away']}"
-    end
-  else
-    puts "!! unknown score duration:"
-    pp score
-    exit 1
-  end
-
-  [ft,ht,et,pen]
-end
-
-
 #######
 ##  map round-like to higher-level stages
 STAGES = {
@@ -80,13 +37,6 @@ STAGES = {
 
 def self.convert( league:, season: )
 
-  ### note/fix: cl (champions league for now is a "special" case)
-  # if league.downcase == 'cl'
-  #   convert_cl( league: league,
-  #              season: season )
-  #  return
-  # end
-
   season = Season( season )   ## cast (ensure) season class (NOT string, integer, etc.)
 
   league_code = find_league!( league )
@@ -237,22 +187,16 @@ matches.each do |m|
     end
 
 
-    ##
-    ##  add time, timezone(tz)
-    ##    2023-08-18T18:30:00Z
-    ## e.g. "utcDate": "2020-05-09T00:00:00Z",
-    ##      "utcDate": "2023-08-18T18:30:00Z",
-
-    ## -- todo - make sure / assert it's always utc - how???
-    ## utc   = ## tz_utc.strptime( m['utcDate'], '%Y-%m-%dT%H:%M:%SZ' )
-    ##  note:  DateTime.strptime  is supposed to be unaware of timezones!!!
-    ##            use to parse utc
+
     utc = UTC.strptime( m['utcDate'], '%Y-%m-%dT%H:%M:%SZ' )
     assert( utc.strftime( '%Y-%m-%dT%H:%M:%SZ' ) == m['utcDate'], 'utc time mismatch' )
 
 
+    ## do NOT add time if status is SCHEDULED
+    ##                        or POSTPONED for now
+    ##   otherwise assume time always present - why? why not?
+    ##
     ## assume NOT valid utc time if 00:00
-    ##   do
     if utc.hour == 0 && utc.min == 0 &&
        ['SCHEDULED','POSTPONED'].include?( m['status'] )
        date     = utc.strftime( '%Y-%m-%d' )
@@ -266,13 +210,6 @@ matches.each do |m|
     end
 
 
-    ## do NOT add time if status is SCHEDULED
-    ##                        or POSTPONED for now
-    ##   otherwise assume time always present - why? why not?
-
-
-
-    ## todo/fix: assert matchday is a number e.g. 1,2,3, etc.!!!
     recs << [stage,
              group,
              matchday,

data/lib/footballdata/version.rb

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

data/lib/footballdata.rb

@@ -1,14 +1,8 @@
 ## 3rd party (our own)
-require 'season/formats'   ## add season support
+require 'football/timezones'  # note - pulls in season/formats, cocos & tzinfo
 require 'webget'           ## incl. webget, webcache, webclient, etc.
 
 
-require 'cocos'   ## check if webget incl. cocos ??
-
-
-require 'tzinfo'
-
-
 module Footballdata
   class Configuration
     #########
@@ -36,13 +30,13 @@ end   # module Footballdata
 # our own code
 require_relative 'footballdata/version'
 require_relative 'footballdata/leagues'
-require_relative 'footballdata/timezones'
 
 require_relative 'footballdata/download'
 require_relative 'footballdata/prettyprint'
 
 require_relative 'footballdata/mods'
 require_relative 'footballdata/convert'
+require_relative 'footballdata/convert-score'
 require_relative 'footballdata/teams'
 
 

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: footballdata-api
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tzinfo
-  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: season-formats
+  name: football-timezones
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cocos
-  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: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -117,8 +89,8 @@ files:
 - Rakefile
 - bin/fbdat
 - config/leagues.csv
-- config/timezones.csv
 - lib/footballdata.rb
+- lib/footballdata/convert-score.rb
 - lib/footballdata/convert.rb
 - lib/footballdata/download.rb
 - lib/footballdata/leagues.rb
@@ -126,7 +98,6 @@ files:
 - lib/footballdata/prettyprint.rb
 - lib/footballdata/stat.rb
 - lib/footballdata/teams.rb
-- lib/footballdata/timezones.rb
 - lib/footballdata/version.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:

data/config/timezones.csv

@@ -1,27 +0,0 @@
-key,    zone
-eng,    Europe/London
-es,     Europe/Madrid
-de,     Europe/Berlin
-fr,     Europe/Paris
-it,     Europe/Rome
-
-nl,     Europe/Amsterdam
-pt,     Europe/Lisbon
-
-## for champs default for not to cet (central european time) - why? why not?
-uefa.cl,  Europe/Paris
-euro,     Europe/Paris
-
-## todo/fix - pt.1
-##  one team in madeira!!! check for different timezone??
-##  CD Nacional da Madeira
-
-br,  America/Sao_Paulo
-    ## todo/fix - brazil has 4 timezones
-    ##           really only two in use for clubs
-    ##             west and east (amazonas et al)
-    ##           for now use west for all - why? why not?
-copa.l,  America/Sao_Paulo
-
-
-##  world+2022,    add quatar here

data/lib/footballdata/timezones.rb

@@ -1,97 +0,0 @@
-
-class UTC
-  def self.now()  Time.now.utc; end
-  def self.today() now.to_date; end
-
-  ## -- todo - make sure / assert it's always utc - how???
-  ## utc   = ## tz_utc.strptime( m['utcDate'], '%Y-%m-%dT%H:%M:%SZ' )
-  ##  note:  DateTime.strptime  is supposed to be unaware of timezones!!!
-  ##            use to parse utc
-  ## quick hack -
-  ##     use to_time.getutc instead of utc ???
-  def self.strptime( str, format )
-      DateTime.strptime( str, format ).to_time.utc
-  end
-
-  def self.find_zone( name )
-     zone = TZInfo::Timezone.get( name )
-     ## wrap tzinfo timezone in our own - for adding more (auto)checks etc.
-     zone ? Timezone.new( zone ) : nil
-  end
-
-class Timezone   ## nested inside UTC
-   ## todo/fix
-   ##  cache timezone - why? why not?
-   def initialize( zone )
-     @zone = zone
-   end
-
-   def to_local( time )
-      ## assert time is Time (not Date or DateTIme)
-      ##  and assert utc!!!
-      assert( time.is_a?( Time ),  "time #{time} is NOT of class Time; got #{time.class.name}" )
-      assert( time.utc?,           "time #{time} is NOT utc; utc? returns #{time.utc?}" )
-      local = @zone.to_local( time )
-      local
-   end
-
-   def assert( cond, msg )
-    if cond
-      # do nothing
-    else
-      puts "!!! assert failed - #{msg}"
-      exit 1
-    end
-  end
-end  # class Timezone
-end   # class UTC
-
-
-
-module Footballdata
-def self.find_zone!( league:, season: )
-   @zones ||= begin
-                recs = read_csv( "#{FootballdataApi.root}/config/timezones.csv" )
-                zones = {}
-                recs.each do |rec|
-                    zone = UTC.find_zone( rec['zone'] )
-                    if zone.nil?
-                      ## raise ArgumentError - invalid zone
-                      puts "!! ERROR - cannot find timezone in timezone db:"
-                      pp rec
-                      exit 1
-                    end
-                    zones[ rec['key']] = zone
-                end
-                zones
-              end
-
-
-   ## lookup first try by league+season
-   league_code = league.downcase
-   season      = Season( season )
-
-   ##  e.g. world+2022, etc.
-   key = "#{league_code}+#{season}"
-   zone = @zones[key]
-
-   ## try league e.g. eng.1 etc.
-   zone = @zones[league_code]  if zone.nil?
-
-   ## try first code only (country code )
-   if zone.nil?
-     code, _  = league_code.split( '.', 2 )
-     zone = @zones[code]
-   end
-
-   if zone.nil?  ## still not found; report error
-      puts "!! ERROR: no timezone found for #{league} #{season}"
-      exit 1
-   end
-
-   zone
-end
-end # module Footballdata
-
-
-