sportdb-parser 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c4d7c1c55b5122f11fc1fdd863e2b8a5cc929b9ae9c57bcc0322400516ab4b8
-  data.tar.gz: f5fcae93a1010e1d74fd4f453cb6a201f8f6e11de1ad0d0c9a572c9bb00bd540
+  metadata.gz: 2d3ea1789627c1b9380ab692b8731f0f8143d43fe20353a3b9b9413da0ef1876
+  data.tar.gz: f5a15299064a88cebcb7ebc7e4b56fc985e78c0f654d9c86347fa299d9cd5133
 SHA512:
-  metadata.gz: 93cb2dc95acf74b1a26088afe3162f0f87a25e949d3f81cd6408c35ec9c42d7309a7c5f59a4c29870146b72e77ed6d5bc3e14c754abf2925b1564b55cafe0ac3
-  data.tar.gz: 6de22cc1e40f8e423786cef7386ae890533a627b6877f6f17c73d47e6956b2de181c6f3d357a731be4476781c363abaab0de9b21c83a4f88f8b058f8a3a7d005
+  metadata.gz: 489259813cc34fc38fb8a16bda45ac6785c8f2d0ee148caf458c014fe4754e1f360985f37f8132f0212dd89b427c09d2cf6a0054853e6217a814dde5ea2de222
+  data.tar.gz: 3280fc2ebc7db55a9182abc0e7ef23e7d9689758b64741e4824c642a6ad89b4e16eae5d52c666ec75c295919607d255f55ebaa63e1ad68ad95dc1e6717812a6b

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.3.3
+### 0.3.4
 
 ### 0.0.1 / 2024-07-12
 

data/Manifest.txt

@@ -12,6 +12,7 @@ lib/sportdb/parser/outline_reader.rb
 lib/sportdb/parser/parser.rb
 lib/sportdb/parser/token-date.rb
 lib/sportdb/parser/token-score.rb
+lib/sportdb/parser/token-status.rb
 lib/sportdb/parser/token-text.rb
 lib/sportdb/parser/token.rb
 lib/sportdb/parser/version.rb

data/lib/sportdb/parser/fbtok/main.rb

@@ -3,7 +3,7 @@ module Fbtok
 def self.main( args=ARGV )
 
     opts = {
-        debug: true,
+        debug: false,
         metal: false,
         file:  nil,
     }
@@ -12,14 +12,14 @@ def self.main( args=ARGV )
       parser.banner = "Usage: #{$PROGRAM_NAME} [options]"
 
 
-      parser.on( "-q", "--quiet",
-                 "less debug output/messages - default is (#{!opts[:debug]})" ) do |debug|
-        opts[:debug] = false
-      end
-#      parser.on( "--verbose", "--debug",
-#                   "turn on verbose / debug output (default: #{opts[:debug]})" ) do |debug|
-#        opts[:debug] = true
+#      parser.on( "-q", "--quiet",
+#                 "less debug output/messages - default is (#{!opts[:debug]})" ) do |debug|
+#        opts[:debug] = false
 #      end
+     parser.on( "--verbose", "--debug",
+                   "turn on verbose / debug output (default: #{opts[:debug]})" ) do |debug|
+        opts[:debug] = true
+     end
 
       parser.on( "--metal",
                      "turn off typed parse tree; show to the metal tokens"+

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

@@ -0,0 +1,38 @@
+
+##  (match) status
+##    note: english usage - cancelled (in UK), canceled (in US)
+##
+##  add more variants - why? why not?
+
+
+
+
+STATUS_RE = %r{
+          \[
+           ### allow long forms with note/comment for some stati
+           (?: (?<status> awarded
+                            |
+                          annulled
+                            |
+                          abandoned
+               ) [ ;,]* (?<status_note> [^\]]+ )
+                 [ ]*
+            )
+            |
+            ## short from only (no note/comments)
+            (?<status>
+               cancelled|canceled|can\.
+                 |
+               abandoned|abd\.
+                 |
+               postponed
+                 |
+               awarded|awd\.
+                 |
+               replay
+                 |
+               annulled
+            )
+      \]
+     }ix
+

data/lib/sportdb/parser/token.rb

@@ -100,33 +100,6 @@ MINUTE_RE = %r{
 }ix
 
 
-##  (match) status
-##    note: english usage - cancelled (in UK), canceled (in US)
-##
-##  add more variants - why? why not?
-
-STATUS_RE = %r{
-     (?<status>
-         \b
-         (?:
-            cancelled|canceled|can\.
-               |
-            abandoned|abd\.
-               |
-            postponed
-               |
-            awarded|awd\.
-               |
-            replay
-         )
-   (?=[ \]]|$)
-     )}ix
-
-## todo/check:  remove loakahead assertion here - why require space?
-## note: \b works only after non-alphanum
-##          to make it work with awd. (dot) "custom" lookahead neeeded
-
-
 ##   goal types
 # (pen.) or (pen) or (p.) or (p)
 ## (o.g.) or (og)
@@ -146,8 +119,8 @@ GOAL_OG_RE = %r{
 
 
 
-RE = Regexp.union(   STATUS_RE,
-                     TIMEZONE_RE,
+RE = Regexp.union( STATUS_RE,
+                    TIMEZONE_RE,
                      TIME_RE,
                      DURATION_RE,  # note - duration MUST match before date
                     DATE_RE,
@@ -216,7 +189,11 @@ def tokenize_with_errors( line, typed: false,
         elsif m[:text]
           [:text, m[:text]]   ## keep pos - why? why not?
         elsif m[:status]   ## (match) status e.g. cancelled, awarded, etc.
-          [:status, m[:status]]
+          if m[:status_note]   ## includes note? e.g.  awarded; originally 2-0
+             [:status, m[:status], {note:m[:status_note]}]
+          else
+             [:status, m[:status]]
+          end
         elsif m[:time]
           if typed
               ## unify to iso-format

data/lib/sportdb/parser/version.rb

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

data/lib/sportdb/parser.rb

@@ -23,6 +23,7 @@ require_relative 'parser/version'
 require_relative 'parser/token-score'
 require_relative 'parser/token-date'
 require_relative 'parser/token-text'
+require_relative 'parser/token-status'
 require_relative 'parser/token'
 require_relative 'parser/lang'
 require_relative 'parser/parser'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-parser
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-19 00:00:00.000000000 Z
+date: 2024-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocos
@@ -96,6 +96,7 @@ files:
 - lib/sportdb/parser/parser.rb
 - lib/sportdb/parser/token-date.rb
 - lib/sportdb/parser/token-score.rb
+- lib/sportdb/parser/token-status.rb
 - lib/sportdb/parser/token-text.rb
 - lib/sportdb/parser/token.rb
 - lib/sportdb/parser/version.rb