commontator 6.0.0.pre.2 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b104df98e58a375c90e006da5b5dfe15833cbc12bd8bc19a1c7deb5fe47fb50
-  data.tar.gz: f7b5f7d780315910e49e6989f58d98d2bf085dcd27007086ec1c4554b7f1d0a0
+  metadata.gz: f72fc2d006727dfff3cf250d48273f122fb2932b6db8ebe9422e8ba624ad3290
+  data.tar.gz: 658d3fd4fae52f45de97e2e626dea6594b5739129dcbe79686b1d8bcb517446f
 SHA512:
-  metadata.gz: 99f7eeda6f7d0208640dbe86a98b047ae1092460836bbf8d1d13e200993aad7dc505e12fb793bdfc4fca9aff1c01498ea479368772022c1b6e47a65b0636f8af
-  data.tar.gz: b0db208a7f29d5d3ab311c2ec9d044c86a205e08c79b335621e70a2b9af1027b3c146356b121d768c02c63f85708e57f453a51fe4b15d70523f1e1534b0afb7a
+  metadata.gz: b2542590cca9e1cc266fadfcb3b5783f675e12f116361c5f9ee1530a3f0c91ed845e60a52809286e6c3f625fa142729c4d7f19e6cda78f1af4f01e03782d89ad
+  data.tar.gz: d3021862824f68bd2a14d3fb13511e6958721949f8843c8ce264a219e44ea1c8ea7df2fb471787ab18b2e9070da4d69ef1501177a6b9ab7dfafb23e2e8e45276

data/app/models/commontator/thread.rb

@@ -55,7 +55,7 @@ class Commontator::Thread < ActiveRecord::Base
     [ :i, :b ].include?(config.comment_reply_style) ? oc.where(parent_id: parent_id) : oc
   end
 
-  def paginated_comments(page = 1, parent_id, show_all)
+  def paginated_comments(page, parent_id, show_all)
     cp = comments_with_parent_id(parent_id, show_all)
 
     cp.paginate(page: page, per_page: config.comments_per_page[0])
@@ -90,10 +90,10 @@ class Commontator::Thread < ActiveRecord::Base
     if [ :i, :b ].include? config.comment_reply_style
       all_parent_ids = comments.map(&:id)
       (config.comments_per_page[1..-1] + [ 0 ]).each_with_index do |per_page, index|
-        ordered_comments(show_all).where(parent_id: all_parent_ids)
-                                  .group(:parent_id)
-                                  .count
-                                  .each do |parent_id, count|
+        filtered_comments(show_all).where(parent_id: all_parent_ids)
+                                   .group(:parent_id)
+                                   .count
+                                   .each do |parent_id, count|
           count_by_parent_id[parent_id] = count
           per_page_by_parent_id[parent_id] = per_page
         end
@@ -103,10 +103,12 @@ class Commontator::Thread < ActiveRecord::Base
         children = all_parent_ids.empty? ? [] : Commontator::Comment.find_by_sql(
           all_parent_ids.map do |parent_id|
             Commontator::Comment.select(Arel.star).from(
-              Arel::Nodes::Grouping.new(
-                Arel::Nodes::SqlLiteral.new(
-                  ordered_comments(show_all).where(parent_id: parent_id).limit(per_page).to_sql
-                )
+              Arel::Nodes::TableAlias.new(
+                Arel::Nodes::Grouping.new(
+                  Arel::Nodes::SqlLiteral.new(
+                    ordered_comments(show_all).where(parent_id: parent_id).limit(per_page).to_sql
+                  )
+                ), :commontator_comments
               )
             ).to_sql
           end.reduce { |memo, sql| memo.nil? ? sql : "#{memo} UNION ALL #{sql}" }

data/config/initializers/commontator.rb

@@ -234,7 +234,7 @@ Commontator.configure do |config|
   # 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:
+  # The maximum number of comments loaded at once for the default setting is:
   # 20 + 20*5 + 20*5*2 == 320
   # Default: [ 20, 5, 2 ]
   config.comments_per_page = [ 20, 5, 2 ]

data/lib/commontator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.2
+  version: 6.0.0
 platform: ruby
 authors:
 - Dante Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-14 00:00:00.000000000 Z
+date: 2019-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -246,9 +246,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.4
 signing_key: