sportdb-models 1.18.6 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dd5f98f71987e9c250fc7330f8c58b5b73dc59c
-  data.tar.gz: f31178e06e8b4f9a5f08b06c5506252233eb1e1f
+  metadata.gz: b1524cb3a76b16ce80f8b2d484b11f8ab11002f6
+  data.tar.gz: 209a229871e299fab7ac5ca8b90765052fc7da5f
 SHA512:
-  metadata.gz: 30fc84ff5953bd2f390f152f6f912bb18f97a76e7692afcd99b221c3bb86dcd5ad9897ec637e9d1cbc968e2da591796c1446952f6495638f25099af37b1725ce
-  data.tar.gz: f3146353a838f07e34a5b901a5ac9858b8aad3b33467e9cd042dfb43df0e9569de2ffcaa02dcf9ffe333753f667e2a12d3dc8e03d15133be723e0ba5a3c56d1a
+  metadata.gz: a9c48d1be59422f7fb7726e6121e909aceb9dc3a2306caea036ea19a5a64ebd5f4f7ff828009bf23810f48884d26b970b0f63718fa46ff37e7649e78b3b20f98
+  data.tar.gz: 3e77eb48eafbf666afc8a92e5f6ea7d9403e157745b8abb508367292910dc3a355324cacc8a236b434cc7936d90876ff3bff95f177686378c33c0a025cf058fe

data/Manifest.txt

@@ -4,8 +4,6 @@ README.md
 Rakefile
 lib/sportdb/calc.rb
 lib/sportdb/deleter.rb
-lib/sportdb/indexers/team.rb
-lib/sportdb/matcher.rb
 lib/sportdb/models.rb
 lib/sportdb/models/assoc.rb
 lib/sportdb/models/assoc_assoc.rb
@@ -40,115 +38,11 @@ lib/sportdb/models/world/continent.rb
 lib/sportdb/models/world/country.rb
 lib/sportdb/models/world/state.rb
 lib/sportdb/patterns.rb
-lib/sportdb/pretty_printer.rb
-lib/sportdb/reader.rb
-lib/sportdb/reader_file.rb
-lib/sportdb/reader_zip.rb
-lib/sportdb/readers/assoc.rb
-lib/sportdb/readers/event.rb
-lib/sportdb/readers/event_meta.rb
-lib/sportdb/readers/event_table.rb
-lib/sportdb/readers/game.rb
-lib/sportdb/readers/ground.rb
-lib/sportdb/readers/league.rb
-lib/sportdb/readers/season.rb
-lib/sportdb/readers/squad_club.rb
-lib/sportdb/readers/squad_national_team.rb
-lib/sportdb/readers/team.rb
-lib/sportdb/rsssf_reader.rb
 lib/sportdb/schema.rb
 lib/sportdb/standings.rb
 lib/sportdb/stats.rb
-lib/sportdb/utils.rb
-lib/sportdb/utils_date.rb
-lib/sportdb/utils_goals.rb
-lib/sportdb/utils_group.rb
-lib/sportdb/utils_map.rb
-lib/sportdb/utils_round.rb
-lib/sportdb/utils_scores.rb
-lib/sportdb/utils_teams.rb
 lib/sportdb/version.rb
-test/data/at-austria/2013_14/bl.txt
-test/data/at-austria/2013_14/bl.yml
-test/data/at-austria/2013_14/bl_ii.txt
-test/data/at-austria/2013_14/el.txt
-test/data/at-austria/2013_14/el.yml
-test/data/at-austria/2013_14/squads/austria.txt
-test/data/at-austria/2013_14/squads/salzburg.txt
-test/data/at-austria/2014_15/1-bundesliga-ii.txt
-test/data/at-austria/2014_15/1-bundesliga.yml
-test/data/at-austria/2015_16/1-bundesliga-v2.conf.txt
-test/data/at-austria/2015_16/1-bundesliga-v2.yml
-test/data/at-austria/2015_16/1-bundesliga.conf.txt
-test/data/at-austria/2015_16/1-bundesliga.yml
-test/data/at-austria/2015_16/cup.yml
-test/data/at-austria/leagues.txt
-test/data/at-austria/teams.txt
-test/data/at-austria/teams_2.txt
-test/data/csv/de-2013-14--1-bundesliga.txt
-test/data/de-deutschland/2013-14/1-bundesliga.yml
-test/data/de-deutschland/leagues.txt
-test/data/de-deutschland/teams.txt
-test/data/eng-england/2015-16/1-premierleague-v2.yml
-test/data/eng-england/2015-16/1-premierleague.yml
-test/data/national-teams/assocs.txt
-test/data/national-teams/europe/assocs.txt
-test/data/national-teams/europe/teams.txt
-test/data/national-teams/north-america/assocs.txt
-test/data/national-teams/north-america/teams.txt
-test/data/national-teams/teams.txt
-test/data/players/europe/at-austria/players.txt
-test/data/players/europe/de-deutschland/players.txt
-test/data/players/south-america/br-brazil/players.txt
-test/data/rsssf/at-2014-15--1-bundesliga.txt
-test/data/rsssf/at-2015-16--1-bundesliga.txt
-test/data/world-cup/1930/cup.txt
-test/data/world-cup/1930/cup.yml
-test/data/world-cup/1930/cup_goals.txt
-test/data/world-cup/1930/cup_goals.yml
-test/data/world-cup/1954/cup.txt
-test/data/world-cup/1954/cup.yml
-test/data/world-cup/1962/cup.txt
-test/data/world-cup/1962/cup.yml
-test/data/world-cup/1974/cup.yml
-test/data/world-cup/1974/cup_finals.txt
-test/data/world-cup/1974/cup_i.txt
-test/data/world-cup/1974/cup_ii.txt
-test/data/world-cup/2014/cup.txt
-test/data/world-cup/2014/cup.yml
-test/data/world-cup/2014/squads/br-brazil.txt
-test/data/world-cup/2014/squads/de-deutschland.txt
-test/data/world-cup/2014/squads/jp-japan.txt
-test/data/world-cup/2014/squads/uy-uruguay.txt
-test/data/world-cup/leagues.txt
-test/data/world-cup/seasons_1930.txt
-test/data/world-cup/seasons_1954.txt
-test/data/world-cup/seasons_1962.txt
-test/data/world-cup/seasons_1974.txt
-test/data/world-cup/teams_1930.txt
-test/data/world-cup/teams_1954.txt
-test/data/world-cup/teams_1962.txt
-test/data/world-cup/teams_1974.txt
 test/helper.rb
-test/test_assoc_reader.rb
 test/test_changes.rb
 test/test_cursor.rb
-test/test_event_meta_reader.rb
-test/test_event_reader.rb
-test/test_event_table_reader.rb
-test/test_goals.rb
-test/test_indexer_team.rb
-test/test_load.rb
-test/test_pp.rb
-test/test_reader.rb
-test/test_reader_from_string.rb
-test/test_round_auto.rb
-test/test_round_def.rb
-test/test_round_header.rb
-test/test_rsssf_reader.rb
-test/test_squad_club_reader.rb
-test/test_squad_national_team_reader.rb
-test/test_standings.rb
-test/test_standings_ii.rb
-test/test_utils.rb
 test/test_winner.rb

data/Rakefile

@@ -22,7 +22,6 @@ Hoe.spec 'sportdb-models' do
   self.extra_deps = [
     ['worlddb-models',        '>= 2.4.0'],    # Note: pull in all (extra) dependencies va worlddb-models
     ['persondb-models',       '>= 0.5.0'],     # persons (people) table
-    ['sportdb-match-formats', '>= 0.1.0'],
   ]
 
   self.licenses = ['Public Domain']

data/lib/sportdb/deleter.rb

@@ -3,7 +3,7 @@ module SportDb
 
   class Deleter
     ######
-    # NB: make models available in sportdb module by default with namespace
+    # note: make models available in sportdb module by default with namespace
     #  e.g. lets you use Team instead of Model::Team
     include SportDb::Models
 

data/lib/sportdb/models.rb

@@ -6,9 +6,6 @@ require 'worlddb/models'     # NOTE: include worlddb-models gem (not cli tools g
 require 'persondb/models'
 
 
-require 'sportdb/match/formats'  ## todo/fix: move all readers out-of-models AND than (finally) remove sportdb/formats dependency
-
-
 # our own code
 
 require 'sportdb/version'    # let version always go first
@@ -54,54 +51,15 @@ require 'sportdb/models/utils'   # e.g. GameCursor
 require 'sportdb/schema'       # NB: requires sportdb/models (include SportDB::Models)
 
 
-require 'sportdb/utils'
-require 'sportdb/utils_date'
-require 'sportdb/utils_group'
-require 'sportdb/utils_map'
-require 'sportdb/utils_round'
-require 'sportdb/utils_scores'
-require 'sportdb/utils_teams'
-require 'sportdb/utils_goals'
-require 'sportdb/matcher'
 require 'sportdb/calc'       # fix/todo: obsolete - replace w/ standings
 require 'sportdb/standings'
 
-
-require 'sportdb/readers/assoc'
-require 'sportdb/readers/event'           ## old event reader (remove later??)
-require 'sportdb/readers/event_table'     ## new "standard" event reader
-require 'sportdb/readers/event_meta'      ## new "standard" event reader for meta data
-require 'sportdb/readers/game'
-require 'sportdb/readers/ground'
-require 'sportdb/readers/league'
-require 'sportdb/readers/season'
-require 'sportdb/readers/squad_club'    # roster
-require 'sportdb/readers/squad_national_team'
-require 'sportdb/readers/team'
-require 'sportdb/reader'
-require 'sportdb/reader_file'
-require 'sportdb/reader_zip'
-
-require 'sportdb/indexers/team'
-
-
 require 'sportdb/deleter'
 require 'sportdb/stats'
 
-require 'sportdb/pretty_printer'
-
-## "simplified" match reader for rsssf-formated/style leagues
-require 'sportdb/rsssf_reader'
-
 
 module SportDb
 
-  def self.test_data_path
-    "#{root}/test/data"
-  end
-
-
-
   def self.create
     CreateDb.new.up
     ConfDb::Model::Prop.create!( key: 'db.schema.sport.version', value: VERSION )
@@ -117,52 +75,12 @@ module SportDb
     SportDb.create
   end
 
-
-  def self.read_setup( setup, include_path )
-    reader = Reader.new( include_path )
-    reader.load_setup( setup )
-  end
-
-  def self.read_setup_from_zip( zip_name, setup, include_path, opts={} ) ## todo/check - use a better (shorter) name ??
-    reader = ZipReader.new( zip_name, include_path, opts )
-    reader.load_setup( setup )
-    reader.close
-  end
-
-  def self.read_all( include_path )   # convenience helper
-    read_setup( 'setups/all', include_path )
-  end
-
-  def self.read_builtin
-    puts "!! WARN - deprecated SportDb.read_builtin call - remove!! no longer in use; will get removed soon"
-  end
-
-
-  # load built-in (that is, bundled within the gem) named plain text seeds
-  # - pass in an array of pairs of event/seed names e.g.
-  #   [['at.2012/13', 'at/2012_13/bl'],
-  #    ['cl.2012/13', 'cl/2012_13/cl']] etc.
-
-  def self.read( ary, include_path )
-    reader = Reader.new( include_path )
-    ## todo: check kind_of?( Array ) or kind_of?(String) to support array or string
-    ary.each do |name|
-      reader.load( name )
-    end
-  end
-
-
   # delete ALL records (use with care!)
   def self.delete!
     puts '*** deleting sport table records/data...'
     Deleter.new.run
   end # method delete!
 
-  def self.update!
-    puts '*** update event fixtures...'
-    Updater.new.run
-  end
-
 
   def self.tables
     Stats.new.tables
@@ -226,14 +144,11 @@ module SportDb
     ActiveRecord::Base.logger = Logger.new( STDOUT )
     ## ActiveRecord::Base.colorize_logging = false  - no longer exists - check new api/config setting?
 
-    self.connect( adapter:  'sqlite3',
-                  database: ':memory:' )
+    connect( adapter:  'sqlite3',
+             database: ':memory:' )
 
     ## build schema
-    SportDb.create_all
-
-    ## read builtins - why? why not?
-    SportDb.read_builtin
+    create_all
   end # setup_in_memory_db (using SQLite :memory:)
 
 

data/lib/sportdb/version.rb

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

data/test/helper.rb

@@ -1,13 +1,8 @@
-
-## $:.unshift(File.dirname(__FILE__))
-
 ## minitest setup
-
 require 'minitest/autorun'
 
 
 ## our own code
-
 require 'sportdb/models'
 
 
@@ -41,109 +36,6 @@ AlltimeStanding      = SportDb::Model::AlltimeStanding
 AlltimeStandingEntry = SportDb::Model::AlltimeStandingEntry
 
 
-
-####################
-# Reader shortcuts
-
-Reader                  = SportDb::Reader
-TeamReader              = SportDb::TeamReader
-TeamIndexer             = SportDb::TeamIndexer
-AssocReader             = SportDb::AssocReader
-SeasonReader            = SportDb::SeasonReader
-LeagueReader            = SportDb::LeagueReader
-EventReader             = SportDb::EventReader
-EventMetaReader         = SportDb::EventMetaReader
-EventTableReader        = SportDb::EventTableReader
-GameReader              = SportDb::GameReader
-NationalTeamSquadReader = SportDb::NationalTeamSquadReader
-ClubSquadReader         = SportDb::ClubSquadReader
-
-## moved to racing.db  - remove/delete!!
-## RaceTeamReader     = SportDb::RaceTeamReader
-
-PersonReader       = PersonDb::PersonReader
-
-######
-# New Reader ShortCuts
-
-module TestPrettyPrinter
-  def self.from_file( name, opts={} )
-    SportDb::PrettyPrinter.from_file( "#{SportDb.test_data_path}/#{name}.txt", opts )
-  end
-end
-
-
-module TestTeamReader
-  def self.from_file( name, more_attribs={} )
-    TeamReader.from_file( "#{SportDb.test_data_path}/#{name}.txt", more_attribs )
-  end
-end
-
-module TestTeamIndexer
-  def self.from_file( name, more_attribs={} )
-    TeamIndexer.from_file( "#{SportDb.test_data_path}/#{name}.txt", more_attribs )
-  end
-end
-
-
-module TestClubSquadReader
-  def self.from_file( name, more_attribs={} )
-    ClubSquadReader.from_file( "#{SportDb.test_data_path}/#{name}.txt", more_attribs )
-  end
-end
-
-module TestNationalTeamSquadReader
-  def self.from_file( name, more_attribs={} )
-    NationalTeamSquadReader.from_file( "#{SportDb.test_data_path}/#{name}.txt", more_attribs )
-  end
-end
-
-module TestLeagueReader
-  def self.from_file( name, more_attribs={} )
-    LeagueReader.from_file( "#{SportDb.test_data_path}/#{name}.txt", more_attribs )
-  end
-end
-
-module TestSeasonReader
-  def self.from_file( name )
-    SeasonReader.from_file( "#{SportDb.test_data_path}/#{name}.txt" )
-  end
-end
-
-module TestEventReader
-  def self.from_file( name )
-    EventReader.from_file( "#{SportDb.test_data_path}/#{name}.yml" )
-  end
-end
-
-module TestEventMetaReader
-  def self.from_file( name )
-    EventMetaReader.from_file( "#{SportDb.test_data_path}/#{name}.yml" )
-  end
-end
-
-module TestEventTableReader
-  def self.from_file( name )
-    EventTableReader.from_file( "#{SportDb.test_data_path}/#{name}.txt" )
-  end
-end
-
-
-module TestGameReader
-  ## NOTE: pass in .yml as path (that is, event config!!!!)
-  def self.from_file( name, more_attribs={} )
-    GameReader.from_file( "#{SportDb.test_data_path}/#{name}.yml", more_attribs )
-  end
-end
-
-module TestAssocReader
-  def self.from_file( name )
-    AssocReader.from_file( "#{SportDb.test_data_path}/#{name}.txt" )
-  end
-end
-
-
-
 #################################
 # setup db -> schema / tables
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-models
 version: !ruby/object:Gem::Version
-  version: 1.18.6
+  version: 1.19.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-29 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: sportdb-match-formats
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -95,8 +81,6 @@ files:
 - Rakefile
 - lib/sportdb/calc.rb
 - lib/sportdb/deleter.rb
-- lib/sportdb/indexers/team.rb
-- lib/sportdb/matcher.rb
 - lib/sportdb/models.rb
 - lib/sportdb/models/assoc.rb
 - lib/sportdb/models/assoc_assoc.rb
@@ -131,117 +115,13 @@ files:
 - lib/sportdb/models/world/country.rb
 - lib/sportdb/models/world/state.rb
 - lib/sportdb/patterns.rb
-- lib/sportdb/pretty_printer.rb
-- lib/sportdb/reader.rb
-- lib/sportdb/reader_file.rb
-- lib/sportdb/reader_zip.rb
-- lib/sportdb/readers/assoc.rb
-- lib/sportdb/readers/event.rb
-- lib/sportdb/readers/event_meta.rb
-- lib/sportdb/readers/event_table.rb
-- lib/sportdb/readers/game.rb
-- lib/sportdb/readers/ground.rb
-- lib/sportdb/readers/league.rb
-- lib/sportdb/readers/season.rb
-- lib/sportdb/readers/squad_club.rb
-- lib/sportdb/readers/squad_national_team.rb
-- lib/sportdb/readers/team.rb
-- lib/sportdb/rsssf_reader.rb
 - lib/sportdb/schema.rb
 - lib/sportdb/standings.rb
 - lib/sportdb/stats.rb
-- lib/sportdb/utils.rb
-- lib/sportdb/utils_date.rb
-- lib/sportdb/utils_goals.rb
-- lib/sportdb/utils_group.rb
-- lib/sportdb/utils_map.rb
-- lib/sportdb/utils_round.rb
-- lib/sportdb/utils_scores.rb
-- lib/sportdb/utils_teams.rb
 - lib/sportdb/version.rb
-- test/data/at-austria/2013_14/bl.txt
-- test/data/at-austria/2013_14/bl.yml
-- test/data/at-austria/2013_14/bl_ii.txt
-- test/data/at-austria/2013_14/el.txt
-- test/data/at-austria/2013_14/el.yml
-- test/data/at-austria/2013_14/squads/austria.txt
-- test/data/at-austria/2013_14/squads/salzburg.txt
-- test/data/at-austria/2014_15/1-bundesliga-ii.txt
-- test/data/at-austria/2014_15/1-bundesliga.yml
-- test/data/at-austria/2015_16/1-bundesliga-v2.conf.txt
-- test/data/at-austria/2015_16/1-bundesliga-v2.yml
-- test/data/at-austria/2015_16/1-bundesliga.conf.txt
-- test/data/at-austria/2015_16/1-bundesliga.yml
-- test/data/at-austria/2015_16/cup.yml
-- test/data/at-austria/leagues.txt
-- test/data/at-austria/teams.txt
-- test/data/at-austria/teams_2.txt
-- test/data/csv/de-2013-14--1-bundesliga.txt
-- test/data/de-deutschland/2013-14/1-bundesliga.yml
-- test/data/de-deutschland/leagues.txt
-- test/data/de-deutschland/teams.txt
-- test/data/eng-england/2015-16/1-premierleague-v2.yml
-- test/data/eng-england/2015-16/1-premierleague.yml
-- test/data/national-teams/assocs.txt
-- test/data/national-teams/europe/assocs.txt
-- test/data/national-teams/europe/teams.txt
-- test/data/national-teams/north-america/assocs.txt
-- test/data/national-teams/north-america/teams.txt
-- test/data/national-teams/teams.txt
-- test/data/players/europe/at-austria/players.txt
-- test/data/players/europe/de-deutschland/players.txt
-- test/data/players/south-america/br-brazil/players.txt
-- test/data/rsssf/at-2014-15--1-bundesliga.txt
-- test/data/rsssf/at-2015-16--1-bundesliga.txt
-- test/data/world-cup/1930/cup.txt
-- test/data/world-cup/1930/cup.yml
-- test/data/world-cup/1930/cup_goals.txt
-- test/data/world-cup/1930/cup_goals.yml
-- test/data/world-cup/1954/cup.txt
-- test/data/world-cup/1954/cup.yml
-- test/data/world-cup/1962/cup.txt
-- test/data/world-cup/1962/cup.yml
-- test/data/world-cup/1974/cup.yml
-- test/data/world-cup/1974/cup_finals.txt
-- test/data/world-cup/1974/cup_i.txt
-- test/data/world-cup/1974/cup_ii.txt
-- test/data/world-cup/2014/cup.txt
-- test/data/world-cup/2014/cup.yml
-- test/data/world-cup/2014/squads/br-brazil.txt
-- test/data/world-cup/2014/squads/de-deutschland.txt
-- test/data/world-cup/2014/squads/jp-japan.txt
-- test/data/world-cup/2014/squads/uy-uruguay.txt
-- test/data/world-cup/leagues.txt
-- test/data/world-cup/seasons_1930.txt
-- test/data/world-cup/seasons_1954.txt
-- test/data/world-cup/seasons_1962.txt
-- test/data/world-cup/seasons_1974.txt
-- test/data/world-cup/teams_1930.txt
-- test/data/world-cup/teams_1954.txt
-- test/data/world-cup/teams_1962.txt
-- test/data/world-cup/teams_1974.txt
 - test/helper.rb
-- test/test_assoc_reader.rb
 - test/test_changes.rb
 - test/test_cursor.rb
-- test/test_event_meta_reader.rb
-- test/test_event_reader.rb
-- test/test_event_table_reader.rb
-- test/test_goals.rb
-- test/test_indexer_team.rb
-- test/test_load.rb
-- test/test_pp.rb
-- test/test_reader.rb
-- test/test_reader_from_string.rb
-- test/test_round_auto.rb
-- test/test_round_def.rb
-- test/test_round_header.rb
-- test/test_rsssf_reader.rb
-- test/test_squad_club_reader.rb
-- test/test_squad_national_team_reader.rb
-- test/test_standings.rb
-- test/test_standings_ii.rb
-- test/test_utils.rb
 - test/test_winner.rb
 homepage: https://github.com/sportdb/sport.db
 licenses: