Work round ruby's half assed Tempfile class which, because for some

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 2ad45e8acd7d87ae6e63d01583548e3bfe9b9900..61c76898a0f2b754eab98e7c257145ed33289e2b 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -5,11 +5,13 @@ class User < ActiveRecord::Base
   has_many :diary_entries, :order => 'created_at DESC'
   has_many :messages, :foreign_key => :to_user_id, :order => 'sent_on DESC'
   has_many :new_messages, :class_name => "Message", :foreign_key => :to_user_id, :conditions => "message_read = 0", :order => 'sent_on DESC'
   has_many :diary_entries, :order => 'created_at DESC'
   has_many :messages, :foreign_key => :to_user_id, :order => 'sent_on DESC'
   has_many :new_messages, :class_name => "Message", :foreign_key => :to_user_id, :conditions => "message_read = 0", :order => 'sent_on DESC'

+  has_many :sent_messages, :class_name => "Message", :foreign_key => :from_user_id, :order => 'sent_on DESC'

   has_many :friends
   has_many :tokens, :class_name => "UserToken"
   has_many :preferences, :class_name => "UserPreference"
 
   validates_presence_of :email, :display_name
   has_many :friends
   has_many :tokens, :class_name => "UserToken"
   has_many :preferences, :class_name => "UserPreference"
 
   validates_presence_of :email, :display_name

+  validates_confirmation_of :email, :message => 'Email addresses must match'

   validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'
   validates_uniqueness_of :display_name, :allow_nil => true
   validates_uniqueness_of :email
   validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'
   validates_uniqueness_of :display_name, :allow_nil => true
   validates_uniqueness_of :email


@@ -23,6 +25,8 @@ class User < ActiveRecord::Base
 
   before_save :encrypt_password
 
 
   before_save :encrypt_password
 

+  file_column :image, :magick => { :geometry => "100x100>" }
+

   def after_initialize
     self.creation_time = Time.now if self.creation_time.nil?
   end
   def after_initialize
     self.creation_time = Time.now if self.creation_time.nil?
   end


@@ -72,7 +76,7 @@ class User < ActiveRecord::Base
     return el1
   end
 
     return el1
   end
 

-  def nearby(radius = 50, num = 5)
+  def nearby(radius = 50, num = 10)

     if self.home_lon and self.home_lat 
       gc = OSM::GreatCircle.new(self.home_lat, self.home_lon)
       bounds = gc.bounds(radius)
     if self.home_lon and self.home_lat 
       gc = OSM::GreatCircle.new(self.home_lat, self.home_lon)
       bounds = gc.bounds(radius)