the_comments 0.9.0 → 0.9.9

data/app/models/concerns/the_comments_user.rb

@@ -2,24 +2,31 @@ module TheCommentsUser
   extend ActiveSupport::Concern
 
   included do
-    has_many :comments
-    has_many :comcoms, class_name: :Comment, foreign_key: :holder_id
+    has_many :posted_comments, class_name: :Comment, foreign_key: :user_id 
+    has_many :comcoms,         class_name: :Comment, foreign_key: :holder_id
+  end
+
+  def my_comments
+    posted_comments.with_state([:draft,:published])
+  end
 
-    def recalculate_comments_counters
-      [:comments, :comcoms].each do |name|
-        send "draft_#{name}_count=",     send(name).with_state(:draft).count
-        send "published_#{name}_count=", send(name).with_state(:published).count
-        send "deleted_#{name}_count=",   send(name).with_state(:deleted).count
-      end
-      save
-    end
+  def recalculate_my_comments_counter!
+    self.my_comments_count = my_comments.count
+    save
+  end
 
-    def comments_sum
-      published_comments_count + draft_comments_count
-    end
+  def recalculate_comcoms_counters!
+    self.draft_comcoms_count     = comcoms.with_state(:draft).count
+    self.published_comcoms_count = comcoms.with_state(:published).count
+    self.deleted_comcoms_count   = comcoms.with_state(:deleted).count
+    save
+  end
+
+  def comments_sum
+    published_comments_count + draft_comments_count
+  end
 
-    def comcoms_sum
-      published_comcoms_count + draft_comcoms_count
-    end
+  def comcoms_sum
+    published_comcoms_count + draft_comcoms_count
   end
 end

data/config/routes.rb

@@ -8,17 +8,17 @@ Rails.application.routes.draw do
   end
 
   resources :comments do
-    collection do
-      get :my
-      get :incoming
-      get :trash
-    end
-
     member do
       post   :to_spam
       post   :to_draft
       post   :to_published
       delete :to_trash
     end
+
+    collection do
+      get :my
+      get :incoming
+      get :trash
+    end
   end
 end

data/db/migrate/20130101010101_create_comments.rb

@@ -36,6 +36,9 @@ class CreateComments < ActiveRecord::Migration
       t.string  :user_agent,     default: :undefined
       t.integer :tolerance_time
 
+      # unusable: for future versions
+      t.boolean :spam, default: false
+
       # nested set
       t.integer :parent_id
       t.integer :lft
@@ -58,18 +61,24 @@ class CreateComments < ActiveRecord::Migration
       t.string  :state, default: :warning
     end
 
-    # Add fields to User and Commentable Object
+    # Add fields to User Model
     change_table :users do |t|
+      # posted_comments.with_state([:draft,:published])
+      t.integer :my_comments_count, default: 0
+
       # commentable's comments => comcoms (cache)
       # Relation through Comment#holder_id field
       t.integer :draft_comcoms_count,     default: 0
       t.integer :published_comcoms_count, default: 0
       t.integer :deleted_comcoms_count,   default: 0
+
+      # unusable: for future versions
+      t.integer :spam_comcoms_count,      default: 0
     end
 
-    # Uncomment this. Add fields to User model and Commentable models
+    # Uncomment this. Add fields Commentable Models
     #
-    # [:users, :posts].each do |table_name|
+    # [:posts, :blogs, :articles, :pages].each do |table_name|
     #   change_table table_name do |t|
     #     t.integer :draft_comments_count,     default: 0
     #     t.integer :published_comments_count, default: 0

data/lib/generators/the_comments/templates/the_comments.rb

@@ -1,7 +1,10 @@
 # TheComments.config.param_name => value
 
 TheComments.configure do |config|
-  config.max_reply_depth = 3
-  config.tolerance_time  = 5
-  config.empty_inputs    = [:commentBody]
+  config.max_reply_depth     = 3
+  config.tolerance_time      = 5
+  config.default_state       = :draft
+  config.default_owner_state = :published
+  config.empty_inputs        = [:commentBody]
+  config.default_title       = 'Undefined title'
 end

data/lib/generators/the_comments/views_generator.rb

@@ -28,7 +28,9 @@ BANNER
           copy_file "../assets/javascripts/the_comments", "app/assets/javascripts/the_comments"
           copy_file "../assets/stylesheets/the_comments", "app/assets/stylesheets/the_comments"
         elsif param_name == 'views'
-          directory "../views/the_comments", "app/views/the_comments"
+          directory "../views/the_comments",           "app/views/the_comments"
+          directory "../views/ip_black_lists",         "app/views/ip_black_lists"
+          directory "../views/user_agent_black_lists", "app/views/user_agent_black_lists"
         elsif param_name == 'helper'
           copy_file "../helpers/render_comments_tree_helper.rb", "app/helpers/render_comments_tree_helper.rb"
         else

data/lib/the_comments/config.rb

@@ -10,12 +10,15 @@ module TheComments
   # Configuration class
   class Configuration
     include ActiveSupport::Configurable
-    config_accessor :tolerance_time, :empty_inputs, :max_reply_depth
+    config_accessor :tolerance_time, :empty_inputs, :max_reply_depth, :default_state, :default_owner_state, :default_title
   end
 
   configure do |config|
-    config.max_reply_depth = 3
-    config.tolerance_time  = 5
-    config.empty_inputs    = [:message]
+    config.max_reply_depth     = 3
+    config.tolerance_time      = 5
+    config.default_state       = :draft
+    config.default_owner_state = :published
+    config.empty_inputs        = [:message]
+    config.default_title       = 'Undefined title'
   end
 end

data/lib/the_comments/version.rb

@@ -1,3 +1,3 @@
 module TheComments
-  VERSION = "0.9.0"
+  VERSION = "0.9.9"
 end

data/lib/the_comments.rb

@@ -1,4 +1,3 @@
-require 'haml'
 require 'state_machine'
 require 'the_sortable_tree'
 

data/the_comments.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'haml'
   gem.add_dependency 'state_machine'
   gem.add_dependency 'the_sortable_tree'
+
+  # gem.add_dependency 'rails', '>= 4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_comments
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-04-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &80817540 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *80817540
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &80817330 !ruby/object:Gem::Requirement
+  requirement: &78089010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80817330
+  version_requirements: *78089010
 - !ruby/object:Gem::Dependency
   name: the_sortable_tree
-  requirement: &80817120 !ruby/object:Gem::Requirement
+  requirement: &78088800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80817120
+  version_requirements: *78088800
 description: ! ' Nested Comments '
 email:
 - zykin-ilya@ya.ru
@@ -81,6 +70,12 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20130101010101_create_comments.rb
+- docs/the_comments.jpg
+- docs/the_comments_view_1.gif
+- docs/the_comments_view_2.gif
+- docs/the_comments_view_3.gif
+- docs/the_comments_view_4.gif
+- docs/the_comments_view_5.gif
 - lib/generators/the_comments/USAGE
 - lib/generators/the_comments/templates/comments_controller.rb
 - lib/generators/the_comments/templates/ip_black_lists_controller.rb
@@ -92,7 +87,6 @@ files:
 - lib/the_comments/config.rb
 - lib/the_comments/version.rb
 - the_comments.gemspec
-- the_comments.jpg
 homepage: https://github.com/open-cook/the_comments
 licenses: []
 post_install_message: