sportdb-quick 0.5.3 → 0.8.0

data/lib/sportdb/quick/quick_match_reader.rb

@@ -1,140 +1,137 @@
-#####
-## 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
+  attr_reader :title    ## e.g.  league name (England | Premier League 2026/27) or such
+  attr_reader :matches
 
-  def initialize( txt )
-    @errors = []
-    @outline = QuickLeagueOutline.parse( txt )
-  end
+  attr_reader :teams
+  attr_reader :groups
+  attr_reader :rounds
 
   attr_reader :errors
   def errors?() @errors.size > 0; end
 
-
-  ###
-  #  helpers get matches & more after parse; all stored in data
-  #
-  ## change/rename to event - why? why not?
-  def league_name
-     league = @data.keys[0]
-     season = @data[ league ].keys[0]
-
-     "#{league} #{season}"
+  ##
+  ##  keep/store a reference to (source) txt - why? why not?
+  def initialize( txt, start: nil )
+    _parse( txt, start: start )
   end
 
-  def matches
-    league = @data.keys[0]
-    season = @data[ league ].keys[0]
-    @data[league][season]
-  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
 
-  def parse
+
+  def _parse( txt, start: nil )
     ## note: every (new) read call - resets errors list to empty
-    @errors = []
+    @title   = nil     ## or use '? or use '' - why? why not?
+    @matches = []
 
-    @data = {}   # return data hash with leagues
-                 #    and seasons
-                 #   for now merge stage into matches
+    @teams   = []
+    @groups  = []
+    @rounds  = []
 
-    @outline.each_sec do |sec|   ## sec(tion)s
-      ### move season parse into outline upstream - why? why not?
-      season = Season.parse( sec.season )   ## convert (str) to season obj!!!
-      league = sec.league
-      stage  = sec.stage
-      lines  = sec.lines
+    @errors  = []
 
-      start =  if season.year?
-                  Date.new( season.start_year, 1, 1 )
-                else
-                  Date.new( season.start_year, 7, 1 )
-                end
 
-     # if debug?
-     #   puts "  (sec) lines:"
-     #   pp lines
-     # end
+    parser = SportDb::Parser.new( txt )   ## use own parser instance (not shared) - why? why not?
+    tree, errors = parser.parse_with_errors
 
-      ### note - skip section if no lines !!!!!
-      next if lines.empty?     ## or use lines.size == 0
+    @errors = errors
 
+## note - source file MUST always start with heading 1 for now
 
-      parser = MatchParser.new( lines,
-                                start )   ## note: keep season start_at date for now (no need for more specific stage date need for now)
+##
+## !! (QUICK) PARSE ERROR - source MUST start with Heading1; got 34 nodes:
+## [<BlankLine>,
+##  <BlankLine>,
+## <Heading1 World Cup 1930>,
 
-      auto_conf_teams,  matches, rounds, groups = parser.parse
+      ## remove leading BlankLines if any!!
+      while tree[0].is_a? RaccMatchParser::BlankLine
+          tree.shift  ## remove (leading) blank line from parse tree
+      end
 
-      ## auto-add "upstream" errors from parser
-      @errors += parser.errors  if parser.errors?
 
+    ## try to get league and season
+    if tree[0].is_a? RaccMatchParser::Heading1
+         @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 "!! (DOCUMENT) WARN - source SHOULD start with Heading1; got #{tree.size} nodes:"
+       pp tree
+    end
 
-      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 ">>> #{groups.size} groups:"
-        pp groups
-      end
 
-      ## note: pass along stage (if present): stage  - optional from heading!!!!
-      if stage
-        matches.each do |match|
-          match = match.update( stage: stage )
-        end
-      end
 
-      @data[ league ] ||= {}
-      @data[ league ][ season.key ] ||= []
+    ############
+    ### "walk" tree to get structs (matches/teams/etc.)
+    conv = SportDb::MatchTree.new( tree, start: start )
 
-      @data[ league ][ season.key ] += matches
-      ## note - skip teams, rounds, and groups for now
-    end
+    teams, matches, rounds, groups = conv.convert
 
-## check - only one league and one season
-##             allowed in quick style
 
+      ## auto-add "upstream" errors from parser
+      ## @errors += parser.errors  if parser.errors?
 
-    leagues = @data.keys
-    if leagues.size != 1
-        puts "!! (QUICK) PARSE ERROR - expected one league only; got #{leagues.size}:"
-        pp leagues
-        exit 1
-    end
+      if debug?
+        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
 
-    seasons = @data[ leagues[0] ].keys
-    if seasons.size != 1
-        puts "!! (QUICK) PARSE ERROR - expected one #{leagues[0]} season only; got #{seasons.size}:"
-        pp seasons
-        exit 1
-    end
 
-    @data[ leagues[0] ][ seasons[0] ]
-  end # method parse
+      @matches = matches
+
+      @teams    = teams
+      @groups   = groups
+      @rounds   = rounds
 
-end # class QuickMatchReader
-end # module SportDb
+      self
+end # method _parse
 
+end # class Document
+end # module Fbtxt

data/lib/sportdb/quick/version.rb

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

data/lib/sportdb/quick.rb

@@ -1,37 +1,33 @@
-require 'sportdb/structs'  # deps:  score-foramts
-                           #         season-formats
-                           #         alphabets
-require 'sportdb/parser'   # deps:   cocos
-                           #         season-formats
+require 'sportdb/parser'   # deps:   cocos, racc
 
+require 'season-formats'
 
 
-require 'logutils'
-module SportDb
-  ## logging machinery shortcut; use LogUtils for now
-  Logging = LogUtils::Logging
-end
 
 
 
 ## our own code
 require_relative 'quick/version'
 
-## "generic" outline readers, documents & more
-##
-##  todo/check - move outline reader upstream to cocos - why? why not?
-##       use  read_outline(), parse_outline()  - why? why not?
-require_relative 'quick/outline_reader'
-require_relative 'quick/outline'
-
 ##  match & league machinery
-require_relative 'quick/match_parser'
+require_relative 'quick/match_tree'
+require_relative 'quick/match_tree-helpers'
 
-require_relative 'quick/quick_league_outline'
-require_relative 'quick/quick_match_reader'
+require_relative 'quick/match_tree/match'    ## ("inline") structs
+require_relative 'quick/match_tree/goal'
+require_relative 'quick/match_tree/round'
+require_relative 'quick/match_tree/group'
 
+require_relative 'quick/match_tree_on/on_group_def'
+require_relative 'quick/match_tree_on/on_round_def'
+require_relative 'quick/match_tree_on/on_round_outline'
+require_relative 'quick/match_tree_on/on_date_header'
+require_relative 'quick/match_tree_on/on_match_line'
+require_relative 'quick/match_tree_on/on_goal_line'
 
 
-puts SportDb::Module::Quick.banner    # say hello
+require_relative 'quick/quick_match_reader'
+
 
 
+puts SportDb::Module::Quick.banner    # say hello

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-quick
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-24 00:00:00.000000000 Z
+date: 2026-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-parser
@@ -16,42 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: sportdb-structs
+  name: season-formats
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.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
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -100,10 +86,18 @@ files:
 - README.md
 - Rakefile
 - lib/sportdb/quick.rb
-- lib/sportdb/quick/match_parser.rb
-- lib/sportdb/quick/outline.rb
-- lib/sportdb/quick/outline_reader.rb
-- lib/sportdb/quick/quick_league_outline.rb
+- lib/sportdb/quick/match_tree-helpers.rb
+- lib/sportdb/quick/match_tree.rb
+- lib/sportdb/quick/match_tree/goal.rb
+- lib/sportdb/quick/match_tree/group.rb
+- lib/sportdb/quick/match_tree/match.rb
+- lib/sportdb/quick/match_tree/round.rb
+- lib/sportdb/quick/match_tree_on/on_date_header.rb
+- lib/sportdb/quick/match_tree_on/on_goal_line.rb
+- lib/sportdb/quick/match_tree_on/on_group_def.rb
+- lib/sportdb/quick/match_tree_on/on_match_line.rb
+- lib/sportdb/quick/match_tree_on/on_round_def.rb
+- lib/sportdb/quick/match_tree_on/on_round_outline.rb
 - lib/sportdb/quick/quick_match_reader.rb
 - lib/sportdb/quick/version.rb
 homepage: https://github.com/sportdb/sport.db