sportdb-quick 0.5.3 → 0.7.0

data/lib/sportdb/quick.rb

@@ -1,8 +1,6 @@
-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'
 
 
 
@@ -17,21 +15,26 @@ 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/match_parser'
+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.7.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-24 00:00:00.000000000 Z
+date: 2026-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-parser
@@ -16,28 +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
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: logutils
   requirement: !ruby/object:Gem::Requirement
@@ -101,9 +101,18 @@ files:
 - 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

data/lib/sportdb/quick/outline.rb

@@ -1,96 +0,0 @@
-
-module SportDb
-
-###
-#  add a simple Outline convenience class
-#            for processing OUtlines with OUtlineReader
-#   rename to simply Outline - why? why not?
-#     todo - add more processing options - why? why not?
-
-class Outline
-   def self.read( path )
-       nodes = OutlineReader.read( path ) 
-       new( nodes )
-   end    
-   
-   def self.parse( txt )
-       nodes = OutlineReader.parse( txt )
-       new( nodes )
-   end
-
-
-   def initialize( nodes )
-      @nodes = nodes
-   end
-
-   def each_para( &blk )
-     ## note: every (new) read call - resets errors list to empty
-     ### @errors = []
-
-     ##  process nodes
-     h1 = nil
-     h2 = nil
-     orphans = 0    ## track paragraphs's with no heading
-
-     @nodes.each do |node|
-        type = node[0]
-
-        if type == :h1
-           h1 = node[1]  ## get heading text
-           puts "  = Heading 1 >#{node[1]}<"
-        elsif type == :h2
-           if h1.nil?
-             puts "!! WARN - no heading for subheading; skipping processing"
-             next
-           end
-           h2 = node[1]  ## get heading text
-           puts "  == Heading 2 >#{node[1]}<"
-        elsif type == :p
-           if h1.nil?
-             orphans += 1    ## only warn once
-             puts "!! WARN - no heading for #{orphans} text paragraph(s); skipping parse"
-             next
-           end
-
-           lines = node[1]
-           blk.call( lines )
-        else
-          pp node
-          raise ArgumentError, "unsupported (node) type >#{type}<"
-        end
-     end  # each node
-   end  # each_para
-   alias_method :each_paragraph, :each_para
-
-
-## get all para(graphs) as text (not array of lines)
-##   make default - why? why not?
-#
-#   design - or wrap lines into a Para class
-#                       with properties  lines and text
-#                          and such - why? why not?
-#          downside - might be overkill/overengineered
-#               just use simple txt as string (buffer) for all - why? why not?
-##
-##  hacky alternative - add a to_text or text method to string and array - why? why not?
-
-
-   def each_para_text( &blk )   ## or use each_text or ? - why? why not=
-       each_para do |lines|
-           txt = lines.reduce( String.new ) do |mem,line| 
-                                     mem << line; mem << "\n"; mem 
-                                    end
-           blk.call( txt )
-       end
-   end
-end   # class Outline
-
-
-
-###
-#  add alternate alias - why? why not?
-QuickMatchOutline = Outline
-
-
-end   ## module SportDb
- 

data/lib/sportdb/quick/outline_reader.rb

@@ -1,98 +0,0 @@
-
-
-module SportDb
-
-  
-class OutlineReader
-
-  def self.debug=(value) @@debug = value; end
-  def self.debug?() @@debug ||= false; end
-  def debug?()  self.class.debug?; 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
-
-  def initialize( txt )
-    @txt = txt
-  end
-
-  ## note: skip "decorative" only heading e.g. ========
-  ##  todo/check:  find a better name e.g. HEADING_EMPTY_RE or HEADING_LINE_RE or ???
-  HEADING_BLANK_RE = %r{\A
-                        ={1,}
-                        \z}x
-
-  ## note: like in wikimedia markup (and markdown) all optional trailing ==== too
-  HEADING_RE = %r{\A
-                  (?<marker>={1,})       ## 1. leading ======
-                    [ ]*
-                  (?<text>[^=]+)         ## 2. text   (note: for now no "inline" = allowed)
-                    [ ]*
-                    =*                   ## 3. (optional) trailing ====
-                  \z}x
-
-  def parse
-    outline=[]   ## outline structure
-    start_para = true      ## start new para(graph) on new text line?
-
-    @txt.each_line do |line|
-        line = line.strip      ## todo/fix: keep leading and trailing spaces - why? why not?
-
-        if line.empty?    ## todo/fix: keep blank line nodes?? and just remove comments and process headings?! - why? why not?
-          start_para = true
-          next
-        end
-
-        break if line == '__END__'
-
-        next if line.start_with?( '#' )   ## skip comments too
-        ## strip inline (until end-of-line) comments too
-        ##  e.g Eupen | KAS Eupen ## [de]
-        ##   => Eupen | KAS Eupen
-        ##  e.g bq   Bonaire,  BOE        # CONCACAF
-        ##   => bq   Bonaire,  BOE
-        line = line.sub( /#.*/, '' ).strip
-        pp line    if debug?
-
-        ## todo/check: also use heading blank as paragraph "breaker" or treat it like a comment ?? - why? why not?
-        next if HEADING_BLANK_RE.match( line )  # skip "decorative" only heading e.g. ========
-
-         ## note: like in wikimedia markup (and markdown) all optional trailing ==== too
-        if m=HEADING_RE.match( line )
-           start_para = true
-
-           heading_marker = m[:marker]
-           heading_level  = heading_marker.length   ## count number of = for heading level
-           heading        = m[:text].strip
-
-           puts "heading #{heading_level} >#{heading}<"   if debug?
-           outline << [:"h#{heading_level}", heading]
-        else    ## assume it's a (plain/regular) text line
-           if start_para
-             outline << [:p, [line]]
-             start_para = false
-           else
-             node = outline[-1]    ## get last entry
-             if node[0] == :p      ##  assert it's a p(aragraph) node!!!
-                node[1] << line    ## add line to p(aragraph)
-             else
-               puts "!! ERROR - invalid outline state / format - expected p(aragraph) node; got:"
-               pp node
-               exit 1
-             end
-           end
-        end
-    end
-    outline
-  end # method read
-end # class OutlineReader
-
-end # module SportDb

data/lib/sportdb/quick/quick_league_outline.rb

@@ -1,123 +0,0 @@
-
-
-module SportDb
-
-## shared "higher-level" outline reader
-###   quick version WITHOUT any (database) validation/mapping/normalization !!!
-
-
-class QuickLeagueOutline
-
-  def self.read( path )
-    nodes = OutlineReader.read( path ) 
-    new( nodes )
-  end    
-
-  def self.parse( txt )
-    nodes = OutlineReader.parse( txt )
-    new( nodes )
-  end
-
-
-
-  def initialize( nodes )
-    @nodes = nodes
-  end
-
-
-  ###
-  # use Section struct for easier access - why? why not?
-  ##     e.g. sec.league instead of sec[:league] etc.
-
-  Section = Struct.new( :league, :season, :stage, :lines )  do
-     def text  ## for alternate line access (all-in-text string)
-        txt = lines.reduce( String.new ) do |mem,line| 
-                 mem << line; mem << "\n"; mem 
-              end
-        txt
-     end
-  end
-
-  def each_sec( &blk )
-     @secs ||= _parse
-
-     @secs.each do |sec|
-        blk.call( sec )
-     end 
-  end
-  alias_method :each_section, :each_sec
-
-
-  def _parse
-    secs=[]     # sec(tion)s
-    @nodes.each do |node|
-      if node[0] == :h1
-        ## check for league (and stage) and season
-        heading = node[1]
-        values = _split_league( heading )
-        if m=values[0].match( LEAGUE_SEASON_HEADING_RE )
-          puts "league >#{m[:league]}<, season >#{m[:season]}<"
-
-           secs << Section.new( league: m[:league],
-                                season: m[:season],
-                                stage:  values[1],   ## note: defaults to nil if not present
-                                lines:  [] 
-                              )
-        else
-          puts "** !!! ERROR - cannot match league and season in heading; season missing?"
-          pp heading
-          exit 1
-        end
-      elsif node[0] == :h2
-         ## todo/check - make sure parsed h1 first
-         heading = node[1]
-         ## note - reuse league, season from h1
-         secs << Section.new( league: secs[-1].league,
-                              season: secs[-1].season,
-                              stage:  heading,
-                              lines:  [] 
-                            )
-      elsif node[0] == :p   ## paragraph with (text) lines
-        lines = node[1]
-        ## note: skip lines if no heading seen
-        if secs.empty?
-          puts "** !!! WARN - skipping lines (no heading):"
-          pp lines
-        else
-          ## todo/check: unroll paragraphs into lines or pass along paragraphs - why? why not?
-          ##    add paragraphs not unrolled lines - why? why not?
-          secs[-1].lines += lines
-        end
-      else
-        puts "** !!! ERROR - unknown line type; for now only heading 1 for leagues supported; sorry:"
-        pp node
-        exit 1
-      end
-    end
-    secs
-  end # method _parse
-
-
-  ## split into league + season
-  ##  e.g. Österr. Bundesliga 2015/16   ## or 2015-16
-  ##       World Cup 2018
-  LEAGUE_SEASON_HEADING_RE =  %r{^
-         (?<league>.+?)     ## non-greedy
-            \s+
-         (?<season>\d{4}
-            (?:[\/-]\d{1,4})?     ## optional 2nd year in season
-         )
-            $}x
-
-  def _split_league( str )   ## todo/check: rename to parse_league(s) - why? why not?
-    ## split into league / stage / ... e.g.
-    ##  => Österr. Bundesliga 2018/19, Regular Season
-    ##  => Österr. Bundesliga 2018/19, Championship Round
-    ##  etc.
-    ## note limit split to two parts only!!!!
-    values = str.split( /[,<>‹›]/, 2 )  ## note: allow , > < or › ‹ for now
-    values = values.map { |value| value.strip }   ## remove all whitespaces
-    values
-  end
- end # class QuickLeagueOutline
-end # module SportDb