acts_as_commentable 2.1.1 → 3.0.0

data/lib/comment_methods.rb

@@ -9,28 +9,21 @@ module ActsAsCommentable
     
     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 @@ module ActsAsCommentable
       end
     end
   end
-end
+end

data/lib/commentable_methods.rb

@@ -10,8 +10,8 @@ module Juixe
       end
 
       module ClassMethods
-        def acts_as_commentable(options={})
-          has_many :comments, {:as => :commentable, :dependent => :destroy}.merge(options)
+        def acts_as_commentable
+          has_many :comments, :as => :commentable, :dependent => :destroy
           include Juixe::Acts::Commentable::InstanceMethods
           extend Juixe::Acts::Commentable::SingletonMethods
         end
@@ -23,11 +23,7 @@ module Juixe
         # 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
@@ -35,11 +31,7 @@ module Juixe
         # 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
       
@@ -47,10 +39,7 @@ module Juixe
       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.

data/lib/generators/comment/USEGA

@@ -0,0 +1,6 @@
+Description:
+    Copies comment.rb to app/models/.
+    Copies create_comment.rb to db/migrate
+
+Examples:
+    `rails generate comment`

data/lib/generators/comment/comment_generator.rb

@@ -0,0 +1,18 @@
+require 'rails/generators/migration'
+
+class CommentGenerator < Rails::Generators::Base
+  include Rails::Generators::Migration
+
+  def self.source_root
+    @_acts_as_commentable_source_root ||= File.expand_path("../templates", __FILE__)
+  end
+
+  def self.next_migration_number(path)
+    Time.now.utc.strftime("%Y%m%d%H%M%S")
+  end
+
+  def create_model_file
+    template "comment.rb", "app/models/comment.rb"
+    migration_template "create_comments.rb", "db/migrate/create_comments.rb"
+  end
+end

data/{generators → lib/generators}/comment/templates/comment.rb

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

metadata

@@ -3,10 +3,10 @@ name: acts_as_commentable
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 2
-  - 1
-  - 1
-  version: 2.1.1
+  - 3
+  - 0
+  - 0
+  version: 3.0.0
 platform: ruby
 authors: 
 - Cosmin Radoi, Jack Dempsey, Xelipe, Chris Eppstein
@@ -14,7 +14,7 @@ autorequire: acts_as_commentable
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -04:00
+date: 2010-03-07 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -30,16 +30,17 @@ extra_rdoc_files:
 files: 
 - MIT-LICENSE
 - README
-- generators/comment/comment_generator.rb
-- generators/comment/templates/comment.rb
-- generators/comment/templates/create_comments.rb
 - lib/acts_as_commentable.rb
 - lib/comment_methods.rb
 - lib/commentable_methods.rb
-- lib/tasks/acts_as_commentable_tasks.rake
+- lib/generators/comment/comment_generator.rb
+- lib/generators/comment/templates/comment.rb
+- lib/generators/comment/templates/create_comments.rb
+- lib/generators/comment/USEGA
+- tasks/acts_as_commentable_tasks.rake
 - init.rb
 - install.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://www.juixe.com/techknow/index.php/2006/06/18/acts-as-commentable-plugin/
 licenses: []
 
@@ -49,7 +50,6 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -57,7 +57,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -67,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Plugin/gem that provides comment functionality

data/generators/comment/comment_generator.rb

@@ -1,13 +0,0 @@
-class CommentGenerator < Rails::Generator::Base
-   def manifest
-     record do |m|
-       m.directory 'app/models'
-       m.file 'comment.rb', 'app/models/comment.rb'
-       m.migration_template "create_comments.rb", "db/migrate"
-     end
-   end
-   # ick what a hack.
-   def file_name
-     "create_comments"
-   end
- end