sportdb-formats 1.0.4 → 1.1.2

data/lib/sportdb/formats/structs/team.rb

@@ -11,10 +11,9 @@ class Team
   ##  todo: use just names for alt_names - why? why not?
   attr_accessor :key, :name, :alt_names,
                 :code,    ## code == abbreviation e.g. ARS etc.
-                :year, :year_end,   ## todo/fix: change year_end to end_year (like in season)!!!
+                :year, :year_end,   ## todo/fix: change year to start_year and year_end to end_year (like in season)!!!
                 :country
 
-  alias_method :title, :name  ## add alias/compat - why? why not
 
   def names
     ## todo/check: add alt_names_auto too? - why? why not?

data/lib/sportdb/formats/version.rb

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

data/test/helper.rb

@@ -1,5 +1,6 @@
 ## note: use the local version of gems
 $LOAD_PATH.unshift( File.expand_path( '../date-formats/lib' ))
+$LOAD_PATH.unshift( File.expand_path( '../sportdb-langs/lib' ))
 
 
 ## minitest setup

data/test/test_country_reader.rb

@@ -75,13 +75,13 @@ TXT
     assert_equal 'Czechoslovakia (-1992)', recs[0].name
     assert_equal 'TCH',                    recs[0].code
     assert_equal 'czechoslovakia',         recs[0].key
-    assert_equal ['Czechoslovakia'],       recs[0].alt_names
+    assert_equal [],                       recs[0].alt_names
     assert_equal [],                       recs[0].tags
 
     assert_equal 'East Germany (-1989)',   recs[3].name
     assert_equal 'GDR',                    recs[3].code
     assert_equal 'eastgermany',            recs[3].key
-    assert_equal ['East Germany'],         recs[3].alt_names
+    assert_equal [],                       recs[3].alt_names
     assert_equal [],                       recs[3].tags
   end
 

data/test/test_match_auto_relegation.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_match_auto_relegation.rb
+
+
+require 'helper'
+
+
+class TestMatchAutoRelegation < MiniTest::Test
+
+  def test_rel
+    txt = <<TXT
+Hinspiel
+[31.5.]
+  SC Wiener Neustadt     0-2  SKN St. Pölten
+
+Rückspiel
+[3.6.]
+  SKN St. Pölten         1-1  SC Wiener Neustadt
+TXT
+
+    start =  Date.new( 2017, 7, 1 )
+    SportDb::Import.config.lang = 'de'
+
+    teams, rounds, groups, round_defs, group_defs = SportDb::AutoConfParser.parse( txt, start: start )
+
+    puts "teams:"
+    pp teams
+    puts "rounds:"
+    pp rounds
+    puts "groups:"
+    pp groups
+    puts "round defs:"
+    pp round_defs
+    puts "group defs:"
+    pp group_defs
+  end
+
+end   # class TestMatchAutoRelegation

data/test/test_match_start_date.rb

@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_match_start_date.rb
+
+
+require 'helper'
+
+
+class TestMatchStart < MiniTest::Test
+
+  def test_eng
+    txt =<<TXT
+Matchday 1
+[Aug 2]
+   A - B
+Matchday 2
+[Jan 3]
+   A - B
+Matchday 3
+[Aug 4]
+  A - B
+TXT
+
+   teams =<<TXT
+A
+B
+TXT
+    SportDb::Import.config.lang = 'en'
+
+    start = Date.new( 2017, 7, 1 )
+
+    parser = SportDb::MatchParser.new( txt, teams, start )
+    matches, rounds  = parser.parse
+
+    pp rounds
+    pp matches   ## only dump last record for now
+
+    assert_equal Date.new( 2017, 8, 2), matches[0].date
+    assert_equal Date.new( 2018, 1, 3), matches[1].date
+    assert_equal Date.new( 2018, 8, 4), matches[2].date
+  end   # method test_end
+end   # class TestMatchStart

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

@@ -9,25 +9,35 @@ require 'helper'
 
 class TestSeason < MiniTest::Test
 
-  Season = SportDb::Import::Season
-
-  def test_path
-    assert_equal '2010-11',       Season.new( '2010-11' ).path
-    assert_equal '2010-11',       Season.new( '2010-2011' ).path
-    assert_equal '2010-11',       Season.new( '2010/11' ).path
-    assert_equal '2010-11',       Season.new( '2010/1' ).path
-    assert_equal '2010-11',       Season.new( '2010/2011' ).path
-    assert_equal '2010',          Season.new( '2010' ).path
-
-    assert_equal '2010s/2010-11', Season.new( '2010-11' ).path( format: 'long' )
-    assert_equal '2010s/2010-11', Season.new( '2010-2011' ).path( format: 'long' )
-    assert_equal '2010s/2010',    Season.new( '2010' ).path( format: 'long' )
-
-    assert_equal '1999-00',       Season.new( '1999-00' ).path
-    assert_equal '1999-00',       Season.new( '1999-2000' ).path
-    assert_equal '1990s/1999-00', Season.new( '1999-00' ).path( format: 'long' )
-    assert_equal '1990s/1999-00', Season.new( '1999-2000' ).path( format: 'long' )
-  end  # method test_path
+
+  def test_to_path
+    assert_equal '2010-11',       Season.new( '2010-11' ).to_path
+    assert_equal '2010-11',       Season.new( '2010-2011' ).to_path
+    assert_equal '2010-11',       Season.new( '2010/11' ).to_path
+    assert_equal '2010-11',       Season.new( '2010/1' ).to_path
+    assert_equal '2010-11',       Season.new( '2010/2011' ).to_path
+    assert_equal '2010',          Season.new( '2010' ).to_path
+
+    assert_equal '2010-11',       Season.new( 2010, 2011 ).to_path
+    assert_equal '2010',          Season.new( 2010 ).to_path
+
+    assert_equal '2010s/2010-11', Season.new( '2010-11' ).to_path( :decade )
+    assert_equal '2010s/2010-11', Season.new( '2010-2011' ).to_path( :decade )
+    assert_equal '2010s/2010',    Season.new( '2010' ).to_path( :decade )
+
+    assert_equal '1999-00',       Season.new( '1999-00' ).to_path
+    assert_equal '1999-00',       Season.new( '1999-2000' ).to_path
+    assert_equal '1990s/1999-00', Season.new( '1999-00' ).to_path( :decade )
+    assert_equal '1990s/1999-00', Season.new( '1999-2000' ).to_path( :decade )
+
+    assert_equal '2000s/2010-11', Season.new( '2010-11' ).to_path( :century )
+    assert_equal '2000s/2010-11', Season.new( '2010-2011' ).to_path( :century )
+    assert_equal '2000s/2010',    Season.new( '2010' ).to_path( :century )
+
+    assert_equal '1900s/1999-00', Season.new( '1999-00' ).to_path( :century )
+    assert_equal '1900s/1999-00', Season.new( '1999-2000' ).to_path( :century )
+  end  # method test_to_path
+
 
   def test_key
     assert_equal '2010/11',       Season.new( '2010-11' ).key
@@ -59,4 +69,43 @@ class TestSeason < MiniTest::Test
     assert_equal '1998/99',       Season.new( '1999-00' ).prev.key
     assert_equal '1998/99',       Season.new( '1999-2000' ).prev.key
   end
+
+  def test_next
+    assert_equal '2009/10',       Season.new( '2008-09' ).next.key
+    assert_equal '2009/10',       Season.new( '2008-2009' ).next.key
+    assert_equal '2009',          Season.new( '2008' ).next.key
+
+    assert_equal '1998/99',       Season.new( '1997-98' ).next.key
+    assert_equal '1998/99',       Season.new( '1997-1998' ).next.key
+  end
+
+
+  def test_range
+    s2010 = Season.new( '2010' )..Season.new( '2019' )
+    pp s2010.to_a
+# => [2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019]
+
+    s2010 = Season.new( '2010-11')..Season.new( '2019-20')
+    pp s2010.to_a
+# => [2010/11, 2011/12, 2012/13, 2013/14, 2014/15,
+#     2015/16, 2016/17, 2017/18, 2018/19, 2019/20]
+
+    puts s2010 === Season.new( '2015-16' )  # true
+    puts s2010 === Season.new( '2015' )     # false  - why? if using >= <=
+    puts s2010 === Season.new( '1999-00' )  # false
+    puts s2010 === Season.new( '2020-21' )  # false
+
+    puts Season.new( '2010-11' ) < Season.new( '2015' )   # true
+    puts Season.new( '2015' )    < Season.new( '2019-20') # true
+
+    puts Season.new( '2015' ) == Season.new( '2015-16') # false
+    puts Season.new( '2015' ) < Season.new( '2015-16') # true
+    puts Season.new( '2015' ) == Season.new( '2015')    # true
+
+    puts
+    puts s2010.include? Season.new( '2015-16' )  # true
+    puts s2010.include? Season.new( '2015' )     # false
+    puts s2010.include? Season.new( '1999-00' )  # false
+  end
+
 end # class TestSeason

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-formats
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alphabets
@@ -127,6 +127,8 @@ files:
 - lib/sportdb/formats/country/country_reader.rb
 - lib/sportdb/formats/datafile.rb
 - lib/sportdb/formats/datafile_package.rb
+- lib/sportdb/formats/event/event_index.rb
+- lib/sportdb/formats/event/event_reader.rb
 - lib/sportdb/formats/goals.rb
 - lib/sportdb/formats/league/league_index.rb
 - lib/sportdb/formats/league/league_outline_reader.rb
@@ -182,10 +184,12 @@ 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
 - test/test_match_euro.rb
+- test/test_match_start_date.rb
 - test/test_match_worldcup.rb
 - test/test_name_helper.rb
 - test/test_outline_reader.rb