football-timezones 0.0.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f628a9691af73e5ab5f28f1be1cd09bae28ecf6e064e7efc4cb91867c182bf0a
-  data.tar.gz: 6273d92f3482d84bf785b6c161e4b71cf84172802c3ad40ffe3119f45c7f5fdf
+  metadata.gz: d8574fc2a4c6312eb5f3080f41b1f08a353618b65f049876b2d1c90752e1f579
+  data.tar.gz: 001a40fbd239ab29c44104f1c67e1f033a4389974ce5699ffd9f61ce44e193a7
 SHA512:
-  metadata.gz: 6424048a8a71b877fe32a3ed0278b79391f04cfea1836e09750a64aadc246f6a2df5e57560e0ff3e502b78b26a286843636b18520f346c7add1afe85bfe6e9fe
-  data.tar.gz: 9091b37b0f6ef280c1927b32299886318f401fbaa0c9c90da2a70d0542351ab67190e2bc9ea5f946de7557c03d279cf2983eb9cd8a75ba2e70ab0062e4c4ba68
+  metadata.gz: 80ff25b583304c98bd7fac3b838b901010d6d8a44142c9f8cc5a73d69a86c36d5aed47ab9426875fa7d7d8d8036c35b95fb9520e1aae2c91b4589cdd77df4220
+  data.tar.gz: 7bf0cf0736dea5c94427049d48a7693e19bc2a6230055a78b759ee12e5df3fcca7282c5ce763c3d2de91bdf31c7fee52e83939bb45ca616a21cd868d85e9d9eb

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+### 0.2.0
+
 ### 0.0.1 / 2024-09-11
 
 * Everything is new. First release.

data/Manifest.txt

@@ -6,7 +6,11 @@ config/timezones_africa.csv
 config/timezones_america.csv
 config/timezones_asia.csv
 config/timezones_europe.csv
+config/timezones_middle_east.csv
+config/timezones_pacific.csv
 config/timezones_world.csv
 lib/football-timezones.rb
+lib/football-timezones/datasets.rb
+lib/football-timezones/timezones.rb
 lib/football-timezones/version.rb
 lib/football/timezones.rb

data/config/timezones_africa.csv

@@ -1,4 +1,17 @@
 key,   zone
 
-eg,   Africa/Cairo  # +3  (gmt+3)
+eg,   Africa/Cairo
+
+dz,   Africa/Algiers
+
+ma,   Africa/Casablanca
+
+za,   Africa/Johannesburg
+
+
+ng,   Africa/Lagos
+
+ke,   Africa/Nairobi
+
+
 

data/config/timezones_america.csv

@@ -1,29 +1,30 @@
 key,   zone
 
 
-us,     America/New_York     # (gmt-5) new york
+us,     America/New_York
 ca,     America/Toronto
 
 mx,     America/Mexico_City
 
 
-cr,    America/Costa_Rica     # gmt-6
-gt,    America/Guatemala      # gmt-6
-hn,    America/Tegucigalpa    # gmt-6
-sv,    America/El_Salvador    # gmt-6
-ni,    America/Managua       # gmt-6
+cr,    America/Costa_Rica
+gt,    America/Guatemala
+hn,    America/Tegucigalpa
+sv,    America/El_Salvador
+ni,    America/Managua
 
-uy,    America/Montevideo     #   gmt-3
-pe,    America/Lima           #  gmt-5
-ec,    America/Guayaquil      #  gmt-5
+uy,    America/Montevideo
+pe,    America/Lima
+ec,    America/Guayaquil
 co,    America/Bogota
-bo,    America/La_Paz         #  gmt-4
-cl,    America/Santiago      #  gmt-4
+bo,    America/La_Paz
+cl,    America/Santiago
+py,    America/Asuncion
 
-br,    America/Sao_Paulo               # gmt-3  - change to -3?
-ar,    America/Argentina/Buenos_Aires  # gmt-3  - change to -3?
+br,    America/Sao_Paulo
+ar,    America/Argentina/Buenos_Aires
 
 
-concacaf.cl,    America/Mexico_City     ### use mx time
-copa.l,         America/Sao_Paulo       ### use brazil time
+concacaf.cl,    America/Mexico_City     ### use mx time - why? why not?
+copa.l,         America/Sao_Paulo       ### use brazil time - why? why not?
 

data/config/timezones_asia.csv

@@ -1,8 +1,8 @@
 key,   zone
 
-jp,   Asia/Tokyo      # +9  (gmt+9)
+jp,   Asia/Tokyo
 kr,   Asia/Seoul
-cn,   Asia/Shanghai   # +7  (gmt+7)
+cn,   Asia/Shanghai
 
 
 

data/config/timezones_europe.csv

@@ -9,39 +9,79 @@ de,     Europe/Berlin
 fr,     Europe/Paris
 it,     Europe/Rome
 
-pt,     Europe/Lisbon
+sm,     Europe/San_Marino
+va,     Europe/Vatican
 
 
+pt,     Europe/Lisbon
+ad,	    Europe/Andorra
+gi,    Europe/Gibraltar
+mc,	    Europe/Monaco
 
 
-fi,      Europe/Helsinki      # +2
+cy,     Asia/Nicosia
+mt,     Europe/Malta
 gr,      Europe/Athens
+tr,     Europe/Istanbul
 ro,      Europe/Bucharest
+bg,      Europe/Sofia
 ua,     Europe/Kyiv
+ru,     Europe/Moscow
+by,     Europe/Minsk
+
 
 
-ru,     Europe/Moscow
-tr,     Europe/Istanbul     # +3 turkey time/moscow time
 
 at,     Europe/Vienna
 ch,     Europe/Zurich
+li,     Europe/Vaduz
+
 hu,     Europe/Budapest
 cz,    Europe/Prague
 sk,    Europe/Bratislava     # link to Prague !!!
+si,    Europe/Ljubljana
+mk,	   Europe/Skopje
+
+
 pl,   Europe/Warsaw
+
 be,  Europe/Brussels
 lu,  Europe/Luxembourg      # link to Brussels !!!
 nl,  Europe/Amsterdam       # link to Brussels !!!
 
 
-dk,   Europe/Berlin     ## check if country-specific available
-se,   Europe/Berlin     ## check if country-specific available
-hr,   Europe/Belgrade   ## check if country-specific available
+
+is,    Iceland
+
+
+dk,   Europe/Copenhagen    ## link to Berlin
+se,   Europe/Stockholm     ## link to Berlin
+no,   Europe/Oslo           # link to Berlin
+fi,   Europe/Helsinki
+
+lv,   Europe/Riga
+ee,   Europe/Tallinn
+lt,    Europe/Vilnius
+
+
+
+hr,   Europe/Zagreb    # link to Belgrade
+al,   Europe/Tirane
+ba,   Europe/Sarajevo   # link to Belgrade
+me,	  Europe/Podgorica
+
+
+
+md,    Europe/Chisinau
+
+
 
 
 
 ## for champs default for not to cet (central european time) - why? why not?
-uefa.cl,  Europe/Paris
-uefa.el,  Europe/Paris
-euro,     Europe/Paris
+uefa.cl,   Europe/Paris
+uefa.el,   Europe/Paris
+uefa.conf, Europe/Paris
+uefa.nl,   Europe/Paris
+euro,      Europe/Paris
 

data/config/timezones_middle_east.csv

@@ -0,0 +1,5 @@
+key, zone
+
+il,  	Asia/Jerusalem
+
+

data/config/timezones_pacific.csv

@@ -0,0 +1,5 @@
+key,   zone
+
+
+au,  Australia/Sydney
+nz,  Pacific/Auckland

data/config/timezones_world.csv

@@ -1,4 +1,13 @@
 key,   zone
 
 
-##  world+2022,    add quatar here
+world+2022,    Asia/Qatar            # Qatar
+world+2018,    Europe/Moscow         # Russia
+world+2014,    America/Sao_Paulo     # Brazil
+world+2010,    Africa/Johannesburg   # South Africa
+world+2006,    Europe/Berlin         # Germany
+world+2002,    Asia/Tokyo            # Japan & South Korea
+world+1998,    Europe/Paris          # France
+
+
+

data/lib/football-timezones/datasets.rb

@@ -0,0 +1,48 @@
+
+
+module Datasets
+def self.parse_args( args )
+    ### split args in datasets with leagues and seasons
+    datasets = []
+    args.each do |arg|
+       if arg =~ %r{^[0-9/-]+$}   ##  season
+           if datasets.empty?
+             puts "!! ERROR - league required before season arg; sorry"
+             exit 1
+           end
+
+           season = Season.parse( arg )  ## check season
+           datasets[-1][1] << season
+       else ## assume league key
+           key = arg.downcase
+           datasets << [key, []]
+       end
+    end
+    datasets
+end
+
+
+def self.parse( txt )
+    ### 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|
+            season = Season.parse( season_str )  ## check season
+            datasets[-1][1] << season
+        end
+    end
+    datasets
+end
+
+def self.read( path )
+    parse( read_text( path ))
+end
+end  # module Datasets
+

data/lib/football-timezones/timezones.rb

@@ -0,0 +1,154 @@
+####
+### check - nest CET class inside UTC e.g. UTC::CET - why? why not?
+##     make UTC and CET into a module (not class) - why? why not?
+
+module CET   ## central european time helpers
+  def self.now()  zone.now; end
+  def self.today() now.to_date; end
+  def self.strptime( str, format )
+
+    ### fix - change to Time.strptime - why? why not?
+    ##       (simply) ignore offset; double check that hours, minutes
+    ##        get parsed as is (without applying offset)
+
+    d = DateTime.strptime( str, format )
+      ## remove assert check - why? why not?
+      if d.zone != '+00:00'    ### use d.offset != Ration(0,1)  - why? why not?
+        puts "!! ASSERT - CET parse date; DateTime returns offset != +0:00"
+        pp d.zone
+        pp d
+        exit 1
+     end
+   zone.local_time( d.year, d.month, d.day, d.hour, d.min, d.sec )
+  end
+  def self.zone() @zone ||= UTC.find_zone( 'Europe/Vienna' ); end
+end  # class CET
+
+
+
+module 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 )
+      d = DateTime.strptime( str, format )
+      ## remove assert check - why? why not?
+      if d.zone != '+00:00'    ### use d.offset != Ration(0,1)  - why? why not?
+         puts "!! ASSERT - UTC parse date; DateTime returns offset != +0:00"
+         pp d.zone
+         pp d
+         exit 1
+      end
+      ## note - ignores offset if any !!!!
+      ##    todo/check - report warn if offset different from 0:00 (0/1) - why? why not?
+      Time.utc( d.year, d.month, d.day, d.hour, d.min, d.sec )
+  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 local_time( year, month=1, mday=1, hour=0, min=0, sec=0 )
+    ## add auto-fix for ambigious time (dst vs non-dst)
+    ##    always select first for now (that is, dst)
+      @zone.local_time( year, month, mday, hour, min, sec ) {|time| time.first }
+   end
+
+   def now() @zone.now; end
+
+
+
+
+   def assert( cond, msg )
+    if cond
+      # do nothing
+    else
+      puts "!!! assert failed - #{msg}"
+      exit 1
+    end
+  end
+end  # class Timezone
+end   # module UTC
+
+
+
+
+module TimezoneHelper
+def find_zone!( league:, season: )
+   ## note: do NOT pass in league struct! pass in key (string)
+   raise ArgumentError, "league key as string|symbol expected"  unless league.is_a?(String) || league.is_a?(Symbol)
+
+   @zones ||= begin
+                zones = {}
+                ['timezones_africa',
+                 'timezones_america',
+                 'timezones_asia',
+                 'timezones_europe',
+                 'timezones_middle_east',
+                 'timezones_pacific',
+                 'timezones_world',].each do |name|
+                     recs = read_csv( "#{SportDb::Module::Timezones.root}/config/#{name}.csv" )
+                     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
+                 end
+                 zones
+              end
+
+   ## lookup first try by league+season
+   league_code = league.to_s.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 TimezoneHelper
+

data/lib/football-timezones/version.rb

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

data/lib/football-timezones.rb

@@ -7,161 +7,24 @@ require 'tzinfo'
 
 ## our own code
 require_relative 'football-timezones/version'
-
+require_relative 'football-timezones/timezones'
 
 ####
-### check - nest CET class inside UTC e.g. UTC::CET - why? why not?
-##     make UTC and CET into a module (not class) - why? why not?
-
-module CET   ## central european time helpers
-  def self.now()  zone.now; end
-  def self.today() now.to_date; end
-  def self.strptime( str, format )
-
-    ### fix - change to Time.strptime - why? why not?
-    ##       (simply) ignore offset; double check that hours, minutes
-    ##        get parsed as is (without applying offset)
-
-    d = DateTime.strptime( str, format )
-      ## remove assert check - why? why not?
-      if d.zone != '+00:00'    ### use d.offset != Ration(0,1)  - why? why not?
-        puts "!! ASSERT - CET parse date; DateTime returns offset != +0:00"
-        pp d.zone
-        pp d
-        exit 1
-     end
-   zone.local_time( d.year, d.month, d.day, d.hour, d.min, d.sec )
-  end
-  def self.zone() @zone ||= UTC.find_zone( 'Europe/Vienna' ); end
-end  # class CET
-
-
-
-module 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 )
-      d = DateTime.strptime( str, format )
-      ## remove assert check - why? why not?
-      if d.zone != '+00:00'    ### use d.offset != Ration(0,1)  - why? why not?
-         puts "!! ASSERT - UTC parse date; DateTime returns offset != +0:00"
-         pp d.zone
-         pp d
-         exit 1
-      end
-      ## note - ignores offset if any !!!!
-      ##    todo/check - report warn if offset different from 0:00 (0/1) - why? why not?
-      Time.utc( d.year, d.month, d.day, d.hour, d.min, d.sec )
-  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 local_time( year, month=1, mday=1, hour=0, min=0, sec=0 )
-      @zone.local_time( year, month, mday, hour, min, sec )
-   end
-
-   def now() @zone.now; end
-
-
-
-   def assert( cond, msg )
-    if cond
-      # do nothing
-    else
-      puts "!!! assert failed - #{msg}"
-      exit 1
-    end
-  end
-end  # class Timezone
-end   # module UTC
-
-
-
-
-module TimezoneHelper
-def find_zone!( league:, season: )
-   @zones ||= begin
-                zones = {}
-                ['timezones_america',
-                 'timezones_asia',
-                 'timezones_europe',
-                 'timezones_world',].each do |name|
-                     recs = read_csv( "#{SportDb::Module::Timezones.root}/config/#{name}.csv" )
-                     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
-                 end
-                 zones
-              end
-
-   ## lookup first try by league+season
-   league_code = league.to_s.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
+### note - make find_zone! public/global by default - why? why not?
+module Kernel
+   include TimezoneHelper
 end
-end #  module TimezoneHelper
 
 
 
+require_relative 'football-timezones/datasets'
+
+###
+### note - make read_datasets & friends public/global by default - why? why not?
+def read_datasets( path )       Datasets.read( path ); end
+def parse_datasets( str )       Datasets.parse( str ); end
+def parse_datasets_args( args ) Datasets.parse_args( args ); end
 
-####
-### note - make find_zone! public/global by default - why? why not?
-module Kernel
-   include TimezoneHelper
-end
 
 
 puts SportDb::Module::Timezones.banner   ## say hello

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: football-timezones
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-11 00:00:00.000000000 Z
+date: 2024-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -103,8 +103,12 @@ files:
 - config/timezones_america.csv
 - config/timezones_asia.csv
 - config/timezones_europe.csv
+- config/timezones_middle_east.csv
+- config/timezones_pacific.csv
 - config/timezones_world.csv
 - lib/football-timezones.rb
+- lib/football-timezones/datasets.rb
+- lib/football-timezones/timezones.rb
 - lib/football-timezones/version.rb
 - lib/football/timezones.rb
 homepage: https://github.com/sportdb/sport.db