sportdb-models 1.19.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bccadbad7c54602a83e586c0eda1e125a5cccd6
-  data.tar.gz: 5ae4f27e9bde5789e73422bc88bb09b58f659ac8
+  metadata.gz: fa3708f265e85ff08b23288dbb6a0d9a9d99892e
+  data.tar.gz: 0143b37e2c0eeab01bde7aaa6d66619bd81f5a4e
 SHA512:
-  metadata.gz: 03e5aff14e4f82d56d084315b3f9570bf9c560aae14bdbe317c8b877ec37ac8d454443732670a6160c33c135427ba6892c126ac77a47a8c5230dea360b4a7c18
-  data.tar.gz: bd3c9d78dc0cbb414ef5b99fe09e0fb1583f9dc1b79be38d1eee04ed6c9922aa09ba3f99560dd9d0363d0ecab9a469938ba41b8232198b4664e38cf6cd95021e
+  metadata.gz: b7835c911d31c45e12a4a4d07f29188f4bbd95cbf1a8534ed5dd025f42e02f39832763ccaf73c35847be8f4a89ef004ca7d33103ae28a7a17faf602b503d901d
+  data.tar.gz: 072c3f07aebb20fc10bb6df827d4a87274aa7dce0c5ad7ad9dd78c2f2555103084a871b24fa9c22b9b1c021da443343704a3ee75f66cebc9c760494e92d39966

data/Manifest.txt

@@ -2,46 +2,35 @@ CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
-lib/sportdb/calc.rb
-lib/sportdb/deleter.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/schema.rb
-lib/sportdb/standings.rb
-lib/sportdb/stats.rb
-lib/sportdb/version.rb
+lib/sportdb/models/version.rb
 test/helper.rb
 test/test_changes.rb
 test/test_cursor.rb

data/Rakefile

@@ -1,5 +1,5 @@
 require 'hoe'
-require './lib/sportdb/version.rb'
+require './lib/sportdb/models/version.rb'
 
 
 Hoe.spec 'sportdb-models' do

data/lib/sportdb/models.rb

@@ -8,54 +8,41 @@ require 'persondb/models'
 
 # our own code
 
-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/calc'       # fix/todo: obsolete - replace w/ standings
-require 'sportdb/standings'
-
-require 'sportdb/deleter'
-require 'sportdb/stats'
+require 'sportdb/models/version'    # let version always go first
+
+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/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/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/models/utils'   # e.g. MatchCursor
+
+require 'sportdb/models/deleter'
+require 'sportdb/models/stats'
 
 
 module SportDb
@@ -155,5 +142,24 @@ module SportDb
 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
+
+

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}

@@ -8,7 +8,7 @@ class Badge < ActiveRecord::Base
   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}

@@ -15,14 +15,14 @@ module SportDb
 
   Person    = PersonDb::Model::Person
 
-  ## nb: for now only team and league use worlddb tables
+  ## 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 Team   < ActiveRecord::Base ; end
   class League < ActiveRecord::Base ; end
   class Ground < ActiveRecord::Base ; end
-  class Goal  < ActiveRecord::Base ; end
+  class Goal   < ActiveRecord::Base ; end
 
   end
 

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

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

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