sportdb-readers 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 935075d2b41927e37e8ccf597d5b3f0dee8e7009
-  data.tar.gz: 5d0e4a742fd769021d9272e6401d1584acfac367
+  metadata.gz: d00cca5fea7e84fd30f67fc79ecf764ce1e900c0
+  data.tar.gz: 8a10004745355d8aeaa98ba4d765a05e17a812ba
 SHA512:
-  metadata.gz: af375d0924b115d0ba81bc6b4f52a6e5d4af672c40a56bf922d83fcad4fb57bf8fd16a5cda304f6dff4f34b07c49e23088dd4dc160e0c6336ca02525b5481068
-  data.tar.gz: 3416642226590a5448c4a8f094f3db2e85693d37e0aeda5dff901ca0888977346af99ba9450fe9035cc31c395768d35c6fd13e42bedf6637685f0cea3bd60104
+  metadata.gz: f654094b67436cce1f8931416ca088b263ef1e6e410e1252ef255938ada337449d960300d258adcbe5604af5194339413d008dd7aad6782b12c0c049548e88cf
+  data.tar.gz: 2b7382754ead0df285a33b7fa7f7993fdbfe93dea386c013ad7c81ded6282a0b2382c9becf93fe7e91f15998cb4b46df59120dcd340a82d742e81412ebe60b0e

data/lib/sportdb/readers/conf_parser_auto.rb

@@ -22,19 +22,26 @@ class AutoConfParser
 
   def parse
     ## try to  find all clubs in match schedule
-    @clubs = Hash.new(0)   ## keep track of usage counter
+    @last_round   = nil
+    @rounds       = {}           ## track usage counter and match (two clubs) counter
+    @clubs        = Hash.new(0)   ## keep track of usage counter
+
 
     @lines.each do |line|
       if is_round?( line )
         logger.info "skipping matched round line: >#{line}<"
+
+        round = @rounds[ line ] ||= {count: 0, match_count: 0}   ## usage counter, match counter
+        round[:count] +=1
+        @last_round = round
       elsif try_parse_game( line )
         # do nothing here
       else
-        logger.info "skipping line (no match found): >#{line}<"
+        logger.warn "skipping line (no match found): >#{line}<"
       end
     end # lines.each
 
-    @clubs
+    [@clubs, @rounds]
   end
 
   def is_round?( line )
@@ -128,9 +135,12 @@ class AutoConfParser
 
      puts "(auto config) try matching clubs:"
      pp values
+
      @clubs[ values[0] ] += 1    ## update usage counters
      @clubs[ values[1] ] += 1
 
+     @last_round[ :match_count ] += 1
+
      true
   end
 

data/lib/sportdb/readers/match_parser.rb

@@ -72,6 +72,7 @@ class MatchParserSimpleV2   ## simple match parser for club match schedules
       end
     end # lines.each
 
+    ## todo/fix: reverse - pass matches as first para
     [@rounds.values, @matches]
   end # method parse
 

data/lib/sportdb/readers/match_reader.rb

@@ -21,6 +21,26 @@ 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] )
 
+      ## hack for now: switch lang
+      if ['de', 'at'].include?( league.country.key )
+        SportDb.lang.lang = 'de'
+        DateFormats.lang  = 'de'
+      elsif ['fr'].include?( league.country.key )
+        SportDb.lang.lang = 'fr'
+        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'
+      elsif ['pt', 'br'].include?( league.country.key )
+        SportDb.lang.lang = 'pt'
+        DateFormats.lang  = 'pt'
+      else
+        SportDb.lang.lang = 'en'
+        DateFormats.lang  = 'en'
+      end
 
       ## todo/fix:
       ##    always auto create
@@ -36,8 +56,8 @@ class MatchReaderV2    ## todo/check: rename to MatchReaderV2 (use plural?) why?
           ## fix: just use Stage.create
           stage = Sync::Stage.find_or_create( rec[:stage], event: event )
 
-          auto_conf_clubs = AutoConfParser.parse( rec[:lines],
-                                                  start: event.start_at )
+          auto_conf_clubs, _ = AutoConfParser.parse( rec[:lines],
+                                                      start: event.start_at )
         end
       else
         event  = Sync::Event.find( league: league, season: season )
@@ -45,8 +65,8 @@ class MatchReaderV2    ## todo/check: rename to MatchReaderV2 (use plural?) why?
           ## fix: just use Event.create
           event  = Sync::Event.find_or_create( league: league, season: season )
 
-          auto_conf_clubs = AutoConfParser.parse( rec[:lines],
-                                                  start: event.start_at )
+          auto_conf_clubs, _ = AutoConfParser.parse( rec[:lines],
+                                                      start: event.start_at )
         end
       end
 
@@ -82,27 +102,6 @@ class MatchReaderV2    ## todo/check: rename to MatchReaderV2 (use plural?) why?
         teams = event.teams
       end
 
-      ## hack for now: switch lang
-      if ['de', 'at'].include?( league.country.key )
-        SportDb.lang.lang = 'de'
-        DateFormats.lang  = 'de'
-      elsif ['fr'].include?( league.country.key )
-        SportDb.lang.lang = 'fr'
-        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'
-      elsif ['pt', 'br'].include?( league.country.key )
-        SportDb.lang.lang = 'pt'
-        DateFormats.lang  = 'pt'
-      else
-        SportDb.lang.lang = 'en'
-        DateFormats.lang  = 'en'
-      end
-
       ## todo/fix: set lang for now depending on league country!!!
       parser = MatchParserSimpleV2.new( rec[:lines],
                                 teams,  ## note: use event OR stage teams (if stage is present)

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 = 3
+  PATCH = 4
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/test_conf_parser_auto.rb

@@ -36,19 +36,23 @@ class TestAutoConfParser < MiniTest::Test
 
 TXT
 
-  clubs = parse( txt, lang: 'de' )
+  clubs, rounds = 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
+     '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
+
+    assert_equal Hash(
+     '29. Runde' => { count: 1, match_count: 5 },
+     '30. Runde' => { count: 1, match_count: 5 } ), rounds
   end
 
   def test_es
@@ -81,9 +85,9 @@ Jornada 2
 25.08.2012   Atlético  Athletic  4-0
 TXT
 
-    clubs = parse( txt, lang: 'es' )
+    clubs, rounds = parse( txt, lang: 'es' )
 
-    assert_equal Hash(#
+    assert_equal Hash(
  'Barcelona' => 2,
  'R. Sociedad' => 2,
  'Levante' => 2,
@@ -104,6 +108,10 @@ TXT
  'Granada' => 2,
  'Deportivo' => 2,
  'Osasuna' => 2), clubs
+
+  assert_equal Hash(
+   'Jornada 1' => {count: 1, match_count: 10},
+   'Jornada 2' => {count: 1, match_count: 10} ), rounds
   end
 
 
@@ -142,7 +150,7 @@ Journée 2
   21h00  Girondins de Bordeaux 4-1 AS Monaco FC
 TXT
 
-    clubs = parse( txt, lang: 'fr' )
+    clubs, rounds = parse( txt, lang: 'fr' )
 
     assert_equal Hash(
  'Stade de Reims' => 2,
@@ -165,8 +173,13 @@ TXT
  'Stade Rennais FC' => 2,
  'AS Monaco FC' => 2,
  'FC Lorient' => 2), clubs
+
+    assert_equal Hash(
+ 'Journée 1' => { count: 1, match_count: 10 },
+ 'Journée 2' => { count: 1, match_count: 10 } ), rounds
   end
 
+
   def test_eng
     txt = <<TXT
 Matchday 1
@@ -203,7 +216,7 @@ Matchday 2
   Manchester City          1-1  Everton FC
 TXT
 
-    clubs = parse( txt )
+    clubs, rounds = parse( txt )
 
     assert_equal Hash(
  'Arsenal FC'     => 2,
@@ -227,6 +240,10 @@ TXT
  'Manchester United' => 2,
  'West Ham United'   => 2 ), clubs
 
+    assert_equal Hash(
+ 'Matchday 1' => { count: 1, match_count: 10},
+ 'Matchday 2' => { count: 1, match_count: 10} ), rounds
+
 
     txt =<<TXT
 Round 38
@@ -255,7 +272,7 @@ May/14 Blackpool 4-3 Bolton
 May/14 Sunderland 1-3 Wolves
 May/14 West Brom 1-0 Everton
 TXT
-    clubs = parse( txt )
+    clubs, rounds = parse( txt )
 
     assert_equal Hash(
   'Aston Villa' => 2,
@@ -278,6 +295,10 @@ TXT
   'Sunderland' => 2,
   'Wolves' => 2,
   'Blackburn' => 2), clubs
+
+    assert_equal Hash(
+     'Round 38' => { count: 1, match_count: 10 },
+     'Round 37' => { count: 1, match_count: 10 } ), rounds
   end   # method test_parse
 
 
@@ -306,7 +327,7 @@ Final
   Petite Rivière Noire         2-0  Pamplemousses                   @ New George V Stadium, Curepipe
 TXT
 
-    clubs = parse( txt )
+    clubs, rounds = parse( txt )
 
     assert_equal Hash(
      'Pointe-aux-Sables Mates' => 1,
@@ -318,6 +339,12 @@ TXT
      'Pamplemousses'           => 3,
      'Savanne SC'              => 1,
      'Entente Boulet Rouge'    => 2), clubs
+
+    assert_equal Hash(
+ 'Preliminary Round' => {count: 1, match_count: 1},
+ 'Quarterfinals'     => {count: 1, match_count: 4},
+ 'Semifinals'        => {count: 1, match_count: 2},
+ 'Final'             => {count: 1, match_count: 1} ), rounds
   end
 
 
@@ -329,10 +356,13 @@ def parse( txt, lang: 'en' )
 
   start = Date.new( 2017, 7, 1 )
 
-  DateFormats.lang = lang  # e.g. 'en'
+  DateFormats.lang  = lang  # e.g. 'en'
+  SportDb.lang.lang = lang
+
   parser = SportDb::AutoConfParser.new( lines, start )
-  clubs = parser.parse
+  clubs, rounds = parser.parse
+  pp rounds
   pp clubs
-  clubs
+  [clubs, rounds]
 end
 end   # class AutoConfParser

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Gerald Bauer