sportdb-readers 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b34ccb4d608b438478b0d909f5dad9e5f4807677
-  data.tar.gz: bb1641c9eb65feebd42fbbecb9b3430c0b6c69ff
+  metadata.gz: 46454d349dc5a94aea1f56de0b900244df2607bd
+  data.tar.gz: b51de78a375e0a63838e845512c794b2abfdee62
 SHA512:
-  metadata.gz: 269f51e9317a5762304ca0e36b9454a47a88e4cf6b7935690e6c2351c475ecfe7a24dffb1ac546af1f8925d3c7173cfb67373d7e46cd0b54923dcdedd8428f8c
-  data.tar.gz: 1e908059a559669c4a8a15ae6c88778c2b9c4f07e2badb1a3dc1a595d3b58c15ee35c5bd57054859afce2e32da356108035b9be926a7d1274cc277d857e3e0a3
+  metadata.gz: 6fde9823e1e243e8f3be5824b1ff8846e7ad2f531551cc49a9e17165927b96305320d497a7385f45d9e56362c3d30fcc271f9d88b288a12df2ef4aab7ebba74b
+  data.tar.gz: 06b38e7dbce194808a843fd1b735002c31e5cd574a4c2b2b1c9bbe8d7b29c1c96c2c6690306b9514159f3d797d291d0dd09f7bd11405abae8e19f00be06b2d76

data/Manifest.txt

@@ -3,10 +3,12 @@ Manifest.txt
 README.md
 Rakefile
 lib/sportdb/readers.rb
-lib/sportdb/readers/event_reader.rb
+lib/sportdb/readers/conf_linter.rb
+lib/sportdb/readers/conf_reader.rb
+lib/sportdb/readers/league_outline_reader.rb
+lib/sportdb/readers/match_linter.rb
 lib/sportdb/readers/match_parser.rb
 lib/sportdb/readers/match_reader.rb
-lib/sportdb/readers/outline_reader.rb
 lib/sportdb/readers/version.rb
 test/helper.rb
 test/test_match_parser.rb

data/lib/sportdb/readers.rb

@@ -9,17 +9,33 @@ require 'sportdb/sync'
 ###
 # our own code
 require 'sportdb/readers/version' # let version always go first
-require 'sportdb/readers/outline_reader'
-require 'sportdb/readers/event_reader'
+require 'sportdb/readers/league_outline_reader'
+require 'sportdb/readers/conf_reader'
+require 'sportdb/readers/conf_linter'
 require 'sportdb/readers/match_parser'
 require 'sportdb/readers/match_reader'
+require 'sportdb/readers/match_linter'
+
 
 
 ##
 ##  add convenience shortcut helpers
 module SportDb
 
-  def self.read( path )
+  def self.read_conf( path, sync: true )    ## note: sync is dry run (for lint checking)
+    sync ?  ConfReaderV2.read( path ) : ConfLinter.read( path )
+  end
+
+  ### todo: add alias read_matches - why? why not?
+  def self.read_match( path, sync: true )     ## note: sync is dry run (for lint checking)
+    sync ?  MatchReaderV2.read( path ) : MatchLinter.read( path )
+  end
+
+  def self.lint_conf( path )   read_conf( path, sync: false ); end
+  def self.lint_match( path )  read_match( path, sync: false ); end
+
+
+  def self.read( path, sync: true )
     ## step 1: collect all datafiles
     if File.directory?( path )   ## if directory read complete package
       datafiles_conf = Datafile.find_conf( path )
@@ -27,21 +43,20 @@ module SportDb
                                                /[a-z0-9_-]+\.txt$    ## txt e.g /1-premierleague.txt
                                               }x )
 
-      datafiles_conf.each { |datafile| EventReaderV2.read( datafile ) }
-      datafiles.each { |datafile| MatchReaderV2.read( datafile ) }
+      datafiles_conf.each { |datafile| read_conf( datafile, sync: sync ) }
+      datafiles.each { |datafile| read_match( datafile, sync: sync ) }
     else
-      ## check if datafile matches configuration naming (e.g. .conf.txt)
+      ## check if datafile matches conf(iguration) naming (e.g. .conf.txt)
       if Datafile.match_conf( path )
-        EventReaderV2.read( path )
+        read_conf( path, sync: sync )
       else   ## assume "regular" match datafile
-        MatchReaderV2.read( path )
+        read_match( path, sync: sync )
       end
     end
   end  # method read
 
-  ########################################
-  ##  more convenience alias
-  ConfReaderV2 = EventReaderV2    ## add why? why not?
+  def self.lint( path )  read( path, sync: false ); end
+
 end # module SportDb
 
 

data/lib/sportdb/readers/conf_linter.rb

@@ -0,0 +1,103 @@
+# encoding: utf-8
+
+module SportDb
+
+
+class ConfLinter
+
+  def self.config() Import.config; end    ## shortcut convenience helper
+
+
+  def self.read( path )   ## use - rename to read_file or from_file etc. - why? why not?
+    puts "reading conf(iguration) datafile >#{path}<..."
+    txt = File.open( path, 'r:utf-8' ).read
+    parse( txt )
+  end
+
+  def self.parse( txt )
+    recs = LeagueOutlineReader.parse( txt )
+
+    if recs.empty?
+      puts "  ** !!! WARN !!! - no league headings found"
+    else
+      puts "  found #{recs.size} league (+season+stage) headings"
+      recs.each do |rec|
+         ## rec[:league] )
+         ## rec[:season] )
+         ## rec[:stage]
+         puts "   league: >#{rec[:league]}<, season: >#{rec[:season]}<, stage: >#{rec[:stage]}<"
+      end
+    end
+
+    ## pass 2 - check & map; replace inline (string with record)
+    recs.each do |rec|
+      league = rec[:league]
+      clubs = []    ## convert lines to clubs
+      rec[:lines].each do |line|
+
+        next if line =~ /^[ -]+$/   ## skip decorative lines with dash only (e.g. ---- or - - - -) etc.
+
+        scan = StringScanner.new( line )
+
+        if scan.check( /\d{1,2}[ ]+/ )    ## entry with standaning starts with ranking e.g. 1,2,3, etc.
+          puts "  table entry >#{line}<"
+          rank = scan.scan( /\d{1,2}[ ]+/ ).strip   # note: strip trailing spaces
+
+          ## note: uses look ahead scan until we hit at least two spaces
+          ##  or the end of string  (standing records for now optional)
+          name = scan.scan_until( /(?=\s{2})|$/ )
+          if scan.eos?
+            standing = nil
+          else
+            standing = scan.rest.strip   # note: strip leading and trailing spaces
+          end
+          puts "   rank: >#{rank}<, name: >#{name}<, standing: >#{standing}<"
+
+          ## note: rank and standing gets ignored (not used) for now
+        else
+          ## assume club is full line
+          name = line
+        end
+
+        clubs << find_club( name, league.country )
+      end
+
+      rec[:clubs] = clubs
+      rec.delete( :lines )   ## remove lines entry
+    end
+
+    recs
+  end # method read
+
+
+  ### todo/fix: move to clubs for sharing!!!!!!!  use clubs.find_by!( name:, country: )
+  def self.find_club( name, country )   ## todo/fix: add international or league flag?
+    club = nil
+    m = config.clubs.match_by( name: name, country: country )
+
+    if m.nil?
+      ## (re)try with second country - quick hacks for known leagues
+      ##  todo/fix: add league flag to activate!!!
+      m = config.clubs.match_by( name: name, country: config.countries['wal'])  if country.key == 'eng'
+      m = config.clubs.match_by( name: name, country: config.countries['nir'])  if country.key == 'ie'
+      m = config.clubs.match_by( name: name, country: config.countries['mc'])   if country.key == 'fr'
+      m = config.clubs.match_by( name: name, country: config.countries['li'])   if country.key == 'ch'
+      m = config.clubs.match_by( name: name, country: config.countries['ca'])   if country.key == 'us'
+    end
+
+    if m.nil?
+      puts "** !!! ERROR !!! no match for club >#{name}<"
+      exit 1
+    elsif m.size > 1
+      puts "** !!! ERROR !!! too many matches (#{m.size}) for club >#{name}<:"
+      pp m
+      exit 1
+    else   # bingo; match - assume size == 1
+      club = m[0]
+    end
+
+    club
+  end
+
+end # class ConfLinter
+end # module SportDb

data/lib/sportdb/readers/{event_reader.rb → conf_reader.rb}

@@ -3,7 +3,7 @@
 module SportDb
 
 
-class EventReaderV2    ## todo/check: rename to EventsReaderV2 (use plural?) why? why not?
+class ConfReaderV2    ## todo/check: rename to EventsReaderV2 (use plural?) why? why not?
 
   def self.config() Import.config; end    ## shortcut convenience helper
 
@@ -114,5 +114,5 @@ class EventReaderV2    ## todo/check: rename to EventsReaderV2 (use plural?) why
     club
   end
 
-end # class EventReaderV2
+end # class ConfReaderV2
 end # module SportDb

data/lib/sportdb/readers/{outline_reader.rb → league_outline_reader.rb}

@@ -82,6 +82,7 @@ class LeagueOutlineReader
     known_stages = ['regular season',
                     'championship round',
                     'relegation round',
+                    'play-offs'
                    ]
 
     if known_stages.include?( name.downcase )

data/lib/sportdb/readers/match_linter.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+
+module SportDb
+
+class MatchLinter
+
+  def self.read( path )   ## use - rename to read_file or from_file etc. - why? why not?
+    puts "reading match datafile >#{path}<..."
+    txt = File.open( path, 'r:utf-8' ).read
+    parse( txt )
+  end
+
+  def self.parse( txt )
+    recs = LeagueOutlineReader.parse( txt )
+
+    if recs.empty?
+      puts "  ** !!! WARN !!! - no league headings found"
+    else
+      puts "  found #{recs.size} league (+season+stage) headings"
+      recs.each do |rec|
+         ## rec[:league] )
+         ## rec[:season] )
+         ## rec[:stage]
+         puts "   league: >#{rec[:league]}<, season: >#{rec[:season]}<, stage: >#{rec[:stage]}<"
+      end
+    end
+    recs
+  end # method read
+end # class MatchLinter
+end # module SportDb

data/lib/sportdb/readers/version.rb

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

data/test/test_reader.rb

@@ -24,7 +24,7 @@ class TestReader < MiniTest::Test
     # 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 )
+    recs = SportDb::ConfReaderV2.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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-09 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-config
@@ -95,10 +95,12 @@ files:
 - README.md
 - Rakefile
 - lib/sportdb/readers.rb
-- lib/sportdb/readers/event_reader.rb
+- lib/sportdb/readers/conf_linter.rb
+- lib/sportdb/readers/conf_reader.rb
+- lib/sportdb/readers/league_outline_reader.rb
+- lib/sportdb/readers/match_linter.rb
 - lib/sportdb/readers/match_parser.rb
 - lib/sportdb/readers/match_reader.rb
-- lib/sportdb/readers/outline_reader.rb
 - lib/sportdb/readers/version.rb
 - test/helper.rb
 - test/test_match_parser.rb