sportdb-structs 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '009da80615ac77d643529d2feee7692ca31ce2c07c5f1dd45cf2667558af4b90'
-  data.tar.gz: 7368f410cfc3b4fa0af288c20399c1244841518cf5598ff443dcf17aaa881501
+  metadata.gz: c966a814cdade0a21ea6453fc1900bfc8c384a8ceecaa34dc158e6d60bfd39b5
+  data.tar.gz: 5086fb02b42d15da5f93780121de2ba77012de34be0ff51134a06b97136c5f00
 SHA512:
-  metadata.gz: 56acdb1dc22c5b70f51c398e1ae912ff6bcbf50f021391efa5eba75d3ddeb4c1d069255fd715a891f6c4451f25f4c0212eb8769bd129755ede88ca322cd4e4e6
-  data.tar.gz: 35dcad60e6c784859d5c7218e4771ec5979cb4a07b1e07ba6f598e64fc968c1cfd75ee5e48f2c22996fa570a37292051b8f4f4e195ea2b9527ecfceef4753b6c
+  metadata.gz: fb26346fb4a76ced79e7bbb4518e5bcdb26b7128583a17ff963e3b1bc8c2198d41115babfadb06fc9331fb21c5b06059162510961f330cce58dee96aa7e16c17
+  data.tar.gz: b2d9c498d7cd119637e71b546e84d586329dd6e9186ffaaf8c93d27d5a9e3b2f4b8e1c37a69f09cbdfbc98f94ffb695b632c91c81c35c6c6dddae3c0d60e3c06

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.2.0
+### 0.3.0
 
 ### 0.0.1 / 2020-08-24
 

data/Manifest.txt

@@ -3,20 +3,15 @@ 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/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/country.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/round.rb
+lib/sportdb/structs/standings.rb
+lib/sportdb/structs/team.rb
+lib/sportdb/structs/team_usage.rb
 lib/sportdb/structs/version.rb

data/Rakefile

@@ -20,12 +20,9 @@ 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 = {

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/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/{structs/match.rb → match.rb}

@@ -4,7 +4,8 @@ module Sports
 
 class Match
 
-  attr_reader :date,
+  attr_reader :num,
+              :date,
               :time,
               :team1,     :team2,      ## todo/fix: use team1_name, team2_name or similar - for compat with db activerecord version? why? why not?
               :score1,    :score2,     ## full time
@@ -37,7 +38,10 @@ class Match
     update( **kwargs )  unless kwargs.empty?
   end
 
+
   def update( **kwargs )
+    @num      = kwargs[:num]     if kwargs.has_key?( :num )
+
     ## 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 )

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 = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

data/lib/sportdb/structs.rb

@@ -1,85 +1,32 @@
 ## 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 'sportdb/structs/name_helper'
+require_relative 'structs/version' # let version always go first
 
-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_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 'sportdb/structs/structs/ground'
+require_relative 'structs/matchlist'
+require_relative 'structs/standings'
+require_relative 'structs/team_usage'
 
 
 ##
 ## 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 +41,7 @@ class Player
 
 def initialize( name:,
                 pos:    nil,
-                nat:    nil,  
+                nat:    nil,
                 height: nil,
                 birthdate: nil,
                 birthplace: nil )
@@ -112,51 +59,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 +67,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.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-22 00:00:00.000000000 Z
+date: 2024-08-22 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,17 @@ 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/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/country.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/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:

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