sportdb-models 1.18.6 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dd5f98f71987e9c250fc7330f8c58b5b73dc59c
-  data.tar.gz: f31178e06e8b4f9a5f08b06c5506252233eb1e1f
+  metadata.gz: 5c8072de5db8829c62e3b726472af30146ebf320
+  data.tar.gz: ad299b7cd1fe9e2e604ac09d69894df443a6d46b
 SHA512:
-  metadata.gz: 30fc84ff5953bd2f390f152f6f912bb18f97a76e7692afcd99b221c3bb86dcd5ad9897ec637e9d1cbc968e2da591796c1446952f6495638f25099af37b1725ce
-  data.tar.gz: f3146353a838f07e34a5b901a5ac9858b8aad3b33467e9cd042dfb43df0e9569de2ffcaa02dcf9ffe333753f667e2a12d3dc8e03d15133be723e0ba5a3c56d1a
+  metadata.gz: 34d296b375d07d2b3345796fb13d85482f27b46d36b954d65eff33db37d35a8debde350032bc55e5f21e62eb4efbdea9911498c9bb37f0a4d7b99ec720420337
+  data.tar.gz: ceadae3f743055cc344fff0badf8a43f145f9390cee78b9e64f7725768e3cbb00fd6a0899e9e52e8ffc67f4520f8d585efdae23fec6eb6bb72471f7d736b8d32

data/Manifest.txt

@@ -2,153 +2,36 @@ CHANGELOG.md
 Manifest.txt
 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
-lib/sportdb/models/badge.rb
-lib/sportdb/models/event.rb
-lib/sportdb/models/event_ground.rb
-lib/sportdb/models/event_team.rb
-lib/sportdb/models/forward.rb
-lib/sportdb/models/game.rb
-lib/sportdb/models/goal.rb
-lib/sportdb/models/ground.rb
-lib/sportdb/models/group.rb
-lib/sportdb/models/group_team.rb
-lib/sportdb/models/league.rb
-lib/sportdb/models/person.rb
-lib/sportdb/models/roster.rb
-lib/sportdb/models/round.rb
-lib/sportdb/models/season.rb
-lib/sportdb/models/stage.rb
-lib/sportdb/models/stage_team.rb
-lib/sportdb/models/stats/alltime_standing.rb
-lib/sportdb/models/stats/alltime_standing_entry.rb
-lib/sportdb/models/stats/event_standing.rb
-lib/sportdb/models/stats/event_standing_entry.rb
-lib/sportdb/models/stats/group_standing.rb
-lib/sportdb/models/stats/group_standing_entry.rb
-lib/sportdb/models/team.rb
-lib/sportdb/models/team_compat.rb
+lib/sportdb/models/deleter.rb
+lib/sportdb/models/formats.rb
+lib/sportdb/models/models/assoc.rb
+lib/sportdb/models/models/badge.rb
+lib/sportdb/models/models/event.rb
+lib/sportdb/models/models/forward.rb
+lib/sportdb/models/models/goal.rb
+lib/sportdb/models/models/ground.rb
+lib/sportdb/models/models/group.rb
+lib/sportdb/models/models/league.rb
+lib/sportdb/models/models/lineup.rb
+lib/sportdb/models/models/match.rb
+lib/sportdb/models/models/person.rb
+lib/sportdb/models/models/round.rb
+lib/sportdb/models/models/season.rb
+lib/sportdb/models/models/stage.rb
+lib/sportdb/models/models/stats/alltime_standing.rb
+lib/sportdb/models/models/stats/event_standing.rb
+lib/sportdb/models/models/stats/group_standing.rb
+lib/sportdb/models/models/team.rb
+lib/sportdb/models/models/world/city.rb
+lib/sportdb/models/models/world/continent.rb
+lib/sportdb/models/models/world/country.rb
+lib/sportdb/models/models/world/state.rb
+lib/sportdb/models/schema.rb
+lib/sportdb/models/stats.rb
 lib/sportdb/models/utils.rb
-lib/sportdb/models/world/city.rb
-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
+lib/sportdb/models/version.rb
 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

@@ -1,10 +1,10 @@
 require 'hoe'
-require './lib/sportdb/version.rb'
+require './lib/sportdb/models/version.rb'
 
 
 Hoe.spec 'sportdb-models' do
 
-  self.version = SportDb::VERSION
+  self.version = SportDb::Module::Models::VERSION
 
   self.summary = "sportdb-models - sport.db schema 'n' models for easy (re)use"
   self.description = summary
@@ -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/models.rb

@@ -6,102 +6,47 @@ 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/models/version'    # let version always go first
 
-# our own code
+require 'sportdb/models/formats'
+require 'sportdb/models/models/forward'
 
-require 'sportdb/version'    # let version always go first
-
-require 'sportdb/patterns'
-require 'sportdb/models/forward'
-require 'sportdb/models/world/city'
-require 'sportdb/models/world/country'
-require 'sportdb/models/world/continent'
-require 'sportdb/models/world/state'
-require 'sportdb/models/assoc'
-require 'sportdb/models/assoc_assoc'
-require 'sportdb/models/badge'
-require 'sportdb/models/event'
-require 'sportdb/models/event_ground'
-require 'sportdb/models/event_team'
-require 'sportdb/models/game'
-require 'sportdb/models/goal'
-require 'sportdb/models/ground'
-require 'sportdb/models/group'
-require 'sportdb/models/group_team'
-require 'sportdb/models/league'
-require 'sportdb/models/person'
-require 'sportdb/models/roster'
-require 'sportdb/models/round'
-require 'sportdb/models/season'
-require 'sportdb/models/stage'
-require 'sportdb/models/stage_team'
-require 'sportdb/models/team'
-require 'sportdb/models/team_compat'   ### fix/todo: move to compat gem !!!!!
-
-
-require 'sportdb/models/stats/alltime_standing'
-require 'sportdb/models/stats/alltime_standing_entry'
-require 'sportdb/models/stats/event_standing'
-require 'sportdb/models/stats/event_standing_entry'
-require 'sportdb/models/stats/group_standing'
-require 'sportdb/models/stats/group_standing_entry'
-
-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'
+require 'sportdb/models/models/world/city'
+require 'sportdb/models/models/world/country'
+require 'sportdb/models/models/world/continent'
+require 'sportdb/models/models/world/state'
 
+require 'sportdb/models/models/assoc'
+require 'sportdb/models/models/badge'
+require 'sportdb/models/models/event'
+require 'sportdb/models/models/goal'
+require 'sportdb/models/models/ground'
+require 'sportdb/models/models/group'
+require 'sportdb/models/models/league'
+require 'sportdb/models/models/lineup'
+require 'sportdb/models/models/match'
+require 'sportdb/models/models/person'
+require 'sportdb/models/models/round'
+require 'sportdb/models/models/season'
+require 'sportdb/models/models/stage'
+require 'sportdb/models/models/team'
 
-module SportDb
+require 'sportdb/models/models/stats/alltime_standing'
+require 'sportdb/models/models/stats/event_standing'
+require 'sportdb/models/models/stats/group_standing'
 
-  def self.test_data_path
-    "#{root}/test/data"
-  end
+require 'sportdb/models/schema'       # note: requires sportdb/models (include SportDB::Models)
+
+require 'sportdb/models/utils'   # e.g. MatchCursor
 
+require 'sportdb/models/deleter'
+require 'sportdb/models/stats'
 
 
+module SportDb
+
   def self.create
     CreateDb.new.up
     ConfDb::Model::Prop.create!( key: 'db.schema.sport.version', value: VERSION )
@@ -117,52 +62,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
@@ -177,32 +82,36 @@ module SportDb
       ### change default to ./sport.db ?? why? why not?
       db = URI.parse( ENV['DATABASE_URL'] || 'sqlite3:///sport.db' )
 
-      if db.scheme == 'postgres'
-        config = {
-          adapter: 'postgresql',
-          host: db.host,
-          port: db.port,
-          username: db.user,
-          password: db.password,
-          database: db.path[1..-1],
-          encoding: 'utf8'
-        }
-      else # assume sqlite3
-       config = {
-         adapter: db.scheme, # sqlite3
-         database: db.path[1..-1] # sport.db (NB: cut off leading /, thus 1..-1)
-      }
-      end
+      config =  if db.scheme == 'postgres'
+                    { adapter: 'postgresql',
+                      host:     db.host,
+                      port:     db.port,
+                      username: db.user,
+                      password: db.password,
+                      database: db.path[1..-1],
+                      encoding: 'utf8'
+                    }
+                  else # assume sqlite3
+                    { adapter:  db.scheme,       # sqlite3
+                      database: db.path[1..-1]   # sport.db (NB: cut off leading /, thus 1..-1)
+                    }
+                  end
+    else
+      ## note: for compatibility lets you also pass-in/use string keys
+      ##   e.g. YAML.load uses/returns always string keys - always auto-convert to symbols
+      config = config.symbolize_keys
     end
 
+
+    ## todo/check/fix: move jruby "hack" to attic - why? why not?
     ## todo/check: use if defined?( JRUBY_VERSION ) instead ??
-    if RUBY_PLATFORM =~ /java/ && config[:adapter] == 'sqlite3'
+    ## if RUBY_PLATFORM =~ /java/ && config[:adapter] == 'sqlite3'
       # quick hack for JRuby sqlite3 support via jdbc
-      puts "jruby quick hack - adding jdbc libs for jruby sqlite3 database support"
-      require 'jdbc/sqlite3'
-      require 'active_record/connection_adapters/jdbc_adapter'
-      require 'active_record/connection_adapters/jdbcsqlite3_adapter'
-    end
+    ##  puts "jruby quick hack - adding jdbc libs for jruby sqlite3 database support"
+    ##  require 'jdbc/sqlite3'
+    ##  require 'active_record/connection_adapters/jdbc_adapter'
+    ##  require 'active_record/connection_adapters/jdbcsqlite3_adapter'
+    ## end
 
     puts "Connecting to db using settings: "
     pp config
@@ -210,8 +119,11 @@ module SportDb
     # ActiveRecord::Base.logger = Logger.new( STDOUT )
 
     ## if sqlite3 add (use) some pragmas for speedups
-    if config[:adapter] == 'sqlite3'
-      ## check/todo: if in memory e.g. ':memory:' no pragma needed!!
+    if config[:adapter]  == 'sqlite3'  &&
+       config[:database] != ':memory:'
+      ## note: if in memory database e.g. ':memory:' no pragma needed!!
+      ## try to speed up sqlite
+      ##   see http://www.sqlite.org/pragma.html
       con = ActiveRecord::Base.connection
       con.execute( 'PRAGMA synchronous=OFF;' )
       con.execute( 'PRAGMA journal_mode=OFF;' )
@@ -221,24 +133,47 @@ module SportDb
 
 
   def self.setup_in_memory_db
-
     # Database Setup & Config
     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:)
 
 
 end  # module SportDb
 
 
+
+module SportDb
+  module Model
+##################
+#  add alias why? why not?
+#
+#  more aliases to consider:
+#   - Tournament for Event?
+#   - Cup for League?
+#   - Roster for Lineup?
+#   - Stadium for Ground?  - why? why not?
+
+
+Competition = Event
+Comp        = Event
+
+LineUp = Lineup
+Squad  = Lineup
+
+Game = Match  ## add (old) alias - why? why not?
+  end # module Model
+end # module SportDb
+
+
+
 ## say hello
-puts SportDb.banner   if defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG
+puts SportDb::Module::Models.banner
+
+