acts_as_commentable_with_threading 1.1.2 → 1.1.3

data/Gemfile

@@ -8,6 +8,6 @@ group :development do
   gem "rake", ">= 0"
   gem "bundler"
   gem "rspec", "~> 1.3"
-  gem "sqlite3-ruby", ">= 0"
+  gem "sqlite3", ">= 0"
   gem "rails", "~> 3.2"
 end

data/Gemfile.lock

@@ -75,8 +75,6 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.5)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -95,4 +93,4 @@ DEPENDENCIES
   rails (~> 3.2)
   rake
   rspec (~> 1.3)
-  sqlite3-ruby
+  sqlite3

data/README.md

@@ -81,16 +81,12 @@ Usage
 
         @comment.children
 
-* If you plan to use the `acts_as_voteable` plugin with your comment system be
+* If you plan to use the `acts_as_votable` plugin with your comment system be
   sure to uncomment two things:
 
-  * In `lib/comment.rb` uncomment the line [`acts_as_voteable`][L9].
-
-  * In `lib/acts_as_commentable_with_threading.rb` uncomment the line
-    [`include Juixe::Acts::Voteable`][L5] near the top.
+  * In `lib/comment.rb` uncomment the line [`acts_as_votable`][L9].
 
 [L9]: https://github.com/elight/acts_as_commentable_with_threading/blob/master/lib/generators/acts_as_commentable_with_threading_migration/templates/comment.rb#L9
-[L5]: https://github.com/elight/acts_as_commentable_with_threading/blob/master/lib/acts_as_commentable_with_threading.rb#L5
 
 Credits
 -------

data/acts_as_commentable_with_threading.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "acts_as_commentable_with_threading"
-  s.version  = "1.1.2"
-  s.date     = "2012-03-23"
+  s.version  = "1.1.3"
+  s.date     = "2013-04-18"
   s.summary  = "Polymorphic comments Rails gem - Rails 3+ only"
   s.email    = "evan@tripledogdare.net"
   s.homepage = "http://github.com/elight/acts_as_commentable_with_threading"
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'bundler', '~> 1.0'
   s.add_development_dependency 'rspec', '~> 1.3'
-  s.add_development_dependency 'sqlite3-ruby'
+  s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'rails', '~> 3.0'
 
   s.add_dependency 'activerecord', '>= 3.0'

data/lib/acts_as_commentable_with_threading.rb

@@ -2,12 +2,11 @@ require 'active_record'
 require 'awesome_nested_set'
 ActiveRecord::Base.class_eval do
   include CollectiveIdea::Acts::NestedSet
-  #include Juixe::Acts::Voteable   #<-- uncomment this if you have installed and wish to use the acts_as_voteable plugin
 end
 
 #
 unless ActiveRecord::Base.respond_to?(:acts_as_nested_set)
-  ActiveRecord::Base.send(:include, CollectiveIdea::Acts::NestedSet::Base) 
+  ActiveRecord::Base.send(:include, CollectiveIdea::Acts::NestedSet::Base)
 end
 
 # ActsAsCommentableWithThreading
@@ -17,12 +16,13 @@ module Acts #:nodoc:
 
   module ClassMethods
     def acts_as_commentable
-      has_many :comment_threads, :class_name => "Comment", :as => :commentable, :dependent => :destroy
+      has_many :comment_threads, :class_name => "Comment", :as => :commentable
+      before_destroy { |record| record.root_comments.destroy_all }
       include Acts::CommentableWithThreading::LocalInstanceMethods
       extend Acts::CommentableWithThreading::SingletonMethods
     end
   end
-    
+
   # This module contains class methods
   module SingletonMethods
     # Helper method to lookup for comments for a given object.
@@ -30,34 +30,34 @@ module Acts #:nodoc:
     def find_comments_for(obj)
       Comment.where(:commentable_id => obj.id, :commentable_type => obj.class.base_class).order('created_at DESC')
     end
-    
+
     # Helper class method to lookup comments for
-    # the mixin commentable type written by a given user.  
+    # 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 = self.base_class.name.to_s
       Comment.where(:user_id => user.id, :commentable_type => commentable).order('created_at DESC')
     end
   end
-  
+
   module LocalInstanceMethods
-    
+
     # Helper method to display only root threads, no children/replies
     def root_comments
       self.comment_threads.where(:parent_id => nil)
     end
-    
+
     # Helper method to sort comments by date
     def comments_ordered_by_submitted
       Comment.where(:commentable_id => id, :commentable_type => self.class.name).order('created_at DESC')
     end
-    
+
     # Helper method that defaults the submitted time.
     def add_comment(comment)
       comments << comment
     end
   end
-    
+
   end
 end
 

data/lib/generators/acts_as_commentable_upgrade_migration/comment.rb

@@ -1,12 +1,12 @@
 class Comment < ActiveRecord::Base
   acts_as_nested_set :scope => [:commentable_id, :commentable_type]
 
-  validates_presence_of :body
-  validates_presence_of :user
+  validates :body, :presence => true
+  validates :user, :presence => true
 
   # NOTE: install the acts_as_votable plugin if you
   # want user to vote on the quality of comments.
-  #acts_as_voteable
+  #acts_as_votable
 
   belongs_to :commentable, :polymorphic => true
 
@@ -17,12 +17,10 @@ class Comment < ActiveRecord::Base
   # by passing a commentable object, a user_id, and comment text
   # example in readme
   def self.build_from(obj, user_id, comment)
-    c = self.new
-    c.commentable_id = obj.id
-    c.commentable_type = obj.class.base_class.name
-    c.body = comment
-    c.user_id = user_id
-    c
+    new \
+      :commentable => obj,
+      :body        => comment,
+      :user_id     => user_id
   end
 
   #helper method to check if a comment has children

data/lib/generators/acts_as_commentable_with_threading_migration/templates/comment.rb

@@ -1,12 +1,12 @@
 class Comment < ActiveRecord::Base
   acts_as_nested_set :scope => [:commentable_id, :commentable_type]
 
-  validates_presence_of :body
-  validates_presence_of :user
+  validates :body, :presence => true
+  validates :user, :presence => true
 
   # NOTE: install the acts_as_votable plugin if you
   # want user to vote on the quality of comments.
-  #acts_as_voteable
+  #acts_as_votable
 
   belongs_to :commentable, :polymorphic => true
 
@@ -17,17 +17,15 @@ class Comment < ActiveRecord::Base
   # by passing a commentable object, a user_id, and comment text
   # example in readme
   def self.build_from(obj, user_id, comment)
-    c = self.new
-    c.commentable_id = obj.id
-    c.commentable_type = obj.class.base_class.name
-    c.body = comment
-    c.user_id = user_id
-    c
+    new \
+      :commentable => obj,
+      :body        => comment,
+      :user_id     => user_id
   end
 
   #helper method to check if a comment has children
   def has_children?
-    self.children.size > 0
+    self.children.any?
   end
 
   # Helper class method to lookup all comments assigned

data/lib/generators/acts_as_commentable_with_threading_migration/templates/migration.rb

@@ -12,7 +12,7 @@ class ActsAsCommentableWithThreadingMigration < ActiveRecord::Migration
     end
     
     add_index :comments, :user_id
-    add_index :comments, :commentable_id
+    add_index :comments, [:commentable_id, :commentable_type]
   end
   
   def self.down

data/spec/commentable_spec.rb

@@ -5,6 +5,29 @@ describe "A class that is commentable" do
     Commentable.new.comment_threads.should be_a_kind_of(Enumerable)
   end
 
+  describe "when is destroyed" do
+    before :each do
+      @user = User.create!
+      @commentable = Commentable.create!
+      @comment = Comment.create!(:user => @user, :commentable => @commentable, :body => 'blargh')
+    end
+
+    it "also destroys its root comments" do
+      @commentable.destroy
+      Comment.all.should_not include(@comment)
+    end
+
+    it "also destroys its nested comments" do
+      child = Comment.new(:body => "This is a child", :commentable => @commentable, :user => @user)
+      child.save!
+      child.move_to_child_of(@comment)
+
+      @commentable.destroy
+      Comment.all.should_not include(@comment)
+      Comment.all.should_not include(child)
+    end
+  end
+
   describe "special class finders" do
     before :each do
       @user = User.create!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_commentable_with_threading
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -63,7 +63,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -185,6 +185,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1968228787496291367
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Polymorphic comments Rails gem - Rails 3+ only