commontator 6.2.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c41d7e4b88feb84affff73e5a74d3dd276d05946e4522bb40944b5a2787393c
-  data.tar.gz: fd642e33b5674fc580225b551718cad420d51fba59750608c47201b130afe1e2
+  metadata.gz: e4b52a669ee098261a37c5670b3d964f7f5be3628ee9036471240fde923f77ec
+  data.tar.gz: 95b55b14e06b86d302ac9b5d75107015fe3f6dd787ba77ff5b30112bfc53bcb7
 SHA512:
-  metadata.gz: 8143238089fdd8d0dd8ddefe5a0ce9c388760d428db5f946cf210f876c529b534eff165f9b8eb74bd3c1efa545d1895cda611502a315a9d3bab0d239edd66917
-  data.tar.gz: 18912adb40b3ee23d9aa26ac8ed47a89c0ef7a1e276fc382042333fe35fdb184b166d5ebdbfd6d14d5fbd3225b8f2a55d095ba0542136a05db2c8b606b4223cf
+  metadata.gz: b14bdde0d9c9738efee797e609497d894f5e4d3bd77534f9fabc101b952e37d356b97579fe2ba2eaca6defea3d13bcc18276a20efd1c18ee92a7ff3296c8a6ac
+  data.tar.gz: e652e1739c6940111cae53b0a9fbc0c7fe3f8a4e251fd03f422c1ee501faad0382ffafffd331fa22ef66530b0a31fd820c444d582e3a1e7a139f25c2555bb6ad

data/README.md

@@ -1,11 +1,11 @@
 # Commontator
 
 [![Gem Version](https://badge.fury.io/rb/commontator.svg)](https://badge.fury.io/rb/commontator)
-[![Build Status](https://travis-ci.org/lml/commontator.svg?branch=master)](https://travis-ci.org/lml/commontator)
+[![Tests](https://github.com/lml/commontator/workflows/Tests/badge.svg)](https://github.com/lml/commontator/actions?query=workflow:Tests)
 [![Code Climate](https://codeclimate.com/github/lml/commontator/badges/gpa.svg)](https://codeclimate.com/github/lml/commontator)
 [![Code Coverage](https://codeclimate.com/github/lml/commontator/badges/coverage.svg)](https://codeclimate.com/github/lml/commontator)
 
-Commontator is a Rails engine for comments. It is compatible with Rails 5+.
+Commontator is a Rails engine for comments. It is compatible with Rails 5.2+.
 Being an engine means it is fully functional as soon as you install and
 configure the gem, providing models, views and controllers of its own.
 At the same time, almost anything about it can be configured or customized to suit your needs.

data/app/helpers/commontator/link_renderer.rb

@@ -1,3 +1,7 @@
+require 'will_paginate/view_helpers/link_renderer' 
+require 'will_paginate/view_helpers/action_view'
+
+
 class Commontator::LinkRenderer < WillPaginate::ActionView::LinkRenderer
   protected
 

data/app/models/commontator/thread.rb

@@ -8,6 +8,8 @@ class Commontator::Thread < ActiveRecord::Base
   validates :commontable, presence: true, unless: :is_closed?
   validates :commontable_id, uniqueness: { scope: :commontable_type, allow_nil: true }
 
+  RAILS_7_PRELOADER = Rails::VERSION::MAJOR >= 7
+
   def config
     @config ||= commontable.try(:commontable_config) || Commontator
   end
@@ -147,9 +149,17 @@ class Commontator::Thread < ActiveRecord::Base
     ).tap do |nested_comments|
       next unless is_votable?
 
-      ActiveRecord::Associations::Preloader.new.preload(
-        nested_comments.flatten, :votes_for, ActsAsVotable::Vote.where(voter: user)
-      )
+      if RAILS_7_PRELOADER
+        ActiveRecord::Associations::Preloader.new(
+          records: nested_comments.flatten,
+          associations: :votes_for,
+          scope: ActsAsVotable::Vote.where(voter: user)
+        ).call
+      else
+        ActiveRecord::Associations::Preloader.new.preload(
+          nested_comments.flatten, :votes_for, ActsAsVotable::Vote.where(voter: user)
+        )
+      end
     end
   end
 

data/app/views/commontator/comments/_show.html.erb

@@ -36,7 +36,7 @@
       <% is_deleted = comment.is_deleted? %>
       <% del_string = is_deleted ? 'undelete' : 'delete' %>
       <%= link_to t("commontator.comment.actions.#{del_string}"),
-                  commontator.polymorphic_path([del_string, comment]),
+                  commontator.polymorphic_path([del_string.to_sym, comment]),
                   data: is_deleted ? {} : { confirm: t('commontator.comment.actions.confirm_delete') },
                   method: :put,
                   id: "commontator-comment-#{comment.id}-#{del_string}",

data/app/views/commontator/subscriptions/_link.html.erb

@@ -7,7 +7,7 @@
 <% is_subscribed = !!thread.subscription_for(user) %>
 <% sub_string = is_subscribed ? 'unsubscribe' : 'subscribe' %>
 <%= link_to t("commontator.subscription.actions.#{sub_string}"),
-            commontator.polymorphic_path([sub_string, thread]),
+            commontator.polymorphic_path([sub_string.to_sym, thread]),
             method: :put,
             id: "commontator-thread-#{thread.id}-#{sub_string}",
             class: sub_string,

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

@@ -54,7 +54,7 @@
         <% end %>
 
         <%= link_to t("commontator.thread.actions.#{close_string}"),
-                    commontator.polymorphic_path([close_string, thread]),
+                    commontator.polymorphic_path([close_string.to_sym, thread]),
                     data: is_closed ? {} :
                                       { confirm: t('commontator.thread.actions.confirm_close') },
                     method: :put,
@@ -110,5 +110,5 @@
 </div>
 
 <script type="text/javascript">
-  <%= render partial: 'commontator/threads/hide_show_links.js', locals: { thread: thread } %>
+  <%= render partial: 'commontator/threads/hide_show_links', locals: { thread: thread } %>
 </script>

data/lib/commontator/acts_as_commontable.rb

@@ -17,7 +17,7 @@ module Commontator::ActsAsCommontable
         cattr_accessor :commontable_config
         self.commontable_config = Commontator::CommontableConfig.new(options)
 
-        has_one :commontator_thread, association_options.merge(
+        has_one :commontator_thread, **association_options.merge(
           as: :commontable, class_name: 'Commontator::Thread'
         )
 

data/lib/commontator/acts_as_commontator.rb

@@ -16,10 +16,10 @@ module Commontator::ActsAsCommontator
         cattr_accessor :commontator_config
         self.commontator_config = Commontator::CommontatorConfig.new(options)
 
-        has_many :commontator_comments, association_options.merge(
+        has_many :commontator_comments, **association_options.merge(
           as: :creator, class_name: 'Commontator::Comment'
         )
-        has_many :commontator_subscriptions, association_options.merge(
+        has_many :commontator_subscriptions, **association_options.merge(
           as: :subscriber, class_name: 'Commontator::Subscription'
         )
 

data/lib/commontator/controllers.rb

@@ -1,10 +1,6 @@
 require_relative 'shared_helper'
 
 module Commontator::Controllers
-  def self.included(base)
-    base.helper Commontator::SharedHelper
-  end
-
   def commontator_set_thread_variables
     return if @commontator_thread.nil? || !@commontator_thread.can_be_read_by?(@commontator_user)
 

data/lib/commontator/engine.rb

@@ -1,7 +1,13 @@
 require 'commontator'
+require 'sprockets/railtie'
 
 class Commontator::Engine < ::Rails::Engine
   isolate_namespace Commontator
 
+  # Files in installed gems don't change during development,
+  # but still cause issues in Rails 7 if autoloaded in an initializer
+  # To fix this, make sure they are autoloaded only once
+  config.autoload_once_paths = config.autoload_paths + config.eager_load_paths
+
   config.assets.precompile += [ 'commontator/*.png' ]
 end

data/lib/commontator/shared_helper.rb

@@ -59,5 +59,8 @@ end
 
 ActiveSupport.on_load :action_controller do
   include Commontator::SharedHelper
+end
+
+ActiveSupport.on_load :action_controller_base do
   helper Commontator::SharedHelper
 end

data/lib/commontator/version.rb

@@ -1 +1 @@
-COMMONTATOR_VERSION = '6.2.1'
+COMMONTATOR_VERSION = '7.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Dante Soares
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-02 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +250,7 @@ homepage: https://github.com/lml/commontator
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -251,8 +265,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Allows users to comment on any model in your application.
 test_files: []