sportdb-structs 0.4.1 → 0.5.0

data/lib/sportdb/structs/league.rb

@@ -2,9 +2,52 @@
 module Sports
 
 
+class LeaguePeriod
+  attr_reader   :key, :name, :qname, :slug,
+                :prev_name,  :start_season, :end_season
+  def initialize( key:, name:, qname:, slug:,
+                        prev_name: nil,
+                        start_season: nil, end_season: nil )
+    @key = key
+    @name = name
+    @qname = qname
+    @slug = slug
+    @prev_name = prev_name
+    @start_season = start_season
+    @end_season  = end_season
+  end
+
+
+  def pretty_print( printer )
+    buf = String.new
+    buf << "<LeaguePeriod"
+    buf << " #{@key}"
+    buf << " (#{@start_season}-#{@end_season})"  if @start_season || @end_season
+    buf << " -"
+    buf << " #{@name}"
+    if @name != @qname
+       buf << " | #{@qname}"
+    else
+       buf << "*"
+    end
+    buf << ">"
+
+    printer.text( buf )
+  end
+end # class LeaguePeriod
+
+
+################
+# todo: add a type field -
+#       add a tier field - why? why not?
+#   e.g.  league/cup  (or national_league, national_cup, intl_cup, etc.?)
+#   e.g.  1st-tier, 2nd-tier, etc.
+
+
 class League
   attr_reader   :key, :name, :country, :intl
   attr_accessor :alt_names
+  attr_accessor :periods
 
 
   def initialize( key:, name:, alt_names: [],
@@ -12,12 +55,15 @@ class League
     @key            = key
     @name           = name
     @alt_names      = alt_names
- 
+
     @country        = country
     @intl           = intl
     @clubs          = clubs
+
+    @periods        = []   ## change/rename to history - why? why not?
   end
 
+
   def intl?()      @intl == true; end
   def national?()  @intl == false; end
   alias_method   :domestic?, :national?
@@ -27,35 +73,122 @@ class League
   alias_method   :club?,          :clubs?
   alias_method   :national_team?, :national_teams?
 
-=begin 
+
+  #############################
+  ### virtual helpers
+  ##    1) codes  (returns uniq array of all codes in lowercase
+  ##               incl. key, code and alt_codes in alt_names)
+  ##    2) names  (returns uniq array of all names - with language tags stripped)
+  ##
+
+## note: split names into names AND codes
+##      1)  key plus all lower case names are codes
+##      2)    all upper case names are names AND codes
+##      3)    all other names are names
+
+## only allow asci a to z (why? why not?)
+##  excludes Ö1 or such (what else?)
+##   allow space and dot - why? why not?
+##     e.g. HNL 1
+##          NB I or NB II etc.
+IS_CODE_N_NAME_RE = %r{^
+                           [\p{Lu}0-9. ]+
+                       $}x
+## add space (or /) - why? why not?
+IS_CODE_RE           = %r{^
+                            [\p{Ll}0-9.]+
+                        $}x
+
+
+  def codes
+       ## change/rename to more_codes - why? why?
+       ##    get reference (tier/canonicial) codes via periods!!!!
+
+       ## note - "auto-magically" downcase code (and code'n'name matches)!!
+      ##  note - do NOT include key as code for now!!!
+      ##
+      ## todo/check - auto-remove space from code - why? why not?
+      ##         e.g. NB I, NB II, HNL 1 => NBI, NBII, HBNL1, etc -
+      codes = []
+      alt_names.each do |name|
+        if IS_CODE_N_NAME_RE.match?( name )
+          codes << name.downcase
+        elsif IS_CODE_RE.match?( name )
+          codes << name
+        else ## assume name
+          ## do nothing - skip/ignore
+        end
+      end
+      codes.uniq
+  end
+
+
+  include SportDb::NameHelper   # pulls-in strip_lang
+
+  def names
+    names = [@name]
+    alt_names.each do |name|
+       if IS_CODE_N_NAME_RE.match?( name )
+         names << name
+       elsif IS_CODE_RE.match?( name )
+         ## do nothing - skip/ignore
+       else ## assume name
+         names <<  strip_lang( name )
+       end
+   end
+
+##  report duplicate names - why? why not
+     ## check for duplicates - simple check for now - fix/improve
+     ## todo/fix: (auto)remove duplicates - why? why not?
+     count      = names.size
+     count_uniq = names.uniq.size
+     if count != count_uniq
+       puts "** !!! ERROR !!! - #{count-count_uniq} duplicate name(s):"
+       pp names
+       pp self
+       exit 1
+     end
+
+   names.uniq
+  end
+
+
+=begin
  @alt_names=[],
   @clubs=true,
   @country=<Country: at - Austria (AUT)|Österreich [de], fifa|uefa)>,
   @intl=false,
   @key="at.1",
-  @name="Bundesliga">, 
+  @name="Bundesliga">,
 =end
 
-  def pretty_print( printer ) 
+  def pretty_print( printer )
     buf = String.new
     buf << "<League"
     buf << " INTL"   if @intl
-    buf <<   if @clubs 
-                 " CLUBS" 
-             else 
+    buf <<   if @clubs
+                 " CLUBS"
+             else
                  " NATIONAL TEAMS"
-             end  
-    buf << ": #{@key} - #{@name}"
-    buf << "|#{@alt_names.join('|')}"  if @alt_names && !@alt_names.empty?
-    buf << ", #{@country.name} (#{@country.code})"     if @country
-    buf << ">"
-
-    printer.text( buf ) 
-  end
+             end
+    buf << ": #{@name}"
 
+    if @alt_names && !@alt_names.empty?
+      buf << "|"
+      buf << @alt_names.join('|')
+    end
 
+    buf << ", #{@country.name} (#{@country.code})"     if @country
 
+    if @periods && !@periods.empty?
+      buf << ", "
+      buf << @periods.map{|period| period.key }.uniq.join('|')
+    end
+    buf << ">"
 
+    printer.text( buf )
+  end
 end   # class League
 
+
 end   # module Sports

data/lib/sportdb/structs/match.rb

@@ -181,12 +181,14 @@ class Match
 
 
 def as_json
-  ##
+  #####
+  ##  note - use string keys (NOT symbol for data keys)
+  ##            for easier json compatibility
   data = {}
 
   ## check round
   if @round
-    data[:round ] = if round.is_a?( Integer )
+    data['round'] = if round.is_a?( Integer )
                       "Matchday #{@round}"
                     else ## assume string
                       @round
@@ -194,28 +196,28 @@ def as_json
   end
 
 
-  data[:num] = @num    if @num
+  data['num'] = @num    if @num
   if @date
     ## assume 2020-09-19 date format!!
-    data[:date]  = @date.is_a?( String ) ? @date : @date.strftime('%Y-%m-%d')
+    data['date']  = @date.is_a?( String ) ? @date : @date.strftime('%Y-%m-%d')
 
-    data[:time] = @time  if @time
+    data['time'] = @time  if @time
   end
 
-  data[:team1] =  @team1.is_a?( String ) ? @team1 : @team1.name
-  data[:team2] =  @team2.is_a?( String ) ? @team2 : @team2.name
+  data['team1'] =  @team1.is_a?( String ) ? @team1 : @team1.name
+  data['team2'] =  @team2.is_a?( String ) ? @team2 : @team2.name
 
-  data[:score] = {}
+  data['score'] = {}
 
-  data[:score][:ht] = [@score1i,   @score2i]     if @score1i && @score2i
-  data[:score][:ft] = [@score1,    @score2]      if @score1 && @score2
-  data[:score][:et] = [@score1et,  @score2et]    if @score1et && @score2et
-  data[:score][:p]  = [@score1p,   @score2p]     if @score1p && @score2p
+  data['score']['ht'] = [@score1i,   @score2i]     if @score1i && @score2i
+  data['score']['ft'] = [@score1,    @score2]      if @score1 && @score2
+  data['score']['et'] = [@score1et,  @score2et]    if @score1et && @score2et
+  data['score']['p']  = [@score1p,   @score2p]     if @score1p && @score2p
 
-  data[:status] = @status  if @status
+  data['status'] = @status  if @status
 
-  data[:group]  = @group   if @group
-  data[:stage]  = @stage   if @stage
+  data['group']  = @group   if @group
+  data['stage']  = @stage   if @stage
 
 =begin
       "round": "Spieltag 1",

data/lib/sportdb/structs/round.rb

@@ -21,13 +21,14 @@ module Sports
       def pretty_print( printer )
         ## todo/check - how to display/format key - use () or not - why? why not?
         buf = String.new
-        buf << "<Round: "
+        buf << "<Round"
+        buf << " AUTO"    if @auto
+        buf << ": "
         buf << "(#{@num}) "  if @num
         buf << "#{@name}, "
         buf << "#{@start_date}"
         buf << " - #{@end_date}"  if @start_date != @end_date
         buf << "  (knockout)" if @knockout
-        buf << "  (auto)"     if @auto
         buf << ">"
 
         printer.text( buf )

data/lib/sportdb/structs/team.rb

@@ -64,7 +64,7 @@ class Team   # shared base for clubs AND natinal_teams
 
   def initialize( **kwargs )
     @alt_names      = []
- 
+
     update( **kwargs )  unless kwargs.empty?
   end
 
@@ -89,14 +89,14 @@ class NationalTeam < Team
     self   ## note - MUST return self for chaining
   end
 
-  def pretty_print( printer ) 
+  def pretty_print( printer )
     buf = String.new
     buf << "<NationalTeam: #{@name}"
     ## use code from country or from team ???
-    buf << " (#{@code})"  
+    buf << " (#{@code})"
     buf << ">"
 
-    printer.text( buf ) 
+    printer.text( buf )
   end
 end  # class NationalTeam
 
@@ -121,8 +121,9 @@ class Club < Team
   def geos()      @a == nil ?  @geos     : @a.geos;     end
 
 
-  def initialize( **kwargs )
-    super
+  def initialize( auto: false, **kwargs )
+    @auto = auto
+    super( **kwargs )   ## todo/check - use super only or super() - must it always come first?
   end
 
   def update( **kwargs )
@@ -135,13 +136,15 @@ class Club < Team
   end
 
 
-  def pretty_print( printer ) 
+  def pretty_print( printer )
     buf = String.new
-    buf << "<Club: #{@name}"
+    buf << "<Club"
+    buf << " AUTO"   if @auto
+    buf << ": #{@name}"
     buf << " (#{@country.code})"    if @country
     buf << ">"
 
-    printer.text( buf ) 
+    printer.text( buf )
   end
 end # class Club
 

data/lib/sportdb/structs/version.rb

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

data/lib/sportdb/structs.rb

@@ -3,11 +3,16 @@ require 'alphabets'       # unaccent, downcase_i18n, variants, ...
 require 'season/formats'  # Season.parse, ...
 require 'score/formats'
 
+require 'cocos'    # pull-in for read_csv & more
+
 
 ###
 # our own code
 require_relative 'structs/version' # let version always go first
 
+## shared support helpers/machinery
+require_relative 'structs/name_helper'
+
 require_relative 'structs/country'
 require_relative 'structs/league'
 require_relative 'structs/team'
@@ -24,9 +29,6 @@ require_relative 'structs/team_usage'
 require_relative 'structs/event_info'
 
 
-## shared support helpers/machinery
-require_relative 'structs/name_helper'
-
 
 ##
 ## todo/fix  - move "inline" player to structs/player file !!!!
@@ -76,7 +78,10 @@ module SportDb
     ## add "old" convenience aliases for structs - why? why not?
     ##   todo/check: just use include Sports !!!!
     Country      = ::Sports::Country
+    City         = ::Sports::City
+
     League       = ::Sports::League
+    LeaguePeriod = ::Sports::LeaguePeriod
     Group        = ::Sports::Group
     Round        = ::Sports::Round
     Match        = ::Sports::Match
@@ -99,6 +104,38 @@ end     # module SportDb
 
 
 
+###
+#  csv (tabular dataset) support / machinery
+require_relative 'csv/match_status_parser'
+require_relative 'csv/goal'
+require_relative 'csv/goal_parser_csv'
+require_relative 'csv/match_parser_csv'
+
+
+### add convenience shortcut helpers
+module Sports
+  class Match
+    def self.read_csv( path, headers: nil, filters: nil, converters: nil, sep: nil )
+       SportDb::CsvMatchParser.read( path,
+                                       headers:    headers,
+                                       filters:    filters,
+                                       converters: converters,
+                                       sep:        sep )
+    end
+
+    def self.parse_csv( txt, headers: nil, filters: nil, converters: nil, sep: nil )
+       SportDb::CsvMatchParser.parse( txt,
+                                        headers:    headers,
+                                        filters:    filters,
+                                        converters: converters,
+                                        sep:        sep )
+    end
+  end # class Match
+end # module Sports
+
+
+
+
 #####
 # note: add Sport and Football convenience alias - why? why not?
 Sport    = Sports

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-structs
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-28 00:00:00.000000000 Z
+date: 2024-12-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cocos
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: alphabets
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +92,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: sportdb-structs - sport data structures for matches, scores, leagues,
   seasons, rounds, groups, teams, clubs and more
 email: gerald.bauer@gmail.com
@@ -100,6 +114,10 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- lib/sportdb/csv/goal.rb
+- lib/sportdb/csv/goal_parser_csv.rb
+- lib/sportdb/csv/match_parser_csv.rb
+- lib/sportdb/csv/match_status_parser.rb
 - lib/sportdb/structs.rb
 - lib/sportdb/structs/country.rb
 - lib/sportdb/structs/event_info.rb
@@ -136,7 +154,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: sportdb-structs - sport data structures for matches, scores, leagues, seasons,