commontator 6.0.0.pre.1 → 6.0.0.pre.2

data/app/views/commontator/threads/_show.js.erb

@@ -1,14 +1,14 @@
 <%#
   Views that use this partial must supply the following variables:
-  thread
   user
+  thread
   page
-  per_page
   show_all
 %>
 
+
 $("#commontator-thread-<%= thread.id %>").html("<%= escape_javascript(
-  render partial: 'commontator/threads/show',
-         formats: [ :html ],
-         locals: { thread: thread, user: user, page: page, per_page: per_page, show_all: show_all }
+  render partial: 'commontator/threads/show', formats: [ :html ], locals: {
+    user: user, thread: thread, page: page, show_all: show_all
+  }
 ) %>");

data/app/views/commontator/threads/show.js.erb

@@ -1,11 +1,12 @@
 <%=
   render partial: 'show', locals: {
-    thread: @commontator_thread,
     user: @commontator_user,
+    thread: @commontator_thread,
     page: @commontator_page,
-    per_page: @commontator_per_page,
     show_all: @commontator_show_all
   }
 %>
 
+$("#commontator-thread-<%= @commontator_thread.id %>-comment-list").hide().fadeIn();
+
 <%= javascript_proc %>

data/config/initializers/commontator.rb

@@ -222,19 +222,22 @@ Commontator.configure do |config|
   # Valid options:
   #   :n (no replies, though users can still manually add <blockquote>s)
   #   :q (copies the comment being replied to into a <blockquote>)
-  # Not yet implemented:
   #   :i (indents each reply under the comment being replied to)
+  #   :b (both <blockquote> the original comment and indent replies)
   # It might be a good idea to add some CSS to hide <blockquote>s when converting from :q to :i
   # Default: :n
   config.comment_reply_style = :n
 
   # comments_per_page
-  # Type: Integer or nil
+  # Type: Array
   # Number of comments to display in each page
-  # Set to nil to disable pagination
-  # Any other value requires the will_paginate gem
-  # Default: nil (no pagination)
-  config.comments_per_page = nil
+  # The array represents how many comments to load at each nesting level, with the
+  # first number corresponding to the current level, the second number to the next level, etc
+  # Note: large values WILL cause performance and memory issues with many nested comments
+  # The maximum number of comments loaded at once is for the default setting is:
+  # 20 + 20*5 + 20*5*2 == 320
+  # Default: [ 20, 5, 2 ]
+  config.comments_per_page = [ 20, 5, 2 ]
 
   # thread_subscription
   # Type: Symbol

data/config/locales/de.yml

@@ -7,11 +7,18 @@ de:
         creator: Ersteller
         editor: Bearbeiter
         thread: Diskussion
+        parent: Elternkommentar
       commontator/subscription:
         subscriber: Subscriber
         thread: Diskussion
       commontator/thread:
         commontable: Commontable
+    errors:
+      models:
+        commontator/comment:
+          attributes:
+            body:
+              double_posted: ist ein Duplikat.
     models:
       commontator/comment:
         one: Kommentar
@@ -38,14 +45,14 @@ de:
       errors:
         already_deleted: Dieser Kommentar wurde bereits gelöscht.
         create: "Kommentar kann nicht veröffentlicht werden:"
-        double_posted: Kommentar ist ein Duplikat.
         not_deleted: Dieser Kommentar wurde nicht gelöscht..
         update: "Kommentar kann nicht bearbeitet werden:"
       status:
         created_at: Veröffentlich am %{created_at}.
         deleted_by: Kommentar gelöscht von %{deleter_name}.
         updated_at: Bearbeitet von %{editor_name} am %{updated_at}.
-      replying: "%{creator_name} Antworten"
+        replying: "%{creator_name} Antworten"
+        reply_pages: "Antwortseiten:"
     email:
       comment_created:
         body: "%{creator_name} kommentierte zu %{commontable_name}:"
@@ -75,6 +82,7 @@ de:
         cannot_post: Zurzeit können keine neuen Kommentare verfasst werden.
         closed: Kommentare (geschlossen von %{closer_name})
         open: Kommentare
+        pages: "Kommentarseiten:"
   time:
     formats:
       commontator: "%d. %B %Y um %H:%M %Z"

data/config/locales/en.yml

@@ -38,11 +38,18 @@ en:
         creator: Creator
         editor: Editor
         thread: Discussion
+        parent: Parent Comment
       commontator/subscription:
         subscriber: Subscriber
         thread: Discussion
       commontator/thread:
         commontable: Commontable
+    errors:
+      models:
+        commontator/comment:
+          attributes:
+            body:
+              double_posted: is a duplicate of another comment.
     models:
       commontator/comment:
         one: comment
@@ -69,14 +76,14 @@ en:
       errors:
         already_deleted: This comment has already been deleted.
         create: "This comment could not be posted because:"
-        double_posted: is a duplicate of another comment.
         not_deleted: This comment is not deleted.
         update: "This comment could not be modified because:"
       status:
         created_at: Posted on %{created_at}.
         deleted_by: Comment deleted by %{deleter_name}.
         updated_at: Last modified by %{editor_name} on %{updated_at}.
-      replying: Replying to %{creator_name}
+        replying: Replying to %{creator_name}
+        reply_pages: "Reply pages:"
     email:
       comment_created:
         body: "%{creator_name} commented on %{commontable_name}:"
@@ -106,6 +113,7 @@ en:
         cannot_post: New comments cannot be posted at this time.
         closed: Comments (Closed by %{closer_name})
         open: Comments
+        pages: "Comment pages:"
   time:
     formats:
       commontator: "%b %d %Y at %I:%M%p %Z"

data/config/locales/pt-BR.yml

@@ -7,11 +7,18 @@ pt-BR:
         creator: Criador
         editor: Editor
         thread: Discussão
+        parent: Comentário pai
       commontator/subscription:
         subscriber: Assinante
         thread: Discussão
       commontator/thread:
         commontable: Comentável
+    errors:
+      models:
+        commontator/comment:
+          attributes:
+            body:
+              double_posted: é um comentário duplicado.
     models:
       commontator/comment:
         one: comentário
@@ -38,14 +45,14 @@ pt-BR:
       errors:
         already_deleted: Este comentário já foi removido.
         create: "Este comentário não pôde ser postado porque:"
-        double_posted: é um comentário duplicado.
         not_deleted: Este comentário não foi removido.
         update: "Este comentário não pôde ser editado porque:"
       status:
         created_at: Postado em %{created_at}.
         deleted_by: Comentário removido por %{deleter_name}.
         updated_at: Editado por %{editor_name} em %{updated_at}.
-      replying: Respondendo a %{creator_name}
+        replying: Respondendo a %{creator_name}
+        reply_pages: "Páginas de respostas:"
     email:
       comment_created:
         body: "%{creator_name} comentou em %{commontable_name}:"
@@ -75,6 +82,7 @@ pt-BR:
         cannot_post: Não é possível postar novos comentários.
         closed: Comentários (Fechado por %{closer_name})
         open: Comentários
+        pages: "Páginas de comentários:"
   time:
     formats:
       commontator: "%d de %B de %Y às %H:%M %Z"

data/config/locales/ru.yml

@@ -7,11 +7,18 @@ ru:
         creator: Создал
         editor: Редактировал
         thread: Обсуждение
+        parent: Родительский Комментарий
       commontator/subscription:
         subscriber: Подписчик
         thread: Обсуждение
       commontator/thread:
         commontable: Комментируем
+    errors:
+      models:
+        commontator/comment:
+          attributes:
+            body:
+              double_posted: этот комментарий уже есть.
     models:
       commontator/comment:
         one: комментарий
@@ -41,14 +48,14 @@ ru:
       errors:
         already_deleted: Этот комментарий был удален.
         create: Комментарий нельзя оставить потому что
-        double_posted: этот комментарий уже есть.
         not_deleted: Этот комментарий не удален.
         update: Этот комментарий нельзя изменить потому что
       status:
         created_at: Создан %{created_at}.
         deleted_by: Комментарий был удален %{deleter_name}.
         updated_at: Редактировал %{editor_name}, %{updated_at}.
-      replying: Отвечая %{creator_name}
+        replying: Отвечая %{creator_name}
+        reply_pages: "Страницы ответов:"
     email:
       comment_created:
         body: "%{creator_name} комментировал %{commontable_name}:"
@@ -78,6 +85,7 @@ ru:
         cannot_post: Новый комментарии нельзя разместить в данный момент.
         closed: Комментарии (Закрыты %{closer_name})
         open: Комментарии
+        pages: "Страницы комментариев:"
   time:
     formats:
       commontator: "%d %b %Y в %H:%M %Z"

data/config/locales/zh.yml

@@ -7,11 +7,18 @@ zh: &zh
         creator: 留言者
         editor: 編輯
         thread: 討論
+        parent: 家长留言
       commontator/subscription:
         subscriber: 訂閱者
         thread: 討論
       commontator/thread:
         commontable: 可以留言
+    errors:
+      models:
+        commontator/comment:
+          attributes:
+            body:
+              double_posted: 已經有一筆相同的留言。
     models:
       commontator/comment:
         one: 留言
@@ -37,15 +44,15 @@ zh: &zh
         reply: 回复评论
       errors:
         already_deleted: 此留言已經被刪除了
-        create: "此留言無法發佈因為:"
-        double_posted: 已經有一筆相同的留言。
+        create: 此留言無法發佈因為：
         not_deleted: 此留言未被刪除
-        update: "此留言無法被修改因為:"
+        update: 此留言無法被修改因為：
       status:
         created_at: 於%{created_at}發佈
         deleted_by: 被%{deleter_name}刪除
         updated_at: 最在於%{updated_at}被%{editor_name}修改
-      replying: 回复%{creator_name}
+        replying: 回复%{creator_name}
+        reply_pages: 回复页面：
     email:
       comment_created:
         body: "%{creator_name}留言於%{commontable_name}"
@@ -75,6 +82,7 @@ zh: &zh
         cannot_post: 現在還不能發佈
         closed: 留言已經被%{closer_name}關閉
         open: 留言
+        pages: 留言页面：
   time:
     formats:
       commontator: "%Y年%m月%d日 於 %H:%M %Z"

data/config/routes.rb

@@ -1,24 +1,24 @@
 Commontator::Engine.routes.draw do
-  resources :threads, only: [:show] do
-    resources :comments, except: [:index, :destroy], shallow: true do
+  resources :threads, only: [ :show ] do
+    resources :comments, except: [ :index, :destroy ], shallow: true do
       member do
-        put 'delete'
-        put 'undelete'
-        
         put 'upvote'
         put 'downvote'
         put 'unvote'
+
+        put 'delete'
+        put 'undelete'
       end
     end
-    
+
     member do
       get 'mentions' if Commontator.mentions_enabled
 
-      put 'close'
-      put 'reopen'
-      
       put 'subscribe', to: 'subscriptions#subscribe'
       put 'unsubscribe', to: 'subscriptions#unsubscribe'
+
+      put 'close'
+      put 'reopen'
     end
   end
 end

data/db/migrate/1_add_replying_to_comments.rb

@@ -3,7 +3,5 @@ class AddReplyingToComments < ActiveRecord::Migration[5.2]
     add_reference :commontator_comments, :parent, foreign_key: {
       to_table: :commontator_comments, on_update: :restrict, on_delete: :cascade
     }
-    add_column :commontator_comments, :ancestor_ids, :text
-    add_column :commontator_comments, :descendant_ids, :text
   end
 end

data/lib/commontator.rb

@@ -1,3 +1,4 @@
+require 'will_paginate'
 require 'commontator/version'
 
 module Commontator

data/lib/commontator/commontable_config.rb

@@ -5,9 +5,14 @@ class Commontator::CommontableConfig
     attr_accessor attribute
   end
 
+  # For backwards-compatibility with Integer comments_per_page
+  def comments_per_page=(cpp)
+    @comments_per_page = [ cpp ].flatten
+  end
+
   def initialize(options = {})
     Commontator::Config::COMMONTABLE_ATTRIBUTES.each do |attribute|
-      self.send attribute.to_s + '=', options[attribute] || Commontator.send(attribute)
+      send "#{attribute}=", options[attribute] || Commontator.send(attribute)
     end
   end
 end

data/lib/commontator/commontator_config.rb

@@ -7,7 +7,7 @@ class Commontator::CommontatorConfig
 
   def initialize(options = {})
     Commontator::Config::COMMONTATOR_ATTRIBUTES.each do |attribute|
-      self.send attribute.to_s + '=', options[attribute] || Commontator.send(attribute)
+      send "#{attribute}=", options[attribute] || Commontator.send(attribute)
     end
   end
 end

data/lib/commontator/config.rb

@@ -27,13 +27,13 @@ module Commontator::Config
     :comment_voting,
     :vote_count_proc,
     :comment_order,
-    :new_comment_style,
-    :comments_per_page,
     :thread_subscription,
     :email_from_proc,
     :commontable_name_proc,
     :comment_url_proc,
+    :new_comment_style,
     :comment_reply_style,
+    :comments_per_page,
     :mentions_enabled
   ]
 

data/lib/commontator/controllers.rb

@@ -8,21 +8,15 @@ module Commontator::Controllers
   def commontator_set_thread_variables
     return if @commontator_thread.nil? || !@commontator_thread.can_be_read_by?(@commontator_user)
 
-    @commontator_per_page = params[:per_page]
-    @commontator_per_page = @commontator_thread.config.comments_per_page \
-      if @commontator_per_page.blank?
-    @commontator_page = params[:page]
-    @commontator_page = 1 if @commontator_page.blank?
+    @commontator_page = [params[:page].to_i, 1].max
     @commontator_show_all = !params[:show_all].blank? &&
                             @commontator_thread.can_be_edited_by?(@commontator_user)
-
-    commontator_set_new_comment
   end
 
   def commontator_set_new_comment
     return unless @commontator_thread.config.new_comment_style == :t
 
-    new_comment = Commontator::Comment.new(user: @commontator_user, thread: @commontator_thread)
+    new_comment = Commontator::Comment.new(creator: @commontator_user, thread: @commontator_thread)
     @commontator_new_comment = new_comment if new_comment.can_be_created_by?(@commontator_user)
   end
 
@@ -30,6 +24,7 @@ module Commontator::Controllers
     commontator_set_user
     commontator_set_thread(commontable)
     commontator_set_thread_variables
+    commontator_set_new_comment
 
     @commontator_thread_show = true
     @commontator_thread.mark_as_read_for(@commontator_user)

data/lib/commontator/shared_helper.rb

@@ -15,7 +15,6 @@ module Commontator::SharedHelper
       partial: 'commontator/shared/thread', locals: {
         user: @commontator_user,
         thread: @commontator_thread,
-        per_page: @commontator_per_page,
         page: @commontator_page,
         show_all: @commontator_show_all
       }

data/lib/commontator/version.rb

@@ -1 +1 @@
-COMMONTATOR_VERSION = '6.0.0.pre.1'
+COMMONTATOR_VERSION = '6.0.0.pre.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.1
+  version: 6.0.0.pre.2
 platform: ruby
 authors:
 - Dante Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-07 00:00:00.000000000 Z
+date: 2019-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,13 +25,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sassc-rails
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails-i18n
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails-controller-testing
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,22 +179,23 @@ files:
 - app/helpers/commontator/application_helper.rb
 - app/helpers/commontator/link_renderer.rb
 - app/mailers/commontator/subscriptions_mailer.rb
+- app/models/commontator/collection.rb
 - app/models/commontator/comment.rb
 - app/models/commontator/json_array_coder.rb
 - app/models/commontator/subscription.rb
 - app/models/commontator/thread.rb
-- app/views/commontator/comments/_actions.html.erb
 - app/views/commontator/comments/_body.html.erb
 - app/views/commontator/comments/_form.html.erb
 - app/views/commontator/comments/_list.html.erb
-- app/views/commontator/comments/_reply.html.erb
 - app/views/commontator/comments/_show.html.erb
+- app/views/commontator/comments/_show.js.erb
 - app/views/commontator/comments/_votes.html.erb
 - app/views/commontator/comments/cancel.js.erb
 - app/views/commontator/comments/create.js.erb
 - app/views/commontator/comments/delete.js.erb
 - app/views/commontator/comments/edit.js.erb
 - app/views/commontator/comments/new.js.erb
+- app/views/commontator/comments/show.js.erb
 - app/views/commontator/comments/update.js.erb
 - app/views/commontator/comments/vote.js.erb
 - app/views/commontator/shared/_thread.html.erb