sportdb-parser 0.7.1 → 0.7.2

data/lib/sportdb/parser/token-date--names.rb

@@ -0,0 +1,108 @@
+module SportDb
+class Lexer
+
+
+def self.parse_names( txt )
+  lines = [] # array of lines (with words)
+
+  txt.each_line do |line|
+    line = line.strip
+
+    next if line.empty?
+    next if line.start_with?( '#' )   ## skip comments too
+
+    ## strip inline (until end-of-line) comments too
+    ##   e.g. Janvier  Janv  Jan  ## check janv in use??
+    ##   =>   Janvier  Janv  Jan
+
+    line = line.sub( /#.*/, '' ).strip
+    ## pp line
+
+    values = line.split( /[ \t]+/ )
+    ## pp values
+
+    ## todo/fix -- add check for duplicates
+    lines << values
+  end
+  lines
+
+end # method parse
+
+
+def self.build_names( lines )
+  ## join all words together into a single string e.g.
+  ##   January|Jan|February|Feb|March|Mar|April|Apr|May|June|Jun|...
+  lines.map { |line| line.join('|') }.join('|')
+end
+
+
+def self.build_map( lines, downcase: false )
+   ## note: downcase name!!!
+  ## build a lookup map that maps the word to the index (line no) plus 1 e.g.
+  ##  {"january" => 1,  "jan" => 1,
+  ##   "february" => 2, "feb" => 2,
+  ##   "march" => 3,    "mar" => 3,
+  ##   "april" => 4,    "apr" => 4,
+  ##   "may" => 5,
+  ##   "june" => 6,     "jun" => 6, ...
+  lines.each_with_index.reduce( {} ) do |h,(line,i)|
+    line.each do |name|
+       h[ downcase ? name.downcase : name ] = i+1
+    end  ## note: start mapping with 1 (and NOT zero-based, that is, 0)
+    h
+  end
+end
+
+
+
+
+MONTH_LINES = parse_names( <<TXT )
+January    Jan
+February   Feb
+March      Mar
+April      Apr
+May
+June       Jun
+July       Jul
+August     Aug
+September  Sept  Sep
+October    Oct
+November   Nov
+December   Dec
+TXT
+
+MONTH_NAMES = build_names( MONTH_LINES )
+# pp MONTH_NAMES
+MONTH_MAP   = build_map( MONTH_LINES, downcase: true )
+# pp MONTH_MAP
+
+
+
+DAY_LINES = parse_names( <<TXT )
+Monday                   Mon  Mo
+Tuesday            Tues  Tue  Tu
+Wednesday                Wed  We
+Thursday    Thurs  Thur  Thu  Th
+Friday                   Fri  Fr
+Saturday                 Sat  Sa
+Sunday                   Sun  Su
+TXT
+
+DAY_NAMES = build_names( DAY_LINES )
+# pp DAY_NAMES
+DAY_MAP   = build_map( DAY_LINES, downcase: true )
+# pp DAY_MAP
+
+
+#=>
+# "January|Jan|February|Feb|March|Mar|April|Apr|May|June|Jun|
+#  July|Jul|August|Aug|September|Sept|Sep|October|Oct|
+#  November|Nov|December|Dec"
+#
+# "Monday|Mon|Mo|Tuesday|Tues|Tue|Tu|Wednesday|Wed|We|
+#  Thursday|Thurs|Thur|Thu|Th|Friday|Fri|Fr|
+#  Saturday|Sat|Sa|Sunday|Sun|Su"
+
+
+end   # class Lexer
+end   # module SportDb

data/lib/sportdb/parser/token-date.rb

@@ -3,112 +3,6 @@ class Lexer
 
 
 
-def self.parse_names( txt )
-  lines = [] # array of lines (with words)
-
-  txt.each_line do |line|
-    line = line.strip
-
-    next if line.empty?
-    next if line.start_with?( '#' )   ## skip comments too
-
-    ## strip inline (until end-of-line) comments too
-    ##   e.g. Janvier  Janv  Jan  ## check janv in use??
-    ##   =>   Janvier  Janv  Jan
-
-    line = line.sub( /#.*/, '' ).strip
-    ## pp line
-
-    values = line.split( /[ \t]+/ )
-    ## pp values
-
-    ## todo/fix -- add check for duplicates
-    lines << values
-  end
-  lines
-
-end # method parse
-
-
-def self.build_names( lines )
-  ## join all words together into a single string e.g.
-  ##   January|Jan|February|Feb|March|Mar|April|Apr|May|June|Jun|...
-  lines.map { |line| line.join('|') }.join('|')
-end
-
-
-def self.build_map( lines, downcase: false )
-   ## note: downcase name!!!
-  ## build a lookup map that maps the word to the index (line no) plus 1 e.g.
-  ##  {"january" => 1,  "jan" => 1,
-  ##   "february" => 2, "feb" => 2,
-  ##   "march" => 3,    "mar" => 3,
-  ##   "april" => 4,    "apr" => 4,
-  ##   "may" => 5,
-  ##   "june" => 6,     "jun" => 6, ...
-  lines.each_with_index.reduce( {} ) do |h,(line,i)|
-    line.each do |name|
-       h[ downcase ? name.downcase : name ] = i+1
-    end  ## note: start mapping with 1 (and NOT zero-based, that is, 0)
-    h
-  end
-end
-
-
-
-
-MONTH_LINES = parse_names( <<TXT )
-January    Jan
-February   Feb
-March      Mar
-April      Apr
-May
-June       Jun
-July       Jul
-August     Aug
-September  Sept  Sep
-October    Oct
-November   Nov
-December   Dec
-TXT
-
-MONTH_NAMES = build_names( MONTH_LINES )
-# pp MONTH_NAMES
-MONTH_MAP   = build_map( MONTH_LINES, downcase: true )
-# pp MONTH_MAP
-
-
-
-DAY_LINES = parse_names( <<TXT )
-Monday                   Mon  Mo
-Tuesday            Tues  Tue  Tu
-Wednesday                Wed  We
-Thursday    Thurs  Thur  Thu  Th
-Friday                   Fri  Fr
-Saturday                 Sat  Sa
-Sunday                   Sun  Su
-TXT
-
-DAY_NAMES = build_names( DAY_LINES )
-# pp DAY_NAMES
-DAY_MAP   = build_map( DAY_LINES, downcase: true )
-# pp DAY_MAP
-
-
-#=>
-# "January|Jan|February|Feb|March|Mar|April|Apr|May|June|Jun|
-#  July|Jul|August|Aug|September|Sept|Sep|October|Oct|
-#  November|Nov|December|Dec"
-#
-# "Monday|Mon|Mo|Tuesday|Tues|Tue|Tu|Wednesday|Wed|We|
-#  Thursday|Thurs|Thur|Thu|Th|Friday|Fri|Fr|
-#  Saturday|Sat|Sa|Sunday|Sun|Su"
-
-
-
-## todo - add more date variants !!!! why? why not?
-
-
 # e.g.  Fri Aug 9
 #       Fri  Aug 9
 ##      Fri, Aug 9
@@ -118,7 +12,7 @@ DAY_MAP   = build_map( DAY_LINES, downcase: true )
 ##           Aug 9, 2024
 ##   note - eat-up optional comma after DAY_NAMES!!
 ##
-##      note - Fri Aug/9  no longer supported!!!   
+##      note - Fri Aug/9  no longer supported!!!
 DATE_I_RE = %r{
 (?<date>
   \b
@@ -127,12 +21,12 @@ DATE_I_RE = %r{
            (?: ,?[ ]+)
      )?
      (?<month_name>#{MONTH_NAMES})
-          [ ] 
+          [ ]
      (?<day>\d{1,2})
           \b
      ## optional year
      (      ,? [ ]       ## note - comma optinal with single space required for now
-            (?<year>\d{4})        ## optional year 2025 (yyyy)      
+            (?<year>\d{4})        ## optional year 2025 (yyyy)
               \b
      )?
 )}ix
@@ -146,13 +40,13 @@ DATE_LEGS_I_RE = %r{
 (?<date_legs>
  \b
      (?<month_name1>#{MONTH_NAMES})
-          [ ] 
+          [ ]
      (?<day1>\d{1,2})
     [ ] & [ ]
      (?:
         (?<month_name2>#{MONTH_NAMES})
-          [ ] 
-      )?  ## note - make 2nd month_name optional 
+          [ ]
+      )?  ## note - make 2nd month_name optional
      (?<day2>\d{1,2})
   \b
 )}ix
@@ -161,10 +55,10 @@ DATE_LEGS_I_RE = %r{
 ###
 # e.g. 3 June  or 10 June
 ##   note - allow more spaces between  DAY_NAMES and DAY e.g.
-##    Sun  1 Mar        
-##    Wed  4 Mar        
-##    Sat 14 Mar   
-##    Sat 11 Apr 
+##    Sun  1 Mar
+##    Wed  4 Mar
+##    Sat 14 Mar
+##    Sat 11 Apr
 ##    Sat 11 Apr 2021
 ##    Sat 11 Apr 21
 ##
@@ -187,7 +81,7 @@ DATE_II_RE = %r{
           \b
      ## optional year
      (  [ ]
-        (?: 
+        (?:
            (?<year>\d{4})        ## optional year 2025 (yyyy)
                |
             (?:
@@ -196,13 +90,13 @@ DATE_II_RE = %r{
                (?! :|[:h]\d{2})
             )
         )
-        \b   
+        \b
      )?
 )}ix
 
 
-# e.g. iso-date  -  2011-08-25     
-##   note - allow/support ("shortcuts") e.g 2011-8-25  or 2011-8-3 / 2011-08-03 etc. 
+# e.g. iso-date  -  2011-08-25
+##   note - allow/support ("shortcuts") e.g 2011-8-25  or 2011-8-3 / 2011-08-03 etc.
 DATE_III_A_RE = %r{
 (?<date>
   \b
@@ -232,20 +126,20 @@ DATE_III_B_RE = %r{
 
 
 
-## allow (short)"european" style  8.8. 
+## allow (short)"european" style  8.8.
 ##   note - assume day/month!!!
 DATE_IIII_RE = %r{
 (?<date>
   \b
      ## optional day name
      ((?<day_name>#{DAY_NAMES})
-           (?: ,?[ ]+) 
+           (?: ,?[ ]+)
      )?
    (?<day>\d{1,2})
        \.
    (?<month>\d{1,2})
        \.
-   (?: (?: 
+   (?: (?:
           (?<year>\d{4})        ## optional year 2025 (yyyy)
               |
           (?<yy>\d{2})           ## optional year 25 (yy)
@@ -271,9 +165,9 @@ DATE_IIIII_RE = %r{
        /
    (?<month>\d{1,2})
     \b
-   (?:  
+   (?:
         /
-       (?: 
+       (?:
           (?<year>\d{4})         ## optional year 2025 (yyyy)
               |
           (?<yy>\d{2})           ## optional year 25 (yy)
@@ -293,7 +187,7 @@ DATE_RE = Regexp.union(
    DATE_II_RE,
    DATE_III_A_RE,    ## e.g. 1973-08-14
    DATE_III_B_RE,
-   DATE_IIII_RE,    ## e.g. 8.8. or 8.13.79 or 08.14.1973 
+   DATE_IIII_RE,    ## e.g. 8.8. or 8.13.79 or 08.14.1973
    DATE_IIIII_RE,   ## e.g.  08/14/1973
 )
 
@@ -301,72 +195,6 @@ DATE_RE = Regexp.union(
 DATE_LEGS_RE  =    DATE_LEGS_I_RE
 
 
-##  "internal" date helpers
-def self._build_date( m )
-            date = {}
-         ## map month names
-         ## note - allow any/upcase JULY/JUL etc. thus ALWAYS downcase for lookup
-            date[:y]  = m[:year].to_i(10)  if m[:year]
-            ## check - use y too for two-digit year or keep separate - why? why not?
-            date[:yy] = m[:yy].to_i(10)    if m[:yy]    ## two digit year (e.g. 25 or 78 etc.)
-            date[:m] = m[:month].to_i(10)  if m[:month]
-            date[:m] = MONTH_MAP[ m[:month_name].downcase ]   if m[:month_name]
-            date[:d]  = m[:day].to_i(10)   if m[:day]
-            date[:wday] = DAY_MAP[ m[:day_name].downcase ]   if m[:day_name]
-
-            date
-end
-def _build_date( m ) self.class._build_date( m ); end
-
-def self._build_date_legs( m )
-           legs = {}
-        ## map month names
-         ## note - allow any/upcase JULY/JUL etc. thus ALWAYS downcase for lookup
-            date = {}
-            date[:m] = MONTH_MAP[ m[:month_name1].downcase ]
-            date[:d]  = m[:day1].to_i(10)   
-            legs[:date1] = date
-     
-            date = {}
-            date[:m] = MONTH_MAP[ m[:month_name2].downcase ]   if m[:month_name2]
-            date[:d]  = m[:day2].to_i(10)   
-            legs[:date2] = date
-
-            legs
-end 
-def _build_date_legs( m ) self.class._build_date_legs( m ); end
-
-
-
-
-#############
-## "top-level" add a date parser helper
-def self.parse_date( str, start: )
-    if m=DATE_RE.match( str )
-
-      year    = m[:year].to_i(10)  if m[:year]
-      month   = MONTH_MAP[ m[:month_name].downcase ]   if m[:month_name]
-      day     = m[:day].to_i(10)   if m[:day]
-      wday    = DAY_MAP[ m[:day_name].downcase ]   if m[:day_name]
-
-      if year.nil?   ## try to calculate year
-        year =  if  month > start.month ||
-                   (month == start.month && day >= start.day)
-                  # assume same year as start_at event (e.g. 2013 for 2013/14 season)
-                  start.year
-                else
-                  # assume year+1 as start_at event (e.g. 2014 for 2013/14 season)
-                  start.year+1
-                end
-      end
-      Date.new( year,month,day )
-    else
-      puts "!! ERROR - unexpected date format; cannot parse >#{str}<"
-      exit 1
-    end
-end
-
 
 end  #   class Lexer
 end  # module SportDb
-

data/lib/sportdb/parser/token-date_duration.rb

@@ -52,7 +52,7 @@ DURATION_I_RE =  %r{
       [ ]
    )?
    (?<month_name1>#{MONTH_NAMES})
-      [ ] 
+      [ ]
    (?<day1>\d{1,2})
    ## optional year
    (  ,?   # optional comma
@@ -68,7 +68,7 @@ DURATION_I_RE =  %r{
       [ ]
    )?
    (?<month_name2>#{MONTH_NAMES})
-      [ ] 
+      [ ]
    (?<day2>\d{1,2})
    ## optional year
    (  ,?   # optional comma
@@ -81,14 +81,14 @@ DURATION_I_RE =  %r{
 
 
 
-#   FIX - remove this variant 
+#   FIX - remove this variant
 #         "standardize on month day [year]" !!!!
 
 =begin
 ###
 #   variant ii
 # e.g. 26 July - 27 July
-#      26 July, 
+#      26 July,
 XXX_DURATION_II_RE =  %r{
 (?<duration>
     \b
@@ -101,7 +101,7 @@ XXX_DURATION_II_RE =  %r{
       [ ]
    (?<month_name1>#{MONTH_NAMES})
    ## optional year
-   (  
+   (
        [ ]
       (?<year1>\d{4})
    )?
@@ -128,12 +128,12 @@ XXX_DURATION_II_RE =  %r{
 
 #  variant ii
 #  add support for shorthand
-#     August 16-18, 2011     
+#     August 16-18, 2011
 #     September 13-15, 2011
 #      October 18-20, 2011
 #      March 6-8 2012
 #      March 6-8
-#     
+#
 #   - add support for August 16+17 or such (and check 16+18)
 #       use <op> to check if day2 is a plus or range or such - why? why not?
 
@@ -150,7 +150,7 @@ DURATION_II_RE =  %r{
             ,?     ## optional comma
             [ ]
             (?<year1>\d{4})
-          )?     ## optional year   
+          )?     ## optional year
    )
    \b
 )}ix
@@ -166,25 +166,6 @@ DURATION_RE = Regexp.union(
 )
 
 
-def self._build_duration( m )
-            ## todo/check/fix - if end: works for kwargs!!!!!
-            duration = { start: {}, end: {}}
-
-            duration[:start][:y] = m[:year1].to_i(10)  if m[:year1]
-            duration[:start][:m] = MONTH_MAP[ m[:month_name1].downcase ]   if m[:month_name1]
-            duration[:start][:d]  = m[:day1].to_i(10)   if m[:day1]
-            duration[:start][:wday] = DAY_MAP[ m[:day_name1].downcase ]   if m[:day_name1]
-
-            duration[:end][:y] = m[:year2].to_i(10)  if m[:year2]
-            duration[:end][:m] = MONTH_MAP[ m[:month_name2].downcase ]   if m[:month_name2]
-            duration[:end][:d]  = m[:day2].to_i(10)   if m[:day2]
-            duration[:end][:wday] = DAY_MAP[ m[:day_name2].downcase ]   if m[:day_name2]
-
-            duration
-end
-def _build_duration(m) self.class._build_duration( m ); end
-
 
 end  #   class Lexer
 end  # module SportDb
-

data/lib/sportdb/parser/token-geo.rb

@@ -21,7 +21,7 @@ GEO_TEXT_RE = %r{
                 # opt 1 - start with alpha
                  \p{L}+    ## all unicode letters (e.g. [a-z])
                    |
-                # opt 2 - start with num!! - 
+                # opt 2 - start with num!! -
                      \d+  # check for num lookahead (MUST be space or dot)
                       ## MAY be followed by (optional space) !
                       ## MUST be follow by a to z!!!!
@@ -37,11 +37,11 @@ GEO_TEXT_RE = %r{
 
                ##
                ## todo/check - find a different "more intuitive" regex/rule if possible?
-               ##    for single spaces only (and _/ MUST not be surround by spaces) 
+               ##    for single spaces only (and _/ MUST not be surround by spaces)
 
-              (?: 
+              (?:
                   (?:
-                    [ ]?   # only single (inline) space allowed - double spaces are breaks!!!  
+                    [ ]?   # only single (inline) space allowed - double spaces are breaks!!!
                     (?:
                        \p{L} | \d  | [.&'°]
                         |
@@ -64,7 +64,7 @@ GEO_TEXT_RE = %r{
               ##        Ost-Berlin (Walter-Ulbricht)
               ##        Athinai (OAKA - Maroussi)
               ##
-              ##   or   Valencia (Spain) or Solna   
+              ##   or   Valencia (Spain) or Solna
               (?:
                     [ ]
                     \(
@@ -93,20 +93,14 @@ GEO_TEXT_RE = %r{
 
 
 
-GEO_BASICS_RE = %r{
-    (?<spaces> [ ]{2,}) |
-    (?<space>  [ ])
-        |
-    (?<sym> [,›>\[] )
-}ix
 
 
 ##  note - add "hacky" check for comma that is followed by a prop(erty)
 ##
 ##  make sure to NOT match
 ##      props  e.g.  att: 18000
-##   July 10 @ Paris, Parc des Princes, att: 18000    
-##   July 10 @ Paris, Parc des Princes,   att: 18000    
+##   July 10 @ Paris, Parc des Princes, att: 18000
+##   July 10 @ Paris, Parc des Princes,   att: 18000
 ##
 
 
@@ -115,18 +109,24 @@ GEO_END_RE = %r{
         ,
     )
     ## POSITIVE lookahead for props
-    (?=    
+    ##   todo/fix - use generic [a-z]+ - why? why not?
+    (?=
         [ ]*  ## optional spaces
-         (?: att|ref)    ## todo/fix - use generic [a-z]+ - why? why not?
+         (?:     attendance|att
+              |  referee?s|refs?
+          )
          :
     )
 }ix
 
 
+
+
 GEO_RE = Regexp.union(
+                    SPACES_RE,
                     GEO_END_RE,
-                    GEO_BASICS_RE, 
                     GEO_TEXT_RE,
+                    /  (?<sym> [,›>\[] ) /x,
                     ANY_RE,
                       )
 

data/lib/sportdb/parser/token-goals--helpers.rb

@@ -0,0 +1,114 @@
+module SportDb
+class Lexer
+
+
+
+def self._build_goal_minute( m )
+    minute = {}
+
+    minute[:m]     =  m[:value].to_i(10)   ## always required
+
+    ## stoppage/injury time (offset)
+    minute[:offset] = m[:value2].to_i(10)   if m[:value2]
+
+    minute[:og]  = true       if m[:og]
+    minute[:pen] = true       if m[:pen]
+    minute[:freekick] = true  if m[:fk]
+    minute[:header] = true    if m[:hdr]
+
+    minute[:secs] = m[:secs].to_i(10)   if m[:secs]
+
+    minute
+end
+
+def self._build_goal_minute_na( m )
+    minute = {}
+
+    minute[:m]     =  '?'   ##  or use nil or 999 or -1 or ???
+
+    minute[:og]  = true       if m[:og]
+    minute[:pen] = true       if m[:pen]
+    minute[:freekick] = true  if m[:fk]
+    minute[:header] = true    if m[:hdr]
+
+    minute
+end
+
+
+
+def self._build_minute( m )
+    minute = {}
+    minute[:m]      = m[:value].to_i(10)   ## always required
+
+    ## stoppage/injury time (offset)
+    minute[:offset] = m[:value2].to_i(10)   if m[:value2]
+
+    minute
+end
+
+
+def self._build_goal_count( m )
+    count = {}
+    count[:count] = m[:value].to_i(10)        if m[:value]
+    count[:og]    = m[:og_value] ? m[:og_value].to_i(10) : 1      if m[:og]   ## check flag
+    count[:pen]   = m[:pen_value] ? m[:pen_value].to_i(10) : 1    if m[:pen]  ## check flag
+    count
+end
+
+def self._build_goal_type( m )
+    goal = {}
+    goal[:og]       = true  if m[:og]
+    goal[:pen]      = true  if m[:pen]
+    goal[:freekick] = true  if m[:fk]
+    goal[:header]   = true  if m[:hdr]
+    goal
+end
+
+
+def _build_goal_minute( m ) self.class._build_goal_minute( m ); end
+def _build_goal_minute_na( m ) self.class._build_goal_minute_na( m ); end
+def _build_minute( m ) self.class._build_minute( m ); end
+def _build_goal_count( m ) self.class._build_goal_count( m ); end
+def _build_goal_type( m ) self.class._build_goal_type( m ); end
+
+
+
+
+
+###
+# parse helpers
+
+def self._parse_goal_minute( str )
+    ## note - strip - leading/trailing spaces
+    m = GOAL_MINUTE_RE.match( str.strip )
+    if m && m.pre_match == '' && m.post_match == ''
+      _build_goal_minute( m )
+    elsif  m
+        ## note - match BUT not anchored to start and end-of-string!!!
+        ##  report, error somehow??
+      nil
+    else
+      nil  ## no match - return nil
+    end
+end
+
+def self._parse_goal_count( str )
+    ## note - strip - leading/trailing spaces
+    m = GOAL_COUNT_RE.match( str.strip )
+    if m && m.pre_match == '' && m.post_match == ''
+      _build_goal_count( m )
+    elsif  m
+        ## note - match BUT not anchored to start and end-of-string!!!
+        ##  report, error somehow??
+      nil
+    else
+      nil  ## no match - return nil
+    end
+end
+
+
+
+
+
+end   # class Lexer
+end   # module SportDb