sportdb-structs 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9431034364f7a840395b78fcf67ceb649ee9ca0066cb7431004013cec474d01
-  data.tar.gz: 31df641c63e132a6c957768341e3b42417ca9f6b6837bb5bde541bd3143b2d68
+  metadata.gz: a3fbeabfa958e34c5c809d3b923d528818f6fac42b7e72165e49d5d77d60314c
+  data.tar.gz: 746d77f86ac8f8e1b5f8c8a928ee43a34714707c3dc026627e7322d9db3752df
 SHA512:
-  metadata.gz: bbe06e842890afab3ff027151ccf0f8cf23fa225aa7b7b4b9acc8462db689a5d03e1931f1ac0489dfd250875f5e751ef17007c36261b36ae6c3ee76ee70a6b74
-  data.tar.gz: 467780063aeb3926f338cd10e7e0977e5c60aaef69c999f942ef3b594963433851cbfe3a671da57167ab0b822c8a3cf61f0f8fed100c429798eee48f8acbb3e6
+  metadata.gz: 0fa12c96f27937106ac161ff8377f7a9a3a1b9ed100d756b87e3cbac82c4f1574a14eb1149a54328368485932d18bb73aa98738a82a59e720c56ec47f5fb3087
+  data.tar.gz: 5271fbd2f5a510c44cf13520681397b541afa47481f33f475fe14ea910b5cc21bead7705838d4c0240ad2debab6fb489ae33e7b26e5c4c463e5120f009825203

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.2.1
+### 0.3.1
 
 ### 0.0.1 / 2020-08-24
 

data/Manifest.txt

@@ -3,20 +3,17 @@ Manifest.txt
 README.md
 Rakefile
 lib/sportdb/structs.rb
-lib/sportdb/structs/config.rb
-lib/sportdb/structs/goal_parser_csv.rb
-lib/sportdb/structs/match_parser_csv.rb
-lib/sportdb/structs/match_status_parser.rb
+lib/sportdb/structs/country.rb
+lib/sportdb/structs/event_info.rb
+lib/sportdb/structs/goal.rb
+lib/sportdb/structs/ground.rb
+lib/sportdb/structs/group.rb
+lib/sportdb/structs/league.rb
+lib/sportdb/structs/match.rb
+lib/sportdb/structs/matchlist.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
-lib/sportdb/structs/structs/matchlist.rb
-lib/sportdb/structs/structs/round.rb
-lib/sportdb/structs/structs/standings.rb
-lib/sportdb/structs/structs/team.rb
-lib/sportdb/structs/structs/team_usage.rb
+lib/sportdb/structs/round.rb
+lib/sportdb/structs/standings.rb
+lib/sportdb/structs/team.rb
+lib/sportdb/structs/team_usage.rb
 lib/sportdb/structs/version.rb

data/README.md

@@ -5,7 +5,6 @@
 * bugs  :: [github.com/sportdb/sport.db/issues](https://github.com/sportdb/sport.db/issues)
 * gem   :: [rubygems.org/gems/sportdb-structs](https://rubygems.org/gems/sportdb-structs)
 * rdoc  :: [rubydoc.info/gems/sportdb-structs](http://rubydoc.info/gems/sportdb-structs)
-* forum :: [opensport](http://groups.google.com/group/opensport)
 
 
 

data/Rakefile

@@ -20,15 +20,12 @@ Hoe.spec 'sportdb-structs' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['alphabets',      '>= 1.0.0'],
-    ['date-formats',   '>= 1.0.2'],
+    ['alphabets',      '>= 1.0.2'],
     ['score-formats',  '>= 0.1.1'],
     ['season-formats', '>= 0.0.1'],
-    ['csvreader',      '>= 1.2.4'],
-    ['sportdb-langs',  '>= 0.1.1'],
   ]
 
   self.spec_extras = {
-    required_ruby_version: '>= 2.2.2'
+    required_ruby_version: '>= 3.1.0'
   }
 end

data/lib/sportdb/structs/{structs/country.rb → country.rb}

@@ -47,6 +47,15 @@ class Country
     @tags           = tags
   end
 
+  def pretty_print( printer ) 
+    buf = String.new
+    buf << "<Country: #{@key} - #{@name} (#{@code})"
+    buf << "|#{@alt_names.join('|')}"  if @alt_names && !@alt_names.empty?
+    buf << ", #{@tags.join('|')})"     if @tags && !@tags.empty?
+    buf << ">"
+
+    printer.text( buf ) 
+  end
 end  # class Country
 
 end   # module Sports

data/lib/sportdb/structs/event_info.rb

@@ -0,0 +1,65 @@
+module Sports
+
+class EventInfo
+    ##  "high level" info (summary) about event
+    ##    (like a "wikipedia infobox")
+    ##    use for checking dataset imports; lets you check e.g.
+    ##    - dates within range
+    ##    - number of teams e.g. 20
+    ##    - matches played e.g. 380
+    ##    - goals scored e.g. 937
+    ##    etc.
+
+    attr_reader :league,
+                :season,
+                :teams,
+                :matches,
+                :goals,
+                :start_date,
+                :end_date
+
+    def initialize( league:, season:,
+                    start_date: nil, end_date: nil,
+                    teams:   nil,
+                    matches: nil,
+                    goals:   nil )
+
+      @league      = league
+      @season      = season
+
+      @start_date  = start_date
+      @end_date    = end_date
+
+      @teams       = teams    ## todo/check: rename/use teams_count ??
+      @matches     = matches  ## todo/check: rename/use match_count ??
+      @goals       = goals
+    end
+
+    def include?( date )
+       ## todo/fix: add options e.g.
+       ##  - add delta/off_by_one or such?
+       ##  - add strict (for) only return true if date range (really) defined (no generic auto-rules)
+
+      ### note: for now allow off by one error (via timezone/local time errors)
+      ##    todo/fix: issue warning if off by one!!!!
+      if @start_date && @end_date
+        date >= (@start_date-1) &&
+        date <= (@end_date+1)
+      else
+        if @season.year?
+           # assume generic rule
+           ## same year e.g. Jan 1 - Dec 31; always true for now
+           date.year == @season.start_year
+        else
+           # assume generic rule
+           ##  July 1 - June 30 (Y+1)
+           ##  - todo/check -start for some countries/leagues in June 1 or August 1 ????
+           date >= Date.new( @season.start_year, 7, 1 ) &&
+           date <= Date.new( @season.end_year, 6, 30 )
+        end
+      end
+    end  # method include?
+    alias_method :between?, :include?
+  end # class EventInfo
+
+end  # module Sports

data/lib/sportdb/structs/goal.rb

@@ -0,0 +1,78 @@
+
+module Sports
+
+class Goal  ### nested (non-freestanding) inside match (match is parent)
+  attr_reader :score1,
+              :score2,
+              :team,
+              :player,
+              :minute,
+              :offset,
+              :owngoal,
+              :penalty,
+              :notes
+
+  ## add alias for player => name - why? why not?
+  alias_method :name, :player
+
+
+  def owngoal?() @owngoal==true; end
+  def penalty?() @penalty==true; end
+  def team1?()   @team == 1; end
+  def team2?()   @team == 2; end
+
+
+  ## note: make score1,score2 optional for now !!!!
+  def initialize( team:,
+                  player:,
+                  minute:,
+                  offset:  nil,
+                  owngoal: false,
+                  penalty: false,
+                  score1:  nil,
+                  score2:  nil,
+                  notes:   nil
+                )
+    @score1  = score1
+    @score2  = score2
+
+    @team    = team     # 1 or 2
+    @player  = player
+    @minute  = minute
+    @offset  = offset
+    @owngoal = owngoal
+    @penalty = penalty
+    @notes   = notes
+  end
+
+  def state
+    [@score1, @score2,
+     @team,
+     @player, @minute, @offset, @owngoal, @penalty,
+     @notes
+     ]
+  end
+
+  def ==(o)
+    o.class == self.class && o.state == state
+  end
+
+  def pretty_print( printer )
+    buf = String.new
+    buf << "<Goal: #{@score1 ? @score1 : '?'}-#{@score2 ? @score2 : '?'}"
+    buf << " #{@player} #{@minute}"
+    buf << "+#{@offset}"    if @offset && @offset > 0
+    buf << "'"
+    buf << " (o.g.)"  if @owngoal
+    buf << " (pen.)"  if @penalty
+    buf << " for #{@team}"     ### team 1 or 2 - use home/away
+    buf << " -- #{@notes}"   if @notes
+    buf << ">"
+
+    printer.text( buf )
+  end
+end # class Goal
+
+
+end # module Sports
+

data/lib/sportdb/structs/{structs/group.rb → group.rb}

@@ -11,14 +11,14 @@ class Group
         @teams  = teams
       end
 
-      def pretty_print( printer ) 
-        ## todo/check - how to display/format key - use () or not - why? why not? 
+      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 ) 
+
+        printer.text( buf )
       end
 end  # class Group
 end # module Sports

data/lib/sportdb/structs/{structs/league.rb → league.rb}

@@ -27,6 +27,35 @@ class League
   alias_method   :club?,          :clubs?
   alias_method   :national_team?, :national_teams?
 
+=begin 
+ @alt_names=[],
+  @clubs=true,
+  @country=<Country: at - Austria (AUT)|Österreich [de], fifa|uefa)>,
+  @intl=false,
+  @key="at.1",
+  @name="Bundesliga">, 
+=end
+
+  def pretty_print( printer ) 
+    buf = String.new
+    buf << "<League"
+    buf << " INTL"   if @intl
+    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   # class League
 
 end   # module Sports

data/lib/sportdb/structs/version.rb

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

data/lib/sportdb/structs.rb

@@ -1,85 +1,38 @@
 ## 3rd party gems
-require 'alphabets'       # downcase_i18n, unaccent, variants, ...
-require 'date/formats'    # DateFormats.parse, find!, ...
+require 'alphabets'       # unaccent, downcase_i18n, variants, ...
 require 'season/formats'  # Season.parse, ...
 require 'score/formats'
-require 'csvreader'
-
-
-def read_csv( path, sep:             nil,
-                    symbolize_names: nil )
-  opts = {}
-  opts[:sep]               = sep         if sep
-  opts[:header_converters] = :symbol     if symbolize_names
-
-  CsvHash.read( path, **opts )
-end
-
-def parse_csv( txt, sep:             nil,
-                    symbolize_names: nil )
-  opts = {}
-  opts[:sep]               = sep         if sep
-  opts[:header_converters] = :symbol     if symbolize_names
-
-  CsvHash.parse( txt, **opts )
-end
-
-
-
-## more sportdb libs/gems
-require 'sportdb/langs'
-
-
-## todo/fix: move shortcut up to sportdb/langs!!!
-module SportDb
-  Logging = LogUtils::Logging     ## logging machinery shortcut; use LogUtils for now
-end
-
-## let's put test configuration in its own namespace / module
-module SportDb
-  class Test    ## todo/check: works with module too? use a module - why? why not?
-
-    ####
-    #  todo/fix:  find a better way to configure shared test datasets - why? why not?
-    #    note: use one-up (..) directory for now as default - why? why not?
-    def self.data_dir()        @data_dir ||= '../test'; end
-    def self.data_dir=( path ) @data_dir = path; end
-  end
-end   # module SportDb
-
-
-## todo/check: move up config to langs too - why? why not?
-
-
 
 
 ###
 # our own code
-require 'sportdb/structs/version' # let version always go first
-require 'sportdb/structs/config'  # let "global" config "framework" go next - why? why not?
+require_relative 'structs/version' # let version always go first
+
+require_relative 'structs/country'
+require_relative 'structs/league'
+require_relative 'structs/team'
+require_relative 'structs/ground'
+require_relative 'structs/round'
+require_relative 'structs/group'
+require_relative 'structs/goal'
+require_relative 'structs/match'
 
+require_relative 'structs/matchlist'
+require_relative 'structs/standings'
+require_relative 'structs/team_usage'
 
-require 'sportdb/structs/name_helper'
+require_relative 'structs/event_info'
 
-require 'sportdb/structs/structs/country'
-require 'sportdb/structs/structs/league'
-require 'sportdb/structs/structs/team'
-require 'sportdb/structs/structs/round'
-require 'sportdb/structs/structs/group'
-require 'sportdb/structs/structs/goal'
-require 'sportdb/structs/structs/match'
-require 'sportdb/structs/structs/matchlist'
-require 'sportdb/structs/structs/standings'
-require 'sportdb/structs/structs/team_usage'
 
-require 'sportdb/structs/structs/ground'
+## shared support helpers/machinery
+require_relative 'structs/name_helper'
 
 
 ##
 ## todo/fix  - move "inline" player to structs/player file !!!!
 
 module Sports
-### note - own classes for National(Squad)Player and 
+### note - own classes for National(Squad)Player and
 ##                        Club(Squad)Player and such in use
 
 class Player
@@ -94,7 +47,7 @@ class Player
 
 def initialize( name:,
                 pos:    nil,
-                nat:    nil,  
+                nat:    nil,
                 height: nil,
                 birthdate: nil,
                 birthplace: nil )
@@ -112,51 +65,6 @@ end  # module Sports
 
 
 
-require 'sportdb/structs/match_status_parser'
-require 'sportdb/structs/match_parser_csv'
-require 'sportdb/structs/goal_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
-
-
-
-module Sports
-  ## lets you use
-  ##   Sports.configure do |config|
-  ##      config.lang = 'it'
-  ##   end
-
-  ## note: just forward to SportDb::Import configuration!!!!!
-  ##  keep Sports module / namespace "clean"
-  ##    that is, only include data structures (e.g. Match,League,etc) for now - why? why not?
-  def self.configure()  yield( config ); end
-  def self.config()  SportDb::Import.config; end
-end   # module Sports
-
-
-
 #####
 # note: add Sport and Football convenience alias - why? why not?
 Sport    = Sports
@@ -165,7 +73,5 @@ Football = Sports
 
 
 
-
 puts SportDb::Module::Structs.banner   # say hello
 
-

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-structs
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-27 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alphabets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: date-formats
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,34 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: csvreader
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.4
-- !ruby/object:Gem::Dependency
-  name: sportdb-langs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -143,22 +101,19 @@ files:
 - README.md
 - Rakefile
 - lib/sportdb/structs.rb
-- lib/sportdb/structs/config.rb
-- lib/sportdb/structs/goal_parser_csv.rb
-- lib/sportdb/structs/match_parser_csv.rb
-- lib/sportdb/structs/match_status_parser.rb
+- lib/sportdb/structs/country.rb
+- lib/sportdb/structs/event_info.rb
+- lib/sportdb/structs/goal.rb
+- lib/sportdb/structs/ground.rb
+- lib/sportdb/structs/group.rb
+- lib/sportdb/structs/league.rb
+- lib/sportdb/structs/match.rb
+- lib/sportdb/structs/matchlist.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
-- lib/sportdb/structs/structs/matchlist.rb
-- lib/sportdb/structs/structs/round.rb
-- lib/sportdb/structs/structs/standings.rb
-- lib/sportdb/structs/structs/team.rb
-- lib/sportdb/structs/structs/team_usage.rb
+- lib/sportdb/structs/round.rb
+- lib/sportdb/structs/standings.rb
+- lib/sportdb/structs/team.rb
+- lib/sportdb/structs/team_usage.rb
 - lib/sportdb/structs/version.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
@@ -174,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/sportdb/structs/config.rb

@@ -1,39 +0,0 @@
-module SportDb
-module Import
-
-class Configuration
-  ##
-  ##  todo: allow configure of countries_dir like clubs_dir
-  ##         "fallback" and use a default built-in world/countries.txt
-
-  ##  note: catalog defined/added in sports-catalogs gem!!! 
-  ## attr_accessor   :catalog
-
-  attr_reader   :lang
-  def lang=(value)
-    ## check/todo: always use to_sym - why? needed?
-    DateFormats.lang  = value
-    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!!!!
-  end
-
-end # class Configuration
-
-
-## lets you use
-##   SportDb::Import.configure do |config|
-##      config.lang = 'it'
-##   end
-def self.configure()  yield( config ); end
-
-def self.config()  @config ||= Configuration.new;  end
-
-
-end   # module Import
-end   # module SportDb
-

data/lib/sportdb/structs/goal_parser_csv.rb

@@ -1,28 +0,0 @@
-
-module SportDb
-  class CsvGoalParser
-
-
-  def self.read( path )
-     txt = File.open( path, 'r:utf-8' ) {|f| f.read }   ## note: make sure to use (assume) utf-8
-     parse( txt )
-  end
-
-  def self.parse( txt )
-     new( txt ).parse
-  end
-
-
-  def initialize( txt )
-    @txt = txt
-  end
-
-  def parse
-    rows = parse_csv( @txt )
-    recs = rows.map { |row| Sports::GoalEvent.build( row ) }
-    ## pp recs[0]
-    recs
-  end
-
-  end # class CsvGoalParser
-end # module Sports