sportdb-parser 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 366948a35eecdf2ea0b1e83e48a4ae53b399f5f91436c066e8b3328fb3d9dda4
-  data.tar.gz: 8fba19e829e8d81873f4a263c5d0b2a1db27095fddebb90233a0d075c2ec7ea4
+  metadata.gz: b8d65c02b835d52ddb9f7fd61bd44dd6ff4392bd7ddcef751dcc2ec7a0934065
+  data.tar.gz: 92b797acbb7c1652ea50910207f86ae53fa5097bec9acaadeae96e161b005aa2
 SHA512:
-  metadata.gz: d4cc2627f892ab128df8cbccab77117dd97b85ac9b9900f0434f4ada02fdad1ba7a19cf6055aeb7a88fe1dce477190bfa8b028276837e30546bce0656ba4f901
-  data.tar.gz: 671f21e8bdb895223504e2b8776905d169c7ba97086cf843ebcc6e361a074eaad4c2fa62c6296328e265bae511eb4c4574bbdfd3d76ce92649212547898f726a
+  metadata.gz: dee3a2ff615fe8789593db7f627d00a1f3931d18bc150af50e75c4d68b9ad74c87dc359ebfe4268a5f974de7c681b4ddfdb4cd87e66b69b86c4fd6633c1b98a5
+  data.tar.gz: 54762780eb57ba090caa44c4efd53e2fcc8149c87a2aa97b7d052efc58f51da5d4f2f49cfe4ce7b1a45db437a3c9d82856cf7bb887382f75942acda6f495be4c

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.6.7
+### 0.6.8
 ### 0.0.1 / 2024-07-12
 
 * Everything is new. First release.

data/config/rounds_en.txt

@@ -17,6 +17,10 @@ Major Semi-Final
 Minor Semi-Final
 
 
+1/8 Finals
+
+
+
 ## keep weirdo matchday ??
 Matchday 0    ## in 2003-04/az.1.txt
 

data/lib/sportdb/parser/lang.rb

@@ -15,6 +15,7 @@ module Lang
 ## Group 1-99
 ## Group HEX  # used in concaf world cup quali
 ## Group 1A or A1, B1  - used anywhere
+##   yes - A1, A2, B1, C1, etc. used in UEFA Nations League for example!!
 ##
 ##  use "key" of group - why? why not?
 
@@ -197,7 +198,17 @@ end
 
 
 def self.is_round?( text )
-    ROUND_RE.match?( text ) || more_round_names.include?( text )
+    ### note - use check for case-insensitive 
+    ##   was:
+    ##       more_round_names.include?( text )
+    ##   change to:
+    ##       more_round_names.any?{ |str| str.casecmp( text )==0 }
+    ##
+    ##  todo/fix:
+    ##    maybe in the future use our own unaccent and downcase - wyh? why not?
+    ##      note - for now ROUND_RE is also case-insensitive!!
+
+    ROUND_RE.match?( text ) || more_round_names.any?{ |str| str.casecmp( text )==0 }
 end
 
 ##

data/lib/sportdb/parser/lexer.rb

@@ -344,6 +344,9 @@ def _tokenize_line( line )
         elsif ['goals'].include?( key.downcase )
           @re = PROP_GOAL_RE
           tokens << [:PROP_GOALS, m[:key]]
+        elsif ['penalties', 'penalty shootout'].include?( key.downcase )
+          @re = PROP_PENALTIES_RE
+          tokens << [:PROP_PENALTIES, m[:key]]
         else   ## assume (team) line-up
           @re = PROP_RE           ## use LINEUP_RE ???
           tokens << [:PROP, m[:key]]
@@ -511,6 +514,38 @@ def _tokenize_line( line )
              puts "!!! TOKENIZE ERROR (PROP_RE) - no match found"
              nil 
          end
+      elsif @re == PROP_PENALTIES_RE
+        if m[:space] || m[:spaces]
+              nil    ## skip space(s)
+         elsif m[:prop_name]    ## note - change prop_name to player
+             [:PROP_NAME, m[:name]]    ### use PLAYER for token - why? why not?
+         elsif m[:enclosed_name]
+              ## use HOLD,SAVE,POST or such keys - why? why not?
+             [:ENCLOSED_NAME, m[:name]]
+         elsif m[:score]
+              score = {}
+              ## must always have ft for now e.g. 1-1 or such
+              ###  change to (generic) score from ft -
+              ##     might be score a.e.t. or such - why? why not?
+              score[:ft] = [m[:ft1].to_i(10),
+                            m[:ft2].to_i(10)]  
+              ## note - for debugging keep (pass along) "literal" score
+              [:SCORE, [m[:score], score]]
+         elsif m[:sym]
+            sym = m[:sym]
+            case sym
+            when ',' then [:',']
+            when ';' then [:';']
+            when '[' then [:'[']
+            when ']' then [:']']
+            else
+              nil  ## ignore others (e.g. brackets [])
+            end
+         else
+            ## report error
+            puts "!!! TOKENIZE ERROR (PROP_PENALTIES_RE) - no match found"
+            nil 
+         end
       elsif @re == GOAL_RE || @re == PROP_GOAL_RE
          if m[:space] || m[:spaces]
               nil    ## skip space(s)
@@ -715,7 +750,8 @@ def _tokenize_line( line )
    ##
    ## if in prop mode continue if   last token is [,-]
    ##        otherwise change back to "standard" mode
-   if @re == PROP_RE || @re == PROP_CARDS_RE || @re == PROP_GOAL_RE
+   if @re == PROP_RE       || @re == PROP_CARDS_RE ||
+      @re == PROP_GOAL_RE  || @re == PROP_PENALTIES_RE
      if [:',', :'-', :';'].include?( tokens[-1][0] )
         ## continue/stay in PROP_RE mode
         ##  todo/check - auto-add PROP_CONT token or such