commontator 6.1.1 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b43492888aa32e2a5281147f5b8fa373bf4368fdac7e251f56652aee7263c6e
-  data.tar.gz: df8792352f99e43ae5bb707c73b8f7e2761d4172659816895603d1dc8d3a053d
+  metadata.gz: '090fc289133016e2dee74b6443dbb24d87474a147f0af5be10794d1528572f1f'
+  data.tar.gz: caa26ed1c165afc9dbc133196c0a1bc40c9fb5271835cf5c24195da98eacdb1a
 SHA512:
-  metadata.gz: 8d8149b165e5a4a1b3dfe9b9035129fd1fa232c9c65b0b5852bb5944ea3e2e9188142124e376821ca624b268e19ba32a5a762de1416b72a4690d23325c9cf897
-  data.tar.gz: 2c47c72b76baf4687caae23c5e6d5348e5ee4f1d987ef2ce6b07f22225e39d15be3a3cd2a450442c19bad1aa0712c7ed534e44cdb1f637d73f25518dbfdd45e5
+  metadata.gz: 6b4eb3166f2de162d2a34f1bcc724e14dd538043a90658a87515d6d105509a25570babdca58e25149cfc9aac2d1f496844753f8087923c922a4e1555ec57ad28
+  data.tar.gz: ddb3662fa3723c0fd27809eaa80e19ac1ffd46d9e80b8c0d9f5909e2e4fa159676ea8fe5fba9a220fb6d555ae20db5da30e1c144a3eec5840c12bf797d591199

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+.
 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.
@@ -22,7 +22,7 @@ Follow the steps below to install Commontator:
   gem 'commontator'
   ```
 
-  You will also need jquery-ujs and a sass compiler, which can be either be installed through
+  You will also need jquery and a sass compiler, which can be either be installed through
   the webpacker gem and yarn/npm/bower or through the jquery-rails and sass[c]-rails gems:
 
   ```rb
@@ -81,8 +81,15 @@ Follow the steps below to install Commontator:
 
 5. Javascripts
 
-  Make sure your application.js requires jquery and jquery-ujs:
+  Make sure your application.js requires jquery and rails-ujs or jquery-ujs:
 
+  Rails 5.1+:
+  ```js
+  //= require jquery
+  //= require rails-ujs
+  ```
+
+  Rails 5.0:
   ```js
   //= require jquery
   // If jquery-ujs was installed through jquery-rails

data/app/assets/stylesheets/commontator/application.scss

@@ -11,7 +11,7 @@
     padding: 0;
   }
 
-  .hidden {
+  .commontator-hidden {
     display: none;
   }
 

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

@@ -8,7 +8,7 @@
   <% if thread.is_closed? %>
     <p><%= t 'commontator.thread.status.cannot_post' %></p>
   <% elsif !user %>
-    <p><%= t 'commontator.require_login' %>.</p>
+    <p><%= t 'commontator.require_login' %></p>
   <% else %>
     <% if @commontator_new_comment.nil? %>
       <div id="commontator-thread-<%= thread.id %>-new-comment-link" class="new-comment">
@@ -19,7 +19,7 @@
     <% end %>
 
     <div id="commontator-thread-<%= thread.id %>-new-comment" class="new-comment<%=
-    @commontator_new_comment.nil? ? ' hidden' : '' %>">
+    @commontator_new_comment.nil? ? ' commontator-hidden' : '' %>">
       <% unless @commontator_new_comment.nil? %>
         <%=
           render partial: 'commontator/comments/form', locals: {

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

@@ -11,7 +11,7 @@
   nested_comments = thread.nested_comments_for(user, comments, show_all)
 %>
 
-<div id="commontator-thread-<%= thread.id %>-show" class="show hidden">
+<div id="commontator-thread-<%= thread.id %>-show" class="show commontator-hidden">
   <%= link_to t('commontator.thread.actions.show'),
               '#',
               id: "commontator-thread-#{thread.id}-show-link" %>
@@ -20,7 +20,7 @@
 <div id="commontator-thread-<%= thread.id %>-content" class="content">
   <div id="commontator-thread-<%= thread.id %>-header" class="header">
     <span id="commontator-thread-<%= thread.id %>-actions" class="actions">
-      <span id="commontator-thread-<%= thread.id %>-hide" class="hide hidden">
+      <span id="commontator-thread-<%= thread.id %>-hide" class="hide commontator-hidden">
         <%= link_to t('commontator.thread.actions.hide'),
                     '#',
                     id: "commontator-thread-#{thread.id}-hide-link" %>

data/config/initializers/commontator.rb

@@ -254,10 +254,10 @@ Commontator.configure do |config|
   # Returns: the address emails are sent "from" (String)
   # Important: If using subscriptions, change this to at least match your domain name
   # Default: ->(thread) do
-  #   "no-reply@#{Rails.application.class.parent.to_s.downcase}.com"
+  #   "no-reply@#{Rails.application.class.module_parent.to_s.downcase}.com"
   # end
   config.email_from_proc = ->(thread) do
-    "no-reply@#{Rails.application.class.parent.to_s.downcase}.com"
+    "no-reply@#{Rails.application.class.module_parent.to_s.downcase}.com"
   end
 
   # commontable_name_proc

data/db/migrate/{0_install_commontator.rb → 10_install_commontator.rb}

@@ -1,4 +1,4 @@
-class InstallCommontator < ActiveRecord::Migration[5.2]
+class InstallCommontator < ActiveRecord::Migration[6.0]
   def change
     create_table :commontator_threads do |t|
       t.references :commontable,
@@ -8,7 +8,7 @@ class InstallCommontator < ActiveRecord::Migration[5.2]
 
       t.datetime :closed_at
 
-      t.timestamps null: false
+      t.timestamps
     end
 
     create_table :commontator_comments do |t|
@@ -24,7 +24,7 @@ class InstallCommontator < ActiveRecord::Migration[5.2]
       t.integer :cached_votes_up, default: 0, index: true
       t.integer :cached_votes_down, default: 0, index: true
 
-      t.timestamps null: false
+      t.timestamps
     end
 
     add_index :commontator_comments, [ :creator_id, :creator_type, :thread_id ],
@@ -37,7 +37,7 @@ class InstallCommontator < ActiveRecord::Migration[5.2]
       }
       t.references :subscriber, polymorphic: true, null: false, index: false
 
-      t.timestamps null: false
+      t.timestamps
     end
 
     add_index :commontator_subscriptions, [ :subscriber_id, :subscriber_type, :thread_id ],

data/db/migrate/{1_add_replying_to_comments.rb → 11_add_replying_to_comments.rb}

@@ -1,4 +1,4 @@
-class AddReplyingToComments < ActiveRecord::Migration[5.2]
+class AddReplyingToComments < ActiveRecord::Migration[6.0]
   def change
     add_reference :commontator_comments, :parent, foreign_key: {
       to_table: :commontator_comments, on_update: :restrict, on_delete: :cascade

data/lib/commontator/acts_as_commontable.rb

@@ -21,10 +21,11 @@ module Commontator::ActsAsCommontable
           as: :commontable, class_name: 'Commontator::Thread'
         )
 
-        validates :commontator_thread, presence: true
-
         prepend Commontator::BuildThread
 
+        # Support creating acts_as_commontable records without a commontator_thread when migrating
+        validates :commontator_thread, presence: true, if: -> { Commontator::Thread.table_exists? }
+
         self.is_commontable = true
       end
     end
@@ -33,4 +34,6 @@ module Commontator::ActsAsCommontable
   end
 end
 
-ActiveRecord::Base.send :include, Commontator::ActsAsCommontable
+ActiveSupport.on_load :active_record do
+  include Commontator::ActsAsCommontable
+end

data/lib/commontator/acts_as_commontator.rb

@@ -33,4 +33,6 @@ module Commontator::ActsAsCommontator
   end
 end
 
-ActiveRecord::Base.send :include, Commontator::ActsAsCommontator
+ActiveSupport.on_load :active_record do
+  include Commontator::ActsAsCommontator
+end

data/lib/commontator/controllers.rb

@@ -31,4 +31,6 @@ module Commontator::Controllers
   end
 end
 
-ActionController::Base.send :include, Commontator::Controllers
+ActiveSupport.on_load :action_controller do
+  include Commontator::Controllers
+end

data/lib/commontator/shared_helper.rb

@@ -57,5 +57,7 @@ module Commontator::SharedHelper
   end
 end
 
-ActionController::Base.send :include, Commontator::SharedHelper
-ActionController::Base.helper Commontator::SharedHelper
+ActiveSupport.on_load :action_controller do
+  include Commontator::SharedHelper
+  helper Commontator::SharedHelper
+end

data/lib/commontator/version.rb

@@ -1 +1 @@
-COMMONTATOR_VERSION = '6.1.1'
+COMMONTATOR_VERSION = '6.2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.2.0
 platform: ruby
 authors:
 - Dante Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2020-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -214,8 +214,8 @@ files:
 - config/locales/ru.yml
 - config/locales/zh.yml
 - config/routes.rb
-- db/migrate/0_install_commontator.rb
-- db/migrate/1_add_replying_to_comments.rb
+- db/migrate/10_install_commontator.rb
+- db/migrate/11_add_replying_to_comments.rb
 - lib/commontator.rb
 - lib/commontator/acts_as_commontable.rb
 - lib/commontator/acts_as_commontator.rb