sportdb-readers 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34f6b00e00c0ff63899b32ef86eefd077d54315a
-  data.tar.gz: 6da90ea9439ed32f442fb148ce79d3184bfa7e32
+  metadata.gz: d9ab08e50e95d7fbaf6197f8cea2a7a6dc3cb112
+  data.tar.gz: 68a911b62e1fc80ab12d55874d2e6bc0f3dd63a5
 SHA512:
-  metadata.gz: 8ea4888386c7ae6c371d5145728a04516de88d6aa3d392feb1a141301215fd0268338e944415137ea7ded6e740ff37256da584ef53c411c6f0b2441eef96d9ee
-  data.tar.gz: f43c9e976a1ad41d5096bc7205799eb7371a980f8753dd6f5507e3e68ea46576e971cf41f347a0e369c83c4b4c2f52c6f7d430f1609343bc0a24213aedd2bb15
+  metadata.gz: 73241f497262aaeb3b10a694c7af959745254adfcaa825ef577cbfcf89a5c44b1b6dd795e5c216bb69c6923af477b8306614675e7acd7c82729bb55fab39196e
+  data.tar.gz: 19b772c539490c3e41d9d0324ec1b54afe7b5a973065491a0d14798f1b0dc9242974076d278ded95bbdfa146d5a31fcf7e1ecd1a68aba4e2a19472176ee93e24

data/Manifest.txt

@@ -3,7 +3,6 @@ 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_parser_auto.rb
 lib/sportdb/readers/conf_reader.rb
@@ -18,6 +17,5 @@ test/helper.rb
 test/test_conf_parser_auto.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/version.rb

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

data/lib/sportdb/readers.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
-require 'zip'     ## todo/check: if zip is alreay included in a required module - move into sportdb-formats and add datafile!!!
+require 'zip'     ## todo/check: if zip is alreay included in a required module
+                  ## - move into sportdb-formats and add datafile!!!
 
 
 
@@ -19,7 +20,6 @@ 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'
 require 'sportdb/readers/package'
 

data/test/test_reader.rb

@@ -10,7 +10,88 @@ require 'helper'
 
 class TestReader < MiniTest::Test
 
-  def test_read_i
+
+  def test_read_mauritius
+    SportDb.connect( adapter: 'sqlite3', database: ':memory:' )
+    SportDb.create_all   ## build schema
+
+    ## turn on logging to console
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+leagues_txt =<<TXT
+= Mauritius =
+
+1      Mauritius Premier League
+cup    Mauritius Cup
+TXT
+
+
+clubs_txt =<<TXT
+= Mauritius =
+
+Cercle de Joachim | Cercle de Joachim SC | Joachim
+Chamarel SC | Chamarel | Chamarel Sport Club
+Curepipe Starlight | Curepipe Starlight SC
+Entente Boulet Rouge | Entente Boulet Rouge SC | Entente Boulet Rouge-Riche Mare Rovers
+La Cure Sylvester | La Cure Sylvester SC | La Cure
+Pamplemousses | Pamplemousses SC
+Petite Rivière Noire | Petite Rivière Noire SC | Petite Rivière
+AS Port-Louis 2000 | ASPL 2000 | Port-Louis 2000 |Association Sportive Port-Louis 2000
+AS Quatre Bornes | ASQB | Quatre Bornes
+Rivière du Rempart | AS Rivière du Rempart
+Pointe-aux-Sables Mates
+Savanne SC | Savanne Sporting Club
+TXT
+
+    recs = SportDb::Import::LeagueReader.parse( leagues_txt )
+    SportDb::Import::config.leagues.add( recs )
+
+    recs = SportDb::Import::ClubReader.parse( clubs_txt )
+    SportDb::Import::config.clubs.add( recs )
+
+    pp recs
+
+    country = SportDb::Import::config.countries[ 'Mauritius']
+    pp country
+    clubs = SportDb::Import::config.clubs.match( 'Chamarel SC' )
+    pp clubs
+    club = SportDb::Import::config.clubs.find_by( name: 'Chamarel SC',
+                                                  country: country )
+    pp club
+
+txt =<<TXT
+= Mauritius Premier League 2014/15 =
+
+Matchday 1
+[Wed Nov/5]
+  Curepipe Starlight    1-3  Petite Rivière Noire
+  AS Quatre Bornes      1-0  La Cure Sylvester
+  Pamplemousses         0-1  Rivière du Rempart
+  AS Port-Louis 2000    5-1  Entente Boulet Rouge
+  Chamarel SC           2-3  Cercle de Joachim
+
+Matchday 2
+[Sun Nov/9]
+  Curepipe Starlight    2-1  AS Quatre Bornes
+  Entente Boulet Rouge  1-2  Chamarel SC
+  Rivière du Rempart    1-1  AS Port-Louis 2000
+  La Cure Sylvester     1-2  Pamplemousses
+  Petite Rivière Noire  2-0  Cercle de Joachim
+
+Matchday 3
+[Wed Nov/12]
+  AS Quatre Bornes      1-2  Petite Rivière Noire
+  Pamplemousses         0-4  Curepipe Starlight
+  Chamarel SC           1-1  Rivière du Rempart
+  Cercle de Joachim     2-2  Entente Boulet Rouge
+  AS Port-Louis 2000    1-0  La Cure Sylvester
+TXT
+
+    SportDb::MatchReaderV2.parse( txt )
+  end  # method test_read_mauritius
+
+
+  def xxx_test_read_eng
     SportDb.connect( adapter: 'sqlite3', database: ':memory:' )
     SportDb.create_all   ## build schema
 
@@ -55,10 +136,10 @@ Matchday 2
 TXT
 
     SportDb::MatchReaderV2.parse( txt )
-  end  # method test_read_i
+  end  # method test_read_eng
 
 
-  def xxx_test_read_ii
+  def xxx_test_read
     SportDb.connect( adapter: 'sqlite3', database: ':memory:' )
     SportDb.create_all   ## build schema
 
@@ -80,5 +161,5 @@ TXT
     recs = SportDb::MatchReaderV2.read( path )
     # path = "../../../openfootball/england/2017-18/1-premierleague-ii.txt"
     #recs = SportDb::MatchReaderV2.read( path )
-  end  # method test_read_ii
+  end  # method test_read
 end  # class TestReader

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2019-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-config
@@ -95,7 +95,6 @@ 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_parser_auto.rb
 - lib/sportdb/readers/conf_reader.rb
@@ -110,7 +109,6 @@ files:
 - test/test_conf_parser_auto.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

data/lib/sportdb/readers/club_props_reader.rb

@@ -1,70 +0,0 @@
-# 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/test/test_props.rb

@@ -1,47 +0,0 @@
-# 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