sportdb-quick 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b48a679900d31129e10a922ffa2bdea28bd919d6effe565e958d915cfc69a18
-  data.tar.gz: '089b0cf75426611e738012751e446cc8b3e319027a6ed4f6872fe1d773467bac'
+  metadata.gz: cdf8bc6becd8ace3f8b616c8df1686e7905568b0080691c2d4dfbf20daa0741f
+  data.tar.gz: abbe9c9a47123a7488ced14991e1a7b3690db730d21ea8e86aa88832cc483350
 SHA512:
-  metadata.gz: 677234ed2602b3b153713c58d4a398c3e73a72d48c19f83667c4fa0764331c8971db60f1091800380c146a10041e281b48df8299ac1d493604f5f5dfc59aebf9
-  data.tar.gz: c66fb17fae6acf92fe4aa1177aa3758d8073b7e88f7e25de73942e275b8bf6652a1239fbcea7ee7221c87e87634b3f5d53c312edf97b637e358da3602b1494a7
+  metadata.gz: 11ca56e156063c9d42a36e451ce4ebc38f85e659a3a68efe0d620325bfe77b431dffcdeb888db48ded01b8253b3ba14955362d96f44f36a6d45b542ec885a515
+  data.tar.gz: e89f9960f7b9217ef8c9eb72a333a7171f0797444481a7113c3d6cfe34fd4b43b93e9fe019bdfd642707f41f03546f1e66e0e791bbcf838e5c863ee0e8ccc3f5

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.7.0
+### 0.8.0
 ### 0.0.1 / 2024-08-27
 
 * Everything is new. First release.

data/Manifest.txt

@@ -3,7 +3,6 @@ Manifest.txt
 README.md
 Rakefile
 lib/sportdb/quick.rb
-lib/sportdb/quick/match_parser.rb
 lib/sportdb/quick/match_tree-helpers.rb
 lib/sportdb/quick/match_tree.rb
 lib/sportdb/quick/match_tree/goal.rb

data/README.md

@@ -3,6 +3,7 @@
 
 
 
+
 ## Usage
 
 
@@ -13,12 +14,10 @@ require 'sportdb/quick'
 # path = "./euro/2024--germany/euro.txt"
 path =  "./deutschland/2024-25/1-bundesliga.txt"
 
-matches = SportDb::QuickMatchReader.read( path )
-pp matches
+doc = Fbtxt::Document.read( path )
+pp doc
 
 #  try json for matches
-data = matches.map {|match| match.as_json }
+data = doc.matches.map {|match| match.as_json }
 pp data
 ```
-
-

data/Rakefile

@@ -23,7 +23,7 @@ Hoe.spec 'sportdb-quick' do
   self.extra_deps = [
        ['sportdb-parser',  '>= 0.7.0'],
        ['season-formats',  '>= 0.1.0'],
-       ['logutils',        '>= 0.6.1'],
+   ##    ['logutils',        '>= 0.6.1'],
   ]
 
   self.spec_extras = {

data/lib/sportdb/quick/match_tree/goal.rb

@@ -47,18 +47,18 @@ class Goal  ### nested (non-freestanding) inside match (match is parent)
     o.class == self.class && o.state == state
   end
 
-  def pretty_print( printer )
-    buf = String.new
-    buf << "<Goal"
-    buf << " #{@player} #{@minute}"
-    buf << "+#{@offset}"    if @offset && @offset > 0
-    buf << "'"
-    buf << " (og)"  if @owngoal
-    buf << " (p)"  if @penalty
-    buf << " for #{@team}"     ### team 1 or 2 - use home/away
-    buf << ">"
+  def pretty_print( q )
+    q.group( 4, '<Goal', '>') do        ##  group( indent, open, close)
+      buf = String.new
+      buf << " #{@player} #{@minute}"
+      buf << "+#{@offset}"    if @offset && @offset > 0
+      buf << "'"
+      q.text( buf )
 
-    printer.text( buf )
+      q.text( "(og)" )  if @owngoal
+      q.text( "(p)" )   if @penalty
+      q.text( " for #{@team}" )      ### team 1 or 2 - use home/away
+    end
   end
 end # class Goal
 

data/lib/sportdb/quick/match_tree/group.rb

@@ -10,13 +10,11 @@ class Group
         @teams  = teams
       end
 
-      def pretty_print( printer )
-        buf = String.new
-        buf << "<Group #{@name} "
-        buf << @teams.pretty_print_inspect
-        buf << ">"
-
-        printer.text( buf )
+      def pretty_print( q )
+        q.group( 4, '<Group', '>') do        ##  group( indent, open, close)
+          q.text( " #{@name} " )
+          q.pp( @teams )
+        end
       end
 end  # class Group
 

data/lib/sportdb/quick/match_tree/match.rb

@@ -149,6 +149,8 @@ def as_json
 
 
   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/lib/sportdb/quick/match_tree/round.rb

@@ -16,18 +16,16 @@ class MatchTree
         @auto       = auto        # auto-created (inline reference/header without proper definition before)
       end
 
-      def pretty_print( printer )
+      def pretty_print( q )
         ## todo/check - how to display/format key - use () or not - why? why not?
-        buf = String.new
-        buf << "<Round"
-        buf << " AUTO"    if @auto
-        buf << ": "
-        buf << "#{@name}, "
-        buf << "#{@start_date}"
-        buf << " - #{@end_date}"  if @start_date != @end_date
-        buf << ">"
-
-        printer.text( buf )
+        q.group( 4, '<Round', '>') do        ##  group( indent, open, close)
+           q.text( " AUTO" )    if @auto
+           q.text( " #{@name}" )
+           if @start_date
+             q.text( " : #{@start_date}" )
+             q.text( " - #{@end_date}" )   if @start_date != @end_date
+           end
+        end
       end
 end  # class Round
 

data/lib/sportdb/quick/match_tree.rb

@@ -4,12 +4,7 @@ module SportDb
 ##############################
 ## simple (match) parse tree to structs walker/handler/converter
 class MatchTree
-  def self.debug=(value) @@debug = value; end
-  def self.debug?() @@debug ||= false; end  ## note: default is FALSE
-  def debug?()  self.class.debug?; end
-
-  include Logging         ## e.g. logger#debug, logger#info, etc.
-
+  include Debuggable
 
 
   ##
@@ -27,6 +22,7 @@ class MatchTree
   def errors?() @errors.size > 0; end
 
 
+
   def convert
     ## note: every (new) read call - resets errors list to empty
     @errors = []
@@ -69,8 +65,6 @@ class MatchTree
           on_date_header( node )
       elsif node.is_a? RaccMatchParser::MatchLine
           on_match_line( node )
-      elsif node.is_a? RaccMatchParser::MatchLineWalkover
-          on_match_line_walkover( node )
       elsif node.is_a? RaccMatchParser::MatchLineBye
           on_match_line_bye( node )
       elsif node.is_a? RaccMatchParser::GoalLine
@@ -103,38 +97,8 @@ class MatchTree
 
 
 
-  def on_match_line_walkover( node )
-    logger.debug( "on match (w/o): >#{node}<" )
-
-    ## note - w/o (walkover) records NO date/time or ground (or score etc.)
-    ##                 for now only team1/team2 and match status!!
-    ##                  plus inherited round/group
-
-    status = 'walkover'   ## use w/o - why? why not?
-
-    team1 = node.team1
-    team2 = node.team2
-
-    @teams[ team1 ] += 1
-    @teams[ team2 ] += 1
-
-
-    group =  nil
-    group =  @last_group  if @last_group
-
-    round = nil
-    round =  @last_round  if @last_round
-
-    @matches << Match.new( team1:    team1,  ## note: for now always use mapping value e.g. rec (NOT string e.g. team1.name)
-                           team2:    team2,  ## note: for now always use mapping value e.g. rec (NOT string e.g. team2.name)
-                           round:    round ? round.name : nil,  ## note: for now always use string (assume unique canonical name for event)
-                           group:    group ? group.name : nil,  ## note: for now always use string (assume unique canonical name for event)
-                           status:   status )
-    ### todo: cache team lookups in hash?
-  end
-
   def on_match_line_bye( node )
-    logger.debug( "on match (bye): >#{node}<" )
+    _trace( "on match (bye): >#{node}<" )
 
     ## note - bye    records NO date/time or ground (or score etc.)
     ##                 for now only team1/team2 and match status!!

data/lib/sportdb/quick/match_tree_on/on_date_header.rb

@@ -5,7 +5,7 @@ class MatchTree
 
 
   def on_date_header( node )
-    logger.debug( "date header: >#{node}<")
+    _trace( "date header: >#{node}<")
 
     date = _build_date( m: node.date[:m],
                         d: node.date[:d],
@@ -15,7 +15,7 @@ class MatchTree
                         start: @start,
                         last_year: true )
 
-    logger.debug( "    date: #{date} with start: #{@start}")
+    _trace( "    date: #{date} with start: #{@start}")
 
       @last_date = date   # keep a reference for later use
       @last_time = nil
@@ -31,7 +31,7 @@ class MatchTree
 =begin
       if @start.month != 1
          if date.year == @start.year+1
-           logger.debug( "!! hack - extending start date to full (next/end) year; assumes all dates are chronologigal - always moving forward" )
+           _trace( "!! hack - extending start date to full (next/end) year; assumes all dates are chronologigal - always moving forward" )
            @start_org = @start   ## keep a copy of the original (old) start date - why? why not? - not used for now
            @start = Date.new( @start.year+1, 1, 1 )
          end

data/lib/sportdb/quick/match_tree_on/on_goal_line.rb

@@ -3,10 +3,15 @@ class MatchTree
 
 
   def on_goal_line( node )
-    logger.debug "on goal line: >#{node}<"
+    _trace( "on goal line: >#{node}<" )
 
-    goals1 = node.goals1
-    goals2 = node.goals2
+
+     if node.goals[0].is_a?( Array )
+       goals1, goals2 = node.goals[0], node.goals[1]
+     else
+       goals1 = node.goals
+       goals2 = []
+     end
 
 
     pp [goals1,goals2]     if debug?
@@ -38,6 +43,9 @@ class MatchTree
 
 
 
+   ##
+   ## todo/fix - sort goals by minute (+offset) !!!
+
     goals = []
 
     goals1.each do |rec|

data/lib/sportdb/quick/match_tree_on/on_group_def.rb

@@ -3,7 +3,7 @@ class MatchTree
 
 
   def on_group_def( node )
-    logger.debug "on group def: >#{node}<"
+    _trace( "on group def: >#{node}<" )
 
    ## e.g
    ##  [:group_def, "Group A"],

data/lib/sportdb/quick/match_tree_on/on_match_line.rb

@@ -4,7 +4,7 @@ class MatchTree
 
 
   def on_match_line( node )
-    logger.debug( "on match: >#{node}<" )
+    _trace( "on match: >#{node}<" )
 
     ## collect (possible) nodes by type
     num    = nil

data/lib/sportdb/quick/match_tree_on/on_round_def.rb

@@ -3,7 +3,7 @@ class MatchTree
 
 
   def on_round_def( node )
-    logger.debug "on round def: >#{node}<"
+    _trace( "on round def: >#{node}<" )
 
     ## e.g. [[:round_def, "Matchday 1"], [:duration, "Fri Jun 14 - Tue Jun 18"]]
     ##      [[:round_def, "Matchday 2"], [:duration, "Wed Jun 19 - Sat Jun 22"]]
@@ -68,9 +68,9 @@ class MatchTree
 
 
 
-    logger.debug "    start_date: #{start_date}"
-    logger.debug "    end_date:   #{end_date}"
-    logger.debug "    name:    >#{name}<"
+    _trace( "    start_date: #{start_date}" )
+    _trace( "    end_date:   #{end_date}" )
+    _trace( "    name:    >#{name}<" )
 
     round = Round.new( name:       name,
                        start_date: start_date,

data/lib/sportdb/quick/match_tree_on/on_round_outline.rb

@@ -4,7 +4,7 @@ class MatchTree
 
 
   def on_round_outline( node )
-    logger.debug "on round outline: >#{node}<"
+    _trace( "on round outline: >#{node}<" )
 
     ## always reset dates - why? why not?
     ##    note - needs last_date for year
@@ -20,7 +20,7 @@ class MatchTree
       ##  todo/fix - use only names from group def for lookup/is_group match!!!
       ##    do NOT use (generic) regex!!
       if level == 1 && _is_group?( name )
-        logger.debug "on group header: >#{node}<"
+        _trace( "on group header: >#{node}<" )
 
         group = @groups[ name ]
 

data/lib/sportdb/quick/quick_match_reader.rb

@@ -1,73 +1,73 @@
-#####
-## quick match reader for datafiles with league outlines
 
-module SportDb
-class QuickMatchReader
+module Fbtxt
+class Document
+   include Debuggable
 
-  def self.debug=(value) @@debug = value; end
-  def self.debug?() @@debug ||= false; end  ## note: default is FALSE
-  def debug?()  self.class.debug?; end
 
+def self.read( path )
+  ##  note - use read_text from cocos - why? why not?
+  txt = read_text( path )
+  parse( txt )
+end
 
+def self.parse( txt )
+    new( txt )
+end
 
-  def self.read( path )   ## use - rename to read_file or from_file etc. - why? why not?
-    txt = File.open( path, 'r:utf-8' ) {|f| f.read }
-    parse( txt )
-  end
-
-  def self.parse( txt )
-    new( txt ).parse
-  end
 
 
-  include Logging
 
-  def initialize( txt )
-    @errors = []
-    @txt    = txt
+  attr_reader :title    ## e.g.  league name (England | Premier League 2026/27) or such
+  attr_reader :matches
 
-    @league_name = ''     
-    @matches     = []
-  end
+  attr_reader :teams
+  attr_reader :groups
+  attr_reader :rounds
 
   attr_reader :errors
   def errors?() @errors.size > 0; end
 
+  ##
+  ##  keep/store a reference to (source) txt - why? why not?
+  def initialize( txt, start: nil )
+    _parse( txt, start: start )
+  end
+
 
-  ###
-  #  helpers get matches & more after parse; all stored in data
-  #
-  ## change/rename to event - why? why not?
-  ##  note - may or may not include season
-  def league_name() @league_name; end
-  def matches() @matches; end
-  
 
   ##  try to find season in heading
   ##  e.g. Österr. Bundesliga 2015/16  or 2015-16
   ##       World Cup 2018 or  2018 World Cup etc.
   SEASON_IN_HEADING_RE =  %r{
-                \b
-              (?<season>\d{4}
-                 (?:[\/-]\d{1,4})?     ## optional 2nd year in season
-                 )\b
-                   }x
+                  \b
+              (?<season>
+                  \d{4}
+                 (?: [\/-]
+                     \d{1,4} )?       ## optional 2nd year in season
+                )
+                  \b
+              }x
 
 
-  def parse
+  def _parse( txt, start: nil )
     ## note: every (new) read call - resets errors list to empty
-    @errors = []
-    
-    @league_name = ''     
-    @matches     = []
-  
-
-    ## note - source file MUST always start with heading 1 for now
-    tree   = []
-    parser = RaccMatchParser.new( @txt, debug: debug? )   ## use own parser instance (not shared) - why? why not?
-    tree = parser.parse
-
-    
+    @title   = nil     ## or use '? or use '' - why? why not?
+    @matches = []
+
+    @teams   = []
+    @groups  = []
+    @rounds  = []
+
+    @errors  = []
+
+
+    parser = SportDb::Parser.new( txt )   ## use own parser instance (not shared) - why? why not?
+    tree, errors = parser.parse_with_errors
+
+    @errors = errors
+
+## note - source file MUST always start with heading 1 for now
+
 ##
 ## !! (QUICK) PARSE ERROR - source MUST start with Heading1; got 34 nodes:
 ## [<BlankLine>,
@@ -76,62 +76,62 @@ class QuickMatchReader
 
       ## remove leading BlankLines if any!!
       while tree[0].is_a? RaccMatchParser::BlankLine
-          tree.shift  ## remove (leading) blank line from parse tree 
+          tree.shift  ## remove (leading) blank line from parse tree
       end
 
 
+    ## try to get league and season
     if tree[0].is_a? RaccMatchParser::Heading1
-         ## try to get league and season
-         @league_name = tree[0].text
-    else  
+         @title = tree[0].text
+
+         if (m = SEASON_IN_HEADING_RE.match( @title ))
+           season = Season.parse( m[:season] )   ## convert (str) to season obj!!!
+           start = if season.year?
+                     Date.new( season.start_year, 1, 1 )
+                   else
+                     Date.new( season.start_year, 7, 1 )
+                   end
+         else
+           puts "!! (DOCUMENT) WARN - no season found in Heading1 >#{@title}<"
+         end
+    else
         ### report error - source MUST start with heading 1
-       puts "!! (QUICK) PARSE ERROR - source MUST start with Heading1; got #{tree.size} nodes:"
+       puts "!! (DOCUMENT) WARN - source SHOULD start with Heading1; got #{tree.size} nodes:"
        pp tree
-       exit
     end
 
-      ## todo/fix
-      ##  make season optional
-      m = SEASON_IN_HEADING_RE.match( @league_name )
-      if m.nil?
-        puts "!! (QUICK) PARSE ERROR - no season found in Heading1 >#{@league_name}; sorry"
-        exit 
-      end
-      season = Season.parse( m[:season] )   ## convert (str) to season obj!!!
-      start =  if season.year?
-                  Date.new( season.start_year, 1, 1 )
-                else
-                  Date.new( season.start_year, 7, 1 )
-                end
 
 
     ############
     ### "walk" tree to get structs (matches/teams/etc.)
-    conv = MatchTree.new( tree, start: start )
-    
-    auto_conf_teams, matches, rounds, groups = conv.convert
+    conv = SportDb::MatchTree.new( tree, start: start )
+
+    teams, matches, rounds, groups = conv.convert
 
 
       ## auto-add "upstream" errors from parser
       ## @errors += parser.errors  if parser.errors?
 
       if debug?
-        puts ">>> #{auto_conf_teams.size} teams:"
-        pp auto_conf_teams
-        puts ">>> #{matches.size} matches:"
-        ## pp matches
-        puts ">>> #{rounds.size} rounds:"
-        pp rounds
+        puts ">>> #{teams.size} teams:"
+        pp teams
         puts ">>> #{groups.size} groups:"
         pp groups
+        puts ">>> #{rounds.size} rounds:"
+        pp rounds
+        puts ">>> #{matches.size} matches:"
+        ## pp matches
       end
 
 
       @matches = matches
-      ## note - skip teams, rounds, and groups for now
-      @matches
-end # method parse
 
-end # class QuickMatchReader
-end # module SportDb
+      @teams    = teams
+      @groups   = groups
+      @rounds   = rounds
+
+      self
+end # method _parse
 
+end # class Document
+end # module Fbtxt

data/lib/sportdb/quick/version.rb

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

data/lib/sportdb/quick.rb

@@ -4,12 +4,6 @@ require 'season-formats'
 
 
 
-require 'logutils'
-module SportDb
-  ## logging machinery shortcut; use LogUtils for now
-  Logging = LogUtils::Logging
-end
-
 
 
 ## our own code
@@ -32,7 +26,6 @@ require_relative 'quick/match_tree_on/on_match_line'
 require_relative 'quick/match_tree_on/on_goal_line'
 
 
-require_relative 'quick/match_parser'
 require_relative 'quick/quick_match_reader'
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-quick
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-22 00:00:00.000000000 Z
+date: 2026-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-parser
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
-- !ruby/object:Gem::Dependency
-  name: logutils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +86,6 @@ files:
 - README.md
 - Rakefile
 - lib/sportdb/quick.rb
-- lib/sportdb/quick/match_parser.rb
 - lib/sportdb/quick/match_tree-helpers.rb
 - lib/sportdb/quick/match_tree.rb
 - lib/sportdb/quick/match_tree/goal.rb

data/lib/sportdb/quick/match_parser.rb

@@ -1,76 +0,0 @@
-module SportDb
-
-class MatchParser    ## simple match parser for team match schedules
-
-  def self.debug=(value) @@debug = value; end
-  def self.debug?() @@debug ||= false; end  ## note: default is FALSE
-  def debug?()  self.class.debug?; end
-
-  include Logging         ## e.g. logger#debug, logger#info, etc.
-
-
-
-  def self.parse( txt, start: )
-    ##   todo/check - add teams: option like start:  why? why not?
-    parser = new( txt, start: start )
-    parser.parse
-  end
-
-  def initialize( txt, start: )  
-    @txt     = txt
-    @start   = start
-
-    @errors = []
-  end
-
-
-  attr_reader :errors
-  def errors?() @errors.size > 0; end
-
-  def parse
-    ## note: every (new) read call - resets errors list to empty
-    @errors = []
-    @warns  = []    ## track list of warnings (unmatched lines)  too - why? why not?
-
-         if debug?
-           puts "lines:"
-           pp @txt
-         end
-
-=begin
-          t, error_messages  =  @parser.parse_with_errors( line )
-
-
-           if error_messages.size > 0
-              ## add to "global" error list
-              ##   make a triplet tuple (file / msg / line text)
-              error_messages.each do |msg|
-                  @errors << [ '<file>',  ## add filename here
-                               msg,
-                               line
-                             ]
-              end
-           end
-
-           pp t   if debug?
-
-           @tree << t
-=end
-
-     parser = RaccMatchParser.new( @txt )   ## use own parser instance (not shared) - why? why not?
-     tree = parser.parse
-     ## pp @tree
-
-    ## report parse errors here - why? why not?
-
-
-
-    ## note - team keys are names and values are "internal" stats e.g. usage count!!
-    ##                      and NOT team/club/nat_team structs!!
-    ## returns [@teams.keys, @matches, @rounds.values, @groups.values]
-     conv = MatchTree.new( tree, start: @start )
-     conv.convert
-  end # method parse
-end # class MatchParser
-end # module SportDb
-