sportdb-formats 1.0.2 → 1.0.3

data/test/test_package_match.rb

@@ -9,9 +9,12 @@ require 'helper'
 
 class TestPackageMatch < MiniTest::Test
 
-  CLUBS_DIR   = '../../../openfootball/clubs'    ## source repo directory path
-  LEAGUES_DIR = '../../../openfootball/leagues'
-  AUSTRIA_DIR = '../../../openfootball/austria'
+  CLUBS_DIR       = '../../../openfootball/clubs'    ## source repo directory path
+  LEAGUES_DIR     = '../../../openfootball/leagues'
+  AUSTRIA_DIR     = '../../../openfootball/austria'
+
+  AUSTRIA_CSV_DIR = '../../../footballcsv/austria'
+
 
   def test_find
     datafiles = SportDb::Package.find_clubs( CLUBS_DIR )
@@ -25,6 +28,27 @@ class TestPackageMatch < MiniTest::Test
 
     datafiles = SportDb::Package.find_conf( AUSTRIA_DIR )
     pp datafiles
+
+    datafiles = SportDb::Package.find_match( AUSTRIA_DIR )
+    puts
+    puts "== find_match (in #{AUSTRIA_DIR}) - found #{datafiles.size}:"
+    pp datafiles
+
+    datafiles = SportDb::Package.find_match( AUSTRIA_CSV_DIR )
+    puts
+    puts "== find_match (in #{AUSTRIA_CSV_DIR}) - found #{datafiles.size}:"
+    pp datafiles
+
+
+    datafiles = SportDb::Package.find_match( AUSTRIA_DIR, format: 'csv' )
+    puts
+    puts "== find_match+csv (in #{AUSTRIA_DIR}) - found #{datafiles.size}:"
+    pp datafiles
+
+    datafiles = SportDb::Package.find_match( AUSTRIA_CSV_DIR, format: 'csv' )
+    puts
+    puts "== find_match+csv (in #{AUSTRIA_CSV_DIR}) - found #{datafiles.size}:"
+    pp datafiles
   end
 
 

data/test/test_scores.rb

@@ -12,9 +12,9 @@ class TestScores < MiniTest::Test
   def test_de
     ScoreFormats.lang = :de
     data = [
-      [ '10:0',  [nil,nil,10,0]],
-      [ '1:22',  [nil,nil,1,22]],
-      [ '1-22',  [nil,nil,1,22]],
+      [ '10:0',  [nil,nil, 10,0]],
+      [ '1:22',  [nil,nil, 1,22]],
+      [ '1-22',  [nil,nil, 1,22]],
 
       ## do not support three digits for now - why? why not?
       [ '1:222', []],
@@ -22,23 +22,32 @@ class TestScores < MiniTest::Test
       [ '1-222', []],
       [ '111-0', []],
 
-      [ '2:2 (1:1, 1:0) n.V. 5:1 i.E.',  [1,0,1,1,2,2,5,1]],
-      [ '2:2 (1:1, 1:0) n.V.',           [1,0,1,1,2,2]],
-      [ '2:2 (1:1, ) n.V. 5:1 i.E.',     [nil,nil,1,1,2,2,5,1]],
-      [ '2:2 (1:1, ) n.V.',              [nil,nil,1,1,2,2]],
-
-      [ '2:2 (1:1) n.V. 5:1 i.E.',       [nil,nil,1,1,2,2,5,1]],
-      [ '2:2 (1:1) n.V.',                [nil,nil,1,1,2,2]],
-
-      [ '2-2 (1-1, 1-0) n.V. 5-1 i.E.',  [1,0,1,1,2,2,5,1]],
-      [ '2-2 (1-1, 1-0) n.V.',           [1,0,1,1,2,2]],
-      [ '2-2 (1-1, ) n.V. 5-1 i.E.',     [nil,nil,1,1,2,2,5,1]],
-      [ '2-2 (1-1, ) n.V.',              [nil,nil,1,1,2,2]],
-
-      [ '2 : 2 ( 1 : 1 , 1 : 0 ) n.V. 5 : 1 i.E.',  [1,0,1,1,2,2,5,1]],
-      [ '2 : 2 ( 1 : 1 , 1 : 0 ) n.V.',             [1,0,1,1,2,2]],
-      [ '2 : 2 ( 1 : 1 , ) n.V. 5 : 1 i.E.',        [nil,nil,1,1,2,2,5,1]],
-      [ '2 : 2 ( 1 : 1 , ) n.V.',                   [nil,nil,1,1,2,2]],
+      [ '2:2 (1:1, 1:0) n.V. 5:1 i.E.',  [1,0, 1,1, 2,2, 5,1]],
+      [ '2:2 (1:1, 1:0) n.V.',           [1,0, 1,1, 2,2]],
+      [ '2:2 (1:1, ) n.V. 5:1 i.E.',     [nil,nil, 1,1, 2,2, 5,1]],
+      [ '2:2 (1:1, ) n.V.',              [nil,nil, 1,1, 2,2]],
+
+      [ '2:2 (1:1) n.V. 5:1 i.E.',       [nil,nil, 1,1, 2,2, 5,1]],
+      [ '2:2 (1:1) n.V.',                [nil,nil, 1,1, 2,2]],
+
+      [ '2-2 (1-1, 1-0) n.V. 5-1 i.E.',  [1,0, 1,1, 2,2, 5,1]],
+      [ '2-2 (1-1, 1-0) n.V.',           [1,0, 1,1, 2,2]],
+      [ '2-2 (1-1, ) n.V. 5-1 i.E.',     [nil,nil, 1,1, 2,2, 5,1]],
+      [ '2-2 (1-1, ) n.V.',              [nil,nil, 1,1, 2,2]],
+
+      [ '2 : 2 ( 1 : 1 , 1 : 0 ) n.V. 5 : 1 i.E.',  [1,0, 1,1, 2,2, 5,1]],
+      [ '2 : 2 ( 1 : 1 , 1 : 0 ) n.V.',             [1,0, 1,1, 2,2]],
+      [ '2 : 2 ( 1 : 1 , ) n.V. 5 : 1 i.E.',        [nil,nil, 1,1, 2,2, 5,1]],
+      [ '2 : 2 ( 1 : 1 , ) n.V.',                   [nil,nil, 1,1, 2,2]],
+
+      ## alternate format
+      ['i.E. 2:4, n.V. 3:3 (1:1, 1:0)',  [1,0, 1,1, 3,3, 2,4]],
+      ['iE 2:4 nV 3:3 (1:1, 1:0)',       [1,0, 1,1, 3,3, 2,4]],
+      ['i.E. 2:4 n.V. 3:3 (1:1, 1:0)',   [1,0, 1,1, 3,3, 2,4]],
+      ['i.E. 2:4, n.V. 3:3 (1:1)',       [nil, nil, 1,1, 3,3, 2,4]],
+      ['i.E. 2:4 n.V. 3:3 (1:1)',        [nil, nil, 1,1, 3,3, 2,4]],
+      ['n.V. 3:2 (2:2, 1:2)',            [1,2, 2,2, 3,2]],
+      ['n.V. 3:2 (2:2)',                 [nil, nil, 2,2, 3,2]],
     ]
 
     assert_score( data )
@@ -48,9 +57,9 @@ class TestScores < MiniTest::Test
     ScoreFormats.lang = :en
 
     data = [
-     [ '1-22',  [nil,nil,1,22]],
-     [ '1x22',  [nil,nil,1,22]],
-     [ '1X22',  [nil,nil,1,22]],
+     [ '1-22',  [nil,nil, 1, 22]],
+     [ '1x22',  [nil,nil, 1, 22]],
+     [ '1X22',  [nil,nil, 1,22]],
 
      ## do not support three digits for now - why? why not?
      [ '1-222', []],
@@ -63,39 +72,39 @@ class TestScores < MiniTest::Test
      [ '2:1 (1:1)', []],
 
 
-     [ '2-1 (1-1)', [1,1,2,1]],
-     [ '2x1 (1x1)', [1,1,2,1]],
-     [ '2X1 (1X1)', [1,1,2,1]],
+     [ '2-1 (1-1)', [1,1, 2,1]],
+     [ '2x1 (1x1)', [1,1, 2,1]],
+     [ '2X1 (1X1)', [1,1, 2,1]],
 
-     [ '2-1 a.e.t. (1-1, 0-0)', [0,0,1,1,2,1]],
-     [ '2-1aet (1-1, 0-0)', [0,0,1,1,2,1]],
-     [ '2-1 A.E.T. (1-1, 0-0)', [0,0,1,1,2,1]],
-     [ '2-1AET (1-1, 0-0)', [0,0,1,1,2,1]],
+     [ '2-1 a.e.t. (1-1, 0-0)', [0,0, 1,1, 2,1]],
+     [ '2-1aet (1-1, 0-0)',     [0,0, 1,1, 2,1]],
+     [ '2-1 A.E.T. (1-1, 0-0)', [0,0, 1,1, 2,1]],
+     [ '2-1AET (1-1, 0-0)',     [0,0, 1,1, 2,1]],
 
-     [ '3-4 pen. 2-2 a.e.t. (1-1, 1-1)', [1,1,1,1,2,2,3,4]],
-     [ '3-4 pen 2-2 a.e.t. (1-1, 1-1)', [1,1,1,1,2,2,3,4]],
-     [ '3-4 pen 2-2 a.e.t. (1-1, 1-1)', [1,1,1,1,2,2,3,4]],
-     [ '3-4p 2-2aet (1-1, 1-1)', [1,1,1,1,2,2,3,4]],
-     [ '3-4PSO 2-2AET (1-1, 1-1)', [1,1,1,1,2,2,3,4]],
+     [ '3-4 pen. 2-2 a.e.t. (1-1, 1-1)', [1,1, 1,1, 2,2, 3,4]],
+     [ '3-4 pen 2-2 a.e.t. (1-1, 1-1)',  [1,1, 1,1, 2,2, 3,4]],
+     [ '3-4 pen 2-2 a.e.t. (1-1, 1-1)',  [1,1, 1,1, 2,2, 3,4]],
+     [ '3-4p 2-2aet (1-1, 1-1)',         [1,1, 1,1, 2,2, 3,4]],
+     [ '3-4PSO 2-2AET (1-1, 1-1)',       [1,1, 1,1, 2,2, 3,4]],
 
-     [ '4-3 pen. 1-0 a.e.t. (1-0, )', [nil,nil,1,0,1,0,4,3]],
-     [ '3-4 pen. 2-1 a.e.t. (2-1, )', [nil,nil,2,1,2,1,3,4]],
-     [ '4-1 a.e.t. (3-1, )',          [nil,nil,3,1,4,1]],
-     [ '3-4aet (1-1,)',               [nil,nil,1,1,3,4]],
-     [ '3-4 a.e.t. (1-1,)',           [nil,nil,1,1,3,4]],
+     [ '4-3 pen. 1-0 a.e.t. (1-0, )', [nil,nil, 1,0, 1,0, 4,3]],
+     [ '3-4 pen. 2-1 a.e.t. (2-1, )', [nil,nil, 2,1, 2,1, 3,4]],
+     [ '4-1 a.e.t. (3-1, )',          [nil,nil, 3,1, 4,1]],
+     [ '3-4aet (1-1,)',               [nil,nil, 1,1, 3,4]],
+     [ '3-4 a.e.t. (1-1,)',           [nil,nil, 1,1, 3,4]],
 
-     [ '4-3 pen. 1-0 a.e.t. (1-0)', [nil,nil,1,0,1,0,4,3]],
-     [ '3-4 pen. 2-1 a.e.t. (2-1)', [nil,nil,2,1,2,1,3,4]],
-     [ '4-1 a.e.t. (3-1)',          [nil,nil,3,1,4,1]],
-     [ '3-4aet (1-1)',               [nil,nil,1,1,3,4]],
-     [ '3-4 a.e.t. (1-1)',           [nil,nil,1,1,3,4]],
+     [ '4-3 pen. 1-0 a.e.t. (1-0)', [nil,nil, 1,0, 1,0, 4,3]],
+     [ '3-4 pen. 2-1 a.e.t. (2-1)', [nil,nil, 2,1, 2,1, 3,4]],
+     [ '4-1 a.e.t. (3-1)',          [nil,nil, 3,1, 4,1]],
+     [ '3-4aet (1-1)',               [nil,nil, 1,1, 3,4]],
+     [ '3-4 a.e.t. (1-1)',           [nil,nil, 1,1, 3,4]],
 
-     [ '3-1 pen (1-1)',               [nil,nil,1,1, nil, nil, 3,1]],
+     [ '3-1 pen (1-1)',               [nil,nil, 1,1, nil, nil, 3,1]],
 
      ## try with more "liberal" spaces
-     [ '2 - 1 ( 1 - 1 )',                [1,1,2,1]],
-     [ '2 - 1 a.e.t. ( 1 - 1 , 0 - 0 )', [0,0,1,1,2,1]],
-     [ '4 - 1 a.e.t. ( 3 - 1, )',        [nil,nil,3,1,4,1]],
+     [ '2 - 1 ( 1 - 1 )',                [1,1, 2,1]],
+     [ '2 - 1 a.e.t. ( 1 - 1 , 0 - 0 )', [0,0, 1,1, 2,1]],
+     [ '4 - 1 a.e.t. ( 3 - 1, )',        [nil,nil, 3,1, 4,1]],
    ]
 
     assert_score( data )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-formats
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alphabets
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: csvreader
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,7 @@ files:
 - lib/sportdb/formats/match/mapper_teams.rb
 - lib/sportdb/formats/match/match_parser.rb
 - lib/sportdb/formats/match/match_parser_auto_conf.rb
+- lib/sportdb/formats/match/match_parser_csv.rb
 - lib/sportdb/formats/name_helper.rb
 - lib/sportdb/formats/outline_reader.rb
 - lib/sportdb/formats/package.rb
@@ -168,8 +169,11 @@ files:
 - test/test_conf.rb
 - test/test_country_index.rb
 - test/test_country_reader.rb
+- test/test_csv_match_parser.rb
+- test/test_csv_match_parser_utils.rb
 - test/test_csv_reader.rb
 - test/test_datafile.rb
+- test/test_datafile_package.rb
 - test/test_goals.rb
 - test/test_league_index.rb
 - test/test_league_outline_reader.rb