sportdb-models 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6581b2503f64b81e2e13054cfd6fcdc82ef1cd92
-  data.tar.gz: 53c61cb4597030a55359c09a8952d2ffa3b3d0ee
+  metadata.gz: 2cebb6c98e88a5cbb12889d6a90b4a890d09ac21
+  data.tar.gz: 7d9017176287c6f00a2a209fa6a9e1877fabf286
 SHA512:
-  metadata.gz: 8e07c41d35dbd0beff9d7ac7d90256d83d5d176140b246f9271afaf246b2ddeef7082632743e8db3f3bdb9364d93e19357541d4509d53b897ce68643e4cbb7ef
-  data.tar.gz: c5240235260c31b5968e2069b0797b6d8f56d5c9aa271f6e0e55e8255da43829e874cb8b5afa4489c15fc0ac9b6cdeffdcc7f768055e290578c9fa66f89f577b
+  metadata.gz: 42901342ef3482dfc37ad8abb60b0870c91c718922c85493129249e7ab4ca55bb95aa8fcba3e3f9a04f57b513705003eefddfd55828301e44186e432bc682c53
+  data.tar.gz: d514e02328829f767cac4bf4b75499ba9e9acf4358498e8a77bd8043869120720b9e138b38ed0eeed02bcb1f4d64d77fa3d25588b7e8883f642d8c58c2fc36f0

data/Manifest.txt

@@ -83,6 +83,8 @@ test/data/at-austria/2013_14/el.yml
 test/data/at-austria/2013_14/squads/austria.txt
 test/data/at-austria/2013_14/squads/salzburg.txt
 test/data/at-austria/2014_15/1-bundesliga-ii.txt
+test/data/at-austria/2015_16/1-bundesliga.yml
+test/data/at-austria/2015_16/cup.yml
 test/data/at-austria/leagues.txt
 test/data/at-austria/teams.txt
 test/data/at-austria/teams_2.txt
@@ -127,6 +129,7 @@ test/test_assoc_reader.rb
 test/test_changes.rb
 test/test_cursor.rb
 test/test_date.rb
+test/test_event_reader.rb
 test/test_goals.rb
 test/test_lang.rb
 test/test_load.rb

data/lib/sportdb/readers/event.rb

@@ -140,13 +140,42 @@ class EventReader
         end
 
         event_attribs['ground_ids'] = ground_ids
-      elsif key == 'teams'
+
+      elsif key == 'team3'   ## note: check before teams (to avoid future gotchas)
+        ## for now always assume false  # todo: fix - use value and convert to boolean if not boolean
+        event_attribs['team3'] = false
+
+      elsif key == 'teams' || key.downcase =~ /teams/
         ## assume teams value is an array
-        
+
+        ### check if key includes number of teams; if yes - use for checksum/assert
+        if key =~ /(\d+)/
+          if value.size != $1.to_i
+            puts "[fatal] event reader - team key - expecting #{$1.to_i} teams; got #{value.size}"
+            exit 1
+          end
+        end
+
         team_ids = []
         value.each do |item|
           team_key = item.to_s.strip
-          team = Team.find_by_key( team_key )
+
+          ## check if team_key includes uppercase letters
+          if team_key =~ /[A-Z]/
+            ## assume team name (NOT team key); try to lookup team key in database
+            ##   todo/fix:
+            ##     remove  subtitle from title e.g. everything in () 
+            ##       SV Oberwart (RL Ost)  =>  SV Oberwart
+            team = Team.find_by( title: team_key )
+            if team.nil?
+              ## next try synonyms
+              team = Team.where( "synonyms LIKE ?", "%#{team_key}%" ).first
+            end
+          else
+            ## assume "verbatim/literal" team_key (use as is 1:1)
+            team = Team.find_by( key: team_key )
+          end
+
           if team.nil?
             ### print better error message than just
             ##  *** error: Couldn't find SportDb::Model::Team
@@ -155,14 +184,11 @@ class EventReader
             exit 1
             ### fix/todo: throw exception/error
           end
+
           team_ids << team.id
         end
 
         event_attribs['team_ids'] = team_ids
-        
-      elsif key == 'team3'
-        ## for now always assume false  # todo: fix - use value and convert to boolean if not boolean
-        event_attribs['team3'] = false
 
       elsif key == 'fixtures' || key == 'sources'
         ### todo: check for mulitiple fixtures/sources ?? allow disallow?? why? why not?

data/lib/sportdb/version.rb

@@ -3,7 +3,7 @@
 module SportDb
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
-  MINOR = 13
+  MINOR = 14
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

data/test/data/at-austria/2015_16/1-bundesliga.yml

@@ -0,0 +1,28 @@
+#########################################################################
+# Österreichische Bundesliga 2015/16  (104. Meisterschaft / 42. Saison)
+
+league: at
+season: 2015/16
+start_at: 2015-07-25
+
+# num/edition - 104 or 42 ??  ##
+# note: timezone for games (play_at) is *always* CET (central european time)
+
+fixtures:
+- 1-bundesliga-i
+- 1-bundesliga-ii
+
+
+10 Teams:
+- RB Salzburg
+- Rapid Wien
+- Sturm Graz
+- Wolfsberger AC
+- SV Ried
+- Austria Wien
+- Admira Wacker
+- SCR Altach    
+- SV Grödig
+- SV Mattersburg     ## Aufsteiger
+
+

data/test/data/at-austria/2015_16/cup.yml

@@ -0,0 +1,77 @@
+#################################
+# ÖFB Cup 2015/16
+
+league: at.cup
+season: 2015/16
+start_at: 2015-07-17
+team3: false       # no game for 3rd/4th place
+
+# note: timezone for games (play_at) is *always* CET (central european time)
+
+
+64 Teams:
+- RB Salzburg                     ## Bundesliga (10)
+- Rapid Wien
+- Admira Wacker
+- Austria Wien
+- Sturm Graz
+- SV Ried
+- SCR Altach
+- SV Mattersburg
+- SV Grödig
+- Wolfsburger AC
+- KSV 1919                        ## Erste Liga (9) - excl. FC Liefering
+- Wacker Innsbruck
+- Austria Lustenau
+- SKN St. Pölten
+- SC Wr. Neustadt
+- Austria Klagenfurt
+- LASK Linz
+- Austria Salzburg
+- Floridsdorfer AC
+- SC/ESV Parndorf 1919 (RL Ost)   ## Burgenland (4)
+- SC Ritzing (RL Ost)
+- SV Oberwart (RL Ost)
+- SC Trausdorf (2. Liga Nord Burgenland)
+- SV Schwechat (RL Ost)           ## Wien (5)
+- First Vienna FC 1894 (RL Ost)
+- FC Stadlau (RL Ost)
+- Wiener Sportklub (RL Ost)
+- SC Red Star Penzing (2. LL Wien)
+- 1. SC Sollenau (RL Ost)         ## Niederösterreich (7)
+- SV Horn (RL Ost)
+- ASK Ebreichsdorf (RL Ost)
+- SKU Amstetten (RL Ost)
+- SC Krems (NÖ Landesliga)
+- SV Leobendorf (NÖ Landesliga) 
+- ASK Kottingsbrunn (NÖ Landesliga)
+- SV Wallern (RL Mitte)            ## Oberösterreich (6)
+- Union Gurten (RL Mitte)
+- FC Blau Weiß Linz (RL Mitte)
+- SK Vorwärts Steyr (RL Mitte)
+- ATSV Stadl Paura (RL Mitte)
+- FC Wels (OÖ Liga)
+- SV Seekirchen 1945 (RL West)     ## Salzburg (5)
+- TSV Neumarkt (RL West)
+- TSV St. Johann Pongau (RL West)
+- USC Eugendorf (RL West)
+- SC Golling (Salzburger Liga)
+- SV Lafnitz (RL Mitte)            ## Steiermark (6)
+- TSV Hartberg (RL Mitte)
+- SC Weiz (RL Mitte)
+- Deutschlandsberger SC (RL Mitte)
+- SV Allerheiligen (RL Mitte)
+- FC Piberstein Lankowitz (LL Steiermark)
+- ASV Annabichler SV 1923 (RL Mitte)   ## Kärnten (4)
+- ASKÖ Köttmannsdorf (Kärntner Liga)
+- VST Völkermarkt (Kärntner Liga)
+- FC Lendorf (Kärntner Liga)
+- WSG Wattens (RL West)            ## Tirol (4)
+- SVG Reichenau (RL West)
+- FC Kitzbühel (RL West)
+- SV Innsbruck (Tiroler Liga)
+- FC Hard (RL West)                ## Vorarlberg (4)
+- FC Dornbirn 1913 (RL West)
+- SC Schwarz Weiß Bregenz (RL West)
+- FC Höchst (Vorarlberg-Liga)
+

data/test/test_event_reader.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_event_reader.rb
+#  or better
+#     rake -I ./lib test
+
+
+require 'helper'
+
+class TestEventReaderXX < MiniTest::Test  # note: TestEventReader alreay defined, thus, add xx
+
+  def setup
+    WorldDb.delete!
+    SportDb.delete!
+    PersonDb.delete!
+  end
+
+  def test_bl
+    at     = Country.create!( key: 'at', name: 'Austria', code: 'AUT', pop: 1, area: 1)
+    season = Season.create!( key: '2015/16', title: '2015/16' )
+    bl     = League.create!( key: 'at', title: 'Bundesliga', club: true, country_id: at.id )
+
+    ## read teams (required for db key lookup)
+    teamreader = TestTeamReader.from_file( 'at-austria/teams', country_id: at.id )
+    teamreader.read
+    teamreader = TestTeamReader.from_file( 'at-austria/teams_2', country_id: at.id )
+    teamreader.read
+
+    r = TestEventReader.from_file( 'at-austria/2015_16/1-bundesliga' )
+    r.read
+
+    assert true   ## if we get here; assume everything ok
+  end
+
+  ### fix/todo:
+  ##   to be done - add support for Wiener Sportklub (RL Ost) => Wiener Sportklub lookups
+  def xxxx_test_cup
+    at     = Country.create!( key: 'at', name: 'Austria', code: 'AUT', pop: 1, area: 1)
+    season = Season.create!( key: '2015/16', title: '2015/16' )
+    cup     = League.create!( key: 'at.cup', title: 'Cup', club: true, country_id: at.id )
+
+    r = TestEventReader.from_file( 'at-austria/2015_16/cup' )
+    r.read
+ 
+    assert true   ## if we get here; assume everything ok
+  end
+
+end # class TestEventReader
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-models
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -161,6 +161,8 @@ files:
 - test/data/at-austria/2013_14/squads/austria.txt
 - test/data/at-austria/2013_14/squads/salzburg.txt
 - test/data/at-austria/2014_15/1-bundesliga-ii.txt
+- test/data/at-austria/2015_16/1-bundesliga.yml
+- test/data/at-austria/2015_16/cup.yml
 - test/data/at-austria/leagues.txt
 - test/data/at-austria/teams.txt
 - test/data/at-austria/teams_2.txt
@@ -205,6 +207,7 @@ files:
 - test/test_changes.rb
 - test/test_cursor.rb
 - test/test_date.rb
+- test/test_event_reader.rb
 - test/test_goals.rb
 - test/test_lang.rb
 - test/test_load.rb
@@ -253,6 +256,7 @@ test_files:
 - test/test_load.rb
 - test/test_cursor.rb
 - test/test_standings.rb
+- test/test_event_reader.rb
 - test/test_squad_club_reader.rb
 - test/test_scores.rb
 - test/test_winner.rb