acts_as_commentable_with_replies 0.0.3 → 0.0.5

data/lib/acts_as_commentable_with_replies/commentable.rb

@@ -4,7 +4,7 @@ module ActsAsCommentableWithReplies
     def self.included base
       base.class_eval do
         belongs_to :commentable, :polymorphic => true
-        has_many   :comments, :as => :commentable do
+        has_many   :comments, :as => :commentable, :dependent => :delete_all do
           def commenters
             includes(:commenter).map(&:commenter)
           end
@@ -21,48 +21,41 @@ module ActsAsCommentableWithReplies
     end
 
     # voting
-    def comment(args = {})
+    def comment args = {}
       return nil if args[:commenter].nil? || args[:message].nil?
 
-      comment = Comment.new(
+      __comment__ = Comment.new(
           :commentable => self,
           :commenter => args[:commenter],
           :message => args[:message]
       )
 
-      if comment.save
-        update_cached_comments
-        comment.move_to_child_of(args[:parent]) if !args[:parent].nil?
-        comment
+      if __comment__.save
+        update_comments_counter
+        __comment__.move_to_child_of(args[:parent]) if !args[:parent].nil?
+        __comment__
       else
         nil
       end
     end
-    alias :comment! :comment
 
-
-    # caching
-    def update_cached_comments
-      updates = {}
-      if self.respond_to?(:cached_comments_total=)
-        updates[:cached_comments_total] = count_comments_total(true)
-      end
-      self.update_attributes(updates, :without_protection => true) if updates.size > 0
+    def commented_by? commenter
+      __comments__ = find_comments :commenter_id => commenter.id, :commenter_type => commenter.class.name
+      __comments__.count > 0
     end
 
 
-    # counting
-    def count_comments_total(skip_cache = false)
-      if !skip_cache && self.respond_to?(:cached_comments_total)
-        return self.send(:cached_comments_total)
+    # caching
+    def update_comments_counter
+      if self.respond_to?(:cached_comments_total=)
+        self.class.where(:id => self.id).update_all(:cached_comments_total => self.comments.count)
       end
-      find_comments.count
     end
 
 
     # results
-    def find_comments(extra_conditions = {})
-      comments.where(extra_conditions)
+    def find_comments extra_conditions = {}
+      self.comments.where(extra_conditions)
     end
 
     def root_comments
@@ -70,13 +63,5 @@ module ActsAsCommentableWithReplies
     end
 
 
-    # commenters
-    def commented_by?(commenter)
-      comments = find_comments :commenter_id => commenter.id, :commenter_type => commenter.class.name
-      comments.count > 0
-    end
-
-
-
   end
 end

data/lib/acts_as_commentable_with_replies/commenter.rb

@@ -4,7 +4,7 @@ module ActsAsCommentableWithReplies
     def self.included(base)
       base.class_eval do
         belongs_to :commenter, :polymorphic => true
-        has_many :comments, :as => :commenter do
+        has_many :comments, :as => :commenter, :dependent => :delete_all do
           def commentables
             includes(:commentable).map(&:commentable)
           end
@@ -13,24 +13,19 @@ module ActsAsCommentableWithReplies
     end
 
     # voting
-    def comment(args = {})
+    def comment args = {}
       return nil if args[:commentable].nil? || args[:message].nil?
       args[:commentable].comment args.merge({:commenter => self})
     end
-    alias :comment! :comment
 
-    # results
+
     def commented_on?(commentable)
-      comments = find_comments(:commentable_id => commentable.id, :commentable_type => commentable.class.name)
-      comments.size > 0
+      __comments__ = find_comments(:commentable_id => commentable.id, :commentable_type => commentable.class.name)
+      __comments__.size > 0
     end
 
     def find_comments(extra_conditions = {})
-      comments.where(extra_conditions)
-    end
-
-    def find_comments_for_class(klass, extra_conditions = {})
-      find_comments extra_conditions.merge({:commentable_type => klass.name})
+      self.comments.where(extra_conditions)
     end
 
   end

data/lib/acts_as_commentable_with_replies/version.rb

@@ -1,3 +1,3 @@
 module ActsAsCommentableWithReplies
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,62 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: acts_as_commentable_with_replies
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.5
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Filvo Interactive
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: awesome_nested_set
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: awesome_nested_set
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Acts as Commentable with Replies
-email: 
+email:
 - info@filvo.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -74,37 +67,32 @@ files:
 - lib/generators/acts_as_commentable_with_replies/migration/templates/active_record/migration.rb
 homepage: http://www.filvo.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3742380179039848453
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 3742380179039848453
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A threaded comment system for Rails
 test_files: []
-
-has_rdoc: