commontator 6.2.0 → 6.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '090fc289133016e2dee74b6443dbb24d87474a147f0af5be10794d1528572f1f'
-  data.tar.gz: caa26ed1c165afc9dbc133196c0a1bc40c9fb5271835cf5c24195da98eacdb1a
+  metadata.gz: 4be189fd8c44438a5fe1717c74bfe09067f16dbaaccda6daf159e70213e2c39a
+  data.tar.gz: 6f62579a12c5b207ed9f879e3d473d654915c9fe1ac17dcc51ba0655502793c9
 SHA512:
-  metadata.gz: 6b4eb3166f2de162d2a34f1bcc724e14dd538043a90658a87515d6d105509a25570babdca58e25149cfc9aac2d1f496844753f8087923c922a4e1555ec57ad28
-  data.tar.gz: ddb3662fa3723c0fd27809eaa80e19ac1ffd46d9e80b8c0d9f5909e2e4fa159676ea8fe5fba9a220fb6d555ae20db5da30e1c144a3eec5840c12bf797d591199
+  metadata.gz: b15a7623162ca1ff592e8eb3bd4e15e99d6514e744625686aff53a6cf523d4abf43bdbb070a6eafa8f09d1e992332288a8c053a5d2a11c676424f20c89d4a613
+  data.tar.gz: e79a8df63ac01a4f837db59f4cb0dd23fec1a633d0045a02825a1562791f161d592f58a68b3aa23231cbe32e3ede2c6a8192a0de45af9186ee684da5b44c61f5

data/README.md

@@ -5,7 +5,7 @@
 [![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.
@@ -79,7 +79,9 @@ Follow the steps below to install Commontator:
 
   You can change the mount path if you would like a different one.
 
-5. Javascripts
+### Assets
+
+1. Javascripts
 
   Make sure your application.js requires jquery and rails-ujs or jquery-ujs:
 
@@ -104,7 +106,7 @@ Follow the steps below to install Commontator:
   //= require commontator/application
   ```
 
-6. Stylesheets
+2. Stylesheets
 
   In order to display comment threads properly, you must
   require Commontator's application.scss in your `application.[s]css`:
@@ -113,6 +115,18 @@ Follow the steps below to install Commontator:
   *= require commontator/application
   ```
 
+#### Sprockets 4+
+
+  You must require Commontator's manifest.js in your app's manifest.js for images to work properly:
+
+  ```js
+  //= link commontator/manifest.js
+  ```
+
+  You also need to either add the necessary link tag commands to your layout to load
+  commontator/application.js and commontator/application.css or require them in your app's
+  application.js and application.css like in Sprockets 3.
+
 ## Usage
 
 Follow the steps below to add Commontator to your models and views:

data/app/assets/config/commontator/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../../images
+//= link_directory ../../javascripts .js
+//= link_directory ../../stylesheets .css

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/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,

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/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.0'
+COMMONTATOR_VERSION = '6.3.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.3.2
 platform: ruby
 authors:
 - Dante Soares
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-02 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +159,7 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
+- app/assets/config/commontator/manifest.js
 - app/assets/images/commontator/downvote.png
 - app/assets/images/commontator/downvote_active.png
 - app/assets/images/commontator/downvote_disabled.png
@@ -235,7 +236,7 @@ homepage: https://github.com/lml/commontator
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -250,8 +251,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: []