commontator 6.3.2 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4be189fd8c44438a5fe1717c74bfe09067f16dbaaccda6daf159e70213e2c39a
-  data.tar.gz: 6f62579a12c5b207ed9f879e3d473d654915c9fe1ac17dcc51ba0655502793c9
+  metadata.gz: e4b52a669ee098261a37c5670b3d964f7f5be3628ee9036471240fde923f77ec
+  data.tar.gz: 95b55b14e06b86d302ac9b5d75107015fe3f6dd787ba77ff5b30112bfc53bcb7
 SHA512:
-  metadata.gz: b15a7623162ca1ff592e8eb3bd4e15e99d6514e744625686aff53a6cf523d4abf43bdbb070a6eafa8f09d1e992332288a8c053a5d2a11c676424f20c89d4a613
-  data.tar.gz: e79a8df63ac01a4f837db59f4cb0dd23fec1a633d0045a02825a1562791f161d592f58a68b3aa23231cbe32e3ede2c6a8192a0de45af9186ee684da5b44c61f5
+  metadata.gz: b14bdde0d9c9738efee797e609497d894f5e4d3bd77534f9fabc101b952e37d356b97579fe2ba2eaca6defea3d13bcc18276a20efd1c18ee92a7ff3296c8a6ac
+  data.tar.gz: e652e1739c6940111cae53b0a9fbc0c7fe3f8a4e251fd03f422c1ee501faad0382ffafffd331fa22ef66530b0a31fd820c444d582e3a1e7a139f25c2555bb6ad

data/README.md

@@ -1,7 +1,7 @@
 # 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)
 

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/threads/_show.html.erb

@@ -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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 6.3.2
+  version: 7.0.0
 platform: ruby
 authors:
 - Dante Soares
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-21 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.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        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