lib/sportdb/models.rb in sportdb-models-1.19.1 vs lib/sportdb/models.rb in sportdb-models-2.0.0

@@ -6,60 +6,47 @@
 require 'persondb/models'
 
 
 # our own code
 
-require 'sportdb/version'    # let version always go first
+require 'sportdb/models/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/formats'
+require 'sportdb/models/models/forward'
 
+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/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/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'
 
-require 'sportdb/models/utils'   # e.g. GameCursor
+require 'sportdb/models/models/stats/alltime_standing'
+require 'sportdb/models/models/stats/event_standing'
+require 'sportdb/models/models/stats/group_standing'
 
+require 'sportdb/models/schema'       # note: requires sportdb/models (include SportDB::Models)
 
-require 'sportdb/schema'       # NB: requires sportdb/models (include SportDB::Models)
+require 'sportdb/models/utils'   # e.g. MatchCursor
 
+require 'sportdb/models/deleter'
+require 'sportdb/models/stats'
 
-require 'sportdb/calc'       # fix/todo: obsolete - replace w/ standings
-require 'sportdb/standings'
 
-require 'sportdb/deleter'
-require 'sportdb/stats'
-
-
 module SportDb
 
   def self.create
     CreateDb.new.up
     ConfDb::Model::Prop.create!( key: 'db.schema.sport.version', value: VERSION )
@@ -153,7 +140,26 @@
 
 
 end  # module SportDb
 
 
+
+module SportDb
+  module Models
+##################
+#  add alias why? why not?
+Competition = Event
+Comp        = Event
+
+LineUp = Lineup
+Squad  = Lineup
+
+Game = Match  ## add (old) alias - why? why not?
+  end # module Models
+end # module SportDb
+
+
+
 ## say hello
-puts SportDb::Module::Models.banner   if defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG
+puts SportDb::Module::Models.banner
+
+