community_engine 2.3.2 → 3.0.0

data/app/models/message_thread.rb

@@ -15,7 +15,7 @@ class MessageThread < ActiveRecord::Base
   end
   
   def self.for(message, user)
-    find(:first, :conditions => {:parent_message_id => (message.parent_id || message.id), :recipient_id => user.id})
+    where(:parent_message_id => (message.parent_id || message.id), :recipient_id => user.id).first
   end
   
   def mark_messages_deleted

data/app/models/metro_area.rb

@@ -3,8 +3,6 @@ class MetroArea < ActiveRecord::Base
   belongs_to :state
   belongs_to :country
 
-  attr_accessible :name, :state, :country_id, :state_id
-
   #validates_presence_of :state, :if => Proc.new { |user| user.country.eql?(Country.get(:us)) }
   validates_presence_of :country_id
   validates_presence_of :name

data/app/models/page.rb

@@ -2,8 +2,6 @@ class Page < ActiveRecord::Base
   acts_as_publishable :live, :draft, :members_only, :public
   validates_presence_of :title, :body
 
-  attr_accessible :title, :body, :published_as, :page_public
-
   def to_param
     id.to_s << "-" << (title ? title.parameterize : '')
   end

data/app/models/photo.rb

@@ -5,9 +5,9 @@ class Photo < ActiveRecord::Base
   belongs_to :album
 
   has_attached_file :photo, configatron.photo.paperclip_options.to_hash
-  validates_attachment_presence :photo, :unless => Proc.new{|record| record.photo_remote_url }, :message => :photo_presence_error.l
-  validates_attachment_content_type :photo, :content_type => configatron.photo.validation_options.content_type, :message => :photo_content_type_error.l
-  validates_attachment_size :photo, :less_than => configatron.photo.validation_options.max_size.to_i.megabytes, :message => :photo_size_limit_error.l(:count => configatron.photo.validation_options.max_size)
+  validates_attachment_presence :photo, :unless => Proc.new{|record| record.photo_remote_url }
+  validates_attachment_content_type :photo, :content_type => configatron.photo.validation_options.content_type
+  validates_attachment_size :photo, :less_than => configatron.photo.validation_options.max_size.to_i.megabytes
 
   attr_accessor :crop_x, :crop_y, :crop_w, :crop_h, :photo_remote_url
   after_update :reprocess_photo, :if => :cropping?
@@ -22,9 +22,8 @@ class Photo < ActiveRecord::Base
   has_one :user_as_avatar, :class_name => "User", :foreign_key => "avatar_id", :inverse_of => :avatar
 
   #Named scopes
-  scope :recent, :order => "photos.created_at DESC"
-  scope :new_this_week, :order => "photos.created_at DESC", :conditions => ["photos.created_at > ?", 7.days.ago.iso8601]
-  attr_accessible :name, :description, :photo, :photo_remote_url, :crop_x, :crop_y, :crop_w, :crop_h, :user_id, :album_id
+  scope :recent, lambda { order("photos.created_at DESC") }
+  scope :new_this_week, lambda { order("photos.created_at DESC").where("photos.created_at > ?", 7.days.ago.iso8601) }
 
   def display_name
     (self.name && self.name.length>0) ? self.name : "#{:created_at.l.downcase}: #{I18n.l(self.created_at, :format => :published_date)}"
@@ -56,7 +55,7 @@ class Photo < ActiveRecord::Base
 
 
   def self.find_recent(options = {:limit => 3})
-    self.new_this_week.find(:all, :limit => options[:limit])
+    self.new_this_week.limit(options[:limit])
   end
 
   def self.find_related_to(photo, options = {})
@@ -84,7 +83,8 @@ class Photo < ActiveRecord::Base
   private
 
   def reprocess_photo
-    photo.reprocess!
+    photo.assign(photo)
+    photo.save
   end
 
 end

data/app/models/poll.rb

@@ -4,7 +4,6 @@ class Poll < ActiveRecord::Base
   validates_presence_of :post
   has_many :votes, :dependent => :destroy
   belongs_to :post
-  attr_accessible :question, :post_id, :post
       
   def voted?(user)
     !self.votes.find_by_user_id(user.id).nil?
@@ -19,22 +18,21 @@ class Poll < ActiveRecord::Base
 
   def self.find_recent(options = {})
     options.reverse_merge! :limit => 5
-    find(:all, :order => "polls.created_at desc", :limit => options[:limit], :include => [:post => :user])
+    self.includes(:post => :user).order("polls.created_at desc").limit(options[:limit])
   end
 
   def self.find_popular(options = {})
     options.reverse_merge! :limit => 5, :since => 10.days.ago
-    
-    find(:all, :order => "polls.votes_count desc", 
-      :limit => options[:limit], 
-      :include => [:post => :user],
-      :conditions => ["polls.created_at > ?", options[:since]]
-    )
+
+    self.includes(:post => :user)
+      .where("polls.created_at > ?", options[:since])
+      .order("polls.votes_count desc")
+      .limit(options[:limit])
   end
 
   def self.find_popular_in_category(category, options = {})
     options.reverse_merge! :limit => 5
-    self.includes(:post).order('polls.votes_count desc').limit(options[:limit]).where('posts.category_id = ?', category.id)
+    self.includes(:post).order('polls.votes_count desc').where('posts.category_id = ?', category.id).references(:posts).limit(options[:limit])
   end
 
 end

data/app/models/post.rb

@@ -1,7 +1,6 @@
 class Post < ActiveRecord::Base
   include Rakismet::Model
   rakismet_attrs :comment_type => 'post'
-  attr_protected :akismet_attrs
 
   acts_as_moderated_commentable
 
@@ -33,14 +32,12 @@ class Post < ActiveRecord::Base
 
   attr_accessor :invalid_emails
 
-  attr_accessible :category_id, :title, :raw_post, :published_as, :send_comment_notifications
-
   # Class Methods
   class << self
 
     # Scopes
     def by_featured_writers
-      where("users.featured_writer = ?", true).includes(:user)
+      includes(:user).where("users.featured_writer = ?", true).references(:users)
     end
     def popular
       order('posts.view_count DESC')
@@ -62,28 +59,27 @@ class Post < ActiveRecord::Base
     end
 
     def find_recent(options = {:limit => 5})
-      recent.find :all, options
+      recent.limit(options[:limit])
     end
 
     def find_popular(options = {} )
       options.reverse_merge! :limit => 5, :since => 7.days
 
-      self.popular.since(options[:since]).limit(options[:limit]).all
+      self.popular.since(options[:since]).limit(options[:limit])
     end
 
     def find_featured(options = {:limit => 10})
-      self.recent.by_featured_writers.limit(options[:limit]).all
+      self.recent.by_featured_writers.limit(options[:limit])
     end
 
     def find_most_commented(limit = 10, since = 7.days.ago)
-      Post.find(:all,
-        :select => 'posts.*, count(*) as comments_count',
-        :joins => "LEFT JOIN comments ON comments.commentable_id = posts.id",
-        :conditions => ['comments.commentable_type = ? AND posts.published_at > ?', 'Post', since],
-        :group => self.columns.map{|column| self.table_name + "." + column.name}.join(","),
-        :order => 'comments_count DESC',
-        :limit => limit
-        )
+      Post.select('posts.*', 'count(*) as comments_count')
+      .joins("LEFT JOIN comments ON comments.commentable_id = posts.id")
+      .where('comments.commentable_type = ? AND posts.published_at > ?', 'Post', since)
+      .references('comments')
+      .group(self.columns.map{|column| self.table_name + "." + column.name}.join(","))
+      .order('comments_count DESC')
+      .limit(limit)
     end
 
     def new_from_bookmarklet(params)

data/app/models/role.rb

@@ -1,6 +1,5 @@
 class Role < ActiveRecord::Base
   acts_as_enumerated
-  validates_presence_of :name  
-  attr_accessible :name
+  validates_presence_of :name
 end
 

data/app/models/rsvp.rb

@@ -9,9 +9,6 @@ class Rsvp < ActiveRecord::Base
   belongs_to :user
   belongs_to :event
 
-  attr_protected :user_id
-  attr_protected :event_id
-
 private
 
   def event_allows_rsvp

data/app/models/sb_post.rb

@@ -10,11 +10,13 @@ class SbPost < ActiveRecord::Base
   format_attribute :body
   before_create { |r| r.forum_id = r.topic.forum_id }
   after_create  { |r| 
-    Topic.update_all(['replied_at = ?, replied_by = ?, last_post_id = ?', r.created_at, r.user_id, r.id], ['id = ?', r.topic_id]) 
+    Topic.where('id = ?', r.topic_id)
+    .update_all(['replied_at = ?, replied_by = ?, last_post_id = ?', r.created_at, r.user_id, r.id])
+
   }
   after_destroy { |r| 
     t = Topic.find(r.topic_id)
-    Topic.update_all(['replied_at = ?, replied_by = ?, last_post_id = ?', t.sb_posts.recent.last.created_at, t.sb_posts.recent.last.user_id, t.sb_posts.recent.last.id], ['id = ?', t.id]) if t.sb_posts.recent.last 
+    Topic.where('id = ?', t.id).update_all(['replied_at = ?, replied_by = ?, last_post_id = ?', t.sb_posts.recent.last.created_at, t.sb_posts.recent.last.user_id, t.sb_posts.recent.last.id]) if t.sb_posts.recent.last
   }
 
   validates_presence_of :user_id, :unless => Proc.new{|record| configatron.allow_anonymous_forum_posting }
@@ -23,18 +25,21 @@ class SbPost < ActiveRecord::Base
   validates_presence_of :author_ip, :unless => Proc.new{|record| record.user} #log ip unless logged in
 
   validates_presence_of :body, :topic
-  
-  attr_accessible :body, :author_email, :author_ip, :author_name, :author_url, :topic, :user_id
+
   after_create :monitor_topic
   after_create :notify_monitoring_users  
   
-  scope :with_query_options, :select => 'sb_posts.*, topics.title as topic_title, forums.name as forum_name', :joins => 'inner join topics on sb_posts.topic_id = topics.id inner join forums on topics.forum_id = forums.id', :order => 'sb_posts.created_at desc'
-  scope :recent, :order => 'sb_posts.created_at ASC'
+  scope :with_query_options, lambda {
+    select('sb_posts.*, topics.title as topic_title, forums.name as forum_name')
+    .joins('inner join topics on sb_posts.topic_id = topics.id inner join forums on topics.forum_id = forums.id')
+    .order('sb_posts.created_at desc')
+  }
+  scope :recent, -> { order('sb_posts.created_at ASC') }
   validate :check_spam    
     
   def monitor_topic
     return unless user    
-    monitorship = Monitorship.find_or_initialize_by_user_id_and_topic_id(self.user.id, self.topic.id)
+    monitorship = Monitorship.where(:user_id => self.user.id, :topic_id => self.topic.id).first_or_initialize
     if monitorship.new_record?
       monitorship.update_attribute :active, true
     end
@@ -53,8 +58,8 @@ class SbPost < ActiveRecord::Base
   end
   
   def check_spam
-    if !configatron.akismet_key.nil? && self.spam?
-      self.errors.add(:base, :comment_spam_error.l) 
+    if configatron.has_key?(:akismet_key) && self.spam?
+      self.errors.add(:base, :comment_spam_error.l)
     end
   end  
   

data/app/models/state.rb

@@ -1,6 +1,4 @@
 class State < ActiveRecord::Base
   has_many :metro_areas
   # belongs_to :country
-
-  attr_accessible :name
 end

data/app/models/topic.rb

@@ -5,7 +5,7 @@ class Topic < ActiveRecord::Base
   belongs_to :forum, :counter_cache => true
   belongs_to :user
   has_many :monitorships
-  has_many :monitors, :through => :monitorships, :conditions => ['monitorships.active = ?', true], :source => :user
+  has_many :monitors, -> { where('monitorships.active = ?', true) }, :through => :monitorships, :source => :user
 
   has_many :sb_posts, :dependent => :destroy, :inverse_of => :topic
 
@@ -17,9 +17,8 @@ class Topic < ActiveRecord::Base
   after_create  :create_monitorship_for_owner
   
   accepts_nested_attributes_for :sb_posts
-  attr_accessible :title, :sticky, :locked, :sb_posts_attributes, :forum_id, :user_id
-
-  scope :recently_replied, order('replied_at DESC')
+  
+  scope :recently_replied, -> {order('replied_at DESC')}
 
   def notify_of_new_post(post)
     monitorships.each do |m|
@@ -64,11 +63,11 @@ class Topic < ActiveRecord::Base
     end
 
     def set_post_topic_id
-      SbPost.update_all ['forum_id = ?', forum_id], ['topic_id = ?', id]
+      SbPost.where('topic_id = ?', id).update_all(['forum_id = ?', forum_id])
     end
     
     def create_monitorship_for_owner
-      monitorship = Monitorship.find_or_initialize_by_user_id_and_topic_id(user.id, self.id)
+      monitorship = Monitorship.find_or_initialize_by(:user_id => user.id, :topic_id => self.id)
       monitorship.update_attribute :active, true      
     end
 end

data/app/models/user.rb

@@ -2,15 +2,15 @@ require 'digest/sha1'
 require 'bcrypt'
 
 class User < ActiveRecord::Base
+  extend FriendlyId
   include UrlUpload
   include FacebookProfile
   include TwitterProfile
 
   include Rakismet::Model
   rakismet_attrs :author => :login, :comment_type => 'registration', :content => :description, :user_ip => :last_login_ip, :author_email => :email
-  attr_protected :admin, :featured, :role_id, :akismet_attrs
 
-  has_friendly_id :login, :use_slug => true, :cache_column => 'login_slug'
+  friendly_id :login, :use => [:slugged, :finders], :slug_column => 'login_slug'
 
   MALE    = 'M'
   FEMALE  = 'F'
@@ -20,15 +20,15 @@ class User < ActiveRecord::Base
       c.transition_from_crypto_providers = CommunityEngineSha1CryptoMethod
       c.crypto_provider = Authlogic::CryptoProviders::BCrypt
 
-      c.validates_length_of_password_field_options = { :within => 6..20, :if => :password_required? }
-      c.validates_length_of_password_confirmation_field_options = { :within => 6..20, :if => :password_required? }
+      c.validates_length_of_password_field_options = { :within => configatron.authlogic.password_length, :if => :password_required? }
+      c.validates_length_of_password_confirmation_field_options = { :within => configatron.authlogic.password_length, :if => :password_required? }
 
-      c.validates_length_of_login_field_options = { :minimum => 5, :unless => :omniauthed? }
+      c.validates_length_of_login_field_options = { :within => configatron.authlogic.login_length, :unless => :omniauthed? }
       c.validates_format_of_login_field_options = { :with => configatron.regexes.login, :unless => :omniauthed? }
 
-      c.validates_length_of_email_field_options = { :within => 3..100, :if => :email_required? }
+      c.validates_length_of_email_field_options = { :within => configatron.authlogic.email_length, :if => :email_required? }
       c.validates_format_of_email_field_options = { :with => configatron.regexes.email, :if => :email_required? }
-      c.validates_uniqueness_of_email_field_options :case_sensitive => false
+      c.validates_uniqueness_of_email_field_options :case_sensitive => configatron.authlogic.email_case_sensitive
     end
   rescue StandardError
     puts 'Failed to initialize AuthLogic'
@@ -57,73 +57,62 @@ class User < ActiveRecord::Base
 
   #associations
     has_many :authorizations, :dependent => :destroy
-    has_many :posts, :order => "published_at desc", :dependent => :destroy
-    has_many :photos, :order => "created_at desc", :dependent => :destroy
+    has_many :posts, -> {order("published_at desc")}, :dependent => :destroy
+    has_many :photos, -> {order("created_at desc")}, :dependent => :destroy
     has_many :invitations, :dependent => :destroy
     has_many :rsvps, :dependent => :destroy
     has_many :albums, :dependent => :destroy
 
     #friendship associations
     has_many :friendships, :class_name => "Friendship", :foreign_key => "user_id", :dependent => :destroy
-    has_many :accepted_friendships, :class_name => "Friendship", :conditions => ['friendship_status_id = ?', 2]
-    has_many :pending_friendships, :class_name => "Friendship", :conditions => ['initiator = ? AND friendship_status_id = ?', false, 1]
-    has_many :friendships_initiated_by_me, :class_name => "Friendship", :foreign_key => "user_id", :conditions => ['initiator = ?', true], :dependent => :destroy
-    has_many :friendships_not_initiated_by_me, :class_name => "Friendship", :foreign_key => "user_id", :conditions => ['initiator = ?', false], :dependent => :destroy
+    has_many :accepted_friendships, -> { where('friendship_status_id = ?', 2) }, :class_name => "Friendship"
+    has_many :pending_friendships, -> { where('initiator = ? AND friendship_status_id = ?', false, 1) }, :class_name => "Friendship"
+    has_many :friendships_initiated_by_me, -> { where('initiator = ?', true) }, :class_name => "Friendship", :foreign_key => "user_id", :dependent => :destroy
+    has_many :friendships_not_initiated_by_me, -> { where('initiator = ?', false) }, :class_name => "Friendship", :foreign_key => "user_id", :dependent => :destroy
     has_many :occurances_as_friend, :class_name => "Friendship", :foreign_key => "friend_id", :dependent => :destroy
 
     #forums
     has_many :moderatorships, :dependent => :destroy
-    has_many :forums, :through => :moderatorships, :order => 'forums.name'
+    has_many :forums, -> { order("forums.name") }, :through => :moderatorships
     has_many :sb_posts, :dependent => :destroy
     has_many :topics, :dependent => :destroy
     has_many :monitorships, :dependent => :destroy
-    has_many :monitored_topics, :through => :monitorships, :conditions => ['monitorships.active = ?', true], :order => 'topics.replied_at desc', :source => :topic
+    has_many :monitored_topics, -> { where('monitorships.active = ?', true).order('topics.replied_at desc') }, :through => :monitorships, :source => :topic
 
     belongs_to  :avatar, :class_name => "Photo", :foreign_key => "avatar_id", :inverse_of => :user_as_avatar
     belongs_to  :metro_area, :counter_cache => true
     belongs_to  :state
     belongs_to  :country
-    has_many    :comments_as_author, :class_name => "Comment", :foreign_key => "user_id", :order => "created_at desc", :dependent => :destroy
-    has_many    :comments_as_recipient, :class_name => "Comment", :foreign_key => "recipient_id", :order => "created_at desc", :dependent => :destroy
-    has_many    :clippings, :order => "created_at desc", :dependent => :destroy
-    has_many    :favorites, :order => "created_at desc", :dependent => :destroy
+    has_many    :comments_as_author, -> { order("created_at desc") }, :class_name => "Comment", :foreign_key => "user_id", :dependent => :destroy
+    has_many    :comments_as_recipient, -> { order("created_at desc") }, :class_name => "Comment", :foreign_key => "recipient_id", :dependent => :destroy
+    has_many    :clippings, -> { order("created_at desc") }, :dependent => :destroy
+    has_many    :favorites, -> { order("created_at desc") }, :dependent => :destroy
 
     #messages
     has_many :all_sent_messages, :class_name => "Message", :foreign_key => "sender_id", :dependent => :destroy
-    has_many :sent_messages,
+    has_many :sent_messages, -> { where("messages.sender_deleted = ?", false).order("messages.created_at DESC") },
              :class_name => 'Message',
-             :foreign_key => 'sender_id',
-             :order => "messages.created_at DESC",
-             :conditions => ["messages.sender_deleted = ?", false]
+             :foreign_key => 'sender_id'
 
-    has_many :received_messages,
+    has_many :received_messages, -> { where("messages.recipient_deleted = ?", false).order("messages.created_at DESC") },
              :class_name => 'Message',
-             :foreign_key => 'recipient_id',
-             :order => "message.created_at DESC",
-             :conditions => ["message.recipient_deleted = ?", false]
+             :foreign_key => 'recipient_id'
     has_many :message_threads_as_recipient, :class_name => "MessageThread", :foreign_key => "recipient_id"
 
   #named scopes
-  scope :recent, order('users.created_at DESC')
-  scope :featured, where(:featured_writer => true)
-  scope :active, where("users.activated_at IS NOT NULL")
-  scope :vendors, where(:vendor => true)
+  scope :recent, -> {order('users.created_at DESC')}
+  scope :featured, -> { where(:featured_writer => true) }
+  scope :active, -> {where("users.activated_at IS NOT NULL")}
+  scope :vendors, -> {where(:vendor => true)}
 
 
-  accepts_nested_attributes_for :avatar
-  attr_accessible :avatar_id, :company_name, :country_id, :description, :email,
-    :firstname, :fullname, :gender, :lastname, :login, :metro_area_id,
-    :middlename, :notify_comments, :notify_community_news,
-    :notify_friend_requests, :password, :password_confirmation,
-    :profile_public, :state_id, :stylesheet, :time_zone, :vendor, :zip, :avatar_attributes, :birthday,
-    :activated_at, :activation_code
-
   attr_accessor :authorizing_from_omniauth
+  accepts_nested_attributes_for :avatar
 
   ## Class Methods
 
   def self.find_by_login_or_email(string)
-    self.first(:conditions => ["LOWER(email) = ? OR LOWER(login) = ?", string.downcase, string.downcase])
+    self.where("LOWER(email) = ? OR LOWER(login) = ?", string.downcase, string.downcase).first
   end
 
   def self.find_country_and_state_from_search_params(search)
@@ -140,7 +129,7 @@ class User < ActiveRecord::Base
 
     states  = country ? country.states.sort_by{|s| s.name} : []
     if states.any?
-      metro_areas = state ? state.metro_areas.all(:order => "name") : []
+      metro_areas = state ? state.metro_areas.order("name") : []
     else
       metro_areas = country ? country.metro_areas : []
     end
@@ -169,13 +158,13 @@ class User < ActiveRecord::Base
       users = users.where(user[:metro_area_id].eq(search['metro_area_id']))
     end
     if search['login']
-      users = users.where('`users`.login LIKE ?', "%#{search['login']}%")
+      users = users.where(user[:login].matches("%#{search['login']}%"))
     end
     if search['vendor']
       users = users.where(user[:vendor].eq(true))
     end
     if search['description']
-      users = users.where('`users`.description LIKE ?', "%#{search['description']}%")
+      users = users.where(user[:description].matches("%#{search['description']}%"))
     end
     users
   end
@@ -183,14 +172,12 @@ class User < ActiveRecord::Base
   def self.find_by_activity(options = {})
     options.reverse_merge! :limit => 30, :require_avatar => true, :since => 7.days.ago
 
-    activities = Activity.since(options[:since]).find(:all,
-      :select => 'activities.user_id, count(*) as count',
-      :group => 'activities.user_id',
-      :conditions => "#{options[:require_avatar] ? ' users.avatar_id IS NOT NULL AND ' : ''} users.activated_at IS NOT NULL",
-      :order => 'count DESC',
-      :joins => "LEFT JOIN users ON users.id = activities.user_id",
-      :limit => options[:limit]
-      )
+    activities = Activity.since(options[:since]).select('activities.user_id, count(*) as count').
+      group('activities.user_id').
+      where("#{options[:require_avatar] ? ' users.avatar_id IS NOT NULL AND ' : ''} users.activated_at IS NOT NULL").
+      order('count DESC').
+      joins( "LEFT JOIN users ON users.id = activities.user_id").
+      limit(options[:limit])
     activities.map{|a| find(a.user_id) }
   end
 
@@ -214,12 +201,12 @@ class User < ActiveRecord::Base
   end
 
   def self.currently_online
-    User.find(:all, :conditions => ["sb_last_seen_at > ?", Time.now.utc-5.minutes])
+    User.where("sb_last_seen_at > ?", Time.now.utc-5.minutes)
   end
 
   def self.search(query, options = {})
     with_scope :find => { :conditions => build_search_conditions(query) } do
-      find :all, options
+      where(options)
     end
   end
 
@@ -233,7 +220,7 @@ class User < ActiveRecord::Base
   ## Instance Methods
 
   def moderator_of?(forum)
-    moderatorships.count(:all, :conditions => ['forum_id = ?', (forum.is_a?(Forum) ? forum.id : forum)]) == 1
+    moderatorships.where('forum_id = ?', (forum.is_a?(Forum) ? forum.id : forum)).count == 1
   end
 
   def monitoring_topic?(topic)
@@ -243,16 +230,16 @@ class User < ActiveRecord::Base
   def recount_metro_area_users
     return unless self.metro_area
     ma = self.metro_area
-    ma.users_count = User.count(:conditions => ["metro_area_id = ?", ma.id])
+    ma.users_count = User.where("metro_area_id = ?", ma.id).count
     ma.save
   end
 
   def this_months_posts
-    self.posts.find(:all, :conditions => ["published_at > ?", DateTime.now.to_time.at_beginning_of_month])
+    self.posts.where("published_at > ?", DateTime.now.to_time.at_beginning_of_month)
   end
 
   def last_months_posts
-    self.posts.find(:all, :conditions => ["published_at > ? and published_at < ?", DateTime.now.to_time.at_beginning_of_month.months_ago(1), DateTime.now.to_time.at_beginning_of_month])
+    self.posts.where("published_at > ? and published_at < ?", DateTime.now.to_time.at_beginning_of_month.months_ago(1), DateTime.now.to_time.at_beginning_of_month)
   end
 
   def avatar_photo_url(size = :original)
@@ -335,7 +322,7 @@ class User < ActiveRecord::Base
   end
 
   def friendship_exists_with?(friend)
-    Friendship.find(:first, :conditions => ["user_id = ? AND friend_id = ?", self.id, friend.id])
+    Friendship.where("user_id = ? AND friend_id = ?", self.id, friend.id).first
   end
 
   def deliver_signup_notification
@@ -348,7 +335,7 @@ class User < ActiveRecord::Base
   end
 
   def has_reached_daily_friend_request_limit?
-    friendships_initiated_by_me.count(:conditions => ['created_at > ?', Time.now.beginning_of_day]) >= Friendship.daily_request_limit
+    friendships_initiated_by_me.where('created_at > ?', Time.now.beginning_of_day).count >= Friendship.daily_request_limit
   end
 
   def network_activity(page = {}, since = 1.week.ago)
@@ -404,7 +391,7 @@ class User < ActiveRecord::Base
   end
 
   def update_last_seen_at
-    User.update_all ['sb_last_seen_at = ?', Time.now.utc], ['id = ?', self.id]
+    User.where('id = ?', self.id).update_all(['sb_last_seen_at = ?', Time.now.utc])
     self.sb_last_seen_at = Time.now.utc
   end
 
@@ -413,7 +400,7 @@ class User < ActiveRecord::Base
   end
 
   def unread_message_count
-    message_threads_as_recipient.count(:conditions => ["messages.recipient_id = ? AND messages.recipient_deleted = ? AND read_at IS NULL", self.id, false], :include => :message)
+    message_threads_as_recipient.includes(:message).where("messages.recipient_id = ? AND messages.recipient_deleted = ? AND read_at IS NULL", self.id, false).references(:messages).count
   end
 
   def deliver_password_reset_instructions!
@@ -427,7 +414,7 @@ class User < ActiveRecord::Base
   end
 
   def self.find_or_create_from_authorization(auth)
-    user = User.find_or_initialize_by_email(:email => auth.email)
+    user = User.where(:email => auth.email).first_or_initialize
     user.login ||= auth.nickname
 
     if user.new_record?
@@ -446,7 +433,7 @@ class User < ActiveRecord::Base
   end
 
   def check_spam
-    if !configatron.akismet_key.nil? && self.spam?
+    if configatron.has_key?(:akismet_key) && self.spam?
       self.errors.add(:base, :user_spam_error.l)
     end
   end