fbtxt-document 0.9.0 → 0.9.1

data/lib/fbtxt/document/models/score.rb

@@ -0,0 +1,146 @@
+
+module Fbtxt
+  module Model
+
+### note - use inline Score class Match::Score - why? why not?
+##      note - score might internally be an array [2,3]  -- now reported (!!)
+##                 or hash { ft:, } etc.
+
+## note - score for now might be
+##            1) array e.g. [1,0] or []      --- now reported (!!)
+##            2)  hash  e.g. { ft: [1,0] } etc.
+
+    ## if node.score.is_a?(Array)
+    ##    ## assume "undefined" score
+    ##    score = node.score
+    ##  else  ## (default) assume Hash
+    ##     # ht = node.score[:ht] || [nil,nil]
+    ##     # ft = node.score[:ft] || [nil,nil]
+    ##     # et = node.score[:et] || [nil,nil]
+    ##     # p  = node.score[:p]  || [nil,nil]
+    ##     # values = [*ht, *ft, *et, *p]
+    ##     # pp values
+    ##     ## pp node.score
+    ##    score = node.score
+    ##  end
+    ## end
+
+
+
+class Score
+
+def self.build( score )
+  if score.nil?
+        raise ArgumentError, "Score.build - expected Hash or Array; got nil"
+  elsif score.is_a?(Hash)
+      new( **score.transform_keys(&:to_sym) )
+  elsif score.is_a?(Array)
+       new( reported: score )
+  else
+       raise ArgumentError, "Score.build - expected Hash or Array; got type #{score} #{score.class.name}"
+  end
+end
+
+
+
+attr_reader   :ht, :ft, :et, :p, :agg,
+              :reported
+
+
+def initialize( ht: nil, ft: nil, et: nil, p: nil,
+                agg: nil,
+               reported: nil,
+               score: nil )
+   @ht, @ft, @et, @p = ht, ft, et, p
+   @agg = agg
+
+   ##
+   ## note: use reported for "generic" score where
+   ##             period is not known (might be  full-time or aet)
+   ##          or undefined e.g. for  abandoned or awarded (administered) score
+   @reported = reported
+
+   if score
+      puts "!! DEPRECATED - score got score keyword (use reported):"
+      pp [ ht, ft, et, p, agg, reported, score]
+      @reported = score
+   end
+end
+
+###
+#   only know reported "vanilla" score  (might be full-time? extra-time? etc.)
+def reported?()  @reported.is_a?( Array ) && @reported.size == 2; end
+
+
+def ft?()  @ft.is_a?( Array ) && @ft.size == 2; end
+def et?()  @et.is_a?( Array ) && @et.size == 2; end
+def p?()   @p.is_a?( Array ) && @p.size == 2; end
+
+
+
+def to_s
+    if @reported
+        ## check for ary empty - why? why not?
+        "#{@reported[0]}-#{@reported[1]}"
+    else
+      if @et && @p
+             if @ft && @ht
+               "#{@et[0]}-#{@et[1]} a.e.t." +
+               " (#{@ft[0]}-#{@ft[1]}, #{@ht[0]}-#{@ht[1]}), " +
+               "#{@p[0]}-#{@p[1]} pen."
+             elsif @ft
+               "#{@et[0]}-#{@et[1]} a.e.t." +
+               " (#{@ft[0]}-#{@ft[1]}), " +
+               "#{@p[0]}-#{@p[1]} pen."
+            else
+               "#{@et[0]}-#{@et[1]} a.e.t., " +
+               "#{@p[0]}-#{@p[1]} pen."
+             end
+      elsif @et && @p.nil?
+             if @ft && @ht
+                "#{@et[0]}-#{@et[1]} a.e.t."+
+                " (#{@ft[0]}-#{@ft[1]}, #{@ht[0]}-#{@ht[1]})"
+             elsif @ft
+                "#{@et[0]}-#{@et[1]} a.e.t."+
+                " (#{@ft[0]}-#{@ft[1]})"
+             else
+                "#{@et[0]}-#{@et[1]} a.e.t."
+             end
+      elsif  @ft &&  @et.nil? && @p.nil?
+              if @ht
+                "#{@ft[0]}-#{@ft[1]} (#{@ht[0]}-#{@ht[1]})"
+              else
+               "#{@ft[0]}-#{@ft[1]}"
+              end
+      else
+           ## raise error/warn - about unknown (or empty) score type - why? why not?
+            ''
+      end
+    end
+end
+
+
+
+def as_json(*)
+    if @reported
+        ## return array only - why? why not?
+        ##   or use hash with  reported or _ - key - why? why not?
+        @reported
+    else
+        h = {}
+        h['ht']  = @ht     if @ht
+        h['ft']  = @ft     if @ft
+        h['et']  = @et     if @et
+        h['p']   = @p      if @p
+        h['agg'] = @agg    if @agg
+        h
+    end
+end
+
+
+
+end  # class Score
+
+
+end # module Model
+end # module Fbtxt

data/lib/fbtxt/document/version.rb

@@ -4,7 +4,7 @@ module Fbtxt
     module Document
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
   MINOR = 9
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/fbtxt/document.rb

@@ -9,25 +9,52 @@ require 'season-formats'
 ## our own code
 require_relative 'document/version'
 
+###########
+## ("inline") structs
+require_relative 'document/models/match'
+require_relative 'document/models/goal'
+require_relative 'document/models/round'
+require_relative 'document/models/group'
+require_relative 'document/models/player'
+require_relative 'document/models/referee'
+require_relative 'document/models/lineup'
+require_relative 'document/models/penalty'
+require_relative 'document/models/event'    ##  cards, sub(stitution)s
+require_relative 'document/models/minute'
+require_relative 'document/models/score'
+
+
+
+###
+#  add Models alias for Model
+##  e.g. include Models  (instead of include Model) -- keep - why? why not?
+module Fbtxt
+   Models = Model
+end
+
+
 ##  match & league machinery
 require_relative 'document/match_tree'
 require_relative 'document/match_tree-helpers'
 
-require_relative 'document/match_tree/match'    ## ("inline") structs
-require_relative 'document/match_tree/goal'
-require_relative 'document/match_tree/round'
-require_relative 'document/match_tree/group'
-
 require_relative 'document/match_tree_on/on_group_def'
 require_relative 'document/match_tree_on/on_round_def'
 require_relative 'document/match_tree_on/on_round_outline'
 require_relative 'document/match_tree_on/on_date_header'
 require_relative 'document/match_tree_on/on_match_line'
+require_relative 'document/match_tree_on/on_match_bye'
 require_relative 'document/match_tree_on/on_goal_line'
+require_relative 'document/match_tree_on/on_penalties'
+require_relative 'document/match_tree_on/on_lineup_line'
+require_relative 'document/match_tree_on/on_cards_line'
+require_relative 'document/match_tree_on/on_referee_line'
+
+
+require_relative 'document/document'   ## e.g. use Fbtxt::Document.parse/read/etc.
 
 
-require_relative 'document/quick_match_reader'
 
+require_relative 'document/export_utils'   ## e.g. (batch) genjson (via config)
 
 
 puts Fbtxt::Module::Document.banner    # say hello

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbtxt-document
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-07 00:00:00.000000000 Z
+date: 2026-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fbtxt-parser
@@ -87,19 +87,32 @@ files:
 - README.md
 - Rakefile
 - lib/fbtxt/document.rb
+- lib/fbtxt/document/document.rb
+- lib/fbtxt/document/export_utils.rb
 - lib/fbtxt/document/match_tree-helpers.rb
 - lib/fbtxt/document/match_tree.rb
-- lib/fbtxt/document/match_tree/goal.rb
-- lib/fbtxt/document/match_tree/group.rb
-- lib/fbtxt/document/match_tree/match.rb
-- lib/fbtxt/document/match_tree/round.rb
+- lib/fbtxt/document/match_tree_on/on_cards_line.rb
 - lib/fbtxt/document/match_tree_on/on_date_header.rb
 - lib/fbtxt/document/match_tree_on/on_goal_line.rb
 - lib/fbtxt/document/match_tree_on/on_group_def.rb
+- lib/fbtxt/document/match_tree_on/on_lineup_line.rb
+- lib/fbtxt/document/match_tree_on/on_match_bye.rb
 - lib/fbtxt/document/match_tree_on/on_match_line.rb
+- lib/fbtxt/document/match_tree_on/on_penalties.rb
+- lib/fbtxt/document/match_tree_on/on_referee_line.rb
 - lib/fbtxt/document/match_tree_on/on_round_def.rb
 - lib/fbtxt/document/match_tree_on/on_round_outline.rb
-- lib/fbtxt/document/quick_match_reader.rb
+- lib/fbtxt/document/models/event.rb
+- lib/fbtxt/document/models/goal.rb
+- lib/fbtxt/document/models/group.rb
+- lib/fbtxt/document/models/lineup.rb
+- lib/fbtxt/document/models/match.rb
+- lib/fbtxt/document/models/minute.rb
+- lib/fbtxt/document/models/penalty.rb
+- lib/fbtxt/document/models/player.rb
+- lib/fbtxt/document/models/referee.rb
+- lib/fbtxt/document/models/round.rb
+- lib/fbtxt/document/models/score.rb
 - lib/fbtxt/document/version.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:

data/lib/fbtxt/document/match_tree/goal.rb

@@ -1,67 +0,0 @@
-module Fbtxt
-class MatchTree
-
-
-
-class Goal  ### nested (non-freestanding) inside match (match is parent)
-  attr_reader :team,                ## note - 1|2 expected
-              :player,
-              :minute,
-              :offset,
-              :owngoal,            ## true|false
-              :penalty             ## true|false
-
-  ## 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
-                )
-    @team    = team     # 1|2
-    @player  = player
-    @minute  = minute
-    @offset  = offset
-    @owngoal = owngoal
-    @penalty = penalty
-  end
-
-  def state
-    [@team,
-     @player, @minute, @offset, @owngoal, @penalty
-     ]
-  end
-
-  def ==(o)
-    o.class == self.class && o.state == state
-  end
-
-  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 )
-
-      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
-
-
-end # class MatchTree
-end # module Fbtxt

data/lib/fbtxt/document/match_tree/match.rb

@@ -1,249 +0,0 @@
-##
-# move (simpler) struct version inline to MatchTree for now
-#
-module Fbtxt
-class MatchTree
-
-
-
-class Match
-
-### note - use inline Score class Match::Score - why? why not?
-##      note - score might internally be an array [2,3]
-##                 or hash { ft:, } etc.
-
-## note - score for now might be
-##            1) array e.g. [1,0] or []
-##            2)  hash  e.g. { ft: [1,0] } etc.
-
-  attr_reader :num,
-              :date,
-              :time,
-              :time_local,
-              :team1,     :team2,      ## todo/fix: use team1_name, team2_name or similar - for compat with db activerecord version? why? why not?
-              :score,
-              :round,     ## todo/fix:  use round_num or similar - for compat with db activerecord version? why? why not?
-              :group,
-              :status,    ## e.g. replay, cancelled, awarded, abadoned, postponed, etc.
-              :ground,       ## (optional) add as text line for now (incl. city, timezone etc.)
-              :att            ## (optional) attendance as (integer) number
-
-
-  attr_accessor :goals      ## todo/fix: make goals like all other attribs!!
-
-  def initialize( **kwargs )
-    @score = []
-    ## @score1,    @score2    = [nil,nil]  ## full time
-    ## @score1i,   @score2i   = [nil,nil]  ## half time (first (i) part)
-    ## @score1et,  @score2et  = [nil,nil]  ## extra time
-    ## @score1p,   @score2p   = [nil,nil]  ## penalty
-    ## @score1agg, @score2agg = [nil,nil]  ## full time (all legs) aggregated
-
-
-    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 )
-    @time_local = kwargs[:time_local]  if kwargs.has_key?( :time_local )
-
-    ## todo/fix: use team1_name, team2_name or similar - for compat with db activerecord version? why? why not?
-    @team1    = kwargs[:team1]    if kwargs.has_key?( :team1 )
-    @team2    = kwargs[:team2]    if kwargs.has_key?( :team2 )
-
-    ## note: round is a string!!!  e.g. '1', '2' for matchday or 'Final', 'Semi-final', etc.
-    ##   todo: use to_s - why? why not?
-    @round    = kwargs[:round]    if kwargs.has_key?( :round )
-    @group    = kwargs[:group]    if kwargs.has_key?( :group )
-    @status   = kwargs[:status]   if kwargs.has_key?( :status )
-
-    @ground   = kwargs[:ground]   if kwargs.has_key?( :ground )
-    @att      = kwargs[:att]      if kwargs.has_key?( :att )
-
-
-    if kwargs.has_key?( :score )   ## check all-in-one score struct for convenience!!!
-      score = kwargs[:score]
-
-      if score.nil?   ## reset all score attribs to nil!!
-        @score = []    ##  [nil,nil]
-      else
-        ## check if is array - assume "generic" score e.g. 3-2
-        ##     that is, not known if full-time, after extra-time etc.
-        if score.is_a?( Array )
-           @score = score    ## e.g. [3,2]
-        else  ## assume hash
-           @score = score
-           # @score1,    @score2    =    score[:ft]  || []
-           # @score1i,   @score2i   =    score[:ht]  || []
-           # @score1et,  @score2et  =    score[:et]  || []
-           # @score1p,   @score2p   =    score[:p]   || score[:pen] || []
-           # @score1agg, @score2agg =    score[:agg] || []
-        end
-      end
-    end
-      # @score[:ht]   = kwargs[:score_ht]     if kwargs.has_key?( :score_ht )
-      # @score[:et]   = kwargs[:score_et]     if kwargs.has_key?( :score_et )
-      # @score[:p]    = kwargs[:score_p]      if kwargs.has_key?( :score_p )
-      # @score[:agg]  = kwargs[:score_agg]    if kwargs.has_key?( :score_agg )
-
-      ## note: (always) (auto-)convert scores to integers
-      # @score1     = @score1.to_i(10)      if @score1
-      # @score1i    = @score1i.to_i(10)     if @score1i
-      # @score1et   = @score1et.to_i(10)    if @score1et
-      # @score1p    = @score1p.to_i(10)     if @score1p
-      # @score1agg  = @score1agg.to_i(10)   if @score1agg
-
-      # @score2     = @score2.to_i(10)      if @score2
-      # @score2i    = @score2i.to_i(10)     if @score2i
-      # @score2et   = @score2et.to_i(10)    if @score2et
-      # @score2p    = @score2p.to_i(10)     if @score2p
-      # @score2agg  = @score2agg.to_i(10)   if @score2agg
-
-    ## todo/fix:
-    ##  gr-greece/2014-15/G1.csv:
-    ##     G1,10/05/15,Niki Volos,OFI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-    ##
-
-    ##  for now score1 and score2 must be present
-    ## if @score1.nil? || @score2.nil?
-    ##  puts "** WARN: missing scores for match:"
-    ##  pp kwargs
-    ##  ## exit 1
-    ## end
-
-
-    self   ## note - MUST return self for chaining
-  end
-
-
-  ####
-  ##  deprecated - use score.to_s and friends - why? why not?
-  # def score_str    # pretty print (full time) scores; convenience method
-  #  "#{@score1}-#{@score2}"
-  # end
-
-  # def scorei_str    # pretty print (half time) scores; convenience method
-  #  "#{@score1i}-#{@score2i}"
-  # end
-
-
-def as_json
-  #####
-  ##  note - use string keys (NOT symbol for data keys)
-  ##            for easier json compatibility
-  data = {}
-
-  ## check round
-  if @round
-    data['round'] = if round.is_a?( Integer )
-                      "Matchday #{@round}"
-                    else ## assume string
-                      @round
-                    end
-  end
-
-
-  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['time']        = @time           if @time
-    data['time_local']  = @time_local     if @time_local
-  end
-
-
-  data['team1'] =  @team1.is_a?( String ) ? @team1 : @team1.name
-
-  ## note - for match status bye  team2 is nil!!!
-  ##           e.g.     Queen's Park       bye
-  ##                    Wanderers          bye
-  ##   todo/check - keep bye as a match - why? why not?
-  ##                      has no date/time & venue & score etc.
-  if @team2
-    data['team2'] =  @team2.is_a?( String ) ? @team2 : @team2.name
-  end
-
-  ## note - score might be
-  ##           1) array e.g. [0,1]
-  ##           2) hash  e.g. { ft: [0,1] } etc.
-  ##  note - w/o (walkout)  do NOT add empty score
-  if @score.is_a?(Hash)
-      # note: make sure hash keys are always strings
-      data['score'] = @score.transform_keys(&:to_s)
-  elsif @score.is_a?(Array)
-      ## note:
-      ##   for now always assume full-time (ft)
-      ##     in future check for score note or such
-      ##      to  use "plain" array or such - why? why not?
-      ## data['score'] = { 'ft' => @score }   if !@score.empty?
-
-      data['score'] = @score     if !@score.empty?
-  end
-
-
-  ## data['score']['ht'] = [@score1i,   @score2i]     if @score1i && @score2i
-  ## data['score']['ft'] = [@score1,    @score2]      if @score1 && @score2
-  ## data['score']['et'] = [@score1et,  @score2et]    if @score1et && @score2et
-  ## data['score']['p']  = [@score1p,   @score2p]     if @score1p && @score2p
-
-
-
-  ### check for goals
-  if @goals && @goals.size > 0
-    data['goals1'] = []
-    data['goals2'] = []
-
-    @goals.each do |goal|
-          node = {}
-          node['name']    = goal.player
-
-          ## note - use a string for minutes for now
-          ##           allows e.g.  45+2 etc. too
-          minute_str  = "#{goal.minute}"
-          minute_str += "+#{goal.offset}"   if goal.offset
-
-          node['minute']  = minute_str
-
-          node['owngoal'] = true         if goal.owngoal
-          node['penalty'] = true         if goal.penalty
-
-          if goal.team == 1
-            data['goals1']  << node
-          else  ## assume 2
-            data['goals2']  << node
-          end
-     end  # each goal
-  end
-
-
-  data['status'] = @status  if @status
-
-  data['group']  = @group   if @group
-
-  if @ground
-       ## note: might be array of string e.g. ['Wembley', 'London']
-       ##
-       ##  todo/check - auto-join to string - why? why not?
-       ##                   e.g.  ['Wembley', 'London']
-       ##                     to   'Wembley, London'
-       ##   note - auto-join geo tree for now
-       data['ground'] = @ground.join(', ')
-  end
-
-  data['attendance'] = @att   if @att
-  data
-end
-end  # class Match
-
-
-
-end # class MatchTree
-end # module Fbtxt