sportdb-formats 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 666fc1f16808dddbc988aa073c0d3b47c08a5934
-  data.tar.gz: 97437435e1f37341c9f2cc15c8b4e67adf0efe61
+  metadata.gz: bcac09da9cbe9b0e7d703df7b6b5075025979655
+  data.tar.gz: 71b00a95c66920bd25c1d92d0b4a29a2ec4436e3
 SHA512:
-  metadata.gz: 9498c5e378feab9fa1e80a8287f33ab608e606ecde6ae914997483850faffbbbc7695ef07d2cea1e04a529e724b01612e8231fe8625c19d0af34f3fabffd0a14
-  data.tar.gz: 28146d5c35a061f6c128a001c190681eb76de5471cde8124435e77d93ccca090bf0a84a7a6a09ccb67372f8edef0198e8f09390126629d14072901ff5fcb7743
+  metadata.gz: 81b387f334f672dbe493884bde8661dfd83c892a834bec422c95efc5231141f556397d5aacdfd7665e935589f5cffcedcbeab1f0993a414e8678ae56c89e80ab
+  data.tar.gz: ba6546d68cafa1198c39dec94d91481ec6652d051f3e9887b1366a1319a9a6b35667313390fac1bbae3cc46056468aff0d3bc41a8e128d429f0f9a16d2c7f998

data/Manifest.txt

@@ -3,7 +3,6 @@ Manifest.txt
 README.md
 Rakefile
 lib/sportdb/formats.rb
-lib/sportdb/formats/config.rb
 lib/sportdb/formats/country/country_index.rb
 lib/sportdb/formats/country/country_reader.rb
 lib/sportdb/formats/datafile.rb
@@ -19,25 +18,9 @@ lib/sportdb/formats/match/mapper.rb
 lib/sportdb/formats/match/mapper_teams.rb
 lib/sportdb/formats/match/match_parser.rb
 lib/sportdb/formats/match/match_parser_auto_conf.rb
-lib/sportdb/formats/match/match_parser_csv.rb
-lib/sportdb/formats/match/match_status_parser.rb
-lib/sportdb/formats/name_helper.rb
 lib/sportdb/formats/outline_reader.rb
 lib/sportdb/formats/package.rb
 lib/sportdb/formats/parser_helper.rb
-lib/sportdb/formats/score/score_formats.rb
-lib/sportdb/formats/score/score_parser.rb
-lib/sportdb/formats/season_utils.rb
-lib/sportdb/formats/structs/country.rb
-lib/sportdb/formats/structs/group.rb
-lib/sportdb/formats/structs/league.rb
-lib/sportdb/formats/structs/match.rb
-lib/sportdb/formats/structs/matchlist.rb
-lib/sportdb/formats/structs/round.rb
-lib/sportdb/formats/structs/season.rb
-lib/sportdb/formats/structs/standings.rb
-lib/sportdb/formats/structs/team.rb
-lib/sportdb/formats/structs/team_usage.rb
 lib/sportdb/formats/team/club_index.rb
 lib/sportdb/formats/team/club_index_history.rb
 lib/sportdb/formats/team/club_reader.rb
@@ -53,23 +36,16 @@ test/test_club_index_history.rb
 test/test_club_reader.rb
 test/test_club_reader_history.rb
 test/test_club_reader_props.rb
-test/test_clubs.rb
 test/test_country_index.rb
 test/test_country_reader.rb
-test/test_csv_reader.rb
 test/test_datafile.rb
 test/test_datafile_package.rb
 test/test_goals.rb
 test/test_league_index.rb
 test/test_league_outline_reader.rb
 test/test_league_reader.rb
-test/test_match.rb
-test/test_match_status_parser.rb
-test/test_name_helper.rb
 test/test_outline_reader.rb
 test/test_package.rb
 test/test_package_match.rb
 test/test_regex.rb
-test/test_scores.rb
-test/test_season.rb
 test/test_wiki_reader.rb

data/Rakefile

@@ -20,12 +20,9 @@ Hoe.spec 'sportdb-formats' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['alphabets',     '>= 1.0.0'],
-    ['date-formats',  '>= 1.0.1'],
-    ['csvreader',     '>= 1.2.4'],
-    ['sportdb-langs', '>= 0.1.1'],
+    ['sportdb-structs', '>= 0.1.0'],
 
-    ['rubyzip',       '>= 1.2.4' ],
+    ['rubyzip',         '>= 1.2.4' ],
   ]
 
   self.spec_extras = {

data/lib/sportdb/formats.rb

@@ -1,43 +1,9 @@
-# encoding: utf-8
-
-
 ## 3rd party gems
-require 'alphabets'      # downcase_i18n, unaccent, variants, ...
-require 'date/formats'   # DateFormats.parse, find!, ...
-require 'csvreader'
-
-require 'zip'     ## todo/check: if zip is alreay included in a required module
-
-
-
-def read_csv( path, sep:             nil,
-                    symbolize_names: nil )
-  opts = {}
-  opts[:sep]               = sep         if sep
-  opts[:header_converters] = :symbol     if symbolize_names
-
-  CsvHash.read( path, **opts )
-end
+require 'sportdb/structs'
 
-def parse_csv( txt, sep:             nil,
-                    symbolize_names: nil )
-  opts = {}
-  opts[:sep]               = sep         if sep
-  opts[:header_converters] = :symbol     if symbolize_names
-
-  CsvHash.parse( txt, **opts )
-end
-
-
-
-## more sportdb libs/gems
-require 'sportdb/langs'
 
+require 'zip'     ## todo/check: if zip is alreay included in a required module
 
-## todo/fix: move shortcut to sportdb/langs!!!
-module SportDb
-  Logging = LogUtils::Logging     ## logging machinery shortcut; use LogUtils for now
-end
 
 
 
@@ -45,43 +11,59 @@ end
 # our own code
 require 'sportdb/formats/version' # let version always go first
 
-require 'sportdb/formats/config'  # let "global" config "framework" go next - why? why not?
-
 require 'sportdb/formats/outline_reader'
 require 'sportdb/formats/datafile'
 require 'sportdb/formats/datafile_package'
 require 'sportdb/formats/package'
-require 'sportdb/formats/season_utils'
 
-require 'sportdb/formats/name_helper'
+
 require 'sportdb/formats/parser_helper'
 
-require 'sportdb/formats/structs/country'
-require 'sportdb/formats/structs/season'
-require 'sportdb/formats/structs/league'
-require 'sportdb/formats/structs/team'
-require 'sportdb/formats/structs/round'
-require 'sportdb/formats/structs/group'
-require 'sportdb/formats/structs/match'
-require 'sportdb/formats/structs/matchlist'
-require 'sportdb/formats/structs/standings'
-require 'sportdb/formats/structs/team_usage'
+
+module SportDb
+  module Import
+    Season = ::Season   ## add a convenience alias for top-level Season class
+
+    ## add "old" convenience aliases for structs - why? why not?
+    ##   todo/check: just use include Sports !!!!
+    Country      = ::Sports::Country
+    League       = ::Sports::League
+    Group        = ::Sports::Group
+    Round        = ::Sports::Round
+    Match        = ::Sports::Match
+    Matchlist    = ::Sports::Matchlist
+    Goal         = ::Sports::Goal
+    Team         = ::Sports::Team
+    NationalTeam = ::Sports::NationalTeam
+    Club         = ::Sports::Club
+    Standings    = ::Sports::Standings
+    TeamUsage    = ::Sports::TeamUsage
+
+
+    class Team
+      ## add convenience lookup helper / method for name by season for now
+      ##   use clubs history - for now kept separate from struct - why? why not?
+      def name_by_season( season )
+        ## note: returns / fallback to "regular" name if no records found in history
+        SportDb::Import.catalog.clubs_history.find_name_by( name: name, season: season ) || name
+      end
+    end  # class Team
+
+  end   # module Import
+end     # module SportDb
 
 
-require 'sportdb/formats/score/score_formats'
-require 'sportdb/formats/score/score_parser'
 require 'sportdb/formats/goals'
 
 
+
 require 'sportdb/formats/match/mapper'
 require 'sportdb/formats/match/mapper_teams'
-require 'sportdb/formats/match/match_status_parser'
 require 'sportdb/formats/match/match_parser'
 require 'sportdb/formats/match/match_parser_auto_conf'
 require 'sportdb/formats/match/conf_parser'
 
 
-require 'sportdb/formats/match/match_parser_csv'
 
 require 'sportdb/formats/country/country_reader'
 require 'sportdb/formats/country/country_index'
@@ -128,7 +110,8 @@ require 'sportdb/formats/team/club_index_history'
 ###
 # add convenience helpers / shortcuts
 module SportDb
-module Import
+  module Import
+
 class Club
   def self.read( path )  ClubReader.read( path ); end
   def self.parse( txt )  ClubReader.parse( txt ); end
@@ -137,6 +120,7 @@ class Club
   def self.parse_props( txt )  ClubPropsReader.parse( txt ); end
   ##  todo/check: use ClubProps.read and ClubProps.parse convenience alternate shortcuts - why? why not?
 end # class Club
+
 end   # module Import
 end   # module SportDb
 
@@ -159,23 +143,4 @@ end   # module SportDb
 
 
 
-
-
-
-
-## let's put test configuration in its own namespace / module
-module SportDb
-class Test    ## todo/check: works with module too? use a module - why? why not?
-
-  ####
-  #  todo/fix:  find a better way to configure shared test datasets - why? why not?
-  #    note: use one-up (..) directory for now as default - why? why not?
-  def self.data_dir()        @data_dir ||= '../test'; end
-  def self.data_dir=( path ) @data_dir = path; end
-end
-end   # module SportDb
-
-
-
-
 puts SportDb::Module::Formats.banner   # say hello

data/lib/sportdb/formats/event/event_reader.rb

@@ -90,7 +90,7 @@ class EventInfo
         season_col = row['Season'] || row['Year']
         dates_col  = row['Dates']
 
-        season = Import::Season.new( season_col )
+        season = Import::Season.parse( season_col )
         league = catalog.leagues.find!( league_col )
 
 

data/lib/sportdb/formats/league/league_outline_reader.rb

@@ -65,7 +65,7 @@ class LeagueOutlineReader   ## todo/check - rename to LeaguePageReader / LeagueP
        filtered_secs = []
        filter = norm_seasons( season )
        secs.each do |sec|
-         if filter.include?( Import::Season.new( sec[:season] ).key )
+         if filter.include?( Season.parse( sec[:season] ).key )
            filtered_secs << sec
          else
            puts "  skipping season >#{sec[:season]}< NOT matched by filter"
@@ -76,7 +76,7 @@ class LeagueOutlineReader   ## todo/check - rename to LeaguePageReader / LeagueP
 
     ## pass 3 - check & map; replace inline (string with data struct record)
     secs.each do |sec|
-      sec[:season] = Import::Season.new( sec[:season ] )
+      sec[:season] = Season.parse( sec[:season ] )
       sec[:league] = catalog.leagues.find!( sec[:league] )
 
       check_stage( sec[:stage] )   if sec[:stage]   ## note: only check for now (no remapping etc.)
@@ -100,14 +100,18 @@ class LeagueOutlineReader   ## todo/check - rename to LeaguePageReader / LeagueP
          )
             $}x
 
+
   def norm_seasons( season_or_seasons )     ## todo/check: add alias norm_seasons - why? why not?
-      seasons = if season_or_seasons.is_a?( String )   ## wrap in array
+
+      seasons = if season_or_seasons.is_a?( Array )  # is it an array already
+                  season_or_seasons
+                elsif season_or_seasons.is_a?( Range )  # e.g. Season(1999)..Season(2001) or such
+                  season_or_seasons.to_a
+                else  ## assume - single entry - wrap in array
                   [season_or_seasons]
-                else  ## assume it's an array already
-                   season_or_seasons
                 end
 
-      seasons.map { |season| Import::Season.new( season ).key }
+      seasons.map { |season| Season( season ).key }
   end
 
 
@@ -141,8 +145,16 @@ class LeagueOutlineReader   ## todo/check - rename to LeaguePageReader / LeagueP
     'Europa League Play-off',
     'Europa-League-Play-offs',
     'Playoffs - Championship',
+    'Playoffs - Europa League',
+    'Playoffs - Europa League - Finals',
     'Playoffs - Relegation',
     'Finals',
+
+    'Apertura',
+    'Apertura - Liguilla',
+    'Clausura',
+    'Clausura - Liguilla',
+
   ].map {|name| name.downcase.gsub( /[^a-z]/, '' ) }
 
 

data/lib/sportdb/formats/package.rb

@@ -335,13 +335,13 @@ module SportDb
       ##             filter.skip? filter.include? ( season_sason_key )?
       ##             fiteer.before?( season_key )  etc.
       ##              find some good method names!!!!
-      season_start = start ? Import::Season.new( start ) : nil
+      season_start = start ? Season( start ) : nil
 
       h = {}
       match( format: format ).each do |entry|
         ## note: assume last directory in datafile path is the season part/key
         season_q = File.basename( File.dirname( entry.name ))
-        season   = Import::Season.new( season_q )  ## normalize season
+        season   = Season.parse( season_q )  ## normalize season
 
         ## skip if start season before this season
         next if season_start && season_start.start_year > season.start_year

data/lib/sportdb/formats/team/club_index_history.rb

@@ -79,7 +79,7 @@ class ClubHistoryIndex
       club_new = catalog.clubs.find_by!( name: name_new, country: country_new )
 
       ## note use season obj for now (and NOT key) - why? why not?
-      season = Season.new( season_key )
+      season = Season.parse( season_key )
 
       ## todo/check:
       ##   check if  club_old and club_new reference different club record!!
@@ -108,7 +108,7 @@ class ClubHistoryIndex
   def find_name_by( name:, season: )
     recs = @clubs[ name ]
     if recs
-      season = season( season )   ## make sure season is a season obj (and NOT a string)
+      season = Season( season )   ## make sure season is a season obj (and NOT a string)
       ## check season records for name; use linear search (assume only few records)
       recs.each do |rec|
         if season >= rec[0]
@@ -124,10 +124,6 @@ class ClubHistoryIndex
 
   ##################
   ## helpers
-  def season( season )
-    season.is_a?( Season ) ? season : Season.new( season )
-  end
-
   def strip_geo( name )
     ## e.g. Arsenal, London   =>   Arsenal
     name.split(',')[0].strip

data/lib/sportdb/formats/team/club_reader_history.rb

@@ -80,7 +80,7 @@ def parse
             last_keyword = nil
          elsif heading_level == 2
             ## assume season
-            season = Season.new( heading )
+            season = Season.parse( heading )
             puts "  season >#{heading}< => #{season.key}"
             last_season  = season  ## reset "lowwer levels" - keyword
             last_keyword = nil

data/lib/sportdb/formats/team/club_reader_props.rb

@@ -61,13 +61,29 @@ class ClubPropsReader
         ## todo/fix:   only updated "on-demand" from in-memory struct/records!!!!
 
         ##  update attributes
-        club_rec.key  = rec['Key']      if rec['Key']
-        club_rec.code = rec['Code']     if rec['Code']
+        club_rec.key  = rec['Key']      if is_not_na?( rec['Key'] )
+        club_rec.code = rec['Code']     if is_not_na?( rec['Code'] )
         ## todo/fix: add (some) more props e.g. address, web, etc.
       end
     end
   end # method parse
 
+
+  ## allow various values for nil or n/a (not available/applicable) for now
+  ##  add more or less - why? why not?
+  def is_not_na?( col ) !is_na?( col); end   ## check: find a better name - why? why not?
+
+  NA_VARIANTS = ['-', '--', '---',
+                 '?', '??', '???',
+                 '_', '__', '___',
+                 'na', 'n/a',
+                 'nil', 'null']
+
+  def is_na?( col )
+    col.nil? || col.empty? || NA_VARIANTS.include?( col.downcase )
+  end
+
+
 end # class ClubPropsReader
 
 end ## module Import

data/lib/sportdb/formats/version.rb

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

data/test/helper.rb

@@ -1,6 +1,9 @@
 ## note: use the local version of gems
 $LOAD_PATH.unshift( File.expand_path( '../date-formats/lib' ))
+$LOAD_PATH.unshift( File.expand_path( '../score-formats/lib' ))
 $LOAD_PATH.unshift( File.expand_path( '../sportdb-langs/lib' ))
+$LOAD_PATH.unshift( File.expand_path( '../sportdb-structs/lib' ))
+
 
 
 ## minitest setup

metadata

@@ -1,71 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-formats
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-01 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: alphabets
+  name: sportdb-structs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: date-formats
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: csvreader
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.4
-- !ruby/object:Gem::Dependency
-  name: sportdb-langs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +80,6 @@ files:
 - README.md
 - Rakefile
 - lib/sportdb/formats.rb
-- lib/sportdb/formats/config.rb
 - lib/sportdb/formats/country/country_index.rb
 - lib/sportdb/formats/country/country_reader.rb
 - lib/sportdb/formats/datafile.rb
@@ -138,25 +95,9 @@ files:
 - lib/sportdb/formats/match/mapper_teams.rb
 - lib/sportdb/formats/match/match_parser.rb
 - lib/sportdb/formats/match/match_parser_auto_conf.rb
-- lib/sportdb/formats/match/match_parser_csv.rb
-- lib/sportdb/formats/match/match_status_parser.rb
-- lib/sportdb/formats/name_helper.rb
 - lib/sportdb/formats/outline_reader.rb
 - lib/sportdb/formats/package.rb
 - lib/sportdb/formats/parser_helper.rb
-- lib/sportdb/formats/score/score_formats.rb
-- lib/sportdb/formats/score/score_parser.rb
-- lib/sportdb/formats/season_utils.rb
-- lib/sportdb/formats/structs/country.rb
-- lib/sportdb/formats/structs/group.rb
-- lib/sportdb/formats/structs/league.rb
-- lib/sportdb/formats/structs/match.rb
-- lib/sportdb/formats/structs/matchlist.rb
-- lib/sportdb/formats/structs/round.rb
-- lib/sportdb/formats/structs/season.rb
-- lib/sportdb/formats/structs/standings.rb
-- lib/sportdb/formats/structs/team.rb
-- lib/sportdb/formats/structs/team_usage.rb
 - lib/sportdb/formats/team/club_index.rb
 - lib/sportdb/formats/team/club_index_history.rb
 - lib/sportdb/formats/team/club_reader.rb
@@ -172,25 +113,18 @@ files:
 - test/test_club_reader.rb
 - test/test_club_reader_history.rb
 - test/test_club_reader_props.rb
-- test/test_clubs.rb
 - test/test_country_index.rb
 - test/test_country_reader.rb
-- test/test_csv_reader.rb
 - test/test_datafile.rb
 - test/test_datafile_package.rb
 - test/test_goals.rb
 - test/test_league_index.rb
 - test/test_league_outline_reader.rb
 - test/test_league_reader.rb
-- test/test_match.rb
-- test/test_match_status_parser.rb
-- test/test_name_helper.rb
 - test/test_outline_reader.rb
 - test/test_package.rb
 - test/test_package_match.rb
 - test/test_regex.rb
-- test/test_scores.rb
-- test/test_season.rb
 - test/test_wiki_reader.rb
 homepage: https://github.com/sportdb/sport.db
 licenses: