[80843] branches/gsoc11-statistics/stats-server/app/models

[derek at macports.org]

Revision: 80843
          http://trac.macports.org/changeset/80843
Author:   derek at macports.org
Date:     2011-07-18 15:12:12 -0700 (Mon, 18 Jul 2011)
Log Message:
-----------
Updated models: Added associations and light validations

Port
- A port has many installed ports 
- Added presence validations for name, version

InstalledPort
- An installed port belongs to a port
- An installed port has one user
- Added presence validations for user_id, port_id, version

User
- Fixed typo. User has one OsStatistic entry

Modified Paths:
--------------
    branches/gsoc11-statistics/stats-server/app/models/installed_port.rb
    branches/gsoc11-statistics/stats-server/app/models/port.rb
    branches/gsoc11-statistics/stats-server/app/models/user.rb

Modified: branches/gsoc11-statistics/stats-server/app/models/installed_port.rb
===================================================================
--- branches/gsoc11-statistics/stats-server/app/models/installed_port.rb	2011-07-18 22:09:20 UTC (rev 80842)
+++ branches/gsoc11-statistics/stats-server/app/models/installed_port.rb	2011-07-18 22:12:12 UTC (rev 80843)
@@ -1,3 +1,6 @@
 class InstalledPort < ActiveRecord::Base
-
+  belongs_to :port
+  has_one    :user
+  
+  validates_presence_of :user_id, :port_id, :version
 end

Modified: branches/gsoc11-statistics/stats-server/app/models/port.rb
===================================================================
--- branches/gsoc11-statistics/stats-server/app/models/port.rb	2011-07-18 22:09:20 UTC (rev 80842)
+++ branches/gsoc11-statistics/stats-server/app/models/port.rb	2011-07-18 22:12:12 UTC (rev 80843)
@@ -1,7 +1,11 @@
 class Port < ActiveRecord::Base
   has_one :category
   belongs_to :category
+  has_many :installed_ports
 
+
+  validates_presence_of :name, :version
+
   def self.search(criteria, val, page)
     paginate :per_page => 50, :page => page, :conditions => ["#{self.columns_hash[criteria].name} like ?", "%#{val}%"], :order => 'name ASC'
   end

Modified: branches/gsoc11-statistics/stats-server/app/models/user.rb
===================================================================
--- branches/gsoc11-statistics/stats-server/app/models/user.rb	2011-07-18 22:09:20 UTC (rev 80842)
+++ branches/gsoc11-statistics/stats-server/app/models/user.rb	2011-07-18 22:12:12 UTC (rev 80843)
@@ -1,4 +1,4 @@
 class User < ActiveRecord::Base
-  has_one  :os_statistics
+  has_one  :os_statistic
   has_many :installed_ports
 end
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110718/1afd4945/attachment.html>