sportdb-readers 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 571eb048edc2298d0c059f6af8bd572b9926631c
-  data.tar.gz: 7dc563726f8c82a2fa03327e7b51ba99bff29f20
+  metadata.gz: fec930bd9a27bc8f0e0b12ac9dd6a1e28e63c85d
+  data.tar.gz: 55eaf685681e934e2b694f6ef4597847dbaed8cf
 SHA512:
-  metadata.gz: d1319dcf78797f4a04f766c190cfbea4f2a6777a2925638f63092ab21a073304659e449c7d0443f01addfbf496df61e4cd21112d3ca14b333abbc9a1aba23557
-  data.tar.gz: 8817b8cdf55bb7df0afafd3a8abadc62ac01e05fd82b18e3e6a6cd0bb9228da6662ec49e114b74225a3f41f30c65b23d361c8cdde8ed3c7b7e33faad63745651
+  metadata.gz: 5ca012b994817963992c4b965cf89de4c39ba70b4865ec714a7ee486580aafd42137c047cbfe831e17b9a6db9e3cf940c8cf787746a7ccef88afcc8945739a30
+  data.tar.gz: 9887277231dd7de20ddeaa47ccc87c6df89767032658fc72bee6ed2f317d9fd3fc79ca5cf552bf9a7afcd0a08582566e9b03266cad228c380b346285a21f9c49

data/Manifest.txt

@@ -11,4 +11,5 @@ lib/sportdb/readers/sync.rb
 lib/sportdb/readers/version.rb
 test/helper.rb
 test/test_match_parser.rb
+test/test_read.rb
 test/test_reader.rb

data/lib/sportdb/readers.rb

@@ -32,7 +32,7 @@ module SportDb
       datafiles.each { |datafile| MatchReaderV2.read( datafile ) }
     else
       ## check if datafile matches configuration naming (e.g. .conf.txt)
-      if Datafile::CONF_REGEX.match( path )   ## fix: use Datafile.match_conf
+      if Datafile.match_conf( path )
         EventReaderV2.read( path )
       else   ## assume "regular" match datafile
         MatchReaderV2.read( path )

data/lib/sportdb/readers/event_reader.rb

@@ -59,14 +59,25 @@ class EventReaderV2    ## todo/check: rename to EventsReaderV2 (use plural?) why
        league = Sync::League.find_or_create( rec[:league] )
        season = Sync::Season.find_or_create( rec[:season] )
 
+
        event  = Sync::Event.find_or_create( league: league, season: season )
+       if rec[:stage]
+         stage = Sync::Stage.find_or_create( rec[:stage], event: event )
+       else
+         stage = nil
+       end
+
 
        rec[:clubs].each do |club_rec|
          club = Sync::Club.find_or_create( club_rec )
          ## add teams to event
          ##   todo/fix: check if team is alreay included?
          ##    or clear/destroy_all first!!!
-         event.teams << club
+         if stage
+           stage.teams << club
+         else
+           event.teams << club
+         end
        end
     end
 

data/lib/sportdb/readers/match_reader.rb

@@ -18,17 +18,32 @@ class MatchReaderV2    ## todo/check: rename to MatchReaderV2 (use plural?) why?
       season = Sync::Season.find!( rec[:season] )
 
       event  = Sync::Event.find!( league: league, season: season )
+      if rec[:stage]
+        stage = Sync::Stage.find!( rec[:stage], event: event )
+        teams = stage.teams
+      else
+        teams = event.teams
+      end
+
+      ## hack for now: switch lang
+      if ['at', 'de'].include?( league.country.key )
+        SportDb.lang.lang = 'de'
+      else
+        SportDb.lang.lang = 'en'
+      end
 
       ## todo/fix: set lang for now depending on league country!!!
       parser = MatchParserSimpleV2.new( rec[:lines],
-                                event.teams,
-                                event.start_at )
+                                teams,  ## note: use event OR stage teams (if stage is present)
+                                event.start_at )   ## note: keep season start_at date for now (no need for more specific stage date need for now)
       round_recs, match_recs = parser.parse
+      pp round_recs
 
       round_recs.each do |round_rec|
         round = Sync::Round.find_or_create( round_rec, event: event )  ## check: use/rename to EventRound why? why not?
       end
       match_recs.each do |match_rec|
+        ## todo/fix: pass along stage (if present): stage  - optional!!!!
         match = Sync::Match.create_or_update( match_rec, event: event )
       end
     end

data/lib/sportdb/readers/outline_reader.rb

@@ -25,13 +25,15 @@ class LeagueOutlineReader
     recs=[]
     OutlineReader.parse( txt ).each do |node|
       if node[0] == :h1
-        ## check for league and season
+        ## check for league (and stage) and season
         heading = node[1]
-        if m=heading.match( LEAGUE_SEASON_HEADING_REGEX )
+        values = split_league( heading )
+        if m=values[0].match( LEAGUE_SEASON_HEADING_REGEX )
           puts "league >#{m[:league]}<, season >#{m[:season]}<"
 
            recs << { league: m[:league],
                      season: m[:season],
+                     stage:  values[1],     ## note: defaults to nil if not present
                      lines:  []
                    }
         else
@@ -58,12 +60,39 @@ class LeagueOutlineReader
     recs.each do |rec|
       league = find_league( rec[:league] )
       rec[:league] = league
+
+      check_stage( rec[:stage] )   if rec[:stage]   ## note: only check for now (no remapping etc.)
     end
 
     recs
   end # method parse
 
 
+  def self.split_league( str )   ## todo/check: rename to parse_league(s) - why? why not?
+    ## split into league / stage / ... e.g.
+    ##  => Österr. Bundesliga 2018/19, Regular Season
+    ##  => Österr. Bundesliga 2018/19, Championship Round
+    ##  etc.
+    values = str.split( /[,<>‹›]/ )  ## note: allow , > < or › ‹ for now
+    values = values.map { |value| value.strip }   ## remove all whitespaces
+    values
+  end
+
+  def self.check_stage( name )
+    known_stages = ['regular season',
+                    'championship round',
+                    'relegation round',
+                   ]
+
+    if known_stages.include?( name.downcase )
+       ## everything ok
+    else
+      puts "** !!! ERROR !!! no (league) stage match found for >#{name}<, add to (builtin) stages table; sorry"
+      exit 1
+    end
+  end
+
+
   def self.find_league( name )
     league = nil
     m = config.leagues.match( name )

data/lib/sportdb/readers/sync.rb

@@ -54,6 +54,7 @@ module Sync
     end
   end # class League
 
+
   class Season
     def self.normalize_key( key )    ## helper for season key (rename to norm_key ???)
       ## note:  "normalize" season key
@@ -177,6 +178,38 @@ module Sync
     end
   end # class Round
 
+
+  class Stage
+    def self.find( name, event: )
+      SportDb::Model::Stage.find_by( title: name, event_id: event.id  )
+    end
+    def self.find!( name, event: )
+      rec = find( name, event: event  )
+      if rec.nil?
+        puts "** !!!ERROR!!! db sync - no stage match found for:"
+        pp name
+        pp event
+        exit 1
+      end
+      rec
+    end
+
+    def self.find_or_create( name, event: )
+       rec = find( name, event: event )
+       if rec.nil?
+         ## use title and not name - why? why not?
+         ##  quick fix:  change name to title
+         attribs = { event_id: event.id,
+                     title:    name,
+                   }
+         rec = SportDb::Model::Stage.create!( attribs )
+       end
+       rec
+    end
+  end # class Stage
+
+
+
   class Match   ## todo/check:  add alias for Game class - why? why not?
     def self.create_or_update( match, event: )
        ## note: MUST find round, thus, use bang (!)

data/lib/sportdb/readers/version.rb

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

data/test/test_match_parser.rb

@@ -16,9 +16,15 @@ class TestMatchParser < MiniTest::Test
     def Club.read( txt )
       recs = []
       txt.each_line do |line|
-        values = line.split( ',' )
-        values = values.map {|value| value.strip }
-        recs << Club.new( values[0], values[1], values.size > 2 ? values[2..-1].join('|') : nil )
+        values = line.split( '|' )
+        values = values.map { |value| value.strip }
+
+        title    = values[0]
+        ## note: quick hack - auto-generate key, that is, remove all non-ascii chars and downcase
+        key      = title.downcase.gsub( /[^a-z]/, '' )
+        synonyms = values.size > 1 ? values[1..-1].join( '|' ) : nil
+
+        recs << Club.new( key, title, synonyms )
       end
       recs
     end
@@ -61,26 +67,26 @@ Matchday 2
 TXT
 
     clubs_txt = <<TXT
-arsenalfc, Arsenal FC, Arsenal, FC Arsenal
-leicestercityfc, Leicester City FC, Leicester, Leicester City
-watfordfc, Watford FC, Watford, FC Watford
-liverpoolfc, Liverpool FC, Liverpool, FC Liverpool
-chelseafc, Chelsea FC, Chelsea, FC Chelsea
-burnleyfc, Burnley FC, Burnley, FC Burnley
-crystalpalacefc, Crystal Palace FC, Crystal Palace, C Palace, Palace, Crystal P
-huddersfieldtownafc, Huddersfield Town AFC, Huddersfield, Huddersfield Town
-evertonfc, Everton FC, Everton, FC Everton
-stokecityfc, Stoke City FC, Stoke, Stoke City
-southamptonfc, Southampton FC, Southampton, FC Southampton
-swanseacityfc, Swansea City FC, Swansea, Swansea City, Swansea City AFC
-westbromwichalbionfc, West Bromwich Albion FC, West Brom, West Bromwich Albion, West Bromwich, Albion
-afcbournemouth, AFC Bournemouth, Bournemouth, A.F.C. Bournemouth, Bournemouth FC
-brightonhovealbionfc, Brighton & Hove Albion FC, Brighton, Brighton & Hove, Brighton & Hove Albion
-manchestercityfc, Manchester City FC, Man City, Manchester City, Man. City, Manchester C
-newcastleunitedfc, Newcastle United FC, Newcastle, Newcastle Utd, Newcastle United
-tottenhamhotspurfc, Tottenham Hotspur FC, Tottenham, Tottenham Hotspur, Spurs
-manchesterunitedfc, Manchester United FC, Man Utd, Man. United, Manchester U., Manchester Utd, Manchester United
-westhamunitedfc, West Ham United FC, West Ham, West Ham United
+Arsenal FC | Arsenal | FC Arsenal
+Leicester City FC | Leicester | Leicester City
+Watford FC | Watford | FC Watford
+Liverpool FC | Liverpool | FC Liverpool
+Chelsea FC | Chelsea | FC Chelsea
+Burnley FC | Burnley | FC Burnley
+Crystal Palace FC | Crystal Palace | C Palace | Palace | Crystal P
+Huddersfield Town AFC | Huddersfield | Huddersfield Town
+Everton FC | Everton | FC Everton
+Stoke City FC | Stoke | Stoke City
+Southampton FC | Southampton | FC Southampton
+Swansea City FC | Swansea | Swansea City | Swansea City AFC
+West Bromwich Albion FC | West Brom | West Bromwich Albion | West Bromwich | Albion
+AFC Bournemouth | Bournemouth | A.F.C. Bournemouth | Bournemouth FC
+Brighton & Hove Albion FC | Brighton | Brighton & Hove | Brighton & Hove Albion
+Manchester City FC | Man City | Manchester City | Man. City | Manchester C
+Newcastle United FC | Newcastle | Newcastle Utd | Newcastle United
+Tottenham Hotspur FC | Tottenham | Tottenham Hotspur | Spurs
+Manchester United FC | Man Utd | Man. United | Manchester U. | Manchester Utd | Manchester United
+West Ham United FC | West Ham | West Ham United
 TXT
 
 

data/test/test_read.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_read.rb
+
+
+require 'helper'
+
+
+class TestRead < MiniTest::Test
+
+  def test_read
+
+    SportDb.connect( adapter: 'sqlite3', database: ':memory:' )
+    SportDb.create_all   ## build schema
+
+    ## turn on logging to console
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+
+    path = "../../../openfootball/england/2015-16/.conf.txt"
+    # path = "../../../openfootball/england/2017-18/.conf.txt"
+    # path = "../../../openfootball/england/2018-19/.conf.txt"
+    # path = "../../../openfootball/england/2019-20/.conf.txt"
+    SportDb.read( path )
+    path = "../../../openfootball/england/2015-16/1-premierleague-i.txt"
+    # path = "../../../openfootball/england/2017-18/1-premierleague-i.txt"
+    # path = "../../../openfootball/england/2018-19/1-premierleague.txt"
+    # path = "../../../openfootball/england/2019-20/1-premierleague.txt"
+    SportDb.read( path )
+    # path = "../../../openfootball/england/2017-18/1-premierleague-ii.txt"
+    # SportDb.read( path )
+  end  # method test_read
+end  # class TestReader

data/test/test_reader.rb

@@ -19,11 +19,13 @@ class TestReader < MiniTest::Test
     ActiveRecord::Base.logger = Logger.new(STDOUT)
 
 
+    # path = "../../../openfootball/austria/2018-19/.conf.txt"
     path = "../../../openfootball/england/2015-16/.conf.txt"
     # path = "../../../openfootball/england/2017-18/.conf.txt"
     # path = "../../../openfootball/england/2018-19/.conf.txt"
     # path = "../../../openfootball/england/2019-20/.conf.txt"
     recs = SportDb::EventReaderV2.read( path )
+    # path = "../../../openfootball/austria/2018-19/1-bundesliga.txt"
     path = "../../../openfootball/england/2015-16/1-premierleague-i.txt"
     # path = "../../../openfootball/england/2017-18/1-premierleague-i.txt"
     # path = "../../../openfootball/england/2018-19/1-premierleague.txt"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2019-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-config
@@ -89,6 +89,7 @@ files:
 - lib/sportdb/readers/version.rb
 - test/helper.rb
 - test/test_match_parser.rb
+- test/test_read.rb
 - test/test_reader.rb
 homepage: https://github.com/sportdb/sport.db
 licenses: