sportdb-models 1.15.1 → 1.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98fbd2db0f79206ed3154c7ce08822218cea175c
-  data.tar.gz: 199637ebcaa4e7fa0477c2eb412400c8303a5c6d
+  metadata.gz: 8297074a244e15a0faa0e79815af71b73c93ea68
+  data.tar.gz: 3b74416dac9a999b96998f8f34f3240fe14038ee
 SHA512:
-  metadata.gz: 8d0392d3701140c5af5495115eb0836931f378a0b9e30b33afe8281ceb66dc948176dd89ddf0dd3fbc1d3c255ce49781c4d5335c5988f2187a8ed65fd8db0f29
-  data.tar.gz: 6d087ae871a039444129dbc40afa3c0da415539d5a741cea95acd7117e6421adec737adf97f5ac7549f103f8d02d0f7356a9a4c869318cb4d04ed2ef0fa205fe
+  metadata.gz: 1a43679c3e1444aef940475e28ba250a98d2f25146a819d373fc5e7c8a87c2358cf1246548661b000a26251158597f4b91d8b47148018fde684091f2be829be9
+  data.tar.gz: 1b244eeaab111bcfb6e5fcbf3c74b587494425dddce4370f30b74449e68c815d4eebe318a208fafe21b479cd4457af5c1a3085ddc6009daaede7eea2a622168b

data/Manifest.txt

@@ -58,6 +58,7 @@ lib/sportdb/reader_file.rb
 lib/sportdb/reader_zip.rb
 lib/sportdb/readers/assoc.rb
 lib/sportdb/readers/event.rb
+lib/sportdb/readers/event_table.rb
 lib/sportdb/readers/game.rb
 lib/sportdb/readers/ground.rb
 lib/sportdb/readers/league.rb
@@ -87,7 +88,9 @@ 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/2014_15/1-bundesliga.yml
+test/data/at-austria/2015_16/1-bundesliga-v2.conf.txt
 test/data/at-austria/2015_16/1-bundesliga-v2.yml
+test/data/at-austria/2015_16/1-bundesliga.conf.txt
 test/data/at-austria/2015_16/1-bundesliga.yml
 test/data/at-austria/2015_16/cup.yml
 test/data/at-austria/leagues.txt
@@ -142,6 +145,7 @@ test/test_csv_reader.rb
 test/test_cursor.rb
 test/test_date.rb
 test/test_event_reader.rb
+test/test_event_table_reader.rb
 test/test_goals.rb
 test/test_lang.rb
 test/test_load.rb

data/lib/sportdb/models.rb

@@ -71,7 +71,8 @@ require 'sportdb/mapper_teams'
 require 'sportdb/finders/goals'   # no: requires FixturesHelpers
 
 require 'sportdb/readers/assoc'
-require 'sportdb/readers/event'
+require 'sportdb/readers/event'           ## old event reader (remove later??) 
+require 'sportdb/readers/event_table'     ## new "standard" event reader
 require 'sportdb/readers/game'
 require 'sportdb/readers/ground'
 require 'sportdb/readers/league'

data/lib/sportdb/readers/event_table.rb

@@ -0,0 +1,188 @@
+# encoding: UTF-8
+
+module SportDb
+
+
+class EventTableReader
+
+  include LogUtils::Logging
+
+## make models available by default with namespace
+#  e.g. lets you use Usage instead of Model::Usage
+  include Models
+
+  attr_reader :event           # returns event record; call read first
+
+
+  ## todo/fix: add from_zip()
+
+  def self.from_file( path, more_attribs={} )
+    ## note: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
+    ## - see textutils/utils.rb
+    text = File.read_utf8( path )
+        
+    self.from_string( text, more_attribs )
+  end
+
+  def self.from_string( text, more_attribs={} )
+    self.new( text, more_attribs )
+  end  
+
+  def initialize( text, more_attribs={} )
+    ## todo/fix: how to add opts={} ???
+    @text = text
+    @more_attribs = more_attribs
+
+    @event    = nil
+  end
+
+
+  ## split into league + season
+  ##  e.g. Österr. Bundesliga 2015/16        
+  ##       World Cup 2018
+  EVENT_HEADER_REGEX =  /^
+         (?<league>.+?)     ## non-greedy
+            \s
+         (?<season>\d{4}
+            (?:\/\d{2})?     ## optional 2nd date in season
+         )
+            $/x   
+
+  def read
+    @event    = nil   # reset cached event rec
+    event_attribs={}
+
+    reader = LineReader.from_string( @text )
+
+    header = false
+    season = nil
+    league = nil
+
+    reader.each_line do |line|
+      puts "  line: >#{line}<"
+      
+      ## assume first line is event header (league+season)
+      ##  e.g. Österr. Bundesliga 2015/16        
+      ##       World Cup 2018
+      if header == false       
+         line = line.strip
+         m = EVENT_HEADER_REGEX.match( line )
+         if m
+           league_title = m[:league]
+           season_key   = m[:season]
+           puts "  trying event lookup - league: >#{league_title}<, season: >#{season_key}<"
+           
+           season = Season.find_by( key: season_key )
+
+           ## check if it exists
+           if season.present?
+             event_attribs['season_id'] = season.id
+           else
+             logger.error "season with key >>#{season_key}<< missing"
+             exit 1
+           end
+ 
+           league = League.find_by( title: league_title )
+
+           ## check if it exists
+           if league.present?    ## todo: just use if league  (no present?) ???
+             event_attribs['league_id'] = league.id
+           else
+             logger.error "league with title >>#{league_title}<< missing"
+             exit 1
+           end
+         else
+           fail "[EventTableReader] event header must match league+season pattern: >#{line}<"
+         end
+         header = true
+      else
+        ### process regular team lines
+
+        line = line.strip
+        scan = StringScanner.new( line )
+        
+        if scan.check( /-/ )               # option 1) list entry  e.g.  - Rapid Wien
+          puts "  list entry >#{line}<"
+          scan.skip( /-\s+/)
+          team_title = scan.rest.strip      ## assume the rest is the team name
+        elsif scan.check( /\d{1,2}\./ )    ## option 2) table entry  e.g.   1. Rapid Wien
+          puts "  table entry >#{line}<"
+          rank = scan.scan( /\d{1,2}/ )
+          scan.skip( /\.\s+/)
+          
+          ## note: uses look ahead scan until we hit at least two spaces
+          ##  or the end of string  (standing records for now optional)
+          team_title = scan.scan_until( /(?=\s{2})|$/ )
+          if scan.eos?
+            standing = nil
+          else
+            scan.skip( /\s+/ )
+            standing = scan.rest
+          end
+          puts "   rank: >#{rank}<, standing: >#{standing}<"          
+        else 
+           fail "[EventTableReader] event line must match team pattern: >#{line}<"
+        end
+
+        puts "  team: >#{team_title}<"
+
+        team = Team.find_by( title: team_title )
+        ## next try synonyms (if not found/no match)
+        team = Team.where( "synonyms LIKE ?", "%#{team_title}%" ).first    if team.nil?
+        
+
+        if team.nil?
+          ### print better error message than just
+          ##  *** error: Couldn't find SportDb::Model::Team
+          puts "[fatal] event reader - record for team title >#{team_title}< not found"
+          exit 1
+          ### fix/todo: throw exception/error
+        end
+
+        team_ids = event_attribs['team_ids'] || []
+        team_ids << team.id
+        event_attribs['team_ids'] = team_ids        
+      end
+    end  # each_line
+
+    pp event_attribs
+
+
+    league_id = event_attribs['league_id']
+    season_id = event_attribs['season_id']
+
+    logger.debug "find event - league_id: #{league_id}, season_id: #{season_id}"
+
+    event = Event.find_by( league_id: league_id,
+                           season_id: season_id )
+
+    ## check if it exists
+    if event.present?
+      logger.debug "*** update event #{event.id}-#{event.key}:"
+    else
+      logger.debug "*** create event:"
+      event = Event.new
+      
+      ## hack:  fix/todo1!!
+      ##   add "fake" start_at date for now      
+      if season.key.size == '4'   ## e.g. assume 2018 etc.
+        year = season.key.to_i
+        start_at = Date.new( year, 1, 1 )         
+      else  ## assume 2014/15 etc.
+        year = season.key[0..3].to_i
+        start_at = Date.new( year, 7, 1 )
+      end
+      event_attribs['start_at'] = start_at
+    end
+    
+    logger.debug event_attribs.to_json
+
+    event.update_attributes!( event_attribs )
+    
+    # keep a cached reference for later use
+    @event = event
+  end  # method read
+
+
+end # class EventTableReader
+end # module SportDb

data/lib/sportdb/version.rb

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

data/test/data/at-austria/2015_16/1-bundesliga-v2.conf.txt

@@ -0,0 +1,20 @@
+#########################################################################
+# Österreichische Bundesliga 2015/16  (104. Meisterschaft / 42. Saison)
+#
+#  Start Date: 2015-07-25
+#  10 Teams
+
+
+Österr. Bundesliga 2015/16           ## No. 42
+
+ 1. RB Salzburg
+ 2. Rapid Wien
+ 3. Sturm Graz
+ 4. Wolfsberger AC
+ 5. SV Ried
+ 6. Austria Wien
+ 7. Admira Wacker
+ 8. SCR Altach    
+ 9. SV Grödig          19 10 12 5  4-4  8  [-2]
+10. SV Mattersburg     20 11 10 4  5-5  4        ## Aufsteiger
+

data/test/data/at-austria/2015_16/1-bundesliga.conf.txt

@@ -0,0 +1,20 @@
+#########################################################################
+# Österreichische Bundesliga 2015/16  (104. Meisterschaft / 42. Saison)
+#
+#  Start Date: 2015-07-25
+#  10 Teams
+
+
+Österr. Bundesliga 2015/16
+
+- RB Salzburg
+- Rapid Wien
+- Sturm Graz
+- Wolfsberger AC
+- SV Ried
+- Austria Wien
+- Admira Wacker
+- SCR Altach    
+- SV Grödig
+- SV Mattersburg     ## Aufsteiger
+

data/test/helper.rb

@@ -50,6 +50,7 @@ AssocReader             = SportDb::AssocReader
 SeasonReader            = SportDb::SeasonReader
 LeagueReader            = SportDb::LeagueReader
 EventReader             = SportDb::EventReader
+EventTableReader        = SportDb::EventTableReader
 GameReader              = SportDb::GameReader
 NationalTeamSquadReader = SportDb::NationalTeamSquadReader
 ClubSquadReader         = SportDb::ClubSquadReader
@@ -105,6 +106,13 @@ module TestEventReader
   end
 end
 
+module TestEventTableReader
+  def self.from_file( name )
+    EventTableReader.from_file( "#{SportDb.test_data_path}/#{name}.txt" )
+  end
+end
+
+
 module TestGameReader
   ## NOTE: pass in .yml as path (that is, event config!!!!)
   def self.from_file( name, more_attribs={} )

data/test/test_event_table_reader.rb

@@ -0,0 +1,61 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_event_table_reader.rb
+#  or better
+#     rake -I ./lib test
+
+
+require 'helper'
+
+class TestEventTableReaderXX < MiniTest::Test  # note: TestEventTableReader alreay defined, thus, add xx
+
+  def setup
+    WorldDb.delete!
+    SportDb.delete!
+    PersonDb.delete!
+
+    ## setup österr. bundesliga
+    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: 'Österr. 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
+  end
+
+  def test_bl
+    r = TestEventTableReader.from_file( 'at-austria/2015_16/1-bundesliga.conf' )
+    r.read
+
+    assert true   ## if we get here; assume everything ok
+  end
+
+  def test_bl_v2
+    r = TestEventTableReader.from_file( 'at-austria/2015_16/1-bundesliga-v2.conf' )
+    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.15.1
+  version: 1.15.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-05 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -135,6 +135,7 @@ files:
 - lib/sportdb/reader_zip.rb
 - lib/sportdb/readers/assoc.rb
 - lib/sportdb/readers/event.rb
+- lib/sportdb/readers/event_table.rb
 - lib/sportdb/readers/game.rb
 - lib/sportdb/readers/ground.rb
 - lib/sportdb/readers/league.rb
@@ -164,7 +165,9 @@ files:
 - test/data/at-austria/2013_14/squads/salzburg.txt
 - test/data/at-austria/2014_15/1-bundesliga-ii.txt
 - test/data/at-austria/2014_15/1-bundesliga.yml
+- test/data/at-austria/2015_16/1-bundesliga-v2.conf.txt
 - test/data/at-austria/2015_16/1-bundesliga-v2.yml
+- test/data/at-austria/2015_16/1-bundesliga.conf.txt
 - test/data/at-austria/2015_16/1-bundesliga.yml
 - test/data/at-austria/2015_16/cup.yml
 - test/data/at-austria/leagues.txt
@@ -219,6 +222,7 @@ files:
 - test/test_cursor.rb
 - test/test_date.rb
 - test/test_event_reader.rb
+- test/test_event_table_reader.rb
 - test/test_goals.rb
 - test/test_lang.rb
 - test/test_load.rb