sportdb-structs 0.1.2 → 0.2.0

data/lib/sportdb/structs/structs/team.rb

@@ -1,10 +1,8 @@
 
 module Sports
 
-##
-##  todo/fix:  remove self.create in structs!!!  use just new!!!
 
-class Team
+class Team   # shared base for clubs AND natinal_teams
   ##  todo: use just names for alt_names - why? why not?
   attr_accessor :key, :name, :alt_names,
                 :code,    ## code == abbreviation e.g. ARS etc.
@@ -20,18 +18,36 @@ class Team
   def key
     ## note: auto-generate key "on-the-fly" if missing for now - why? why not?
     ## note: quick hack - auto-generate key, that is, remove all non-ascii chars and downcase
-    @key || @name.downcase.gsub( /[^a-z]/, '' )
+    ##  fix update - allow numbers (0-9)
+    ##  add dash(-) plus parens () too!!  for (-1999) or (1999-2011) or such
+    ##  add umlauts too for now - plus add more later!!!
+    ##
+    ## fix- add more (all) diacritics!!!
+    ##  GÍ Gøta (1926-2008)
+    ##  FC Suðuroy
+    ## fix - remove dash(-) if not followed or preceded by year (four digits)!!!
+    ##
+    ##  use new (autogen)key rule
+    ##   - 1st unaccent, 2nd downcase, 3rd remove space et al
+    ##   use keygen or autokey function or such - why? why not?
+
+    ##   cache autokey generation (elg. use ||= NOT ||) - why? why not?
+
+     @key ||= begin
+                unaccent( @name ).downcase.gsub( /[^a-z0-9()-]/, '' )
+              end
+     @key
   end
 
 
   ## special import only attribs
-  attr_accessor :alt_names_auto    ## auto-generated alt names
   attr_accessor :wikipedia   # wikipedia page name (for english (en))
 
 
   def historic?()  @year_end ? true : false; end
   alias_method  :past?, :historic?
 
+
   def wikipedia?()  @wikipedia; end
   def wikipedia_url
     if @wikipedia
@@ -48,52 +64,17 @@ class Team
 
   def initialize( **kwargs )
     @alt_names      = []
-    @alt_names_auto = []
-
-    update( kwargs )  unless kwargs.empty?
+ 
+    update( **kwargs )  unless kwargs.empty?
   end
 
   def update( **kwargs )
-    @key         = kwargs[:key]        if kwargs.has_key? :key
-    @name        = kwargs[:name]       if kwargs.has_key? :name
-    @code        = kwargs[:code]       if kwargs.has_key? :code
-    @alt_names   = kwargs[:alt_names]  if kwargs.has_key? :alt_names
+    @key         = kwargs[:key]        if kwargs.has_key?( :key )
+    @name        = kwargs[:name]       if kwargs.has_key?( :name )
+    @code        = kwargs[:code]       if kwargs.has_key?( :code )
+    @alt_names   = kwargs[:alt_names]  if kwargs.has_key?( :alt_names )
     self   ## note - MUST return self for chaining
   end
-
-
-
-  ##############################
-  ## helper methods for import only??
-  ## check for duplicates
-  include SportDb::NameHelper
-
-  def duplicates?
-    names = [name] + alt_names + alt_names_auto
-    names = names.map { |name| normalize( sanitize(name) ) }
-
-    names.size != names.uniq.size
-  end
-
-  def duplicates
-    names = [name] + alt_names + alt_names_auto
-
-    ## calculate (count) frequency and select if greater than one
-    names.reduce( {} ) do |h,name|
-       norm = normalize( sanitize(name) )
-       h[norm] ||= []
-       h[norm] << name; h
-    end.select { |norm,names| names.size > 1 }
-  end
-
-
-  def add_variants( name_or_names )
-    names = name_or_names.is_a?(Array) ? name_or_names : [name_or_names]
-    names.each do |name|
-      name = sanitize( name )
-      self.alt_names_auto += variants( name )
-    end
-  end
 end   # class Team
 
 
@@ -108,6 +89,15 @@ class NationalTeam < Team
     self   ## note - MUST return self for chaining
   end
 
+  def pretty_print( printer ) 
+    buf = String.new
+    buf << "<NationalTeam: #{@name}"
+    ## use code from country or from team ???
+    buf << " (#{@code})"  
+    buf << ">"
+
+    printer.text( buf ) 
+  end
 end  # class NationalTeam
 
 
@@ -116,7 +106,8 @@ end  # class NationalTeam
 #   district, geos, year_end, country, etc.
 
 class Club < Team
-  attr_accessor  :ground
+  attr_accessor   :address,
+                  :ground
 
   attr_accessor :a, :b
   def a?()  @a == nil; end  ## is a (1st) team / club (i)?            if a is NOT set
@@ -136,12 +127,22 @@ class Club < Team
 
   def update( **kwargs )
     super
-    @city        = kwargs[:city]       if kwargs.has_key? :city
+    @city        = kwargs[:city]       if kwargs.has_key?( :city )
     ## todo/fix:  use city struct - why? why not?
     ## todo/fix: add country too  or report unused keywords / attributes - why? why not?
 
     self   ## note - MUST return self for chaining
   end
+
+
+  def pretty_print( printer ) 
+    buf = String.new
+    buf << "<Club: #{@name}"
+    buf << " (#{@country.code})"    if @country
+    buf << ">"
+
+    printer.text( buf ) 
+  end
 end # class Club
 
 end   # module Sports

data/lib/sportdb/structs/structs/team_usage.rb

@@ -1,84 +1,84 @@
-
-module Sports
-
-
-class TeamUsage
-
-  class TeamUsageLine   ## nested class
-    attr_accessor  :team,
-                   :matches,  ## number of matches (played),
-                   :seasons,  ## (optianl) array of seasons, use seasons.size for count
-                   :levels    ## (optional) hash of levels (holds mapping level to TeamUsageLine)
-
-    def initialize( team )
-      @team = team
-
-      @matches  = 0
-      @seasons  = []
-      @levels   = {}
-    end
-  end # (nested) class TeamUsageLine
-
-
-
-  def initialize( opts={} )
-    @lines = {}   # StandingsLines cached by team name/key
-  end
-
-
-  def update( matches, season: '?', level: nil )
-    ## convenience - update all matches at once
-    matches.each_with_index do |match,i| # note: index(i) starts w/ zero (0)
-      update_match( match, season: season, level: level )
-    end
-    self  # note: return self to allow chaining
-  end
-
-  def to_a
-    ## return lines; sort
-
-    # build array from hash
-    ary = []
-    @lines.each do |k,v|
-      ary << v
-    end
-
-    ## for now sort just by name (a-z)
-    ary.sort! do |l,r|
-      ## note: reverse order (thus, change l,r to r,l)
-      l.team <=> r.team
-    end
-
-    ary
-  end  # to_a
-
-
-private
-  def update_match( m, season: '?', level: nil )   ## add a match
-
-    line1 = @lines[ m.team1 ] ||= TeamUsageLine.new( m.team1 )
-    line2 = @lines[ m.team2 ] ||= TeamUsageLine.new( m.team2 )
-
-    line1.matches +=1
-    line2.matches +=1
-
-    ## include season if not seen before (allow season in multiple files!!!)
-    line1.seasons << season    unless line1.seasons.include?( season )
-    line2.seasons << season    unless line2.seasons.include?( season )
-
-    if level
-      line1_level = line1.levels[ level ] ||= TeamUsageLine.new( m.team1 )
-      line2_level = line2.levels[ level ] ||= TeamUsageLine.new( m.team2 )
-
-      line1_level.matches +=1
-      line2_level.matches +=1
-
-      line1_level.seasons << season    unless line1_level.seasons.include?( season )
-      line2_level.seasons << season    unless line2_level.seasons.include?( season )
-    end
-  end  # method update_match
-
-
-end # class TeamUsage
-
-end # module Sports
+
+module Sports
+
+
+class TeamUsage
+
+  class TeamUsageLine   ## nested class
+    attr_accessor  :team,
+                   :matches,  ## number of matches (played),
+                   :seasons,  ## (optianl) array of seasons, use seasons.size for count
+                   :levels    ## (optional) hash of levels (holds mapping level to TeamUsageLine)
+
+    def initialize( team )
+      @team = team
+
+      @matches  = 0
+      @seasons  = []
+      @levels   = {}
+    end
+  end # (nested) class TeamUsageLine
+
+
+
+  def initialize( opts={} )
+    @lines = {}   # StandingsLines cached by team name/key
+  end
+
+
+  def update( matches, season: '?', level: nil )
+    ## convenience - update all matches at once
+    matches.each_with_index do |match,i| # note: index(i) starts w/ zero (0)
+      update_match( match, season: season, level: level )
+    end
+    self  # note: return self to allow chaining
+  end
+
+  def to_a
+    ## return lines; sort
+
+    # build array from hash
+    ary = []
+    @lines.each do |k,v|
+      ary << v
+    end
+
+    ## for now sort just by name (a-z)
+    ary.sort! do |l,r|
+      ## note: reverse order (thus, change l,r to r,l)
+      l.team <=> r.team
+    end
+
+    ary
+  end  # to_a
+
+
+private
+  def update_match( m, season: '?', level: nil )   ## add a match
+
+    line1 = @lines[ m.team1 ] ||= TeamUsageLine.new( m.team1 )
+    line2 = @lines[ m.team2 ] ||= TeamUsageLine.new( m.team2 )
+
+    line1.matches +=1
+    line2.matches +=1
+
+    ## include season if not seen before (allow season in multiple files!!!)
+    line1.seasons << season    unless line1.seasons.include?( season )
+    line2.seasons << season    unless line2.seasons.include?( season )
+
+    if level
+      line1_level = line1.levels[ level ] ||= TeamUsageLine.new( m.team1 )
+      line2_level = line2.levels[ level ] ||= TeamUsageLine.new( m.team2 )
+
+      line1_level.matches +=1
+      line2_level.matches +=1
+
+      line1_level.seasons << season    unless line1_level.seasons.include?( season )
+      line2_level.seasons << season    unless line2_level.seasons.include?( season )
+    end
+  end  # method update_match
+
+
+end # class TeamUsage
+
+end # module Sports

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 = 1
-  PATCH = 2
+  MINOR = 2
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -12,11 +12,11 @@ module SportDb
   end
 
   def self.banner
-    "sportdb-structs/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+    "sportdb-structs/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] in (#{root})"
   end
 
   def self.root
-    File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )
+    File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )
   end
 
     end   # module Structs

data/lib/sportdb/structs.rb

@@ -72,6 +72,45 @@ require 'sportdb/structs/structs/matchlist'
 require 'sportdb/structs/structs/standings'
 require 'sportdb/structs/structs/team_usage'
 
+require 'sportdb/structs/structs/ground'
+
+
+##
+## todo/fix  - move "inline" player to structs/player file !!!!
+
+module Sports
+### note - own classes for National(Squad)Player and 
+##                        Club(Squad)Player and such in use
+
+class Player
+  attr_reader :name,
+              :pos,      # position (g/d/m/f) for now
+              :nat,      # nationality
+              :height,   # in cm!! (integer) expected
+              :birthdate,
+              :birthplace
+
+  attr_accessor :alt_names
+
+def initialize( name:,
+                pos:    nil,
+                nat:    nil,  
+                height: nil,
+                birthdate: nil,
+                birthplace: nil )
+    @name       = name
+    @alt_names  = []
+    @pos        = pos
+    @nat        = nat
+    @height     = height
+    @birthdate  = birthdate
+    @birthplace = birthplace
+end
+end  # class Player
+end  # module Sports
+
+
+
 
 require 'sportdb/structs/match_status_parser'
 require 'sportdb/structs/match_parser_csv'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-structs
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Gerald Bauer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-22 00:00:00.000000000 Z
+date: 2024-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alphabets
@@ -120,17 +120,17 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '4.1'
 description: sportdb-structs - sport data structures for matches, scores, leagues,
   seasons, rounds, groups, teams, clubs and more
-email: opensport@googlegroups.com
+email: gerald.bauer@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -150,6 +150,7 @@ files:
 - lib/sportdb/structs/name_helper.rb
 - lib/sportdb/structs/structs/country.rb
 - lib/sportdb/structs/structs/goal.rb
+- lib/sportdb/structs/structs/ground.rb
 - lib/sportdb/structs/structs/group.rb
 - lib/sportdb/structs/structs/league.rb
 - lib/sportdb/structs/structs/match.rb
@@ -159,17 +160,11 @@ files:
 - lib/sportdb/structs/structs/team.rb
 - lib/sportdb/structs/structs/team_usage.rb
 - lib/sportdb/structs/version.rb
-- test/helper.rb
-- test/test_clubs.rb
-- test/test_csv_reader.rb
-- test/test_match.rb
-- test/test_match_status_parser.rb
-- test/test_name_helper.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -186,9 +181,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: sportdb-structs - sport data structures for matches, scores, leagues, seasons,
   rounds, groups, teams, clubs and more

data/test/helper.rb

@@ -1,13 +0,0 @@
-## note: use the local version of sportdb gems
-$LOAD_PATH.unshift( File.expand_path( '../date-formats/lib' ))
-$LOAD_PATH.unshift( File.expand_path( '../score-formats/lib' ))
-$LOAD_PATH.unshift( File.expand_path( '../sportdb-langs/lib' ))
-
-
-## minitest setup
-require 'minitest/autorun'
-
-
-## our own code
-require 'sportdb/structs'
-

data/test/test_clubs.rb

@@ -1,38 +0,0 @@
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_clubs.rb
-
-
-require 'helper'
-
-class TestClubs < MiniTest::Test
-
-  Club = Sports::Club
-
-
-  def test_new
-    club = Club.new( name: 'Rapid Wien' )
-
-    assert_equal 'Rapid Wien',   club.name
-    assert_equal ['Rapid Wien'], club.names
-  end
-
-  def test_duplicates
-    club = Club.new
-    club.name = 'Rapid Wien'
-
-    assert_equal false, club.duplicates?
-    duplicates = {}
-    assert_equal duplicates,  club.duplicates
-
-    club.alt_names_auto += ['Rapid', 'Rapid Wien', 'SK Rapid Wien']
-
-    pp club
-
-    assert_equal true,              club.duplicates?
-    duplicates = {'rapidwien'=>['Rapid Wien','Rapid Wien']}
-    pp club.duplicates
-    assert_equal duplicates, club.duplicates
-  end
-
-end # class TestClubs

data/test/test_csv_reader.rb

@@ -1,30 +0,0 @@
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_csv_reader.rb
-
-
-require 'helper'
-
-
-class TestCsvReader < MiniTest::Test
-
-  def test_parse
-    recs = parse_csv( <<TXT )
-### World Countries
-
-Key, Code, Name
-af,  AFG,  Afghanistan
-al,  ALB,  Albania
-dz,  ALG,  Algeria
-as,  ASA,  American Samoa (US)
-TXT
-
-   pp recs
-   assert_equal  [{ 'Key' => 'af', 'Code' => 'AFG', 'Name' => 'Afghanistan'},
-                  { 'Key' => 'al', 'Code' => 'ALB', 'Name' => 'Albania'},
-                  { 'Key' => 'dz', 'Code' => 'ALG', 'Name' => 'Algeria'},
-                  { 'Key' => 'as', 'Code' => 'ASA', 'Name' => 'American Samoa (US)'},
-                 ], recs[0..3]
-  end
-
-end   # class TestCsvReader

data/test/test_match.rb

@@ -1,30 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_match.rb
-
-
-require 'helper'
-
-class TestMatch < MiniTest::Test
-
-  Match = Sports::Match
-
-
-  def test_round
-    m = Match.new( team1: 'Team 1',
-                   team2: 'Team 2',
-                   round: 3 )
-    pp m
-    assert_equal 3, m.round
-    assert_nil      m.score1
-    assert_nil      m.score2
-
-    m = Match.new
-    m.update( round: 4 )
-    pp m
-    assert_equal 4, m.round
-  end  # method test_round
-
-end # class TestMatch

data/test/test_match_status_parser.rb

@@ -1,57 +0,0 @@
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_match_status_parser.rb
-
-
-require 'helper'
-
-
-class TestMatchStatusParser < MiniTest::Test
-
-   Status       = SportDb::Status
-   StatusParser = SportDb::StatusParser
-
-  def test_find
-    [['awarded [cancelled] canceled [ddd]',                        Status::CANCELLED],
-     ['awarded [bbb; canceled] canceled [awarded; comments] eeee', Status::AWARDED],
-     ['aaa bbb ccc ddd eeee',                                      nil],
-    ].each do |rec|
-      line       = rec[0]
-      status_exp = rec[1]
-       puts "line (before): >#{line}<"
-       status = StatusParser.find!( line )
-       puts "status: >#{status}<"
-       puts "line (after): >#{line}<"
-       puts
-
-       if status_exp.nil?
-        assert_nil status
-       else
-        assert_equal status_exp, status
-       end
-    end
-  end # method test_find
-
-  def test_parse
-    [['cancelled ddd',        Status::CANCELLED],
-     ['CANCELLED',            Status::CANCELLED],
-     ['can.',                 Status::CANCELLED],
-     ['awarded; comments',    Status::AWARDED],
-     ['awd. - comments',      Status::AWARDED],
-     ['aaa bbb ccc ddd eeee', nil],
-    ].each do |rec|
-      str        = rec[0]
-      status_exp = rec[1]
-      status     = StatusParser.parse( str )
-
-      if status_exp.nil?     ##  for "silencing" minitest warning - Use assert_nil if expecting nil
-        assert_nil status
-      else
-        assert_equal status_exp, status
-      end
-    end
-  end
-
-end   # class TestMatchStatusParser
-
-