sportdb-models 1.19.1 → 2.0.0

data/lib/sportdb/models/models/league.rb

@@ -0,0 +1,20 @@
+module SportDb
+  module Model
+
+
+class League < ActiveRecord::Base
+
+  ## leagues also used for conferences, world series, cups, etc.
+  #
+  ## league (or cup/conference/series/etc.) + season (or year) = event
+
+  has_many :events
+  has_many :seasons, :through => :events
+
+  belongs_to :country, :class_name => 'WorldDb::Model::Country', :foreign_key => 'country_id'
+
+end  # class League
+
+
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/{roster.rb → models/lineup.rb}

@@ -2,16 +2,15 @@
 module SportDb
   module Model
 
-### use LineUp, Squad for name? - alias??
+### use Squad for name? - alias??
 
-class Roster < ActiveRecord::Base
+class Lineup < ActiveRecord::Base
 
   belongs_to :event
   belongs_to :team
   belongs_to :person, class_name: 'PersonDb::Model::Person', foreign_key: 'person_id'
 
-end  # class Roster
-
+end  # class Lineup
 
   end # module Model
 end # module SportDb

data/lib/sportdb/models/{game.rb → models/match.rb}

@@ -3,14 +3,18 @@ module SportDb
   module Model
 
 
-class Game < ActiveRecord::Base
+class Match < ActiveRecord::Base
+
+  self.table_name = 'matches'
 
   belongs_to :team1, class_name: 'Team', foreign_key: 'team1_id'
   belongs_to :team2, class_name: 'Team', foreign_key: 'team2_id'
-  
-  belongs_to :round
+
+  belongs_to :event
+  belongs_to :round   # round is optional
   belongs_to :group   # group is optional
-  
+  belongs_to :stage   # stage is optional
+
   belongs_to :ground  # ground is optional
   belongs_to :city,  class_name: 'WorldDb::Model::City', foreign_key: 'city_id'   # city   is optioanl (remove?? redundant?? use ground ??)
 
@@ -27,7 +31,7 @@ class Game < ActiveRecord::Base
   def toto12x() toto1x2; end # alias for toto12x - todo/fix: use ruby alias helper
   def toto1x2
     ## note: will return string e.g. 1-X-2 (winner will return int e.g. 1-0-2)
-    
+
     ## fix: use switch/when expr/stmt instead of ifs
     value = winner90   # 1 0 2  1 => team 1 0 => draw 2 => team
     if value == 0
@@ -82,11 +86,11 @@ class Game < ActiveRecord::Base
       end
 
       ## todo/fix:
-      #  check for next-game/pre-game !!!
+      #  check for next-match/pre-match !!!
       #    use 1st leg and 2nd leg - use for winner too
       #  or add new winner_total or winner_aggregated method ???
 
-      ## check for penalty  - note: some games might only have penalty and no extra time (e.g. copa liberatadores)
+      ## check for penalty  - note: some matches might only have penalty and no extra time (e.g. copa liberatadores)
       if score1p.present? && score2p.present?
         if score1p > score2p
           self.winner = 1
@@ -114,7 +118,7 @@ class Game < ActiveRecord::Base
 
 
   ### getter/setters for deprecated attribs (score3,4,5,6) n national
-  
+
   def score1ot() score1et  end
   def score2ot() score2et  end
 
@@ -122,7 +126,7 @@ class Game < ActiveRecord::Base
   def score2ot=(value) self.score2et = value  end
 
 
-  # game over?
+  # match over?
   def over?()     play_at <= Time.now;  end
 
   ## fix/todo: already added by ar magic ??? remove code
@@ -130,53 +134,6 @@ class Game < ActiveRecord::Base
   def complete?() score1.present? && score2.present?;  end
 
 
-############# convenience helpers for styling
-##
-
-  def team1_style_class
-    buf = ''
-    ## NB: remove if calc?
-
-    ### fix: loser
-    ## - add method for checking winner/loser on ko pairs using (1st leg/2nd leg totals) ??
-    ## use new winner_total method ??
- 
-    if complete?
-      if winner1?
-        buf << 'game-team-winner '
-      elsif winner2?
-        buf << 'game-team-loser '
-      else # assume draw
-        buf << 'game-team-draw '
-      end
-    end
-    
-    buf << 'game-knockout '     if knockout?
-    buf
-  end
-
-  def team2_style_class
-    buf = ''
-    ## NB: remove if calc?
-
-    ### fix: loser
-    ## - add method for checking winner/loser on ko pairs using (1st leg/2nd leg totals) ??
-    ## use new winner_total method ??
-
-    if complete?
-      if winner1?
-        buf << 'game-team-loser '
-      elsif winner2?
-        buf << 'game-team-winner '
-      else # assume draw
-        buf << 'game-team-draw '
-      end
-    end
-
-    buf << 'game-knockout '     if knockout?
-    buf
-  end
-
 
   def play_at_str( format = nil )
     ## e.g. use like
@@ -218,7 +175,7 @@ class Game < ActiveRecord::Base
 
   ## todo/fix: find a better name?
   ##  todo: move to utils for reuse?
-  
+
   def check_for_changes( new_attributes )
     changes_counter = 0
     new_attributes.each do |key,new_value|
@@ -231,14 +188,13 @@ class Game < ActiveRecord::Base
         puts "change #{changes_counter} for #{key} old:>#{old_value}< : #{old_value.class.name} new:>#{new_value}< : #{new_value.class.name}"
       end
     end
-    
+
     # no changes found for counter==0;
     # -- otherwise x changes found; return true
     changes_counter == 0 ? false : true
   end
 
-end # class Game
-
+end # class Match
 
   end # module Model
 end # module SportDb

data/lib/sportdb/models/{round.rb → models/round.rb}

@@ -5,11 +5,7 @@ module SportDb
 
 class Round < ActiveRecord::Base
 
-if ActiveRecord::VERSION::MAJOR == 3
-  has_many :games, :order => 'pos'
-else
-  has_many :games, -> { order('pos') }
-end
+  has_many :matches, -> { order('pos') }, class_name: 'Match'
 
   belongs_to :event
 
@@ -19,4 +15,3 @@ end # class Round
   end # module Model
 end # module SportDb
 
-

data/lib/sportdb/models/{stage.rb → models/stage.rb}

@@ -5,11 +5,7 @@ module SportDb
 
 class Stage < ActiveRecord::Base
 
-if ActiveRecord::VERSION::MAJOR == 3
-  has_many :games, order: 'pos'
-else
-  has_many :games, -> { order('pos') }
-end
+  has_many :matches, -> { order('pos') }, class_name: 'Match'
 
   belongs_to :event
 
@@ -18,5 +14,13 @@ end
 
 end # class Stage
 
+
+class StageTeam < ActiveRecord::Base
+  self.table_name = 'stages_teams'
+
+  belongs_to :stage
+  belongs_to :team
+end # class StageTeam
+
   end # module Model
 end # module SportDb

data/lib/sportdb/models/{stats/alltime_standing_entry.rb → models/stats/alltime_standing.rb}

@@ -4,6 +4,15 @@ module SportDb
   module Model
 
 
+class AlltimeStanding < ActiveRecord::Base
+
+  self.table_name = 'alltime_standings'
+
+  has_many :entries,  class_name: 'SportDb::Model::AlltimeStandingEntry', foreign_key: 'alltime_standing_id', :dependent => :delete_all
+
+end # class AlltimeStanding
+
+
 class AlltimeStandingEntry < ActiveRecord::Base
 
   self.table_name = 'alltime_standing_entries'
@@ -15,7 +24,6 @@ class AlltimeStandingEntry < ActiveRecord::Base
   ##  map standing_id to alltime_standing_id - convenience alias
   def standing_id=(value)  write_attribute(:alltime_standing_id, value);  end
 
-
 end # class AlltimeStandingEntry
 
 

data/lib/sportdb/models/{stats/event_standing_entry.rb → models/stats/event_standing.rb}

@@ -3,6 +3,17 @@
 module SportDb
   module Model
 
+
+class EventStanding < ActiveRecord::Base
+
+  self.table_name = 'event_standings'
+
+  has_many   :entries, class_name: 'SportDb::Model::EventStandingEntry', foreign_key: 'event_standing_id', :dependent => :delete_all
+  belongs_to :event
+
+end # class EventStanding
+
+
 class EventStandingEntry < ActiveRecord::Base
 
   self.table_name = 'event_standing_entries'
@@ -16,6 +27,5 @@ class EventStandingEntry < ActiveRecord::Base
 
 end # class EventStandingEntry
 
-
   end # module Model
 end # module SportDb

data/lib/sportdb/models/{stats/group_standing_entry.rb → models/stats/group_standing.rb}

@@ -4,6 +4,16 @@ module SportDb
   module Model
 
 
+class GroupStanding < ActiveRecord::Base
+
+  self.table_name = 'group_standings'
+
+  has_many   :entries, class_name: 'SportDb::Model::GroupStandingEntry', foreign_key: 'group_standing_id', :dependent => :delete_all
+  belongs_to :group
+
+end # class GroupStanding
+
+
 class GroupStandingEntry < ActiveRecord::Base
 
   self.table_name = 'group_standing_entries'
@@ -17,6 +27,5 @@ class GroupStandingEntry < ActiveRecord::Base
 
 end # class GroupStandingEntry
 
-
   end # module Model
 end # module SportDb

data/lib/sportdb/models/models/team.rb

@@ -0,0 +1,56 @@
+
+module SportDb
+  module Model
+
+##################
+#  FIX: add ?
+#
+#   use single table inheritance STI  ????
+#    - to mark two dervided classes e.g.
+#    - Club           ???   - why? why not?
+#    - NationalTeam   ???   - why? why not?
+
+
+class Team < ActiveRecord::Base
+
+  has_many :home_matches, class_name: 'Match', foreign_key: 'team1_id'
+  has_many :away_matches, class_name: 'Match', foreign_key: 'team2_id'
+
+  validates :key,  format: { with: TEAM_KEY_RE,  message: TEAM_KEY_MESSAGE }
+  validates :code, format: { with: TEAM_CODE_RE, message: TEAM_CODE_MESSAGE }, allow_nil: true
+
+  has_many :event_teams, class_name: 'EventTeam'  # join table (events+teams)
+  has_many :events, :through => :event_teams
+
+  # note: team belongs_to a single (optinal) assoc for now (national assoc may have many assocs)
+  belongs_to :assoc
+
+  ### fix!!! - how to do it with has_many macro? use finder_sql?
+  ##  finder_sql is depreciated in Rails 4!!!
+  #   use -> { where()  } etc.  -- try it if it works
+  ##   keep as is! best solution ??
+  ##   a discussion here -> https://github.com/rails/rails/issues/9726
+  ##   a discussion here (not really helpful) -> http://stackoverflow.com/questions/2125440/activerecord-has-many-where-two-columns-in-table-a-are-primary-keys-in-table-b
+
+  def matches
+    Match.where( 'team1_id = ? or team2_id = ?', id, id ).order( 'date' )
+  end
+
+  def upcoming_matches
+    Match.where( 'team1_id = ? or team2_id = ?', id, id ).where( 'date > ?', Date.today ).order( 'date' )
+  end
+
+  def past_matches
+    Match.where( 'team1_id = ? or team2_id = ?', id, id ).where( 'date < ?', Date.today ).order( 'date desc' )
+  end
+
+
+  has_many :badges   # Winner, 2nd, Cupsieger, Aufsteiger, Absteiger, etc.
+
+  belongs_to :country, class_name: 'WorldDb::Model::Country', foreign_key: 'country_id'
+  belongs_to :city,    class_name: 'WorldDb::Model::City',    foreign_key: 'city_id'
+end  # class Team
+
+
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/{world → models/world}/city.rb

@@ -6,14 +6,14 @@ module WorldDb
 
   class City
     has_many :teams,   class_name: 'SportDb::Model::Team',   foreign_key: 'city_id'
-    
+
     # fix: require active record 4
     # has_many :clubs,           -> { where club: true },  class_name: 'SportDb::Model::Team',   foreign_key: 'city_id'
     # has_many :national_teams,  -> { where club: false }, class_name: 'SportDb::Model::Team',   foreign_key: 'city_id'
 
 
     has_many :grounds, class_name: 'SportDb::Model::Ground', foreign_key: 'city_id'
-    has_many :games,   :through => :grounds
+    has_many :matches, class_name: 'SportDb::Model::Match',  :through => :grounds
   end
 
   end # module Model

data/lib/sportdb/{schema.rb → models/schema.rb}

@@ -8,43 +8,58 @@ def up
 
 create_table :teams do |t|
   t.string  :key,   null: false   # import/export key
-  t.string  :title, null: false
-  t.string  :title2    ## find a better name -why? why not? or remove?
-  t.string  :code     # make it not null?  - three letter code (short title)
-  t.string  :synonyms  # comma separated list of synonyms - todo/fix: change to alt_names!!!
+  t.string  :name,  null: false   # "canonical" unique name
+
+  t.string  :code       #  three letter code (short name)
+  t.string  :alt_names  # comma separated list of alt names / synonyms
+
   t.references :country,   null: false, index: false
-  t.references :city                  , index: false # NB: city is optional (should be required for clubs e.g. non-national teams)
-  ## todo/fix: add optional district (in city)
+  t.references :city,                   index: false # note: city is optional (should be required for clubs e.g. non-national teams)
+  t.references :district,               index: false # note: optional district (in city)
+
+  ##  todo/check/fix: use team type or such e.g. club/national/etc. - why? why not?
+  ###   or remove and add virtual attribute in model instead - why? why not?
   t.boolean  :club,     null: false, default: false  # is it a club (not a national team)?
+  t.boolean  :national, null: false, default: false  # is it a national selection team (not a club)?
+
+  ## todo/fix:  add team reference for a and b team!!!!
+
+
+  t.integer :start_year     # founding year  -fix change to start_year / founded - why? why not?
+  t.integer :end_year
+  ## add more? - start_year2, end_year2 - why? why not?
+  #  e.g. founded   = 1946, 2013 (refounded)
+  #       dissolved = 1997
 
-  t.integer :since     # founding year  -fix change to start_year / founded - why? why not?
   t.string  :address
   t.string  :web
 
+  ## todo/fix: change to gov / governing body or such!!!
   t.references :assoc,   index: false   # optional: national football assoc(iation), for example - used for national teams
 
-  ### fix: remove and add virtual attribute in model instead
-  t.boolean  :national, null: false, default: false  # is it a national selection team (not a club)?
+  t.string      :comments
+
   t.timestamps
 end
 
 add_index :teams, :key, unique: true
 
+
 ###########
 # check: use table (rename to) venues / stadiums - why? why not?
 create_table :grounds do |t|
   t.string     :key,      null: false   # import/export key
-  t.string     :title,    null: false
-  t.string     :synonyms   # comma separated list of synonyms
+  t.string     :name,     null: false
+  t.string     :alt_names    # comma separated list of alt_names / synonyms
 
   t.references :country,  null: false,    index: false
   t.references :city,                     index: false # todo: make city required ???
+  t.references :district,                 index: false # note: optional district (in city)
 
-  t.integer :since     # founding year
-  t.integer :capacity  # attentence capacity e.g. 10_000 or 50_000 etc.
+  t.integer :start_year     # founding year
+  t.integer :capacity       # attentence capacity e.g. 10_000 or 50_000 etc.
   t.string  :address
 
-
   ### fix/todo: add since/founded/opened/build attrib  eg. 2011 or 1987
   ##   - add capacity e.g. 40_000
   ##  fix: add address !!!! etc
@@ -57,10 +72,10 @@ end
 add_index :grounds, :key, unique: true
 
 
-# join table: person+game(team1+team2+event(season+league))
+# join table: person+match(team1+team2+event(season+league))
 create_table :goals do |t|
   t.references  :person,   null: false,  index: false
-  t.references  :game,     null: false,  index: false
+  t.references  :match,    null: false,  index: false
   t.references  :team,     null: false,  index: false     ##  use integer instead w/ values 1 or 2  for team1 or team2 ?? why? why not?
 
   t.integer   :minute
@@ -77,33 +92,30 @@ create_table :goals do |t|
 end
 
 
-################
-#  fix/todo: rename to squads / lineups
-
 # join table -> person+team+event(season+league)
-create_table :rosters do |t|   # use squads as an alternative name? why? why not??
+create_table :lineups do |t|   # use squads as an alternative name? why? why not??
   t.references :person,  null: false,   index: false
   t.references :team,    null: false,   index: false
   t.references :event               ,   index: false # make required?
-  t.integer    :pos,      null: false
+  t.integer    :num,     # optional - jersey (t-shirt) number
 
   t.timestamps
 end
 
 
 create_table :events do |t|
-  t.string      :key,      null: false   # import/export key
-  t.references  :league,   null: false, index: false
-  t.references  :season,   null: false, index: false
-  t.date        :start_at, null: false    # NB: only use date (w/o time) - yes!!! split into two!!!!
-  t.date        :end_at    # make it required???  # NB: only use date (w/o time)
+  t.string      :key,        null: false   # import/export key
+  t.references  :league,     null: false, index: false
+  t.references  :season,     null: false, index: false
+  t.date        :start_date, null: false    # note: only use date (w/o time)
+  t.date        :end_date                   # note: only use date (w/o time)
+
+  t.integer     :num       ## optional series counter e.g. World Cup No. 2, Bundesliga No. 43 etc. etc.
 
-  t.boolean     :team3,    null: false, default: true   ## e.g. Champions League has no 3rd place (only 1st and 2nd/final)
+  ## t.boolean     :team3,    null: false, default: true   ## e.g. Champions League has no 3rd place (only 1st and 2nd/final)
   ## todo: add league/cup flag/flags  or to league itself?
   ##   or add add a tournament type field  - why? why not?
 
-  t.integer     :num       ## optional series counter e.g. World Cup No. 2, Bundesliga No. 43 etc. etc.
-
   ## auto-added flag (e.g. start_at n end_at dates got calculated)
   ##  if auto-added flag is false - do NOT auto-update start_at, end_at etc.
   t.boolean    :auto, null: false, default: true
@@ -111,8 +123,8 @@ create_table :events do |t|
 
   #### track 1-n sources (from repos)  - # todo move to its own table later
   ## NB: relative to event.yml - use mapper to "resolve" to full path w/ repo; use league+season keys
-  t.string      :sources    #  e.g. cup or bl,bl_ii   # NB: for now store all in on string separated by comma
-  t.string      :config  # e.g. cup or bl #  e.g assumes cup.yml, bl.yml etc. for now
+  # t.string      :sources    #  e.g. cup or bl,bl_ii   # NB: for now store all in on string separated by comma
+  # t.string      :config  # e.g. cup or bl #  e.g assumes cup.yml, bl.yml etc. for now
 
 
   t.timestamps
@@ -123,19 +135,22 @@ add_index :events, :key, unique: true
 
 create_table :rounds do |t|
   t.references :event,    null: false, index: false  ## Note: do NOT auto-add index
-  t.string     :title,    null: false
-  t.string     :title2
+  t.string     :name,     null: false
   t.integer    :pos,      null: false   ## use only for "internal" sort order (defaults to insertion order)
 
   t.integer    :num       ## optional match day/week number
   t.string     :key       ## optional match day/week number key (as string)
 
   ## add new table stage/stages for grouping rounds in group rounds and playoff rounds, for example???
-  ## # "regular" season (group) games or post-season (playoff) knockouts (k.o's)
+  ## # "regular" season (group) matches or post-season (playoff) knockouts (k.o's)
   t.boolean    :knockout, null: false, default: false
   ## todo: add leg  (e.g. leg1, leg2, etc. why? why not?)
-  t.date   :start_at  # note: only use date (w/o time)  - fix: change to start_date!!!
-  t.date   :end_at    # note: only use date (w/o time)  - fix: change to end_date!!!
+  t.date   :start_date   # note: only use date (w/o time)  - fix: change to start_date!!!
+  t.date   :end_date     # note: only use date (w/o time)  - fix: change to end_date!!!
+  t.date   :start_date2  # note: only use date (w/o time)  - fix: change to start_date!!!
+  t.date   :end_date2    # note: only use date (w/o time)  - fix: change to end_date!!!
+
+  ## add last_date/first-date(auto) - for "real" last and first dates - auto-added - why? why not?
 
   ## auto-added flag (e.g. start_at n end_at dates got calculated)
   ##  if auto-added flag is false - do NOT auto-update start_at, end_at etc.
@@ -149,7 +164,7 @@ add_index :rounds, :event_id  # fk event_id index
 
 create_table :groups do |t|     # Teamgruppe (zB Gruppe A, Gruppe B, etc.)
   t.references :event,    null: false, index: false    ## Note: do NOT auto-add index
-  t.string     :title,    null: false
+  t.string     :name,     null: false
   t.integer    :pos,      null: false       ## use only for "internal" sort order (defaults to insertion order)
 
   t.string     :key       ## optional group key e.g. A, B, C or 1, 2, etc. - use why? why not?
@@ -161,7 +176,7 @@ add_index :groups, :event_id  # fk event_id index
 
 create_table :stages do |t|     # e.g. regular season, champions round, etc.
   t.references :event,    null: false, index: false    ## Note: do NOT auto-add index
-  t.string     :title,    null: false
+  t.string     :name,     null: false
   ## todo/check: add pos for use only for "internal" sort order (defaults to insertion order)??
   t.timestamps
 end
@@ -170,9 +185,7 @@ add_index :stages, :event_id  # fk event_id index
 
 
 
-###########################
-# fix: rename table to matches - why? why not?
-create_table :games do |t|
+create_table :matches do |t|
   t.string     :key          # import/export key
   t.references :event,    null: false, index: false
   t.integer    :pos,      null: false       ## note: use only for "internal" sort order (defaults to insertion order)
@@ -194,17 +207,20 @@ create_table :games do |t|
   t.string    :stage_key
 
 
-  t.datetime   :play_at      # optioanl play date  - todo/fix: split into play_date AND play_time!!!
+  t.date      :date      # optioanl play date  - todo/fix: split into play_date AND play_time!!!
+  t.time      :time
+
   t.boolean    :postponed, null: false, default: false
-  t.datetime   :play_at_v2   # optional old date (when postponed)
-  t.datetime   :play_at_v3   # optional odl date (when postponed twice)
+  ## t.date   :date2   # optional old date (when postponed)
+  ## t.date   :date3   # optional odl date (when postponed twice)
 
   t.references :ground, index: false    # optional - stadium (lets you get city,region,country,etc)
   t.references :city,   index: false    # optional - convenience for ground.city_id ???
 
-
-  t.boolean    :knockout, null: false, default: false
+  ## change home to neutral - why? why not?
   t.boolean    :home,     null: false, default: true    # is team1 play at home or neutral (that is, at its home stadium)
+  t.boolean    :knockout, null: false, default: false
+
   t.integer    :score1
   t.integer    :score2
   t.integer    :score1et  # extratime - team 1 (opt)
@@ -215,23 +231,25 @@ create_table :games do |t|
   t.integer    :score2i   # half time - team 2
   t.integer    :score1ii  # second third (opt)
   t.integer    :score2ii  # second third - team2 (opt)
-  t.references :next_game, index: false   ## Note: do NOT auto-add index  -- for hinspiel bei rueckspiel in knockout game
-  t.references :prev_game, index: false   ## Note: do NOT auto-add index
+  t.references :next_match, index: false   ## Note: do NOT auto-add index  -- for hinspiel bei rueckspiel in knockout match
+  t.references :prev_match, index: false   ## Note: do NOT auto-add index
 
   t.integer    :winner      # 1,2,0,nil  calculate on save  - "real" winner (after 90 or extra time or penalty, aggregated first+second leg?)
   t.integer    :winner90    # 1,2,0,nil  calculate on save  - winner after 90 mins (or regugular play time depending on sport - add alias or find  a better name!)
 
+  t.string     :comments
+
   t.timestamps
 end
 
-add_index :games, :key,  unique: true
-add_index :games, :event_id      # fk event_id index
-add_index :games, :round_id      # fk round_id index
-add_index :games, :group_id      # fk group_id index
-add_index :games, :next_game_id  # fk next_game_id index
-add_index :games, :prev_game_id  # fk next_game_id index
-add_index :games, :team1_id
-add_index :games, :team2_id
+add_index :matches, :key,  unique: true
+add_index :matches, :event_id      # fk event_id index
+add_index :matches, :round_id      # fk round_id index
+add_index :matches, :group_id      # fk group_id index
+add_index :matches, :next_match_id  # fk next_match_id index
+add_index :matches, :prev_match_id  # fk next_match_id index
+add_index :matches, :team1_id
+add_index :matches, :team2_id
 
 
 # todo: remove id from join table (without extra fields)? why?? why not??
@@ -283,25 +301,29 @@ add_index :groups_teams, :group_id
 
 create_table :seasons do |t|  ## also used for years - add a boolean year true/false flag too - why? why not?
   t.string :key,   null: false
-  t.string :title, null: false   # e.g. 2011/12, 2012/13 ### what to do w/ 2012? for world cup etc?
+  t.string :name,  null: false   # e.g. 2011/12, 2012/13 ### what to do w/ 2012? for world cup etc?
   t.timestamps
 end
 
 
 create_table :leagues do |t|  ## also for cups/conferences/tournaments/world series/etc.
   t.string     :key,   null: false
-  t.string     :title, null: false     # e.g. Premier League, Deutsche Bundesliga, World Cup, Champions League, etc.
-  t.references :country,           index: false   ##  optional for now ,   :null => false   ### todo: create "virtual" country for international leagues e.g. use int? or world (ww?)/europe (eu)/etc. similar? already taken??
+  t.string     :name,  null: false     # e.g. Premier League, Deutsche Bundesliga, World Cup, Champions League, etc.
+  t.string     :alt_names  # comma separated list of alt names / synonyms
+
+  t.references :country,       index: false   ##  optional for now    ### todo: create "virtual" country for international leagues e.g. use int? or world (ww?)/europe (eu)/etc. similar? already taken??
 
   ## fix: rename to :clubs from :club - why? why not?
   ## fix: rename to :intl  from :international - why? why not? shorter? better?
   ## todo/check:  flip clup to league flag? why? why not?
-  t.boolean    :club,          null: false, default: false  # club teams or national teams?
-  t.boolean    :intl,          null: false, default: false  # national league or international?
-  t.boolean    :cup,           null: false, default: false  ## or regular season league?? use a tournament type field with enums - why? why not?
+  t.boolean    :clubs,    null: false, default: false  # club teams or national teams?
+  t.boolean    :intl,     null: false, default: false  # national league or international?
+  t.boolean    :cup,      null: false, default: false  ## or regular season league?? use a tournament type field with enums - why? why not?
+
   t.integer    :level       ## use tier?  e.g. level 1, level 2, etc.
 
-  ## todo/fix: add start_year / end_year ???
+  t.integer    :start_year
+  t.integer    :end_year
 
   ## todo: add t.boolean  :national flag? for national teams?
   t.timestamps
@@ -314,16 +336,16 @@ create_table :badges do |t|
   ## t.references  :event, :null => false   # event => league+season
   t.references  :league, null: false,   index: false
   t.references  :season, null: false,   index: false
-  t.string      :title,  null: false   # Meister, Weltmeister, Europameister, Cupsieger, Vize-Meister, Aufsteiger, Absteiger, etc.
+  t.string      :name,   null: false   # Meister, Weltmeister, Europameister, Cupsieger, Vize-Meister, Aufsteiger, Absteiger, etc.
   t.timestamps
 end
 
 
 create_table :assocs do |t|
   t.string     :key,   null: false
-  t.string     :title, null: false     # e.g. Premier League, Deutsche Bundesliga, World Cup, Champions League, etc.
+  t.string     :name,  null: false     # e.g. Premier League, Deutsche Bundesliga, World Cup, Champions League, etc.
 
-  t.integer    :since     # founding year
+  t.integer    :start_year     # founding year
   t.string     :web
 
   ### if national assoc - has (optional) country ref
@@ -332,6 +354,7 @@ create_table :assocs do |t|
 
   ## add :world flag for FIFA? - just check if parent is null? for root assoc(s)? why? why not?
   ## add :regional flag for continental subdivision?
+  ##  todo: shorten to contl and intercontl  - why? why not?
   t.boolean :continental,      null: false, default: false
   t.boolean :intercontinental, null: false, default: false  # e.g. arab football league (africa+western asia/middle east)
   t.timestamps
@@ -365,16 +388,17 @@ create_table :group_standings do |t|
   t.timestamps
 end
 
-### use items instead of entries - why (shorter! simple plural e.g. just add s)
+### use items or lines instead of entries - why (shorter! simple plural e.g. just add s)
+##  use group_table_lines/stats  - why? why not?
 
 create_table :group_standing_entries do |t|
   t.references  :group_standing,  null: false, index: false
   t.references  :team,            null: false, index: false
-  t.integer     :pos   ## todo/fix: add rank  and use pos only for "internal" insertation order
-  t.integer     :played
-  t.integer     :won
-  t.integer     :lost
-  t.integer     :drawn
+  t.integer     :pos       # check/todo: use rank? -- keep/use pos only for "internal" insertation order only - why? why not?
+  t.integer     :played   ## p/pld
+  t.integer     :won      ## w
+  t.integer     :lost     ## l
+  t.integer     :drawn    ## d  or t/tied ??
   t.integer     :goals_for             # todo: find a short name - gf? why? why not?
   t.integer     :goals_against         # todo: find a shorter name - ga? why? why not?
   t.integer     :pts
@@ -408,7 +432,7 @@ end
 ##  -use (find a better) a different name? why? why not?
 create_table :alltime_standings do |t|
   t.string    :key,   null: false
-  t.string    :title, null: false
+  t.string    :name,  null: false
   t.timestamps
 end
 
@@ -423,7 +447,7 @@ create_table :alltime_standing_entries do |t|
   t.integer     :goals_for             # todo: find a short name - gf? why? why not?
   t.integer     :goals_against         # todo: find a shorter name - ga? why? why not?
   t.integer     :pts
-  t.integer     :recs               # note: specific to alltime - stats records counter (e.g. appearance counter)
+  t.integer     :recs               # note: specific to alltime - stats records counter (e.g. appearance counter) - find a better name - why? why not?
   t.string      :comments
   t.timestamps
 end