sportdb-readers 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46454d349dc5a94aea1f56de0b900244df2607bd
-  data.tar.gz: b51de78a375e0a63838e845512c794b2abfdee62
+  metadata.gz: 7a80a58bb3ddb33bdba8040a926546b548ba5436
+  data.tar.gz: 608847551d5a437ab847e91aa79ea82626d010cf
 SHA512:
-  metadata.gz: 6fde9823e1e243e8f3be5824b1ff8846e7ad2f531551cc49a9e17165927b96305320d497a7385f45d9e56362c3d30fcc271f9d88b288a12df2ef4aab7ebba74b
-  data.tar.gz: 06b38e7dbce194808a843fd1b735002c31e5cd574a4c2b2b1c9bbe8d7b29c1c96c2c6690306b9514159f3d797d291d0dd09f7bd11405abae8e19f00be06b2d76
+  metadata.gz: fc388f76b6b1ec3ca85ea4bea73ace80f13af88ef05eb7601b04176aeca742c35e828ee1fa6d5ca674d6a71789007f5b785185e8b241db4ee14e89218ff624ca
+  data.tar.gz: aa7ed9979898a56656f16d9093687b3d4c7a1590add76d4d5a866966e5bd2169e545fabcbc0fdc11f7c79b2ac8677667c9ca52d7a57e0dfb23963becbaa2d71f

data/lib/sportdb/readers.rb

@@ -22,20 +22,22 @@ require 'sportdb/readers/match_linter'
 ##  add convenience shortcut helpers
 module SportDb
 
-  def self.read_conf( path, sync: true )    ## note: sync is dry run (for lint checking)
-    sync ?  ConfReaderV2.read( path ) : ConfLinter.read( path )
+  def self.read_conf( path, sync: true, season: nil )    ## note: sync is dry run (for lint checking)
+    sync ? ConfReaderV2.read( path, season: season )
+         : ConfLinter.read( path, season: season )
   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 )
+  def self.read_match( path, sync: true, season: nil )     ## note: sync is dry run (for lint checking)
+    sync ? MatchReaderV2.read( path, season: season )
+         : MatchLinter.read( path, season: season )
   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.lint_conf( path, season: nil )   read_conf( path, sync: false, season: season ); end
+  def self.lint_match( path, season: nil )  read_match( path, sync: false, season: season ); end
 
 
-  def self.read( path, sync: true )
+  def self.read( path, sync: true, season: nil )
     ## step 1: collect all datafiles
     if File.directory?( path )   ## if directory read complete package
       datafiles_conf = Datafile.find_conf( path )
@@ -43,19 +45,19 @@ module SportDb
                                                /[a-z0-9_-]+\.txt$    ## txt e.g /1-premierleague.txt
                                               }x )
 
-      datafiles_conf.each { |datafile| read_conf( datafile, sync: sync ) }
-      datafiles.each { |datafile| read_match( datafile, sync: sync ) }
+      datafiles_conf.each { |datafile| read_conf( datafile, sync: sync, season: season ) }
+      datafiles.each { |datafile| read_match( datafile, sync: sync, season: season ) }
     else
       ## check if datafile matches conf(iguration) naming (e.g. .conf.txt)
       if Datafile.match_conf( path )
-        read_conf( path, sync: sync )
+        read_conf( path, sync: sync, season: season )
       else   ## assume "regular" match datafile
-        read_match( path, sync: sync )
+        read_match( path, sync: sync, season: season )
       end
     end
   end  # method read
 
-  def self.lint( path )  read( path, sync: false ); end
+  def self.lint( path, season: nil )  read( path, sync: false, season: season ); end
 
 end # module SportDb
 

data/lib/sportdb/readers/conf_linter.rb

@@ -8,16 +8,16 @@ 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?
+  def self.read( path, season: nil )   ## 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 )
+    parse( txt, season: season )
   end
 
-  def self.parse( txt )
-    recs = LeagueOutlineReader.parse( txt )
+  def self.parse( txt, season: nil )
+    recs = LeagueOutlineReader.parse( txt, season: season )
 
-    if recs.empty?
+    if recs.empty?     ## todo: check for season filter - why? why not?
       puts "  ** !!! WARN !!! - no league headings found"
     else
       puts "  found #{recs.size} league (+season+stage) headings"
@@ -59,7 +59,7 @@ class ConfLinter
           name = line
         end
 
-        clubs << find_club( name, league.country )
+        clubs << config.clubs.find_by!( name: name, country: league.country )
       end
 
       rec[:clubs] = clubs
@@ -69,35 +69,5 @@ class ConfLinter
     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/conf_reader.rb

@@ -8,13 +8,13 @@ class ConfReaderV2    ## todo/check: rename to EventsReaderV2 (use plural?) why?
   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?
+  def self.read( path, season: nil )   ## use - rename to read_file or from_file etc. - why? why not?
     txt = File.open( path, 'r:utf-8' ).read
-    parse( txt )
+    parse( txt, season: season )
   end
 
-  def self.parse( txt )
-    recs = LeagueOutlineReader.parse( txt )
+  def self.parse( txt, season: nil )
+    recs = LeagueOutlineReader.parse( txt, season: season )
     pp recs
 
     ## pass 2 - check & map; replace inline (string with record)
@@ -47,7 +47,7 @@ class ConfReaderV2    ## todo/check: rename to EventsReaderV2 (use plural?) why?
           name = line
         end
 
-        clubs << find_club( name, league.country )
+        clubs << config.clubs.find_by( name: name, country: league.country )
       end
 
       rec[:clubs] = clubs
@@ -84,35 +84,5 @@ class ConfReaderV2    ## todo/check: rename to EventsReaderV2 (use plural?) why?
     recs
   end # method read
 
-
-
-  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 ConfReaderV2
 end # module SportDb

data/lib/sportdb/readers/league_outline_reader.rb

@@ -21,7 +21,8 @@ class LeagueOutlineReader
          )
             $/x
 
-  def self.parse( txt )
+
+  def self.parse( txt, season: nil )
     recs=[]
     OutlineReader.parse( txt ).each do |node|
       if node[0] == :h1
@@ -56,7 +57,22 @@ class LeagueOutlineReader
       end
     end
 
-    ## pass 2 - check & map; replace inline (string with data record)
+
+    ## pass 2 - filter seasons if filter present
+    if season
+       filtered_recs = []
+       filter = normalize_seasons( season )
+       recs.each do |rec|
+         if filter.include?( SeasonUtils.key( rec[:season] ))
+           filtered_recs << rec
+         else
+           puts "  skipping season >#{rec[:season]}< NOT matched by filter"
+         end
+       end
+       recs = filtered_recs
+    end
+
+    ## pass 3 - check & map; replace inline (string with data record)
     recs.each do |rec|
       league = find_league( rec[:league] )
       rec[:league] = league
@@ -68,6 +84,18 @@ class LeagueOutlineReader
   end # method parse
 
 
+
+  def self.normalize_seasons( season_or_seasons )     ## todo/check: add alias norm_seasons - why? why not?
+      seasons = if season_or_seasons.is_a? String    ## wrap in array
+                  [season_or_seasons]
+                else  ## assume it's an array already
+                   season_or_seasons
+                end
+
+      seasons.map { |season| SeasonUtils.key( season ) }
+  end
+
+
   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
@@ -94,6 +122,7 @@ class LeagueOutlineReader
   end
 
 
+  ### fix/todo: move find_league  to sportdb-league index use find_by! and find_by !!!!
   def self.find_league( name )
     league = nil
     m = config.leagues.match( name )

data/lib/sportdb/readers/match_linter.rb

@@ -4,16 +4,16 @@ module SportDb
 
 class MatchLinter
 
-  def self.read( path )   ## use - rename to read_file or from_file etc. - why? why not?
+  def self.read( path, season: nil )   ## 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 )
+    parse( txt, season: season )
   end
 
-  def self.parse( txt )
-    recs = LeagueOutlineReader.parse( txt )
+  def self.parse( txt, season: nil )
+    recs = LeagueOutlineReader.parse( txt, season: season )
 
-    if recs.empty?
+    if recs.empty?    ## todo - check for filter - why? why not?
       puts "  ** !!! WARN !!! - no league headings found"
     else
       puts "  found #{recs.size} league (+season+stage) headings"

data/lib/sportdb/readers/match_reader.rb

@@ -4,13 +4,13 @@ module SportDb
 
 class MatchReaderV2    ## todo/check: rename to MatchReaderV2 (use plural?) why? why not?
 
-  def self.read( path )   ## use - rename to read_file or from_file etc. - why? why not?
+  def self.read( path, season: nil )   ## use - rename to read_file or from_file etc. - why? why not?
     txt = File.open( path, 'r:utf-8' ).read
-    parse( txt )
+    parse( txt, season: season )
   end
 
-  def self.parse( txt )
-    recs = LeagueOutlineReader.parse( txt )
+  def self.parse( txt, season: nil )
+    recs = LeagueOutlineReader.parse( txt, season: season )
     pp recs
 
     recs.each do |rec|

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 = 2
+  PATCH = 3
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-config