the_comments 2.2.2 → 2.3.1

data/app/views/the_comments/slim/_guest_form.html.slim

@@ -0,0 +1,22 @@
+label= t('the_comments.form.title')
+p= f.text_field :title, class: 'form-control'
+
+label= t('the_comments.form.contacts')
+p= f.text_field :contacts, class: 'form-control'
+
+label= t('the_comments.form.content')
+p= f.text_area :raw_content, class: 'form-control'
+
+p.trap
+  - TheComments.config.empty_inputs.each do |name|
+    = text_field_tag name, nil, autocomplete: :off, tabindex: -1, id: nil
+
+= hidden_field_tag :tolerance_time, 0, id: nil, class: :tolerance_time
+
+= f.hidden_field :commentable_type, value: commentable.class
+= f.hidden_field :commentable_id,   value: commentable.id
+= f.hidden_field :parent_id, class: :parent_id
+
+p
+  = f.submit t('the_comments.form.create'), class: :btn
+  = t('the_comments.form.thank_you')

data/app/views/the_comments/slim/_logined_form.html.slim

@@ -0,0 +1,18 @@
+.logined_comment_form
+  .user_data
+    = link_to user_path(current_user), nopin: :nopin do
+      = image_tag current_user.avatar.url(:thumb)
+  .comment_data
+    = hidden_field_tag :tolerance_time, 0, id: nil, class: :tolerance_time
+    = f.hidden_field :commentable_type, value: commentable.class
+    = f.hidden_field :commentable_id,   value: commentable.id
+    = f.hidden_field :parent_id, class: :parent_id
+
+    .user_name
+      b= current_user.username.present? ? current_user.username : current_user.login
+    label= t('the_comments.form.content')
+    p= f.text_area :raw_content
+
+    p
+      = f.submit t('the_comments.form.create'), class: :btn
+      = t('the_comments.form.thank_you')

data/app/views/the_comments/slim/_manage_controls.html.slim

@@ -1,24 +1,27 @@
 - hidden = "display:none"
 
 .row.controls
-  .col-md-9
-    = link_to t('the_comments.edit'), "#", class: "edit btn btn-success"
-    = link_to t('the_comments.cancel'), "#", class: "btn btn-warning edit", style: "display:none"
+  .col-md-9.action_btns
+    = link_to '#', class: "edit btn btn-success" do
+      = t('the_comments.edit')
 
-    - to_hide = comment.published? ? hidden : nil
-    - opts    = { remote: true, style: to_hide, method: :post }
-    = link_to [:to_published, comment], opts.merge(class: "btn btn-primary to_published") do
-      = t('the_comments.to_published')
-    
-    - to_hide = comment.draft? ? hidden : nil
-    - opts    = { remote: true, style: to_hide, method: :post }
-    = link_to [:to_draft, comment], opts.merge(class: "btn btn-warning to_draft") do
-      = t('the_comments.to_draft')
+    = link_to '#', class: "btn btn-warning edit", style: "display:none" do
+      = t('the_comments.cancel')
 
-    - to_hide = comment.deleted? ? hidden : nil
-    - opts    = { remote: true, style: to_hide, method: :delete, data: { confirm: t('the_comments.delete_confirm') } }
-    = link_to [:to_deleted, comment], opts.merge(class: "btn btn-danger to_deleted") do
-      = t('the_comments.to_deleted')
+    - unless to_hide = comment.published? ? hidden : nil
+      - opts    = { remote: true, style: to_hide, method: :post }
+      = link_to [:to_published, comment], opts.merge(class: "btn btn-primary to_published") do
+        = t('the_comments.to_published')
+
+    - unless to_hide = comment.draft? ? hidden : nil
+      - opts    = { remote: true, style: to_hide, method: :post }
+      = link_to [:to_draft, comment], opts.merge(class: "btn btn-warning to_draft") do
+        = t('the_comments.to_draft')
+
+    - unless to_hide = comment.deleted? ? hidden : nil
+      - opts    = { remote: true, style: to_hide, method: :delete, data: { confirm: t('the_comments.delete_confirm') } }
+      = link_to [:to_deleted, comment], opts.merge(class: "btn btn-danger to_deleted") do
+        = t('the_comments.to_deleted')
 
     - opts = { remote: true, method: :post}
     = link_to [:to_spam, comment], opts.merge(class: "btn btn-danger to_spam") do

data/app/views/the_comments/slim/_sidebar.html.slim

@@ -1,28 +1,9 @@
-- cuser = current_user
-
-.panel.panel-primary
+.panel.panel-default
   .panel-heading= t "the_comments.nav.header"
   .panel-body
-    p= link_to raw(t('the_comments.back_to_root')), '/'
-    hr
-
-    h5= t 'the_comments.incoming'
-    ul
-      li= link_to t("the_comments.draft_comments",     num: cuser.draft_comcoms_count),     [:draft,     :comments]
-      li= link_to t("the_comments.published_comments", num: cuser.published_comcoms_count), [:published, :comments]
-      li= link_to t("the_comments.deleted_comments",   num: cuser.deleted_comcoms_count),   [:deleted,   :comments]
-      li= link_to t("the_comments.spam_comments",      num: cuser.spam_comcoms_count),      [:spam,      :comments]
-
-    h5= t 'the_comments.written_by_me'
-    ul
-      li= link_to t("the_comments.draft_comments",     num: cuser.my_draft_comments.count),     [:my_draft,     :comments]
-      li= link_to t("the_comments.published_comments", num: cuser.my_published_comments.count), [:my_published, :comments]
-      li= link_to t("the_comments.my_comments",        num: cuser.my_comments_count),           [:my_comments,  :comments]
+    = render partial: 'the_comments/slim/sidebar_backlink'
 
-    - if cuser.comments_admin?
-      h5= t 'the_comments.in_system'
-      ul
-        li= link_to t("the_comments.draft_comments",     num: Comment.with_state(:draft).count),     [:total_draft,     :comments]
-        li= link_to t("the_comments.published_comments", num: Comment.with_state(:published).count), [:total_published, :comments]
-        li= link_to t("the_comments.deleted_comments",   num: Comment.with_state(:deleted).count),   [:total_deleted,   :comments]
-        li= link_to t("the_comments.spam_comments",      num: Comment.where(spam: true).count),      [:total_spam,      :comments]
+    - if current_user.comments_admin?
+      = render partial: 'the_comments/slim/sidebar_admin'
+    - else
+      = render partial: 'the_comments/slim/sidebar_user'

data/app/views/the_comments/slim/_sidebar_admin.html.slim

@@ -0,0 +1,12 @@
+- cuser = current_user
+
+= render partial: 'the_comments/slim/sidebar_user'
+
+- if cuser.comments_admin?
+  br
+  h5= t 'the_comments.in_system', num: Comment.count
+  p= link_to t("the_comments.published_comments", num: Comment.with_state(:published).count), [:total_published, :comments], class: 'btn btn-success btn-sm'
+  p= link_to t("the_comments.draft_comments",     num: Comment.with_state(:draft).count),     [:total_draft,     :comments], class: 'btn btn-info btn-sm'
+  p
+    = link_to t("the_comments.deleted_comments",   num: Comment.with_state(:deleted).count),   [:total_deleted,   :comments], class: 'btn btn-default btn-sm'
+    = link_to t("the_comments.spam_comments",      num: Comment.where(spam: true).count),      [:total_spam,      :comments], class: 'btn btn-default btn-sm'

data/app/views/the_comments/slim/_sidebar_backlink.html.slim

@@ -0,0 +1,3 @@
+p= link_to t('the_comments.nav.to_root'), root_path
+p= link_to t('the_comments.nav.all_incoming'), manage_comments_url
+hr

data/app/views/the_comments/slim/_sidebar_user.html.slim

@@ -0,0 +1,29 @@
+- cuser = current_user
+
+h5=t 'the_comments.written_by_me', num: cuser.my_comments.count
+
+p= link_to t("the_comments.published_comments", num: cuser.my_published_comments.count), [:my_published, :comments], class: 'btn btn-success btn-sm'
+p= link_to t("the_comments.draft_comments",     num: cuser.my_draft_comments.count),     [:my_draft,     :comments], class: 'btn btn-info btn-sm'
+
+p
+  - if cuser.comments_admin?
+    = link_to t("the_comments.deleted_comments",   num: cuser.my_deleted_comments.count),   [:my_deleted, :comments], class: 'btn btn-default btn-sm'
+    = link_to t("the_comments.spam_comments",      num: cuser.my_spam_comments.count),      [:my_spam,    :comments], class: 'btn btn-default btn-sm'
+  - else
+    span.btn.btn-default.btn-sm= t("the_comments.deleted_comments",   num: cuser.my_deleted_comments.count)
+    span.btn.btn-default.btn-sm= t("the_comments.spam_comments",      num: cuser.my_spam_comments.count)
+
+br
+h5= t 'the_comments.for_my_posts', num: cuser.comcoms.count
+
+p= link_to t("the_comments.published_comments", num: cuser.published_comcoms_count), [:published, :comments], class: 'btn btn-success btn-sm'
+p= link_to t("the_comments.draft_comments",     num: cuser.draft_comcoms_count),     [:draft,     :comments], class: 'btn btn-info btn-sm'
+p
+  - if cuser.comments_admin?
+    = link_to t("the_comments.deleted_comments",   num: cuser.deleted_comcoms_count),   [:deleted,   :comments], class: 'btn btn-default btn-sm'
+    = link_to t("the_comments.spam_comments",      num: cuser.spam_comcoms_count),      [:spam,      :comments], class: 'btn btn-default btn-sm'
+  - else
+    span.btn.btn-default.btn-sm= t("the_comments.deleted_comments",   num: cuser.deleted_comcoms_count)
+    span.btn.btn-default.btn-sm= t("the_comments.spam_comments",      num: cuser.spam_comcoms_count)
+
+

data/app/views/the_comments/slim/_tree.html.slim

@@ -1,4 +1,16 @@
+- if commentable.comments_on?
+  h4.comments_sum
+    - if commentable.comments_sum.zero?
+      | Вы можете стать первым, кто оставит комментарий!
+    - else
+      | Комментариев: #{ commentable.comments_sum }
+
+  - unless current_user
+    .comments_description
+      p &mdash; Комментарий можно оставить <b>без регистрации</b>, для этого достаточно заполнить одно обязательное поле <b class='nobr'>Текст комментария</b>. Анонимные комментарии проходят модерацию и до момента одобрения видны только в браузере автора
+      p &mdash; Комментарии зарегистрированных пользователей публикуются сразу после создания
+
 .comments#comments
-  ol.comments_tree data= { comments: { tolarance_time: TheComments.config.tolerance_time  } }  
+  ol.comments_tree  data: { comments: { tolarance_time: TheComments.config.tolerance_time  } }  
     = render partial: 'the_comments/slim/comment', locals: { tree: comments_tree }
   = render partial: 'the_comments/slim/form', locals: { commentable: commentable }

data/app/views/the_comments/slim/index.html.slim

@@ -9,9 +9,9 @@
 
   .comments
     - @comments.each do |comment|
-      - klass = { published: :primary, draft: :warning, deleted: :danger }[comment.state.to_sym]
+      - klass = { published: :success, draft: :info, deleted: :danger }[comment.state.to_sym]
       .panel  class: "panel-#{klass}"  
-        .panel-heading= comment.title
+        .panel-heading= comment.header_title
         .panel-body
           = render partial: 'the_comments/slim/comment_body', locals: { comment: comment }
 

data/app/views/the_comments/slim/manage.html.slim

@@ -12,14 +12,15 @@
 
   .comments
     - @comments.each do |comment|
-      - klass = { published: :primary, draft: :warning, deleted: :danger }[comment.state.to_sym]
+      - klass = { published: :success, draft: :info, deleted: :danger }[comment.state.to_sym]
       .panel  class: "panel-#{klass}"  
-        .panel-heading= comment.title
+        .panel-heading= comment.header_title
         .panel-body
-          = render partial: 'the_comments/slim/comment_edit', locals: { comment: comment }
           = render partial: 'the_comments/slim/comment_body', locals: { comment: comment }
 
-          = render partial: 'the_comments/slim/manage_controls', locals: { comment: comment }
-          = render partial: 'the_comments/slim/additional_info', locals: { comment: comment }
-        
+          - if current_user.comments_admin?
+            = render partial: 'the_comments/slim/comment_edit', locals: { comment: comment }
+            = render partial: 'the_comments/slim/manage_controls', locals: { comment: comment }
+            = render partial: 'the_comments/slim/additional_info', locals: { comment: comment }
+
   = paginate @comments

data/config/initializers/the_comments.rb

@@ -11,5 +11,4 @@ TheComments.configure do |config|
 
   config.empty_trap_protection     = true
   config.tolerance_time_protection = true
-  config.delete_descendants_on_node_delete = true
 end

data/config/locales/ru.yml

@@ -12,16 +12,18 @@ ru:
 
   the_comments:
     incoming: "Входящие:"
-    in_system: "Все в системе:"
-    written_by_me: "Написанные мной:"
+    in_system: "Все в системе: %{num}"
+    written_by_me: "Написаны мной: %{num}"
+    for_my_posts:  "К моим постам: %{num}"
     back_to_root: "← На главную"
-    
-    my_comments:        "Мои комментарии (%{num})"
-    draft_comments:     "Новые (%{num})"
-    published_comments: "Опубликованные (%{num})"
-    deleted_comments:   "Удаленные (%{num})"
-    spam_comments:      "Спам (%{num})"
 
+    my_comments:        "Мои комментарии %{num}"
+    draft_comments:     "На модерации: %{num}"
+    published_comments: "Опубликованы: %{num}"
+    deleted_comments:   "Удалены: %{num}"
+    spam_comments:      "Спам: %{num}"
+
+    waiting_for_moderation: Комментарий ожидает проверки
     management: Управление комментариями
     new: "Написать новый комментарий"
     update: "Обновить"
@@ -43,7 +45,9 @@ ru:
     no_comments_here: Здесь нет комментариев
 
     nav:
-      header: "Навигация"
+      header: Комментарии
+      to_root: На главную
+      all_incoming: Все входящие
 
     form:
       title: "Ваше имя:"
@@ -64,4 +68,4 @@ ru:
     delete_confirm: Вы уверены?
     waiting_for_moderation: Ожидает модерации
     ajax_requests_required: 'Извините, ожидается JavaScript/Ajax запрос'
-    undefined_commentable: Комментируемый объект не определен
+    undefined_commentable: Комментируемый объект не определен

data/config/routes.rb

@@ -3,10 +3,12 @@ module TheComments
     def call mapper, options = {}
       mapper.collection do
         mapper.get :manage
+        mapper.get :my_comments
 
         mapper.get :my_draft
         mapper.get :my_published
-        mapper.get :my_comments
+        mapper.get :my_deleted
+        mapper.get :my_spam
 
         mapper.get :draft
         mapper.get :published
@@ -33,4 +35,4 @@ module TheComments
       end
     end
   end
-end
+end

data/docs/whats_wrong_with_other_gems.md

@@ -2,27 +2,27 @@
 
 ### What's wrong with other gems?
 
-Just look at [Ruby-Toolbox](https://www.ruby-toolbox.com/categories/rails_comments). What we can see?
+Take a look at [Ruby-Toolbox](https://www.ruby-toolbox.com/categories/rails_comments). What can we see?
 
-* [Acts as commentable with threading](https://github.com/elight/acts_as_commentable_with_threading) - so, guys, where is the render helper for the tree? There is no helper! Should  I make render helper for tree by myself? Nooooo!!! I'm so sorry, but I can't use this gem. 
-* [acts_as_commentable](https://github.com/jackdempsey/acts_as_commentable) - so, I can see code for models. But I can't see code for controllers and views. Unfortunately, there is no threading. It's not enough for me.
-* [opinio](https://github.com/Draiken/opinio) - looks better, but there is no threading. I want to have more!
-* [has_threaded_comments](https://github.com/aarongough/has_threaded_comments) - Nice work! Nice gem! Models, controllers, views, view helper for tree rendering! **But**, last activity 2 years ago, I need few features, I think - I can make it better.
+* [Acts as commentable with threading](https://github.com/elight/acts_as_commentable_with_threading) - Where is the render helper for the tree? There is no helper! Am I supposed to write a render helper for the tree myself? Nooooo!!! I'm sorry, I can't use this gem. 
+* [acts_as_commentable](https://github.com/jackdempsey/acts_as_commentable) - I can see the code for models. But I can't see the code for controllers and views. Unfortunately, there is no threading. This isn't enough for me.
+* [opinio](https://github.com/Draiken/opinio) - Better, but still no threading. I can do better!
+* [has_threaded_comments](https://github.com/aarongough/has_threaded_comments) - A solid gem. Has model, controller and view helpers for tree rendering! **But** last activity was 2 years ago, it still needs a few features - I can do better.
 
-### Why TheComments is better than others gems?
+### Why is TheComments better than other gems?
 
 1. TheComments allows for threaded comments
 2. **Only TheComments has special helper for tree rendering** (based on [TheSortableTree](https://github.com/the-teacher/the_sortable_tree)).
-3. TheComments designed to reduce requests to database. I say about useful cache counters.
-4. TheComments has solution for [building of Recent Comments](https://github.com/the-teacher/the_comments/blob/master/docs/denormalization_and_recent_comments.md) (for polymorphic relations)
-5. TheComments designed for text preprocessors (Textile, Markdown, Sanitize, Coderay etc.)
-6. TheComments has admin UI based on bootstrap 3
-7. TheComments is "all-in-one" solutions.<br>
+3. TheComments is designed to reduce database requests. Helpful for cache counters.
+4. TheComments has a solution for [building Recent Comments](https://github.com/the-teacher/the_comments/blob/master/docs/denormalization_and_recent_comments.md) (for polymorphic relations)
+5. TheComments is designed for text preprocessors (Textile, Markdown, Sanitize, Coderay etc.)
+6. TheComments has an admin UI based on bootstrap 3
+7. TheComments is an "all-in-one" solution.<br>
    It has: Models and Controllers logic (via concerns), Generators, Views, Helper for fast Tree rendering and Admin UI.
-8. I'll try to help you via skype: **ilya.killich**, if you have problems with TheComments
+8. If you have problems with TheComments, I'll try to help you via skype: **ilya.killich**
    
 ### TheComments based on:
 
 1. [AwesomeNestedSet](https://github.com/collectiveidea/awesome_nested_set) - for comments threading
 2. [TheSortableTree](https://github.com/the-teacher/the_sortable_tree) - for fast rendering of comments tree
-3. [State Machine](https://github.com/pluginaweek/state_machine) - to provide easy and correct recalculation cache counters on states transitions
+3. [State Machine](https://github.com/pluginaweek/state_machine) - to provide easy and correct recalculation cache counters on states transitions

data/docs/where_is_example_application.md

@@ -2,11 +2,11 @@
 
 ### Dummy Application
 
-Repo of TheComments has dummy application for developmet and testing.
+TheComments repository contains a dummy application for development and testing.
 
 It's here: [Dummy App](https://github.com/the-teacher/the_comments/tree/master/spec/dummy_app)
 
-For run dummy app, your should do that:
+To run the dummy app:
 
 ```ruby
 git clone https://github.com/the-teacher/the_comments.git
@@ -22,7 +22,7 @@ rails s -p 3000 -b localhost
 
 ### Run tests
 
-Following instructions should helps to run simple tests:
+To run the RSPEC tests:
 
 ```ruby
 git clone https://github.com/the-teacher/the_comments.git

data/gem_version.rb

@@ -1,3 +1,3 @@
 module TheComments
-  VERSION = "2.2.2"
-end
+  VERSION = "2.3.1"
+end

data/lib/the_comments.rb

@@ -1,19 +1,38 @@
 require 'state_machine'
+require 'state_machine/version'
+
+require 'the_simple_sort'
 require 'the_sortable_tree'
 
 require 'the_comments/config'
 require 'the_comments/version'
 
-_root_ = File.expand_path('../../',  __FILE__)
-
 module TheComments
-  class Engine < Rails::Engine; end
+  COMMENTS_COOKIES_TOKEN = 'JustTheCommentsCookies'
+
+  class Engine < Rails::Engine
+    config.autoload_paths += Dir["#{config.root}/app/controllers/concerns/**/"]
+    config.autoload_paths += Dir["#{config.root}/app/models/concerns/**/"]
+  end
 end
 
 # Loading of concerns
+_root_ = File.expand_path('../../',  __FILE__)
 require "#{_root_}/config/routes.rb"
-require "#{_root_}/app/controllers/concerns/controller.rb"
 
-%w[ comment_states comment user commentable ].each do |concern|
-  require "#{_root_}/app/models/concerns/#{concern}.rb"
-end
+if StateMachine::VERSION.to_f <= 1.2
+  puts '~' * 50
+  puts 'TheComments'
+  puts '~' * 50
+  puts 'WARNING!'
+  puts 'StateMachine patch for Rails4 will be applied'
+  puts
+  puts '> private method *around_validation* from StateMachine::Integrations::ActiveModel will be public'
+  puts
+  puts 'https://github.com/pluginaweek/state_machine/issues/295'
+  puts 'https://github.com/pluginaweek/state_machine/issues/251'
+  puts '~' * 50
+  module StateMachine::Integrations::ActiveModel
+    public :around_validation
+  end
+end

data/lib/the_comments/config.rb

@@ -19,8 +19,7 @@ module TheComments
                     :default_title,
                     :template_engine,
                     :empty_trap_protection,
-                    :tolerance_time_protection,
-                    :delete_descendants_on_node_delete
+                    :tolerance_time_protection
   end
 
   configure do |config|
@@ -34,7 +33,5 @@ module TheComments
 
     config.empty_trap_protection     = true
     config.tolerance_time_protection = true
-
-    config.delete_descendants_on_node_delete = true
   end
 end

data/spec/dummy_app/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Base gems
-gem 'rails', '4.0.1' #github: 'rails/rails', branch: 'master'
+gem 'rails', '4.1.4 ' #github: 'rails/rails', branch: 'master'
 gem 'sqlite3'
 
 gem 'jquery-rails'
@@ -40,4 +40,4 @@ group :development, :test do
   gem 'rspec-rails', '~> 2.0'
 
   # gem 'database_cleaner'
-end
+end