fbtxt-document 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e52e2c2ec111cd72919ddb7c902d39824f00ada678705eaf58ee72dd996ec85
-  data.tar.gz: 03ba7e0bf6255fca7abef9ac0adb0add827dc95d61ce72e1d71be88f641cb037
+  metadata.gz: cede645c5634b77011d3c7989db7af19e68083f8af89436af1aabb6c873d115e
+  data.tar.gz: a4e98460ccc55c134d835add92b8dcdd7d35640c831cf504b11a36f88d25f34b
 SHA512:
-  metadata.gz: f6b2fe58e43b658dfd8f5716f05f3f264f70a25845edf1cd3829106ce170b8c181cd067afa79003cbbd3d739135371a4403f2054f7cd6cee740e15e308695763
-  data.tar.gz: 43252d347f1619a5e5050de924db180e4d69407b6b250630f82228fb785d89f40844a51267a5e0561805ba8df01e904229528843c475a65f8ca5a6cd3625e0db
+  metadata.gz: ec91acce5438a7260b6f1fc17475f91c05bce5b469bd284e613afbe89a9e4fc3b1bd0929c1845d59baa977c67b1ba8625a914e2a01d074273842d29d0cfa6871
+  data.tar.gz: d6f6db6fa65ad6126235d0b5205d2b294205979244d2c1e014a141ecd195e22d4ebd4c4bc6a9f828b8cb02072615fb13092dfc563b63598555a1bde311a37d85

data/CHANGELOG.md

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

data/Manifest.txt

@@ -3,17 +3,30 @@ Manifest.txt
 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

data/lib/fbtxt/document/export_utils.rb

@@ -0,0 +1,100 @@
+
+##
+##  add shared quick (export) helper / utility methods
+###
+
+module Fbtxt
+  module Export
+
+#####
+## todo
+##   move to  Fbtxt::Export.genjson or such
+##   or use Fbtxt::Serialize/Batch or ??
+
+
+##
+#  usage for config
+#   e.g.
+#  [['1930/worldcup.json', ['worldcup/1930--uruguay/cup.txt']],
+#   ['1934/worldcup.json', ['worldcup/1934--italy/cup.txt']],
+#   ['2026/worldcup.json', ['worldcup/2026--usa/cup.txt',   'worldcup/2026--usa/cup_finals.txt']]]
+#
+# todo/check:
+#   change/rename indir to sourcedir/rootdir or such - why? why not?
+def self.genjson( config, outdir: '.',
+                          indir: '.' )
+
+
+  config.each do |outfile, infiles|
+
+    ##  step 1
+    ## collect (parse) docs
+      docs = []
+      infiles.each_with_index do |infile,i|
+        inpath = File.join( indir, infile )
+
+        print "==> reading"
+        print " [#{i+1}/#{infiles.size}]"  if infiles.size > 1
+        print " #{inpath}...\n"
+
+        doc = Document.read( inpath )
+
+        if doc.errors?
+          puts "!! #{doc.errors.size} parse error(s) in #{inpath}:"
+          pp doc.errors
+          exit 1
+        end
+
+        docs << doc
+      end
+
+      data = _merge_matches( *docs )
+
+      outpath = File.join( outdir, outfile )
+
+    ####################
+    ## hack - use pretty_inspect for json pretty print
+    txtjson =  data.pretty_inspect
+    txtjson = txtjson.gsub( '=>', ': ' )
+    ## puts txtjson[0,100] + "..."
+    ## double check for syntax errors
+    json = JSON.parse( txtjson )
+
+    ##
+    ## try alternate pretty print
+    ##   puts JSON.pretty_generate( data, object_nl: "\n", array_nl: "\n", indent: 2)
+    ##
+    ## write_json( outpath, data )
+
+    puts "     writing to >#{outpath}<"
+    puts txtjson[0,100] + "..."
+
+    write_text( outpath, txtjson )
+  end
+end
+
+
+def self._merge_matches( *docs )
+    last_name = nil
+    matches   = []
+
+    docs.each do |doc|
+      name         = doc.title
+
+      if last_name && name != last_name
+         puts "!! ERROR - league names do NOT match; cannot merge/concat - sorry"
+         puts "   #{last_name} != #{name}"
+         exit 1
+      end
+
+      last_name = name
+      matches  += doc.matches
+    end
+
+    data = { 'name'    => last_name,
+             'matches' => matches.as_json }
+    data
+end
+
+end # module Export
+end # module Fbtxt

data/lib/fbtxt/document/match_tree.rb

@@ -7,6 +7,10 @@ class MatchTree
   include Debuggable
 
 
+  include Models      ## e.g. Fbtxt::Model(s)
+                      ##      Match,Round,Group,Goal,etc.
+
+
   ##
   ##  note: allow start(_date) nil
   ##          if in use (start: nil) years expected on first date!!!
@@ -69,14 +73,19 @@ class MatchTree
           on_match_line_bye( node )
       elsif node.is_a? RaccMatchParser::GoalLine
           on_goal_line( node )
-      elsif node.is_a?( RaccMatchParser::LineupLine ) ||
-            node.is_a?( RaccMatchParser::RefereeLine )
-           ## skip lineup, referee props for now
+      elsif node.is_a? RaccMatchParser::PenaltiesLine
+           on_penalties( node )
+      elsif node.is_a? RaccMatchParser::LineupLine
+          on_lineup_line( node )
+      elsif node.is_a? RaccMatchParser::CardsLine
+          on_cards_line( node )
+      elsif node.is_a? RaccMatchParser::RefereeLine
+           on_referee_line( node )
       elsif node.is_a?( RaccMatchParser::Heading1 ) ||
             node.is_a?( RaccMatchParser::Heading2 ) ||
             node.is_a?( RaccMatchParser::Heading3 )
           ###  skip headings (1/2/3) for now
-      elsif node.is_a?( RaccMatchParser::BlankLine )
+      elsif node.is_a? RaccMatchParser::BlankLine
           ### skip for now; do nothing
       else
         ## report error
@@ -95,32 +104,5 @@ class MatchTree
   end # method convert
 
 
-
-
-  def on_match_line_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!!
-    ##                  plus inherited round/group
-
-    status = 'bye'
-
-    team = node.team
-
-    @teams[ team ] += 1
-
-    group =  nil
-    group =  @last_group  if @last_group
-
-    round = nil
-    round =  @last_round  if @last_round
-
-    @matches << Match.new( team1:    team,  ## note: for now always use mapping value e.g. rec (NOT string e.g. team1.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
 end # class MatchTree
 end # module Fbtxt

data/lib/fbtxt/document/match_tree_on/on_cards_line.rb

@@ -0,0 +1,66 @@
+module Fbtxt
+class MatchTree
+
+  def on_cards_line( node )
+    _trace( "on cards: >#{node}<" )
+
+    ## get last match
+    match = @matches[-1]
+
+
+    ################################
+    ##  CardsLine = Struct.new( :type, :bookings )
+    ##  Booking   = Struct.new( :name, :minute )
+
+
+    ## check if match has lineup ??
+    if match.lineup
+        ## type = node.type   ## e.g. 'Y', 'Y/R', 'R', 'SENTOFF', etc.
+
+        ## note - flatten for now
+        ##   fix-fix-fix  use lineup[0], lineup[1] latter - why? why not?
+        bookings = node.bookings.flatten
+
+
+        bookings.each do |b|
+          ##  find player ref in match lineup (team1/team2)
+          player = nil
+          ## note - expapand lineup[] to one or two items
+          [*match.lineup].each_with_index do |lineup,i|
+             player = lineup.find_player( b.name )
+             next if player.nil?
+
+             ## fix-fix-fix-  keep player obj/ref - why? why not?
+             rec =  EventCard.new(
+                                    type:   node.type,
+                                    name:   b.name,
+                                    minute: b.minute )
+
+             match.bookings ||= [[],[]]
+             match.bookings[i]  << rec
+
+             break
+          end
+
+          if player.nil?
+            ## raise ArgumentError,
+            ##       "player >#{b.name}< NOT found in match (lineup): #{match.pretty_inspect}"
+
+            ### log warn for now
+            ##    might be trainer, staff or missing player from bench w/o sub
+            ## fix-fix-fix
+            ##    log error!!
+            msg = "!! WARN - player >#{b.name}< NOT found; skipping booking #{b.pretty_inspect}"
+            puts msg
+            log( msg )
+          end
+
+        end
+    else
+      ### warn -  "standalone"  bookings for now not yet supported!!!
+    end
+
+  end
+
+end ## class MatchTree
+end ##  module Fbtxt

data/lib/fbtxt/document/match_tree_on/on_goal_line.rb

@@ -5,6 +5,14 @@ class MatchTree
   def on_goal_line( node )
     _trace( "on goal line: >#{node}<" )
 
+     ###
+     #  note: goals formats
+     #   (i)   [[],[]]   (nested/paired) or
+     #   (ii)  []        (flat/undefined)
+     ##
+     ##   add Array#paired? and
+     ##       Array#flat?
+     ##    helper methods/checks or such - why? why not?
 
      if node.goals[0].is_a?( Array )
        goals1, goals2 = node.goals[0], node.goals[1]
@@ -17,25 +25,27 @@ class MatchTree
     pp [goals1,goals2]     if debug?
 
 
+   ## quick & dirty - auto add goals to last match
+   ##   note - for hacky (quick& dirty) multi-line support
+   ##     always append for now
+   match = @matches[-1]
+
+
 ## special rule
 ##    if goals 2 empty check if score for team 1 is zero
 ##                           and team 2 is NOT zero than
-##                                make goals1 goald2!!
+##                                make goals1 goals2!!
 ##   e.g. Norway 0-1  Austria
 ##                   (Hof 32)
-
-   if goals2.empty? && !goals1.empty?
-
-     match = @matches[-1]
+   if match.score &&
+      goals2.empty? && !goals1.empty?
 
      ##
-     ## todo/fix
-     ##   move upstream
-     ##    use score1_zero? or such - why? why not?
-     if (match.score.is_a?(Array) && match.score[0] == 0 ) ||
-        (match.score.is_a?(Hash)  && match.score[:et] && match.score[:et][0] == 0) ||
-        (match.score.is_a?(Hash)  && match.score[:et].nil? &&
-                                     match.score[:ft] && match.score[:ft][0] == 0)
+     ## todo/fix: move upstream
+     ##             use score1_zero? or such - why? why not?
+     if (match.score.reported?  && match.score.reported[0] == 0 ) ||
+        (match.score.et? && match.score.et[0] == 0) ||
+        (match.score.ft? && !match.score.et? && match.score.ft[0] == 0)
         ## "parallel assignment (or multiple assignment") - swap values in single line
         goals2, goals1 = goals1, goals2
      end
@@ -43,18 +53,14 @@ class MatchTree
 
 
 
-   ##
-   ## todo/fix - sort goals by minute (+offset) !!!
-
     goals = []
 
     goals1.each do |rec|
       rec.minutes.each do |minute|
         goal = Goal.new(
-                  player: rec.player,
+                  name:   rec.player,
                   team:   1,
-                  minute:  minute.m,
-                  offset:  minute.offset,
+                  minute:  minute.to_minute, ## from GoalMinute to Minute!!
                   penalty: minute.pen || false, #  note: pass along/use false NOT nil
                   owngoal: minute.og || false
                 )
@@ -65,10 +71,9 @@ class MatchTree
     goals2.each do |rec|
       rec.minutes.each do |minute|
         goal = Goal.new(
-                  player: rec.player,
+                  name:   rec.player,
                   team:   2,
-                  minute:  minute.m,
-                  offset:  minute.offset,
+                  minute:  minute.to_minute, ## from GoalMinute to Minute!!
                   penalty: minute.pen || false, #  note: pass along/use false NOT nil
                   owngoal: minute.og || false
                 )
@@ -76,18 +81,31 @@ class MatchTree
       end
     end
 
+
     pp goals   if debug?
 
+
+    ## todo/fix
+    ##    PLUS auto-fill score1,score2 - why? why not?
+
     ## quick & dirty - auto add goals to last match
     ##   note - for hacky (quick& dirty) multi-line support
     ##     always append for now
-    match = @matches[-1]
     match.goals ||= []
     match.goals += goals
 
-    ## todo/fix
-    ##   sort by minute
-    ##    PLUS auto-fill score1,score2 - why? why not?
+
+    ##   always keep goal list sorted by minute - why? why not?
+    ##     - sort only on serialize (as_json) - why? why not?
+    match.goals = match.goals.sort do |l,r|
+                    if l.minute && r.minute
+                            ## note - minute is obj!! (Fbtxt::Minute!!)
+                            l.minute <=> r.minute
+                    else
+                       ## keep as is (no minutes available)
+                       0
+                    end
+               end
   end
 
 

data/lib/fbtxt/document/match_tree_on/on_lineup_line.rb

@@ -0,0 +1,96 @@
+module Fbtxt
+class MatchTree
+
+
+   ##
+   ##  fix - move "upstream to lineup"  - why? why not?
+   ##       - rename each_lineup?
+   ##
+   def _each_player( lineup, &blk )
+     lineup.each do |item|
+        blk.call(item)
+        ## plus (walk) recursive sub(stitution)s
+        current = item
+        while current && current.sub
+            blk.call( current.sub.sub )
+            current = current.sub.sub
+        end
+     end
+   end
+
+   ## change to _collect_inline_bookings/cards - why? why not?
+   def _collect_bookings( lineup )
+      recs  = []
+
+## Lineup     = Struct.new( :name, :captain, :cards, :sub )
+## Card       = Struct.new( :name, :minute )
+      _each_player( lineup ) do |item|
+          if item.cards.is_a?(Array) && item.cards.size > 0
+              item.cards.each do |card|
+                 recs << EventCard.new(
+                              ## fix/fix/fix change to card.type upstream - why? why not?
+                                    type:   card.name,
+                                    name:   item.name,
+                                    minute: card.minute )
+
+              end
+           end
+         end
+
+
+## note - (auto-)sort by minute if present
+   recs = recs.sort do |l,r|
+                    if l.minute && r.minute
+                            ## note - minute is obj!! (Fbtxt::Minute!!)
+                            l.minute <=> r.minute
+                    else
+                       0   ## keep as is (no minutes available)
+                    end
+               end
+
+     recs
+  end
+
+
+
+
+
+
+  def on_lineup_line( node )
+    _trace( "on lineup: >#{node}<" )
+
+    ## get last match
+    match = @matches[-1]
+
+    ## collect players
+    team_name = node.team
+    lineup    = node.lineup
+
+    ## note -
+    ##  lineup - uses nested array format
+    ##    for formation
+    ##
+    ##  quick & dirty hack - flatten for now
+    ##    refine later
+    lineup = lineup.flatten
+
+##  LineupLine = Struct.new( :team, :lineup, :formation, :coach ) do
+##  Lineup     = Struct.new( :name, :captain, :cards, :sub ) do
+##   Sub        = Struct.new( :minute, :sub )  do
+
+    ## todo/check if team name match
+    ##  warn if no match
+
+    match.lineup ||= []
+
+    ## todo/fix-fix-fix  add formation here too - why? why not?
+
+    match.lineup  <<   Lineup.build( lineup )
+
+    match.bookings ||=[]
+    match.bookings << _collect_bookings( lineup )
+  end
+
+
+end ## class MatchTree
+end ##  module Fbtxt

data/lib/fbtxt/document/match_tree_on/on_match_bye.rb

@@ -0,0 +1,35 @@
+module Fbtxt
+class MatchTree
+
+
+
+  def on_match_line_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!!
+    ##                  plus inherited round/group
+
+    status = 'bye'
+
+    team = node.team
+
+    @teams[ team ] += 1
+
+    group =  nil
+    group =  @last_group  if @last_group
+
+    round = nil
+    round =  @last_round  if @last_round
+
+    @matches << Match.new( team1:    team,  ## note: for now always use mapping value e.g. rec (NOT string e.g. team1.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
+
+
+
+end ## class MatchTree
+end ##  module Fbtxt

data/lib/fbtxt/document/match_tree_on/on_match_line.rb

@@ -43,27 +43,9 @@ class MatchTree
     end
 
 
-    ### todo/fix
-    ##    add keywords (e.g. ht, ft or such) to Score.new - why? why not?
-    ##     or use new Score.build( ht:, ft:, ) or such - why? why not?
-    ## pp score
     score  = nil
-    score = node.score   if node.score
-
-    ## 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
+    score = Score.build( node.score )    if node.score
+    ## pp score
 
 
     status = nil

data/lib/fbtxt/document/match_tree_on/on_penalties.rb

@@ -0,0 +1,57 @@
+module Fbtxt
+class MatchTree
+
+
+   ## check - use on_penalties_line ???
+  def on_penalties( node )
+    _trace( "on penalties: >#{node}<" )
+
+    ## get last match
+    match = @matches[-1]
+
+
+    ##   PenaltiesLine = Struct.new( :penalties )
+    ##   Penalty       = Struct.new( :name, :score, :note )
+
+        #####
+         ##  note
+         ##     (i)  []          -  single line (no separator)
+         ##     (ii) [[],[]]     -  nested team1/team2 (separator required)
+
+
+    recs = nil
+
+    if node.penalties.is_a?(Array) && node.penalties.size == 2 &&
+       node.penalties[0].is_a?(Array) && node.penalties[1].is_a?(Array)
+
+       ## use zip to make (flattend) sequence - why? why not?
+       ##  we do NOT know who really started (picked via coin toss!!)
+       ##    keep nested arrays for now
+         recs = [[],[]]
+
+         node.penalties.each_with_index.each do |pens,i|
+            pens.each do |pen|
+              recs[i]  << Penalty.new(
+                            name:  pen.name,
+                            score: pen.score,
+                            note:  pen.note )
+            end
+        end
+    else
+      ## assume chronological sequence
+      recs = []
+      node.penalties.each do |pen|
+         recs << Penalty.new(
+                       name:  pen.name,
+                       score: pen.score,
+                       note:  pen.note )
+      end
+    end
+
+
+     match.penalties = recs
+  end
+
+
+end ## class MatchTree
+end ##  module Fbtxt

data/lib/fbtxt/document/match_tree_on/on_referee_line.rb

@@ -0,0 +1,25 @@
+module Fbtxt
+class MatchTree
+
+
+  def on_referee_line( node )
+    _trace( "on referee(s): >#{node}<" )
+
+    ## get last match
+    match = @matches[-1]
+
+   ## support multiple referees (incl. assistant refs etc.)
+   ##  RefereeLine = Struct.new( :referees )
+   ##  Referee = Struct.new( :name, :country )
+
+    recs = []
+    node.referees.each do |ref|
+        recs << Referee.new( name: ref.name, country: ref.country )
+    end
+
+     match.referees = recs
+  end
+
+
+end ## class MatchTree
+end ##  module Fbtxt