sportdb-formats 1.0.2 → 1.1.0

data/test/test_package.rb

@@ -7,40 +7,72 @@
 
 require 'helper'
 
-
 class TestPackage < MiniTest::Test
 
-  def test_read
-    [Datafile::DirPackage.new( '../../../openfootball/england' ),
-     Datafile::ZipPackage.new( 'tmp/england-master.zip' )
-    ].each do |eng|
-       assert eng.find( '2015-16/.conf.txt' ).read.start_with?( '= English Premier League 2015/16' )
-       assert eng.find( '2017-18/.conf.txt' ).read.start_with?( '= English Premier League 2017/18' )
-       assert eng.find( '2015-16/1-premierleague-i.txt' ).read.start_with?( '= English Premier League 2015/16' )
-    end
+  AUSTRIA_DIR     = '../../../openfootball/austria'
+  AUSTRIA_CSV_DIR = '../../../footballcsv/austria'
 
-    [Datafile::DirPackage.new( '../../../openfootball/austria' ),
-     Datafile::ZipPackage.new( 'tmp/austria-master.zip' )
-    ].each do |at|
-       assert at.find( '2018-19/.conf.txt' ).read.start_with?( '= Österr. Bundesliga 2018/19' )
-    end
+  ENGLAND_DIR     = '../../../openfootball/england'
+  ENGLAND_CSV_DIR = '../../../footballcsv/england'
+
+
+  def test_match_by
 
-    puts "DirPackage:"
-    pack = Datafile::DirPackage.new( '../../../openfootball/austria' )
-    puts pack.name
-    puts "  entries:"
-    pack.each( pattern: /\.txt$/ ) do |entry|
-      puts entry.name
+    [ AUSTRIA_CSV_DIR,
+      ENGLAND_CSV_DIR,
+      "#{SportDb::Test.data_dir}/packages/test-levels",
+    ].each do |path|
+      puts
+      puts "match (csv) in #{path}:"
+      pack = SportDb::Package.new( path )
+      pp pack.match_by_season_dir( format: 'csv' )
+      puts "---"
+      pp pack.match_by_season( format: 'csv' )
     end
 
-    puts "ZipPackage:"
-    pack = Datafile::ZipPackage.new( 'tmp/austria-master.zip' )
-    puts pack.name
-    puts "  entries:"
-    pack.each( pattern: /\.txt$/ ) do |entry|
-      puts entry.name
+    [ AUSTRIA_DIR,
+      ENGLAND_DIR,
+      "#{SportDb::Test.data_dir}/packages/test-levels",
+    ].each do |path|
+      puts
+      puts "match (txt) in #{path}:"
+      pack = SportDb::Package.new( path )
+      pp pack.match_by_season_dir
+      puts "---"
+      pp pack.match_by_season( start: '2000' )   ## note: try with start season filter!!
     end
+  end
+
+
+  CLUBS_DIR   = '../../../openfootball/clubs'    ## source repo directory path
+  LEAGUES_DIR = '../../../openfootball/leagues'
+
+  def test_bundle
+    datafiles = SportDb::Package.find_clubs( CLUBS_DIR )
+    pp datafiles
+
+    ## todo/fix: turn into Datafile::Bundle.new  and Bundle#write/save -why? why not?
+    bundle = Datafile::Bundle.new( './tmp/clubs.txt' )
+    bundle.write <<TXT
+##########################################
+# auto-generated all-in-one single datafile clubs.txt bundle
+#    on #{Time.now} from #{datafiles.size} datafile(s)
+TXT
+    bundle.write datafiles
+    bundle.close
+  end
+
+  def test_bundle_old
+    datafiles = SportDb::Package.find_leagues( LEAGUES_DIR )
+    pp datafiles
 
-  end  # method test_read
+    Datafile.write_bundle( './tmp/leagues.txt',
+                           datafiles: datafiles,
+                           header: <<TXT )
+##########################################
+# auto-generated all-in-one single datafile leagues.txt bundle
+#    on #{Time.now} from #{datafiles.size} datafile(s)
+TXT
+  end
 
-end  # class TestPackage
+end # class TestPackage

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_regex.rb

@@ -9,9 +9,27 @@ require 'helper'
 
 class TestRegex < MiniTest::Test
 
+  HEADER_SEP_RE    = SportDb::MatchParser::HEADER_SEP_RE
+
+  def test_header_sep
+    assert_equal ['Round',    'Fr+Sa Dec 11+12'], 'Round    // Fr+Sa Dec 11+12'.split( HEADER_SEP_RE )
+    assert_equal ['Round 11', 'Fr+Sa Dec 11+12'], 'Round 11 /// Fr+Sa Dec 11+12'.split( HEADER_SEP_RE )
+    assert_equal ['Round 11', 'Fr+Sa Dec 11+12'], 'Round 11 -- Fr+Sa Dec 11+12'.split( HEADER_SEP_RE )
+    assert_equal ['Round 11', 'Fr+Sa Dec 11+12'], 'Round 11 --- Fr+Sa Dec 11+12'.split( HEADER_SEP_RE )
+    assert_equal ['Round 11', 'Fr+Sa Dec 11+12'], 'Round 11 ++ Fr+Sa Dec 11+12'.split( HEADER_SEP_RE )
+    assert_equal ['Round 11', 'Fr+Sa Dec 11+12'], 'Round 11 +++ Fr+Sa Dec 11+12'.split( HEADER_SEP_RE )
+    assert_equal ['Round 11', 'Fr+Sa Dec 11+12'], 'Round 11 || Fr+Sa Dec 11+12'.split( HEADER_SEP_RE )
+
+    assert_equal ['Final - Leg 1'], 'Final - Leg 1'.split( HEADER_SEP_RE  )
+    assert_equal ['Final | Leg 1'], 'Final | Leg 1'.split( HEADER_SEP_RE  )
+    assert_equal ['Final / Leg 1'], 'Final / Leg 1'.split( HEADER_SEP_RE  )
+    assert_equal ['Final, Leg 1'],  'Final, Leg 1'.split( HEADER_SEP_RE  )
+  end
+
+
   ADDR_MARKER_RE   = SportDb::Import::ClubReader::ADDR_MARKER_RE
   B_TEAM_MARKER_RE = SportDb::Import::ClubReader::B_TEAM_MARKER_RE
-  
+
   def test_addr
     assert  '~ Wien' =~ ADDR_MARKER_RE
     assert  'Wien ~' =~ ADDR_MARKER_RE
@@ -22,13 +40,13 @@ class TestRegex < MiniTest::Test
     assert 'Fischhofgasse 12 /// 1100 Wien' =~ ADDR_MARKER_RE
 
     assert_nil 'Fischhofgasse 12 + 1100 Wien' =~ ADDR_MARKER_RE
-    assert_nil 'Fischhofgasse 12++1100 Wien' =~ ADDR_MARKER_RE
+    assert_nil 'Fischhofgasse 12++1100 Wien' =~ ADDR_MARKER_RE   ## todo/fix: make it a match!!! why? why not?
     assert_nil 'Fischhofgasse 12 / 1100 Wien' =~ ADDR_MARKER_RE
-    assert_nil 'Fischhofgasse 12//1100 Wien' =~ ADDR_MARKER_RE
-    
+    assert_nil 'Fischhofgasse 12//1100 Wien' =~ ADDR_MARKER_RE   ## todo/fix: make it a match!!! why? why not?
+
     assert_nil 'Atlanta United FC, 2017,  Atlanta   › Georgia' =~ ADDR_MARKER_RE
   end
-  
+
   def test_b_team
     assert 'b)    Rapid Wien II' =~ B_TEAM_MARKER_RE
     assert '(b)   Rapid Wien II' =~ B_TEAM_MARKER_RE
@@ -38,12 +56,12 @@ class TestRegex < MiniTest::Test
     assert '(ii.) Rapid Wien II' =~ B_TEAM_MARKER_RE
     assert '2)    Rapid Wien II' =~ B_TEAM_MARKER_RE
     assert '(2)   Rapid Wien II' =~ B_TEAM_MARKER_RE
- 
+
     assert_nil '(3)   Rapid Wien II' =~ B_TEAM_MARKER_RE
     assert_nil '(iii) Rapid Wien II' =~ B_TEAM_MARKER_RE
     assert_nil 'iii)  Rapid Wien II' =~ B_TEAM_MARKER_RE
     assert_nil 'c)    Rapid Wien II' =~ B_TEAM_MARKER_RE
     assert_nil '(c)   Rapid Wien II' =~ B_TEAM_MARKER_RE
   end
-  
+
 end # class TestRegex

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.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-06-15 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
@@ -178,6 +182,7 @@ files:
 - test/test_match_auto.rb
 - test/test_match_auto_champs.rb
 - test/test_match_auto_euro.rb
+- test/test_match_auto_relegation.rb
 - test/test_match_auto_worldcup.rb
 - test/test_match_champs.rb
 - test/test_match_eng.rb