make all module compatible with rails3

lib/comment_methods.rb

@@ -9,28 +9,21 @@ module Comment
 
     def self.included(comment_model)
       comment_model.extend Finders
-      comment_model.named_scope :in_order, {:order => 'created_at ASC'}
-      comment_model.named_scope :recent, {:order => "created_at DESC"}
-      comment_model.named_scope :limit, lambda {|limit| {:limit => limit}}
+      comment_model.scope :in_order, comment_model.order('created_at ASC')
+      comment_model.scope :recent,   comment_model.order('created_at DESC')
     end
 
     module Finders
       # Helper class method to lookup all comments assigned
       # to all commentable types for a given user.
       def find_comments_by_user(user)
-        find(:all,
-          :conditions => ["user_id = ?", user.id],
-          :order => "created_at DESC"
-        )
+        where(["user_id = ?", user.id]).order("created_at DESC")
       end
 
       # Helper class method to look up all comments for 
       # commentable class name and commentable id.
       def find_comments_for_commentable(commentable_str, commentable_id)
-        find(:all,
-          :conditions => ["commentable_type = ? and commentable_id = ?", commentable_str, commentable_id],
-          :order => "created_at DESC"
-        )
+        where(["commentable_type = ? and commentable_id = ?", commentable_str, commentable_id]).order("created_at DESC")
       end
 
       # Helper class method to look up a commentable object
@@ -40,4 +33,4 @@ def find_commentable(commentable_str, commentable_id)
       end
     end
   end
-end
+end

lib/commentable_methods.rb

@@ -23,34 +23,23 @@ module SingletonMethods
         # This method is equivalent to obj.comments.
         def find_comments_for(obj)
           commentable = ActiveRecord::Base.send(:class_name_of_active_record_descendant, self).to_s
-
-          Comment.find(:all,
-            :conditions => ["commentable_id = ? and commentable_type = ?", obj.id, commentable],
-            :order => "created_at DESC"
-          )
+          Comment.find_comments_for_commentable(commentable, obj.id)
         end
 
         # Helper class method to lookup comments for
         # the mixin commentable type written by a given user.  
         # This method is NOT equivalent to Comment.find_comments_for_user
         def find_comments_by_user(user) 
           commentable = ActiveRecord::Base.send(:class_name_of_active_record_descendant, self).to_s
-
-          Comment.find(:all,
-            :conditions => ["user_id = ? and commentable_type = ?", user.id, commentable],
-            :order => "created_at DESC"
-          )
+          Comment.where(["user_id = ? and commentable_type = ?", user.id, commentable]).order("created_at DESC")
         end
       end
 
       # This module contains instance methods
       module InstanceMethods
         # Helper method to sort comments by date
         def comments_ordered_by_submitted
-          Comment.find(:all,
-            :conditions => ["commentable_id = ? and commentable_type = ?", id, self.class.name],
-            :order => "created_at DESC"
-          )
+          Comment.find_comments_for_commentable(self.class.name, id)
         end
 
         # Helper method that defaults the submitted time.

lib/generators/comment/templates/comment.rb

@@ -12,5 +12,4 @@ class Comment < ActiveRecord::Base
 
   # NOTE: Comments belong to a user
   belongs_to :user
-
 end