sportdb-models 1.19.0 → 2.0.3

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

@@ -5,7 +5,7 @@ module SportDb
     ######
     # note: make models available in sportdb module by default with namespace
     #  e.g. lets you use Team instead of Model::Team
-    include SportDb::Models
+    include Models
 
     def run
       # for now delete all tables
@@ -19,7 +19,7 @@ module SportDb
 
       Goal.delete_all
 
-      Game.delete_all
+      Match.delete_all
       Event.delete_all
       EventTeam.delete_all
       EventGround.delete_all
@@ -30,7 +30,7 @@ module SportDb
       Round.delete_all
       Badge.delete_all
 
-      Roster.delete_all
+      Lineup.delete_all
 
       Team.delete_all
 
@@ -41,12 +41,6 @@ module SportDb
 
       Assoc.delete_all       # associations / organizations
       AssocAssoc.delete_all  # associations / organizations
-
-## note: moved to racing.db - delete/remove!!!
-##      Record.delete_all
-##      Run.delete_all
-##      Race.delete_all
-##      Track.delete_all
     end
 
   end # class Deleter

data/lib/sportdb/models/formats.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+module SportDb
+
+# collection of regex patterns for reuse (SportDb specific)
+
+### todo: add a patterns.md page to  github ??
+##  - add regexper pics??
+
+  TEAM_KEY_RE = %r{ \A
+                      [a-z_][a-z0-9_]*
+                     \z}x
+  TEAM_KEY_MESSAGE = "expected one or more lowercase letters a-z (or 0-9 or _; must start with a-z or _)"
+
+
+  # must start w/ letter A-Z (2nd,3rd,4th or 5th can be number)
+  TEAM_CODE_RE = %r{ \A
+                       [A-Z_][A-Z0-9_]*
+                      \z}x
+  TEAM_CODE_MESSAGE = "expected one or more uppercase letters A-Z (or 0-9 or _; must start with A-Z or _)"
+
+
+end # module SportDb

data/lib/sportdb/models/models/assoc.rb

@@ -0,0 +1,38 @@
+module SportDb
+  module Model
+
+class Assoc < ActiveRecord::Base
+
+
+  has_many :parent_assoc_assocs, class_name: 'AssocAssoc', foreign_key: 'assoc2_id'
+  ## child_assocs - use child_assocs?  - (direct) member/child assocs instead of member?
+  has_many :member_assoc_assocs,  class_name: 'AssocAssoc', foreign_key: 'assoc1_id'
+
+
+  ## note: split member_assocs into two sets (into national=true and national=false)
+  # e.g. fifa has six member confederations (non-national) and 216 national assocs
+  ## note: includes all member (sub assocs + national assocs) - rename to member_assocs?
+  has_many :all_assocs, class_name: 'Assoc', :source => :assoc2, :through => :member_assoc_assocs
+  ## use zone/region as name instead of sub ( for confederatons,zones,etc.)
+  has_many :sub_assocs,      -> { where( national: false ) },  class_name: 'Assoc', :source => :assoc2, :through => :member_assoc_assocs
+  has_many :national_assocs, -> { where( national: true )  },  class_name: 'Assoc', :source => :assoc2, :through => :member_assoc_assocs
+
+  ## for now can have more than one (direct) parent assoc
+  ##   e.g. Africa Fed and Arab League Fed
+  has_many :parent_assocs, class_name: 'Assoc', :source => :assoc1, :through => :parent_assoc_assocs
+
+  # assoc only can have one direct team for now (uses belongs_to on other side)
+  # has_one :team
+end  # class Assoc
+
+
+class AssocAssoc < ActiveRecord::Base
+  self.table_name = 'assocs_assocs'
+
+  belongs_to :assoc1, class_name: 'Assoc', foreign_key: 'assoc1_id'   # parent assoc
+  belongs_to :assoc2, class_name: 'Assoc', foreign_key: 'assoc2_id'   # child assoc is_member_of parent assoc
+
+end # class AssocAssoc
+
+  end # module Model
+end # module SportDb

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

@@ -1,14 +1,14 @@
-module SportDb
-  module Model
-
-class Badge < ActiveRecord::Base
-
-  belongs_to :team
-  belongs_to :league
-  belongs_to :season
-
-end  # class Badge
-  
-
-  end # module Model
-end # module SportDb
+module SportDb
+  module Model
+
+class Badge < ActiveRecord::Base
+
+  belongs_to :team
+  belongs_to :league
+  belongs_to :season
+
+end  # class Badge
+
+
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/models/event.rb

@@ -0,0 +1,55 @@
+# encoding: utf-8
+
+module SportDb
+  module Model
+
+class Event < ActiveRecord::Base
+
+  belongs_to :league
+  belongs_to :season
+
+  has_many :matches, -> { order('pos') }, class_name: 'Match'
+
+  has_many :rounds,  -> { order('pos') }
+  has_many :groups,  -> { order('pos') }
+  has_many :stages
+
+  has_many :event_teams,  class_name: 'EventTeam'
+  has_many :teams, :through => :event_teams
+
+  has_many :event_grounds,  class_name: 'EventGround'
+  has_many :grounds, :through => :event_grounds
+
+
+  before_save :on_before_save
+
+  def on_before_save
+    # event key is composite of league + season (e.g. at.2012/13) etc.
+    self.key = "#{league.key}.#{season.key}"
+  end
+
+  def name
+    ## todo/fix: check attr_reader(:name) or such first if NOT nil !!
+    "#{league.name} #{season.name}"
+  end
+
+end # class Event
+
+
+class EventTeam < ActiveRecord::Base
+  self.table_name = 'events_teams'
+
+  belongs_to :event
+  belongs_to :team
+end # class EventTeam
+
+
+class EventGround < ActiveRecord::Base
+  self.table_name = 'events_grounds'
+
+  belongs_to :event
+  belongs_to :ground
+end # class EventGround
+
+  end # module Model
+end # module SportDb

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

@@ -1,55 +1,55 @@
-
-### forward references
-##   require first to resolve circular references
-
-module SportDb
-  module Model
-
-  Prop      = ConfDb::Model::Prop
-
-  ## todo: why? why not use include WorldDb::Models here???
-  Continent = WorldDb::Model::Continent
-  Country   = WorldDb::Model::Country
-  State     = WorldDb::Model::State
-  City      = WorldDb::Model::City
-
-  Person    = PersonDb::Model::Person
-
-  ## nb: for now only team and league use worlddb tables
-  #   e.g. with belongs_to assoc (country,region)
-
-  class Assoc  < ActiveRecord::Base ; end
-  class Team < ActiveRecord::Base ; end
-  class League < ActiveRecord::Base ; end
-  class Ground < ActiveRecord::Base ; end
-  class Goal  < ActiveRecord::Base ; end
-
-  end
-
-  ## add backwards compatible n convenience namespace
-  Models = Model
-end # module SportDb
-
-
-module WorldDb
-  module Model
-
-  # add alias? why? why not? # is there a better way?
-  #  - just include SportDb::Models  - why? why not?
-  #  - just include once in loader??
-  Assoc  = SportDb::Model::Assoc
-  Team   = SportDb::Model::Team
-  League = SportDb::Model::League
-  Ground = SportDb::Model::Ground
-
-  end
-end
-
-
-module PersonDb
-  module Model
-    Goal  = SportDb::Model::Goal
-  end
-end
-
-
+
+### forward references
+##   require first to resolve circular references
+
+module SportDb
+  module Model
+
+  Prop      = ConfDb::Model::Prop
+
+  ## todo: why? why not use include WorldDb::Models here???
+  Continent = WorldDb::Model::Continent
+  Country   = WorldDb::Model::Country
+  State     = WorldDb::Model::State
+  City      = WorldDb::Model::City
+
+  Person    = PersonDb::Model::Person
+
+  ## note: for now only team and league use worlddb tables
+  #   e.g. with belongs_to assoc (country,region)
+
+  class Assoc  < ActiveRecord::Base ; end
+  class Team   < ActiveRecord::Base ; end
+  class League < ActiveRecord::Base ; end
+  class Ground < ActiveRecord::Base ; end
+  class Goal   < ActiveRecord::Base ; end
+
+  end
+
+  ## add backwards compatible n convenience namespace
+  Models = Model
+end # module SportDb
+
+
+module WorldDb
+  module Model
+
+  # add alias? why? why not? # is there a better way?
+  #  - just include SportDb::Models  - why? why not?
+  #  - just include once in loader??
+  Assoc  = SportDb::Model::Assoc
+  Team   = SportDb::Model::Team
+  League = SportDb::Model::League
+  Ground = SportDb::Model::Ground
+
+  end
+end
+
+
+module PersonDb
+  module Model
+    Goal  = SportDb::Model::Goal
+  end
+end
+
+

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

@@ -1,15 +1,15 @@
-
-module SportDb
-  module Model
-
-
-class Goal < ActiveRecord::Base
-
-  belongs_to :game
-  belongs_to :person, class_name: 'PersonDb::Model::Person', foreign_key: 'person_id'
-
-end  # class Goal
-
-
-  end # module Model
-end # module SportDb
+
+module SportDb
+  module Model
+
+
+class Goal < ActiveRecord::Base
+
+  belongs_to :match
+  belongs_to :person, class_name: 'PersonDb::Model::Person', foreign_key: 'person_id'
+
+end  # class Goal
+
+
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/models/ground.rb

@@ -0,0 +1,16 @@
+
+module SportDb
+  module Model
+
+class Ground < ActiveRecord::Base
+
+  belongs_to :country, class_name: 'WorldDb::Model::Country', foreign_key: 'country_id'
+  belongs_to :city,    class_name: 'WorldDb::Model::City',    foreign_key: 'city_id'
+
+  has_many :matches
+
+end # class Ground
+
+  end # module Model
+end # module SportDb
+

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

@@ -5,11 +5,7 @@ module SportDb
 
 class Group < 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
 
@@ -17,7 +13,14 @@ end
   has_many :teams, :through => :group_teams
 
 end # class Group
-  
-  
+
+
+class GroupTeam < ActiveRecord::Base
+  self.table_name = 'groups_teams'
+
+  belongs_to :group
+  belongs_to :team
+end # class GroupTeam
+
   end # module Model
 end # module SportDb

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}

@@ -1,18 +1,17 @@
-
-module SportDb
-  module Model
-
-### use LineUp, Squad for name? - alias??
-
-class Roster < ActiveRecord::Base
-
-  belongs_to :event
-  belongs_to :team
-  belongs_to :person, class_name: 'PersonDb::Model::Person', foreign_key: 'person_id'
-
-end  # class Roster
-
-
-  end # module Model
-end # module SportDb
-
+
+module SportDb
+  module Model
+
+### use Squad for name? - alias??
+
+class Lineup < ActiveRecord::Base
+
+  belongs_to :event
+  belongs_to :team
+  belongs_to :person, class_name: 'PersonDb::Model::Person', foreign_key: 'person_id'
+
+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,61 +126,15 @@ class Game < ActiveRecord::Base
   def score2ot=(value) self.score2et = value  end
 
 
-  # game over?
-  def over?()     play_at <= Time.now;  end
+  # match over?
+  ##  todo/fix: add back time (hours/minutes) to date if present!!!!
+  def over?()     date <= Date.today;  end
 
   ## fix/todo: already added by ar magic ??? remove code
   def knockout?() knockout == true;  end
   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 +176,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 +189,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