sportdb-readers 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4299b02180313d31b3706a9248032471ffff4b23
-  data.tar.gz: b11257f793ff6292ad4bb201f3326e719c791360
+  metadata.gz: fbf4efcbeb2e1af833862fa9654f7832552082d3
+  data.tar.gz: 108ddbf3e0951307fc5ad1c3c36a9b11e00c16cb
 SHA512:
-  metadata.gz: 1e73305335ddcc20ffcfbd064770edb6469b4b3ab62c3c574e76fbdcb3522f42256f3f337e9a07bef5ffb7ed15786f96fd9c04c5267281aa2cba34283e6284fb
-  data.tar.gz: e0b4d66842c4e66c7bb818496abc26cf75e2932617c19446bc9a804cdde01437866a1d7e61f5364940c569d3f196aa056592fc6fe349afb45b184914afffb627
+  metadata.gz: 720dcb7703b7687eeae81485ee95a702c9ac433d468ba9bba8ab04a3dc0417e97d9a72fc6b862fca4f5e9a29b228ab2310cc1f2a8cbddb215e168e06f6c1a818
+  data.tar.gz: 193d88f88d0404499f5a2f18c5034fabec41d977a1864936edc46f26b3260552fa44028cd8134940acb4dc912a12a2f47aba8f84642c730ce2ebdd790cd04583

data/Manifest.txt

@@ -3,6 +3,7 @@ Manifest.txt
 README.md
 Rakefile
 lib/sportdb/readers.rb
+lib/sportdb/readers/club_props_reader.rb
 lib/sportdb/readers/conf_linter.rb
 lib/sportdb/readers/conf_reader.rb
 lib/sportdb/readers/datafile.rb
@@ -14,5 +15,6 @@ lib/sportdb/readers/version.rb
 test/helper.rb
 test/test_match_parser.rb
 test/test_package.rb
+test/test_props.rb
 test/test_read.rb
 test/test_reader.rb

data/lib/sportdb/readers.rb

@@ -18,6 +18,7 @@ require 'sportdb/readers/conf_linter'
 require 'sportdb/readers/match_parser'
 require 'sportdb/readers/match_reader'
 require 'sportdb/readers/match_linter'
+require 'sportdb/readers/club_props_reader'
 require 'sportdb/readers/datafile'
 
 

data/lib/sportdb/readers/club_props_reader.rb

@@ -0,0 +1,70 @@
+# encoding: utf-8
+
+
+module SportDb
+module Import
+
+
+class ClubPropsReader
+
+  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?
+    txt = File.open( path, 'r:utf-8' ).read
+    parse( txt )
+  end
+
+  def self.parse( txt )
+    recs = parse_csv( txt )
+    recs.each do |rec|
+      name = rec[:name]
+      if name.nil?
+        puts "** !!! ERROR !!! Name column required / missing / NOT found in row:"
+        pp rec
+        exit 1
+      end
+
+      ## find / match club by (canocial) name
+      m = config.clubs.match( name )
+      if m && m.size > 1
+        puts "** !!! WARN !!! ambigious (multiple) club matches (#{m.size}) for name >#{name}< in props row:"
+        pp rec
+        pp m
+
+        ## todo/fix:  try filter by canonical name if more than one match
+        m = m.select { |club| club.name == name }
+        m = nil    if m.empty?     ## note: reset to nil if no more matches
+      end
+
+      if m.nil?
+        puts "** !!! ERROR !!! no club match for (canonical) name >#{name}< in props row:"
+        pp rec
+        exit 1
+      elsif m.size > 1
+        puts "** !!! ERROR !!! ambigious (multiple) club matches (#{m.size}) for (canonical) name >#{name}< in props row:"
+        pp rec
+        pp m
+        exit 1
+      else   ## assume size == 1, bingo!!!
+        club_rec = m[0]
+        ## todo/fix:  warn if name differes from (canonical) name
+        ## todo/fix:  also add props to in-memory structs/records!!!
+        ## todo/fix:   only updated "on-demand" from in-memory struct/records!!!!
+
+        ## update database
+        club = Sync::Club.find_or_create( club_rec )
+        ##  update attributes
+        attributes = {}
+        attributes[:key]  = rec[:key]      if rec[:key]
+        attributes[:code] = rec[:code]     if rec[:code]
+
+        club.attributes = attributes
+        club.save!
+      end
+    end
+  end # method parse
+
+end # class ClubPropsReader
+
+end ## module Import
+end ## module SportDb

data/lib/sportdb/readers/datafile.rb

@@ -12,6 +12,12 @@ module Datafile
                  /[a-z0-9_-]+\.txt$  ## txt e.g /1-premierleague.txt
               }x
 
+  CLUBS_PROPS_RE = %r{  (?:^|/)               # beginning (^) or beginning of path (/)
+                         (?:[a-z]{1,4}\.)?   # optional country code/key e.g. eng.clubs.props.txt
+                        clubs\.props\.txt$
+                     }x
+  def self.match_clubs_props( path, pattern: CLUBS_PROPS_RE ) pattern.match( path ); end
+
   ZIP_RE = %r{ \.zip$
             }x
   def self.match_zip( path, pattern: ZIP_RE ) pattern.match( path ); end
@@ -26,6 +32,14 @@ class PackageBase
   def each_match( &blk )  each( pattern: MATCH_RE, &blk ); end
 
 
+
+  def read_clubs_props
+    each_read( pattern: CLUBS_PROPS_RE ) do |name, txt|
+      ## todo/fix:  add/use SportDb.parse_club_props helper !!!!!!
+      SportDb::Import::ClubPropsReader.parse( txt )
+    end
+  end
+
   def read_conf( *names,
                  season: nil, sync: true )
     if names.empty?   ## no (entry) names passed in; read in all
@@ -58,11 +72,13 @@ class PackageBase
   def read( *names,
             season: nil, sync: true )
     if names.empty?   ##  read all datafiles
+      read_clubs_props()   if sync
       read_conf( season: season, sync: sync )
       read_match( season: season, sync: sync )
     else
       names.each do |name|
         txt = read_entry( name )
+        ## fix/todo: add read_clubs_props too!!!
         if Datafile.match_conf( name )      ## check if datafile matches conf(iguration) naming (e.g. .conf.txt)
           SportDb.parse_conf( txt, season: season, sync: sync )
         else                                ## assume "regular" match datafile

data/lib/sportdb/readers/version.rb

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

data/test/test_props.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_props.rb
+
+
+require 'helper'
+
+class TestProps < MiniTest::Test
+
+  ENG_CLUBS_PROPS_TXT =<<TXT
+####################################
+# English League Teams
+#
+#  note: three letter codes (tags) taken from official premierleague.com site
+
+Key,           Name,                    Code
+chelsea,       Chelsea FC,              CHE
+arsenal,       Arsenal FC,              ARS
+tottenham,     Tottenham Hotspur,       TOT
+westham,       West Ham United,         WHU
+crystalpalace, Crystal Palace,          CRY
+manutd,        Manchester United,       MUN
+mancity,       Manchester City,         MCI
+TXT
+
+  def test_parse_csv
+    recs = parse_csv( ENG_CLUBS_PROPS_TXT )
+    pp recs
+
+    assert_equal [{ key: 'chelsea', name: 'Chelsea FC', code: 'CHE' },
+                  { key: 'arsenal', name: 'Arsenal FC', code: 'ARS' }], recs[0..1]
+  end
+
+
+  def test_parse
+    SportDb.connect( adapter: 'sqlite3', database: ':memory:' )
+    SportDb.create_all   ## build schema
+
+    ## turn on logging to console
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+    SportDb::Import::ClubPropsReader.parse( ENG_CLUBS_PROPS_TXT )
+  end  # method test_parse
+
+end # class TestProps

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Gerald Bauer
@@ -95,6 +95,7 @@ files:
 - README.md
 - Rakefile
 - lib/sportdb/readers.rb
+- lib/sportdb/readers/club_props_reader.rb
 - lib/sportdb/readers/conf_linter.rb
 - lib/sportdb/readers/conf_reader.rb
 - lib/sportdb/readers/datafile.rb
@@ -106,6 +107,7 @@ files:
 - test/helper.rb
 - test/test_match_parser.rb
 - test/test_package.rb
+- test/test_props.rb
 - test/test_read.rb
 - test/test_reader.rb
 homepage: https://github.com/sportdb/sport.db