sportdb-readers 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9ab08e50e95d7fbaf6197f8cea2a7a6dc3cb112
-  data.tar.gz: 68a911b62e1fc80ab12d55874d2e6bc0f3dd63a5
+  metadata.gz: 935075d2b41927e37e8ccf597d5b3f0dee8e7009
+  data.tar.gz: 5d0e4a742fd769021d9272e6401d1584acfac367
 SHA512:
-  metadata.gz: 73241f497262aaeb3b10a694c7af959745254adfcaa825ef577cbfcf89a5c44b1b6dd795e5c216bb69c6923af477b8306614675e7acd7c82729bb55fab39196e
-  data.tar.gz: 19b772c539490c3e41d9d0324ec1b54afe7b5a973065491a0d14798f1b0dc9242974076d278ded95bbdfa146d5a31fcf7e1ecd1a68aba4e2a19472176ee93e24
+  metadata.gz: af375d0924b115d0ba81bc6b4f52a6e5d4af672c40a56bf922d83fcad4fb57bf8fd16a5cda304f6dff4f34b07c49e23088dd4dc160e0c6336ca02525b5481068
+  data.tar.gz: 3416642226590a5448c4a8f094f3db2e85693d37e0aeda5dff901ca0888977346af99ba9450fe9035cc31c395768d35c6fd13e42bedf6637685f0cea3bd60104

data/lib/sportdb/readers/conf_parser_auto.rb

@@ -53,12 +53,14 @@ class AutoConfParser
 
     ## remove all protected text runs e.g. []
     ##   fix: add [ to end-of-line too
+    ##  todo/fix: move remove protected text runs AFTER find date!! - why? why not?
 
     line = line.gsub( /\[
                         [^\]]+?
                        \]/x, '' ).strip
     return true if line.empty?    ## note: return true (for valid line with no match/clubs)
 
+
     ## split by geo (@) - remove for now
     values = line.split( '@' )
     line = values[0]
@@ -71,9 +73,19 @@ class AutoConfParser
                           [^\]]+?
                          \]/x, '' ).strip
 
-      return true if line.empty?    ## note: return true (for valid line with no match/clubs)
+    else
+      ##  check for leading hours only e.g.  20.30 or 20:30 or 20h30
+      ##   todo/fix: make language dependent (or move to find_date/hour etc.) - why? why not?
+      line = line.sub(  %r{^
+                            [12]?[0-9]
+                            [h.:]
+                            [0-9][0-9]
+                           (?=[ ])    ## must be followed by space for now (add end of line too - why? why not?)
+                          }x, '' ).strip
     end
 
+    return true if line.empty?    ## note: return true (for valid line with no match/clubs)
+
 
     scores = find_scores!( line )
 
@@ -103,6 +115,15 @@ class AutoConfParser
      values = values.select { |value| !value.empty? }   ## remove empty strings
 
      return true    if values.size == 0  ## note: return true (for valid line with no match/clubs)
+
+     if values.size == 1
+       puts "(auto config) try matching clubs separated by spaces (2+):"
+       pp values
+
+       values = values[0].split( /[ ]{2,}/ )
+       pp values
+     end
+
      return false   if values.size != 2
 
      puts "(auto config) try matching clubs:"

data/lib/sportdb/readers/match_reader.rb

@@ -21,6 +21,12 @@ class MatchReaderV2    ## todo/check: rename to MatchReaderV2 (use plural?) why?
       league = Sync::League.find_or_create( rec[:league] )
       season = Sync::Season.find_or_create( rec[:season] )
 
+
+      ## todo/fix:
+      ##    always auto create
+      ##   1) check for clubs count on event/stage - only if count == 0 use autoconf!!!
+      ##   2) add lang switch for date/lang too!!!!
+
       stage = nil
       auto_conf_clubs = nil
       if rec[:stage]
@@ -49,9 +55,7 @@ class MatchReaderV2    ## todo/check: rename to MatchReaderV2 (use plural?) why?
         ## step 1: map/find clubs
         club_recs = []
         ## note: loop over keys (holding the names); values hold the usage counter!! e.g. 'Arsenal' => 2, etc.
-        country = config.countries[ league.country.key ]  ## hack/fix: convert to Import::Country from Model::Country
-        ## todo: check is_a? Country check to respond_to? :key  in match in sportdb-clubs !!!!!
-        ##  todo/fix: just pass in league.country (and NOT key)
+        country = league.country
         auto_conf_clubs.keys.each do |name|
            club_rec = config.clubs.find_by!( name: name, country: country )
            club_recs << club_rec
@@ -79,18 +83,24 @@ class MatchReaderV2    ## todo/check: rename to MatchReaderV2 (use plural?) why?
       end
 
       ## hack for now: switch lang
-      if ['at', 'de'].include?( league.country.key )
+      if ['de', 'at'].include?( league.country.key )
         SportDb.lang.lang = 'de'
-        DateFormats.lang = 'de'
+        DateFormats.lang  = 'de'
       elsif ['fr'].include?( league.country.key )
         SportDb.lang.lang = 'fr'
-        DateFormats.lang = 'fr'
-      elsif ['es'].include?( league.country.key )
+        DateFormats.lang  = 'fr'
+      elsif ['it'].include?( league.country.key )
+        SportDb.lang.lang = 'it'
+        DateFormats.lang  = 'it'
+      elsif ['es', 'mx'].include?( league.country.key )
         SportDb.lang.lang = 'es'
-        DateFormats.lang = 'es'
+        DateFormats.lang  = 'es'
+      elsif ['pt', 'br'].include?( league.country.key )
+        SportDb.lang.lang = 'pt'
+        DateFormats.lang  = 'pt'
       else
         SportDb.lang.lang = 'en'
-        DateFormats.lang = 'en'
+        DateFormats.lang  = 'en'
       end
 
       ## todo/fix: set lang for now depending on league country!!!

data/lib/sportdb/readers/version.rb

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

data/test/test_conf_parser_auto.rb

@@ -11,6 +11,162 @@ require 'helper'
 
 class TestAutoConfParser < MiniTest::Test
 
+  def test_at
+    txt = <<TXT
+29. Runde
+
+[Sa 7.4.]
+  16.00   RB Salzburg       2:0   Wacker Innsbruck
+  18.30   SV Ried           0:1   Austria Wien
+          Kapfenberger SV   2:3   Admira Wacker
+          Rapid Wien        2:1   Wr. Neustadt
+[So 8.4.]
+  16.00   SV Mattersburg    0:2   Sturm Graz
+
+
+30. Runde
+
+[Sa 14.4.]
+  16.00   Wr. Neustadt         0:0   Kapfenberger SV
+  18.30   Admira Wacker        1:1   Wacker Innsbruck
+          Sturm Graz           2:2   RB Salzburg
+          SV Ried              2:0   SV Mattersburg
+[So 15.4.]
+  16.00   Austria Wien         0:0   Rapid Wien
+
+TXT
+
+  clubs = parse( txt, lang: 'de' )
+
+    assert_equal Hash(
+    'RB Salzburg' => 2,
+    'Wacker Innsbruck' => 2,
+    'SV Ried' => 2,
+    'Austria Wien' => 2,
+    'Kapfenberger SV' => 2,
+    'Admira Wacker' => 2,
+    'Rapid Wien' => 2,
+    'Wr. Neustadt' => 2,
+    'SV Mattersburg' => 2,
+    'Sturm Graz' => 2 ), clubs
+  end
+
+  def test_es
+    txt = <<TXT
+Jornada 1
+
+18.08.2012   Barcelona  R. Sociedad  5-1
+18.08.2012   Levante  Atlético  1-1
+18.08.2012   Athletic  Betis  3-5
+18.08.2012   Zaragoza  Valladolid  0-1
+18.08.2012   R. Madrid  Valencia  1-1
+18.08.2012   Celta  Málaga  0-1
+18.08.2012   Sevilla  Getafe  2-1
+18.08.2012   Mallorca  Espanyol  2-1
+18.08.2012   Rayo  Granada  1-0
+18.08.2012   Deportivo  Osasuna  2-0
+
+
+Jornada 2
+
+25.08.2012   Valladolid  Levante  2-0
+25.08.2012   Espanyol  Zaragoza  1-2
+25.08.2012   Málaga  Mallorca  1-1
+25.08.2012   R. Sociedad  Celta  2-1
+25.08.2012   Osasuna  Barcelona  1-2
+25.08.2012   Valencia  Deportivo  3-3
+25.08.2012   Getafe  R. Madrid  2-1
+25.08.2012   Granada  Sevilla  1-1
+25.08.2012   Betis  Rayo  1-2
+25.08.2012   Atlético  Athletic  4-0
+TXT
+
+    clubs = parse( txt, lang: 'es' )
+
+    assert_equal Hash(#
+ 'Barcelona' => 2,
+ 'R. Sociedad' => 2,
+ 'Levante' => 2,
+ 'Atlético' => 2,
+ 'Athletic' => 2,
+ 'Betis' => 2,
+ 'Zaragoza' => 2,
+ 'Valladolid' => 2,
+ 'R. Madrid' => 2,
+ 'Valencia' => 2,
+ 'Celta' => 2,
+ 'Málaga' => 2,
+ 'Sevilla' => 2,
+ 'Getafe' => 2,
+ 'Mallorca' => 2,
+ 'Espanyol' => 2,
+ 'Rayo' => 2,
+ 'Granada' => 2,
+ 'Deportivo' => 2,
+ 'Osasuna' => 2), clubs
+  end
+
+
+  def test_fr
+    txt = <<TXT
+Journée 1
+
+[Ven 8. Août]
+  20h30  Stade de Reims  2-2  Paris SG
+[Sam 9. Août]
+  21h00  SC Bastia      3-3  Olympique de Marseille
+         Évian TG       0-3  SM Caen
+         EA Guingamp    0-2  AS Saint-Étienne
+         LOSC Lille     0-0  FC Metz
+         Montpellier Hérault SC  0-1  Girondins de Bordeaux
+         FC Nantes      1-0  RC Lens
+         OGC Nice       3-2  Toulouse FC
+[Dim 10. Août]
+  17h00  Olympique Lyonnais  2-0  Stade Rennais FC
+  21h00  AS Monaco FC  1-2  FC Lorient
+
+Journée 2
+
+[Ven 15. Août]
+  20h30  SM Caen 0-1 LOSC Lille
+[Sam 16. Août]
+  17h00  Paris SG 2-0 SC Bastia
+  20h00  RC Lens 0-1 EA Guingamp
+         FC Lorient 0-0 OGC Nice
+         FC Metz 1-1 FC Nantes
+         Stade Rennais FC 6-2 Évian TG
+         Toulouse FC 2-1 Olympique Lyonnais
+[Dim 17. Août]
+  17h00  Olympique de Marseille 0-2 Montpellier Hérault SC
+         AS Saint-Étienne 3-1 Stade de Reims
+  21h00  Girondins de Bordeaux 4-1 AS Monaco FC
+TXT
+
+    clubs = parse( txt, lang: 'fr' )
+
+    assert_equal Hash(
+ 'Stade de Reims' => 2,
+ 'Paris SG' => 2,
+ 'SC Bastia' => 2,
+ 'Olympique de Marseille' => 2,
+ 'Évian TG' => 2,
+ 'SM Caen' => 2,
+ 'EA Guingamp' => 2,
+ 'AS Saint-Étienne' => 2,
+ 'LOSC Lille' => 2,
+ 'FC Metz' => 2,
+ 'Montpellier Hérault SC' => 2,
+ 'Girondins de Bordeaux' => 2,
+ 'FC Nantes' => 2,
+ 'RC Lens' => 2,
+ 'OGC Nice' => 2,
+ 'Toulouse FC' => 2,
+ 'Olympique Lyonnais' => 2,
+ 'Stade Rennais FC' => 2,
+ 'AS Monaco FC' => 2,
+ 'FC Lorient' => 2), clubs
+  end
+
   def test_eng
     txt = <<TXT
 Matchday 1
@@ -70,8 +226,61 @@ TXT
  'Tottenham Hotspur' => 2,
  'Manchester United' => 2,
  'West Ham United'   => 2 ), clubs
+
+
+    txt =<<TXT
+Round 38
+
+May/22 Aston Villa 1-0 Liverpool
+May/22 Bolton 0-2 Manchester City
+May/22 Everton 1-0 Chelsea
+May/22 Fulham 2-2 Arsenal
+May/22 Manchester United 4-2 Blackpool
+May/22 Newcastle Utd 3-3 West Brom
+May/22 Stoke City 0-1 Wigan
+May/22 Tottenham 2-1 Birmingham
+May/22 West Ham 0-3 Sunderland
+May/22 Wolves 2-3 Blackburn
+
+Round 37
+
+May/17 Manchester City 3-0 Stoke City
+May/15 Arsenal 1-2 Aston Villa
+May/15 Birmingham 0-2 Fulham
+May/15 Liverpool 0-2 Tottenham
+May/15 Wigan 3-2 West Ham
+May/15 Chelsea 2-2 Newcastle Utd
+May/14 Blackburn 1-1 Manchester United
+May/14 Blackpool 4-3 Bolton
+May/14 Sunderland 1-3 Wolves
+May/14 West Brom 1-0 Everton
+TXT
+    clubs = parse( txt )
+
+    assert_equal Hash(
+  'Aston Villa' => 2,
+  'Liverpool' => 2,
+  'Bolton' => 2,
+  'Manchester City' => 2,
+  'Everton' => 2,
+  'Chelsea' => 2,
+  'Fulham' => 2,
+  'Arsenal' => 2,
+  'Manchester United' => 2,
+  'Blackpool' => 2,
+  'Newcastle Utd' => 2,
+  'West Brom' => 2,
+  'Stoke City'=> 2,
+  'Wigan' => 2,
+  'Tottenham' => 2,
+  'Birmingham' => 2,
+  'West Ham' => 2,
+  'Sunderland' => 2,
+  'Wolves' => 2,
+  'Blackburn' => 2), clubs
   end   # method test_parse
 
+
   def test_mauritius
     txt = <<TXT
 Preliminary Round

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2019-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-config