sportdb-structs 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9569b6727737da1a3c241e4acae88a19ea61e7cc132e752b1d391628424db916
-  data.tar.gz: 37ad5ee8f954dfdb3221060b500eed898461ce957ed257d2dd58e6b6467bae7c
+  metadata.gz: '009da80615ac77d643529d2feee7692ca31ce2c07c5f1dd45cf2667558af4b90'
+  data.tar.gz: 7368f410cfc3b4fa0af288c20399c1244841518cf5598ff443dcf17aaa881501
 SHA512:
-  metadata.gz: 4eb9e97280e9a390f188409fd8dab427b96dcc9e0ed9d81de20546254dc02903b9d7c28ab22efbaea0fb7f13cf9ea685c81ab1f88fc67cd69f9d8b017579d3ab
-  data.tar.gz: 4bcb33bdc129b67439817eea7204bd42aaf26a20b0b1962a046eb182d8d48746b38452aa5a177a01c7f522e3bcab203053778d42e75212bde5128405eeb37bf0
+  metadata.gz: 56acdb1dc22c5b70f51c398e1ae912ff6bcbf50f021391efa5eba75d3ddeb4c1d069255fd715a891f6c4451f25f4c0212eb8769bd129755ede88ca322cd4e4e6
+  data.tar.gz: 35dcad60e6c784859d5c7218e4771ec5979cb4a07b1e07ba6f598e64fc968c1cfd75ee5e48f2c22996fa570a37292051b8f4f4e195ea2b9527ecfceef4753b6c

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+### 0.2.0
+
 ### 0.0.1 / 2020-08-24
 
 * Everything is new. First release.

data/Manifest.txt

@@ -10,6 +10,7 @@ lib/sportdb/structs/match_status_parser.rb
 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
@@ -19,9 +20,3 @@ lib/sportdb/structs/structs/standings.rb
 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

data/README.md

@@ -22,8 +22,8 @@ The `sportdb-structs` scripts are dedicated to the public domain.
 Use it as you please with no restrictions whatsoever.
 
 
+
 ## Questions? Comments?
 
-Send them along to the
-[Open Sports & Friends Forum/Mailing List](http://groups.google.com/group/opensport).
-Thanks!
+Yes, you can. More than welcome.
+See [Help & Support »](https://github.com/openfootball/help)

data/Rakefile

@@ -11,7 +11,7 @@ Hoe.spec 'sportdb-structs' do
   self.urls = { home: 'https://github.com/sportdb/sport.db' }
 
   self.author = 'Gerald Bauer'
-  self.email  = 'opensport@googlegroups.com'
+  self.email  = 'gerald.bauer@gmail.com'
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'

data/lib/sportdb/structs/config.rb

@@ -1,12 +1,13 @@
 module SportDb
-  module Import
+module Import
 
 class Configuration
   ##
   ##  todo: allow configure of countries_dir like clubs_dir
   ##         "fallback" and use a default built-in world/countries.txt
 
-  attr_accessor   :catalog
+  ##  note: catalog defined/added in sports-catalogs gem!!! 
+  ## attr_accessor   :catalog
 
   attr_reader   :lang
   def lang=(value)
@@ -15,8 +16,10 @@ class Configuration
     ScoreFormats.lang = value
     SportDb.lang.lang = value
 
-    ## todo/fix:  change SportDb.lang to SportDb.parser.lang or lang_parser or utils or someting !!!!
-    ##   use Sport.lang only as a read-only shortcut a la catalog for config.lang!!!!
+    ## todo/fix:  change SportDb.lang to SportDb.parser.lang
+    ##             or lang_parser or utils or someting !!!!
+    ##   use Sport.lang only as a read-only shortcut 
+    #        a la catalog for config.lang!!!!
   end
 
 end # class Configuration
@@ -26,13 +29,10 @@ end # class Configuration
 ##   SportDb::Import.configure do |config|
 ##      config.lang = 'it'
 ##   end
-
 def self.configure()  yield( config ); end
 
 def self.config()  @config ||= Configuration.new;  end
 
-##  e.g. use config.catalog  -- keep Import.catalog as a shortcut (for "read-only" access)
-def self.catalog() config.catalog;  end
 
 end   # module Import
 end   # module SportDb

data/lib/sportdb/structs/match_parser_csv.rb

@@ -116,7 +116,7 @@ module SportDb
 
          header_league = find_header( headers, ['League'] )
          headers_mapping[:league] = header_league   if header_league
-        else
+      else
          ## else try footballdata.uk and others
          headers_mapping[:team1]  = find_header( headers, ['HomeTeam', 'HT', 'Home'] )
          headers_mapping[:team2]  = find_header( headers, ['AwayTeam', 'AT', 'Away'] )

data/lib/sportdb/structs/structs/country.rb

@@ -4,6 +4,25 @@ module Sports
 #  note: check that shape/structure/fields/attributes match
 #            the ActiveRecord model !!!!
 
+## add city here
+##   use module World - why? why not?
+
+class City
+  attr_reader   :key, :name, :country
+  attr_accessor :alt_names
+
+  def initialize( key: nil, 
+                  name:, country: )
+    ## 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       = key || unaccent(name).downcase.gsub( /[^a-z]/, '' ) + "_" + country.key
+    @name      = name
+    @country   = country
+    @alt_names = []
+  end
+end  # class City
+
+
 class Country
 
   ## note: is read-only/immutable for now - why? why not?
@@ -14,7 +33,15 @@ class Country
   def initialize( key: nil, name:, code:, tags: [] )
     ## 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 = key || name.downcase.gsub( /[^a-z]/, '' )
+    @key = begin 
+              if key
+                key 
+              elsif code
+                 code.downcase
+              else
+                 unaccent( name ).downcase.gsub( /[^a-z]/, '' )
+              end
+            end
     @name, @code = name, code
     @alt_names      = []
     @tags           = tags

data/lib/sportdb/structs/structs/ground.rb

@@ -0,0 +1,78 @@
+##
+#  based on teams/clubs
+#              
+
+
+module Sports
+
+
+class Ground
+  ##  todo: use just names for alt_names - why? why not?
+  attr_accessor :key, :name, :alt_names,
+                :year, :year_end,   ## todo/fix: change year to start_year and end_year/year_end to end_year (like in season)!!!
+                :country,
+                :city, :district, 
+                :geos,
+                :address
+
+  def names
+    ## todo/check: add alt_names_auto too? - why? why not?
+    [@name] + @alt_names
+  end   ## all names
+
+  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
+    ##  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?
+
+    ##  note: ALWAYS auto-add city to key  to make unique!!!!!
+    ##          e.g. Red Bull Arena,  Allianz Arena etc.
+
+     @key ||=  begin 
+                  fst = unaccent( @name ).downcase.gsub( /[^a-z0-9()-]/, '' )
+                  snd = unaccent( city ).downcase.gsub( /[^a-z0-9]/, '' )
+                  trd = country.key
+                  ## use / as separator (or @ or ??) - why? why not?
+                  fst + '_' + snd + '_' + trd
+               end
+     @key
+  end
+
+
+  ##  todo/check
+  ##  check event_ifno  - for start_date, end_date ??
+  ##           use same naming convention here too (start_year/end_year)
+  def historic?()  @year_end ? true : false; end
+  alias_method  :past?, :historic?
+
+
+  def initialize( **kwargs )
+    @alt_names      = []
+  
+    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 )
+    @alt_names   = kwargs[:alt_names]  if kwargs.has_key?( :alt_names )
+
+    @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 
+end   # class Ground
+end   # module Sports

data/lib/sportdb/structs/structs/group.rb

@@ -1,6 +1,6 @@
 module Sports
 
-    class Group
+class Group
       attr_reader :key, :name, :teams
 
       def initialize( key: nil,
@@ -10,7 +10,15 @@ module Sports
         @name   = name
         @teams  = teams
       end
-    end  # class Group
 
+      def pretty_print( printer ) 
+        ## todo/check - how to display/format key - use () or not - why? why not? 
+        buf = String.new
+        buf << "<Group: #{@key ? @key : '?'} - #{@name} "
+        buf << @teams.pretty_print_inspect
+        buf << ">"
+    
+        printer.text( buf ) 
+      end
+end  # class Group
 end # module Sports
-

data/lib/sportdb/structs/structs/league.rb

@@ -6,16 +6,13 @@ class League
   attr_reader   :key, :name, :country, :intl
   attr_accessor :alt_names
 
-  ## special import only attribs
-  attr_accessor :alt_names_auto    ## auto-generated alt names
 
-  def initialize( key:, name:, alt_names: [], alt_names_auto: [],
+  def initialize( key:, name:, alt_names: [],
                   country: nil, intl: false, clubs: true )
     @key            = key
     @name           = name
     @alt_names      = alt_names
-    @alt_names_auto = alt_names_auto
-
+ 
     @country        = country
     @intl           = intl
     @clubs          = clubs

data/lib/sportdb/structs/structs/match.rb

@@ -21,8 +21,8 @@ class Match
               :conf1,    :conf2,      ## special case for mls e.g. conference1, conference2 (e.g. west, east, central)
               :country1, :country2,    ## special case for champions league etc. - uses FIFA country code
               :comments,
-              :league      ## (optinal) added as text for now (use struct?)
-
+              :league,      ## (optinal) added as text for now (use struct?)
+              :ground       ## (optional) add as text line for now (incl. city, timezone etc.)
 
   attr_accessor :goals  ## todo/fix: make goals like all other attribs!!
 
@@ -39,28 +39,29 @@ class Match
 
   def update( **kwargs )
     ## note: check with has_key?  because value might be nil!!!
-    @date     = kwargs[:date]     if kwargs.has_key? :date
-    @time     = kwargs[:time]     if kwargs.has_key? :time
+    @date     = kwargs[:date]     if kwargs.has_key?( :date )
+    @time     = kwargs[:time]     if kwargs.has_key?( :time )
 
     ## todo/fix: use team1_name, team2_name or similar - for compat with db activerecord version? why? why not?
-    @team1    = kwargs[:team1]    if kwargs.has_key? :team1
-    @team2    = kwargs[:team2]    if kwargs.has_key? :team2
+    @team1    = kwargs[:team1]    if kwargs.has_key?( :team1 )
+    @team2    = kwargs[:team2]    if kwargs.has_key?( :team2 )
 
-    @conf1    = kwargs[:conf1]    if kwargs.has_key? :conf1
-    @conf2    = kwargs[:conf2]    if kwargs.has_key? :conf2
-    @country1 = kwargs[:country1]  if kwargs.has_key? :country1
-    @country2 = kwargs[:country2]  if kwargs.has_key? :country2
+    @conf1    = kwargs[:conf1]    if kwargs.has_key?( :conf1 )
+    @conf2    = kwargs[:conf2]    if kwargs.has_key?( :conf2 )
+    @country1 = kwargs[:country1]  if kwargs.has_key?( :country1 )
+    @country2 = kwargs[:country2]  if kwargs.has_key?( :country2 )
 
     ## note: round is a string!!!  e.g. '1', '2' for matchday or 'Final', 'Semi-final', etc.
     ##   todo: use to_s - why? why not?
-    @round    = kwargs[:round]    if kwargs.has_key? :round
-    @stage    = kwargs[:stage]    if kwargs.has_key? :stage
-    @leg      = kwargs[:leg]      if kwargs.has_key? :leg
-    @group    = kwargs[:group]    if kwargs.has_key? :group
-    @status   = kwargs[:status]   if kwargs.has_key? :status
-    @comments = kwargs[:comments] if kwargs.has_key? :comments
+    @round    = kwargs[:round]    if kwargs.has_key?( :round )
+    @stage    = kwargs[:stage]    if kwargs.has_key?( :stage )
+    @leg      = kwargs[:leg]      if kwargs.has_key?( :leg )
+    @group    = kwargs[:group]    if kwargs.has_key?( :group )
+    @status   = kwargs[:status]   if kwargs.has_key?( :status )
+    @comments = kwargs[:comments] if kwargs.has_key?( :comments )
 
-    @league   = kwargs[:league]   if kwargs.has_key? :league
+    @league   = kwargs[:league]   if kwargs.has_key?( :league )
+    @ground   = kwargs[:ground]   if kwargs.has_key?( :ground )
 
 
     if kwargs.has_key?( :score )   ## check all-in-one score struct for convenience!!!
@@ -91,17 +92,17 @@ class Match
         ## @score2agg  = score.score2agg
       end
     else
-      @score1     = kwargs[:score1]      if kwargs.has_key? :score1
-      @score1i    = kwargs[:score1i]     if kwargs.has_key? :score1i
-      @score1et   = kwargs[:score1et]    if kwargs.has_key? :score1et
-      @score1p    = kwargs[:score1p]     if kwargs.has_key? :score1p
-      @score1agg  = kwargs[:score1agg]   if kwargs.has_key? :score1agg
-
-      @score2     = kwargs[:score2]      if kwargs.has_key? :score2
-      @score2i    = kwargs[:score2i]     if kwargs.has_key? :score2i
-      @score2et   = kwargs[:score2et]    if kwargs.has_key? :score2et
-      @score2p    = kwargs[:score2p]     if kwargs.has_key? :score2p
-      @score2agg  = kwargs[:score2agg]   if kwargs.has_key? :score2agg
+      @score1     = kwargs[:score1]      if kwargs.has_key?( :score1 )
+      @score1i    = kwargs[:score1i]     if kwargs.has_key?( :score1i )
+      @score1et   = kwargs[:score1et]    if kwargs.has_key?( :score1et )
+      @score1p    = kwargs[:score1p]     if kwargs.has_key?( :score1p )
+      @score1agg  = kwargs[:score1agg]   if kwargs.has_key?( :score1agg )
+
+      @score2     = kwargs[:score2]      if kwargs.has_key?( :score2 )
+      @score2i    = kwargs[:score2i]     if kwargs.has_key?( :score2i )
+      @score2et   = kwargs[:score2et]    if kwargs.has_key?( :score2et )
+      @score2p    = kwargs[:score2p]     if kwargs.has_key?( :score2p )
+      @score2agg  = kwargs[:score2agg]   if kwargs.has_key?( :score2agg )
 
       ## note: (always) (auto-)convert scores to integers
       @score1     = @score1.to_i      if @score1

data/lib/sportdb/structs/structs/round.rb

@@ -17,7 +17,20 @@ module Sports
         @knockout   = knockout
         @auto       = auto        # auto-created (inline reference/header without proper definition before)
       end
-  end  # class Round
 
+      def pretty_print( printer ) 
+        ## todo/check - how to display/format key - use () or not - why? why not? 
+        buf = String.new
+        buf << "<Round: "
+        buf << "(#{@num}) "  if @num
+        buf << "#{@name}, "
+        buf << "#{@start_date} - #{@end_date}"
+        buf << "  (knockout)" if @knockout
+        buf << "  (auto)"     if @auto
+        buf << ">"
+    
+        printer.text( buf ) 
+      end
+end  # class Round
 end # module Sports
 

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?
   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/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 = 3
+  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.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-20 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.23'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        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,12 +160,6 @@ 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
@@ -186,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: sportdb-structs - sport data structures for matches, scores, leagues, seasons,

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
-
-

data/test/test_name_helper.rb

@@ -1,65 +0,0 @@
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_name_helper.rb
-
-
-require 'helper'
-
-
-class TestNameHelper < MiniTest::Test
-
-  include SportDb::NameHelper
-
-
-  def test_strip_norm    ## strip (remove) non-norm characters e.g. ()'- etc.
-    [['Estudiantes (LP)',            'Estudiantes LP'],
-     ['Central Córdoba (SdE)',       'Central Córdoba SdE'],
-     ['Saint Patrick’s Athletic FC', 'Saint Patricks Athletic FC'],
-     ['Myllykosken Pallo −47',       'Myllykosken Pallo 47'],
-    ].each do |rec|
-       assert_equal rec[1], strip_norm( rec[0] )
-    end
-  end
-
-  def test_strip_year
-    [['A (1911-1912)',              'A'],
-     ['B (1911-1912, 1913-1915)',   'B'],
-     ['C (1911-___)',               'C'],
-     ['D (1911-???)',               'D'],
-     ['FC Linz (1946-2001, 2013-)', 'FC Linz'],
-     ['Admira Wien (-????)',        'Admira Wien'],
-     ['Admira Wien (-____)',        'Admira Wien'],
-    ].each do |rec|
-      assert_equal rec[1], strip_year( rec[0] )
-    end
-  end
-
-  def test_strip_lang
-    [['Bayern Munich [en]', 'Bayern Munich'],
-    ].each do |rec|
-      assert_equal rec[1], strip_lang( rec[0] )
-    end
-  end
-
-
-  def test_variants
-    ## hungarian
-    assert_equal ['Raba ETO Gyor'],                   variants( 'Rába ETO Győr' )
-    assert_equal ['Raba ETO Gyor', 'Rába ETO Gyoer'], variants( 'Rába ETO Györ' )
-
-    ## romanian
-    assert_equal ['Targu Mures'], variants( 'Târgu Mureș' )
-    assert_equal ['Targu Mures'], variants( 'Târgu Mureş' )
-  end
-
-
-=begin
-### fix: move to ClubReader!!!!! not for general use
-  def test_wiki
-    assert_equal 'FC Wacker Innsbruck',   strip_wiki( 'FC Wacker Innsbruck (2002)' )
-    assert_equal 'SK Austria Klagenfurt', strip_wiki( 'SK Austria Klagenfurt (2007)' )
-
-    assert_equal 'Willem II',  strip_wiki( 'Willem II (football club)' )
-  end
-=end
-end # class TestNameHelper