thredded 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a7da465ff23d46ffb17f30aef22bc8195dc7551f485d28d698f3a8e20aaf958
-  data.tar.gz: 24d752703abdc40ba28ffa48d931d70d5c9baeff461467059e7f2c2fbdfea27c
+  metadata.gz: 19cde941264a9f9b9427694c27cc5f2a668fd18debbfe459d3fc58087e5636bf
+  data.tar.gz: 0d4eec1e395f2265783f9283ad958ec2a7f486a017bb961af87b26c2fd711c20
 SHA512:
-  metadata.gz: 6dec36328aba9edd1143d2aecaa70970ba48897ed470e97785c534067c6d5f38e0e175d4637a5824f1d09827059ab508147c2c721400a8027e966884f235a74d
-  data.tar.gz: c35c5f19f198b78b0d6426b96e1f15863cb29ff74c5a130d665a1fde1dd89d9f5af8bb194b0991d2a7bf965aa9fe6309af0de03246a6bf7d2711e1356b34d636
+  metadata.gz: f7d6aa4fd6d1eaecda06e839b757d6fa2bbf7fd24ae6ef4ba3c238a5d8880baeff1be6b9ee2aae21b34c8f844d0aa5eb5c41a1f70e7841cbe867a900e29b980a
+  data.tar.gz: 04af99833299683e35b13468e957bd75880a1627db1ff6c9ab53e1678f99842b273cc50ed529c9cddeedb7600c0d54b404550fd8858a7901346d6c72df77bdb2

data/README.md

@@ -1,6 +1,6 @@
-# Thredded [![Code Climate](https://codeclimate.com/github/thredded/thredded/badges/gpa.svg)](https://codeclimate.com/github/thredded/thredded) [![Travis-CI](https://api.travis-ci.org/thredded/thredded.svg?branch=master)](https://travis-ci.org/thredded/thredded/) [![Test Coverage](https://codeclimate.com/github/thredded/thredded/badges/coverage.svg)](https://codeclimate.com/github/thredded/thredded/coverage) [![Inline docs](http://inch-ci.org/github/thredded/thredded.svg?branch=master)](http://inch-ci.org/github/thredded/thredded) [![Gitter](https://badges.gitter.im/thredded/thredded.svg)](https://gitter.im/thredded/thredded?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+# Thredded [![Code Climate](https://codeclimate.com/github/thredded/thredded/badges/gpa.svg)](https://codeclimate.com/github/thredded/thredded) [![Travis-CI](https://api.travis-ci.org/thredded/thredded.svg?branch=main)](https://travis-ci.org/thredded/thredded/) [![Test Coverage](https://codeclimate.com/github/thredded/thredded/badges/coverage.svg)](https://codeclimate.com/github/thredded/thredded/coverage) [![Inline docs](http://inch-ci.org/github/thredded/thredded.svg?branch=main)](http://inch-ci.org/github/thredded/thredded) [![Gitter](https://badges.gitter.im/thredded/thredded.svg)](https://gitter.im/thredded/thredded?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
-_Thredded_ is a Rails 4.2+ forum/messageboard engine. Its goal is to be as simple and feature rich as possible.
+_Thredded_ is a Rails 6.0+ forum/messageboard engine. Its goal is to be as simple and feature rich as possible.
 
 Some of the features currently in Thredded:
 
@@ -38,6 +38,7 @@ Table of Contents
   * [Adding Thredded to an existing Rails app](#adding-thredded-to-an-existing-rails-app)
   * [Upgrading an existing install](#upgrading-an-existing-install)
   * [Migrating from Forem](#migrating-from-forem)
+* [Rails compatibility](#rails-compatibility)
 * [Views and other assets](#views-and-other-assets)
   * [Standalone layout](#standalone-layout)
   * [Application layout](#application-layout)
@@ -96,7 +97,7 @@ Then, see the rest of this Readme for more information about using and customizi
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 1.0'
+gem 'thredded', '~> 1.1'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -155,6 +156,15 @@ to Thredded.
 [forem-to-thredded]: https://github.com/thredded/thredded/wiki/Migrate-from-Forem
 [Forem]: https://github.com/rubysherpas/forem
 
+## Rails compatibility
+
+| Rails  | Latest Thredded  |
+| ------------- |------------------|
+| Rails 6.0+ | Thredded 1.1+    |
+| Rails 5.2  | Thredded 1.0.1   |
+| Rails 4.2  | Thredded 0.16.16 |
+
+
 ## Views and other assets
 
 ### Standalone layout
@@ -352,7 +362,7 @@ with a "themed" version of thredded.
 #### Styles
 
 Thredded comes with a light Sass theme controlled by a handful of variables that can be found here:
-https://github.com/thredded/thredded/blob/master/app/assets/stylesheets/thredded/base/_variables.scss.
+https://github.com/thredded/thredded/blob/main/app/assets/stylesheets/thredded/base/_variables.scss.
 
 To override the styles, override the variables *before* importing Thredded styles, e.g.:
 
@@ -366,8 +376,8 @@ If you are writing a Thredded plugin, import the [`thredded/base`][thredded-scss
 The `base` package only defines variables, mixins, and %-placeholders, so it can be imported safely without producing
 any duplicate CSS.
 
-[thredded-scss-dependencies]: https://github.com/thredded/thredded/blob/master/app/assets/stylesheets/thredded/_dependencies.scss
-[thredded-scss-base]: https://github.com/thredded/thredded/blob/master/app/assets/stylesheets/thredded/_base.scss
+[thredded-scss-dependencies]: https://github.com/thredded/thredded/blob/main/app/assets/stylesheets/thredded/_dependencies.scss
+[thredded-scss-base]: https://github.com/thredded/thredded/blob/main/app/assets/stylesheets/thredded/_base.scss
 
 ### Email and other notifications
 
@@ -513,35 +523,35 @@ Below is an overview of the default permissions, with links to the implementatio
 <tbody>
 <tr>
   <th align="center">Logged in</th>
-  <td align="center" rowspan="2"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/read/all.rb">
+  <td align="center" rowspan="2"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/read/all.rb">
     ✅ All
   </a></td>
-  <td align="center"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/write/all.rb">
+  <td align="center"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/write/all.rb">
     ✅ All
   </a></td>
-  <td align="center"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/message/readers_of_writeable_boards.rb">
+  <td align="center"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/message/readers_of_writeable_boards.rb">
     Readers of the messageboards<br>the user can post in
   </a></td>
-  <td align="center"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/moderate/if_moderator_column_true.rb">
+  <td align="center"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/moderate/if_moderator_column_true.rb">
     <code>moderator_column</code>
   </a></td>
-  <td align="center"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/admin/if_admin_column_true.rb">
+  <td align="center"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/admin/if_admin_column_true.rb">
     <code>admin_column</code>
   </a></td>
 </tr>
 <tr>
   <th align="center">Not logged in</th>
   <!-- rowspan -->
-  <td align="center"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/write/none.rb">
+  <td align="center"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/write/none.rb">
     ❌ No
   </a></td>
-  <td align="center"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/message/readers_of_writeable_boards.rb">
+  <td align="center"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/message/readers_of_writeable_boards.rb">
     ❌ No
   </a></td>
-  <td align="center"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/moderate/none.rb">
+  <td align="center"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/moderate/none.rb">
     ❌ No
   </a></td>
-  <td align="center"><a href="https://github.com/thredded/thredded/blob/master/app/models/thredded/user_permissions/admin/none.rb">
+  <td align="center"><a href="https://github.com/thredded/thredded/blob/main/app/models/thredded/user_permissions/admin/none.rb">
     ❌ No
   </a></td>
 </tr>
@@ -551,7 +561,7 @@ Below is an overview of the default permissions, with links to the implementatio
 ### Handling "Permission denied" and "Not found" errors
 
 Thredded defines a number of Exception classes for not found / permission denied errors.
-The complete list can be found [here](https://github.com/thredded/thredded/blob/master/app/controllers/thredded/application_controller.rb#L18-L40).
+The complete list can be found [here](https://github.com/thredded/thredded/blob/main/app/controllers/thredded/application_controller.rb#L18-L40).
 
 Currently, the default behaviour is to render an error message with an appropriate response code within the Thredded
 layout. You may want to override the handling for `Thredded::Errors::LoginRequired` to render a login form instead.
@@ -596,8 +606,6 @@ Rails.application.config.to_prepare do
   Thredded::ApplicationController.module_eval do
     # Require authentication to access the forums:
     before_action :thredded_require_login!
-    # NB: in rails 4.2 you will need to change this to:
-    # before_action { thredded_require_login! }
 
     # You may also want to render a login form after the
     # "Please sign in first" message:
@@ -809,4 +817,4 @@ docker-compose run web bundle exec rake
 
 The docker container uses PostgreSQL.
 
-[initializer]: https://github.com/thredded/thredded/blob/master/lib/generators/thredded/install/templates/initializer.rb
+[initializer]: https://github.com/thredded/thredded/blob/main/lib/generators/thredded/install/templates/initializer.rb

data/app/commands/thredded/create_messageboard.rb

@@ -34,8 +34,8 @@ module Thredded
     end
 
     def first_topic_content
-      <<-MARKDOWN
-#{I18n.t('thredded.messageboard_first_topic.content', thredded_version: Thredded::VERSION)}
+      <<~MARKDOWN
+        #{I18n.t('thredded.messageboard_first_topic.content', thredded_version: Thredded::VERSION)}
       MARKDOWN
     end
   end

data/app/forms/thredded/private_topic_form.rb

@@ -130,7 +130,7 @@ module Thredded
       end
     end
 
-    def parse_names(text) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength
+    def parse_names(text) # rubocop:disable Metrics/MethodLength
       result = []
       current = +''
       in_name = in_quoted = false

data/app/helpers/thredded/application_helper.rb

@@ -108,9 +108,9 @@ module Thredded
     # @param follow_reason ['manual', 'posted', 'mentioned', 'auto', nil]
     def topic_follow_reason_text(follow_reason)
       if follow_reason
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         # i18n-tasks-use t('thredded.topics.following.manual') t('thredded.topics.following.posted') t('thredded.topics.following.mentioned') t('thredded.topics.following.auto')
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
         t("thredded.topics.following.#{follow_reason}")
       else
         t('thredded.topics.not_following')

data/app/helpers/thredded/urls_helper.rb

@@ -2,6 +2,8 @@
 
 module Thredded
   module UrlsHelper # rubocop:disable Metrics/ModuleLength
+    include Thredded::Engine.routes.url_helpers
+
     class << self
       include Thredded::Engine.routes.url_helpers
       include Thredded::UrlsHelper

data/app/mailer_previews/thredded/base_mailer_preview.rb

@@ -11,13 +11,13 @@ module Thredded
     protected
 
     def mock_content(mention_users: [])
-      <<-MARKDOWN
-Hey #{mention_users.map { |u| "@#{u}" } * ', '}!
-All of the basic [Markdown](https://kramdown.gettalong.org/quickref.html) formatting is supported (powered by [Kramdown](https://kramdown.gettalong.org)).
+      <<~MARKDOWN
+        Hey #{mention_users.map { |u| "@#{u}" } * ', '}!
+        All of the basic [Markdown](https://kramdown.gettalong.org/quickref.html) formatting is supported (powered by [Kramdown](https://kramdown.gettalong.org)).
 
-Additionally, Markdown is extended to support the following:
+        Additionally, Markdown is extended to support the following:
 
-#{Thredded::FormattingDemoContent.parts.join("\n")}
+        #{Thredded::FormattingDemoContent.parts.join("\n")}
       MARKDOWN
     end
 

data/app/models/concerns/thredded/friendly_id_reserved_words_and_pagination.rb

@@ -11,7 +11,7 @@ module Thredded
     end
 
     def include?(slug)
-      @words.include?(slug) || slug =~ PAGINATION_PATTERN
+      @words.include?(slug) || PAGINATION_PATTERN.match?(slug)
     end
   end
 end

data/app/models/concerns/thredded/notifier_preference.rb

@@ -8,7 +8,7 @@ module Thredded
       delegate :human_name, to: :notifier, prefix: true
 
       def self.detect_or_default(prefs, notifier)
-        (prefs && prefs.find { |pref| pref.notifier_key == notifier.key }) || default(notifier)
+        (prefs&.find { |pref| pref.notifier_key == notifier.key }) || default(notifier)
       end
     end
 

data/app/models/concerns/thredded/post_common.rb

@@ -26,8 +26,8 @@ module Thredded
         preloader = Thredded::Compat.association_preloader(
           records: owners_by_id.values, associations: [:first_post],
           scope: unscoped.where(<<~SQL.delete("\n"))
-          #{posts_table_name}.created_at = (
-          SELECT MAX(p2.created_at) from #{posts_table_name} p2 WHERE p2.postable_id = #{posts_table_name}.postable_id)
+            #{posts_table_name}.created_at = (
+            SELECT MAX(p2.created_at) from #{posts_table_name} p2 WHERE p2.postable_id = #{posts_table_name}.postable_id)
           SQL
         )
         preloader[0].preloaded_records.each do |post|
@@ -68,7 +68,7 @@ module Thredded
     def mark_as_unread(user)
       if previous_post.nil?
         read_state = postable.user_read_states.find_by(user_id: user.id)
-        read_state.destroy if read_state
+        read_state&.destroy
       else
         postable.user_read_states.touch!(user.id, previous_post, overwrite_newer: true)
       end

data/app/models/thredded/post_moderation_record.rb

@@ -33,12 +33,12 @@ module Thredded
         h[r.post.postable_id] = r.post.postable if r.post
       end
       next result if owners_by_id.empty?
-      preloader = ActiveRecord::Associations::Preloader.new.preload(
-        owners_by_id.values, :first_post,
-        Thredded::Post.unscoped.where(<<~SQL.delete("\n"))
+      preloader = Thredded::Compat.association_preloader(
+        records: owners_by_id.values, associations: [:first_post],
+        scope: Thredded::Post.unscoped.where(<<~SQL.delete("\n"))
           #{posts_table_name}.created_at = (
           SELECT MAX(p2.created_at) from #{posts_table_name} p2 WHERE p2.postable_id = #{posts_table_name}.postable_id)
-      SQL
+        SQL
       )
       preloader[0].preloaded_records.each do |post|
         topic = owners_by_id.delete(post.postable_id)

data/app/view_models/thredded/topics_page_view.rb

@@ -9,6 +9,7 @@ module Thredded
              :empty?,
              :[],
              :each,
+             :each_with_index,
              :map,
              :size,
              to: :@topic_views

data/app/views/thredded/moderation/_post_moderation_record.html.erb

@@ -13,13 +13,13 @@
       time_ago:  time_ago(record.created_at)
   }
 %>
-<article class="thredded--post-moderation-record thredded--post-moderation-record-<%= record.moderation_state %>">
+<article id="<%= dom_id(post) %>" class="thredded--post-moderation-record thredded--post-moderation-record-<%= record.moderation_state %>">
   <header class="thredded--post-moderation-record--header">
     <p class="thredded--post-moderation-record--moderation-state-notice">
       <% if record.approved? %>
-        <%= t('thredded.moderation.post_approved_html', moderation_state_notice_args) %>
+        <%= t('thredded.moderation.post_approved_html', **moderation_state_notice_args) %>
       <% elsif record.blocked? %>
-        <%= t('thredded.moderation.post_blocked_html', moderation_state_notice_args) %>
+        <%= t('thredded.moderation.post_blocked_html', **moderation_state_notice_args) %>
       <% end %>
     </p>
     <% if post && post.content != record.post_content %>

data/app/views/thredded/shared/nav/_standalone.html.erb

@@ -2,11 +2,11 @@
   <% resource_name = Thredded.user_class_name.demodulize.underscore %>
   <% if thredded_signed_in? %>
     <%= link_to main_app.send(:"destroy_#{resource_name}_session_path"), method: :delete do %>
-      t('thredded.nav.sign_out')
+      <%= t('thredded.nav.sign_out') %>
     <% end %>
   <% else %>
     <%= link_to main_app.send(:"new_#{resource_name}_session_path") do %>
-      t('thredded.nav.sign_in')
+      <%= t('thredded.nav.sign_in') %>
     <% end %>
   <% end %>
 </li>

data/bin/rubocop

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path('bundle', __dir__)
+
+if File.file?(bundle_binstub)
+  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rubocop', 'rubocop')

data/bin/run_specs_repeatedly

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# exit on first failure
+set -e
+for i in {1..10}
+do
+  echo "#$i (rspec $1)"
+  bundle exec rspec --format d $1 --fail-fast
+done

data/config/i18n-tasks.yml

@@ -1,5 +1,5 @@
 # i18n-tasks finds and manages missing and unused translations
-# See https://github.com/glebm/i18n-tasks/blob/master/templates/config/i18n-tasks.yml
+# See https://github.com/glebm/i18n-tasks/blob/main/templates/config/i18n-tasks.yml
 
 # Do not consider these keys missing:
 ignore_missing:

data/db/upgrade_migrations/20161019150201_upgrade_v0_7_to_v0_8.rb

@@ -6,11 +6,11 @@ class UpgradeV07ToV08 < Thredded::BaseMigration
   def up
     closed_messageboards = Thredded::Messageboard.unscoped.where(closed: true).to_a
     if closed_messageboards.present?
-      fail ActiveRecord::MigrationError, <<-TEXT
-There are #{closed_messageboards.length} closed Messageboards:
-#{closed_messageboards.map { |m| "#{m.name} (id=#{m.id})" }.join("\n")}
-Support for closed messageboards has been removed in thredded v0.8.0.
-Delete or un-close these messageboards and consider using the "paranoia" gem to support soft deletion instead.
+      fail ActiveRecord::MigrationError, <<~TEXT
+        There are #{closed_messageboards.length} closed Messageboards:
+        #{closed_messageboards.map { |m| "#{m.name} (id=#{m.id})" }.join("\n")}
+        Support for closed messageboards has been removed in thredded v0.8.0.
+        Delete or un-close these messageboards and consider using the "paranoia" gem to support soft deletion instead.
       TEXT
     end
     remove_index :thredded_messageboards, name: :index_thredded_messageboards_on_closed

data/lib/generators/thredded/install/templates/initializer.rb

@@ -124,7 +124,7 @@ Thredded.layout = 'thredded/application'
 # Change the HTML sanitization settings used by Thredded.
 # See the Sanitize docs for more information on the underlying library: https://github.com/rgrove/sanitize/#readme
 # E.g. to allow a custom element <custom-element>:
-# Thredded::ContentFormatter.whitelist[:elements] += %w(custom-element)
+# Thredded::ContentFormatter.allowlist[:elements] += %w(custom-element)
 
 # ==> User autocompletion (Private messages and @-mentions)
 # Thredded.autocomplete_min_length = 2 lower to 1 if have 1-letter names -- increase if you want

data/lib/thredded/arel_compat.rb

@@ -9,7 +9,7 @@ module Thredded
     # @param [Arel::Nodes::Node] b integer node
     # @return [Arel::Nodes::Node] a / b
     def integer_division(engine, a, b)
-      if engine.connection.adapter_name =~ /mysql|mariadb/i
+      if /mysql|mariadb/i.match?(engine.connection.adapter_name)
         Arel::Nodes::InfixOperation.new('DIV', a, b)
       else
         Arel::Nodes::Division.new(a, b)

data/lib/thredded/base_migration.rb

@@ -15,7 +15,7 @@ module Thredded
 
     # @return [Integer, nil] the maximum number of codepoints that can be indexed for a primary key or index.
     def max_key_length
-      return nil unless connection.adapter_name =~ /mysql|maria/i
+      return nil unless /mysql|maria/i.match?(connection.adapter_name)
       # Conservatively assume that innodb_large_prefix is **disabled**.
       # If it were enabled, the maximum key length would instead be 768 utf8mb4 characters.
       191

data/lib/thredded/collection_to_strings_with_cache_renderer.rb

@@ -47,7 +47,8 @@ module Thredded
 
         ordered_keys.map do |cache_key|
           [keyed_collection[cache_key], cached_partials[cache_key] || rendered_partials.next.tap do |rendered|
-            cached_partials[cache_key] = cache.write(cache_key, rendered, expires_in: expires_in)
+            cache.write(cache_key, rendered, expires_in: expires_in)
+            cached_partials[cache_key] = rendered
           end]
         end
       end
@@ -82,18 +83,29 @@ module Thredded
       else
         collection.each_slice(collection.size / num_threads).map do |slice|
           Thread.start do
-            # `ActionView::PartialRenderer` mutates the contents of `opts[:locals]`, `opts[:locals][:as]` in particular:
-            # https://github.com/rails/rails/blob/v6.0.2.1/actionview/lib/action_view/renderer/partial_renderer.rb#L379
-            # https://github.com/rails/rails/blob/v6.0.2.1/actionview/lib/action_view/renderer/partial_renderer.rb#L348-L356
-            opts[:locals] = opts[:locals].dup if opts[:locals]
             ActiveRecord::Base.connection_pool.with_connection do
-              render_partials_serial(view_context.dup, slice, opts)
+              render_partials_serial(view_context.dup, slice, dup_opts(opts))
             end
           end
         end.flat_map(&:value)
       end
     end
 
+    # `ActionView::PartialRenderer` mutates the contents of `opts[:locals]`, `opts[:locals][:as]` in particular:
+    # https://github.com/rails/rails/blob/v6.0.2.1/actionview/lib/action_view/renderer/partial_renderer.rb#L379
+    # https://github.com/rails/rails/blob/v6.0.2.1/actionview/lib/action_view/renderer/partial_renderer.rb#L348-L356
+    def dup_opts(opts)
+      if opts[:locals]
+        opts = opts.dup
+        # sometimes have a thread safe :users_provider, preserve that for performance reasons
+        # hence not doing a deep_dup
+        opts[:locals] = opts[:locals].dup
+        opts
+      else
+        opts.dup
+      end
+    end
+
     if Thredded::Compat.rails_gte_61?
       # @param [Array<Object>] collection
       # @param [Hash] opts
@@ -121,42 +133,20 @@ module Thredded
       view.combined_fragment_cache_key(key)
     end
 
-    if Thredded::Compat.rails_gte_60?
-      def cache_fragment_name(view, key, virtual_path:, digest_path:)
-        if Thredded::Compat.rails_gte_61?
-          view.cache_fragment_name(key, digest_path: digest_path)
-        else
-          view.cache_fragment_name(key, virtual_path: virtual_path, digest_path: digest_path)
-        end
-      end
-
-      def digest_path_from_template(view, template)
-        view.digest_path_from_template(template)
-      end
-
-      def render_partial(partial_renderer, view_context, opts)
-        partial_renderer.render(view_context, opts, nil).body
-      end
-    else
-      def cache_fragment_name(_view, key, virtual_path:, digest_path:)
-        if digest_path
-          ["#{virtual_path}:#{digest_path}", key]
-        else
-          [virtual_path, key]
-        end
+    def cache_fragment_name(view, key, virtual_path:, digest_path:)
+      if Thredded::Compat.rails_gte_61?
+        view.cache_fragment_name(key, digest_path: digest_path)
+      else
+        view.cache_fragment_name(key, virtual_path: virtual_path, digest_path: digest_path)
       end
+    end
 
-      def digest_path_from_template(view, template)
-        ActionView::Digestor.digest(
-          name: template.virtual_path,
-          finder: @lookup_context,
-          dependencies: view.view_cache_dependencies
-        ).presence
-      end
+    def digest_path_from_template(view, template)
+      view.digest_path_from_template(template)
+    end
 
-      def render_partial(partial_renderer, view_context, opts)
-        partial_renderer.render(view_context, opts, nil)
-      end
+    def render_partial(partial_renderer, view_context, opts)
+      partial_renderer.render(view_context, opts, nil).body
     end
   end
 end

data/lib/thredded/compat.rb

@@ -3,12 +3,6 @@
 module Thredded
   module Compat
     class << self
-      # @api private
-      def rails_gte_60?
-        @rails_gte_60 = (Rails.gem_version >= Gem::Version.new('6.0.0')) if @rails_gte_60.nil?
-        @rails_gte_60
-      end
-
       # @api private
       def rails_gte_61?
         @rails_gte_61 = (Rails.gem_version >= Gem::Version.new('6.1.0')) if @rails_gte_61.nil?

data/lib/thredded/content_formatter.rb

@@ -4,8 +4,19 @@ module Thredded
   # Generates HTML from content source.
   class ContentFormatter
     class << self
-      # Sanitization whitelist options.
-      attr_accessor :whitelist
+      # Sanitization allowlist options.
+      attr_accessor :allowlist
+
+      # TODO: v2.0: drop alias and just use allowlist
+      # @deprecated use allowlist
+      def whitelist
+        ActiveSupport::Deprecation.warn(<<~MESSAGE.squish)
+          ContentFormatter.whitelist is deprecated and will be removed in Thredded 2.0.
+          Use ContentFormatter.allowlist instead
+        MESSAGE
+
+        allowlist
+      end
 
       # Filters that run before processing the markup.
       # input: markup, output: markup.
@@ -26,16 +37,20 @@ module Thredded
       # Filters that run after sanitization
       # input: sanitized html, output: html
       attr_accessor :after_sanitization_filters
+
+      def sanitization_filter_allowlist_config
+        HTML::Pipeline::SanitizationFilter::ALLOWLIST
+      end
     end
 
-    self.whitelist = HTML::Pipeline::SanitizationFilter::WHITELIST.deep_merge(
-      elements: HTML::Pipeline::SanitizationFilter::WHITELIST[:elements] + %w[abbr iframe span figure figcaption],
-      transformers: HTML::Pipeline::SanitizationFilter::WHITELIST[:transformers] + [
+    self.allowlist = sanitization_filter_allowlist_config.deep_merge(
+      elements: sanitization_filter_allowlist_config[:elements] + %w[abbr iframe span figure figcaption],
+      transformers: sanitization_filter_allowlist_config[:transformers] + [
         ->(env) {
           next unless env[:node_name] == 'a'
           a_tag = env[:node]
           a_tag['href'] ||= '#'
-          if a_tag['href'] =~ %r{^(?:[a-z]+:)?//}
+          if %r{^(?:[a-z]+:)?//}.match?(a_tag['href'])
             a_tag['target'] = '_blank'
             a_tag['rel']    = 'nofollow noopener'
           end
@@ -49,7 +64,7 @@ module Thredded
         'img'    => %w[src longdesc class],
         'th'     => %w[style],
         'td'     => %w[style],
-        :all     => HTML::Pipeline::SanitizationFilter::WHITELIST[:attributes][:all] +
+        :all     => sanitization_filter_allowlist_config[:attributes][:all] +
           %w[aria-expanded aria-label aria-labelledby aria-live aria-hidden aria-pressed role],
       },
       css: {
@@ -136,7 +151,7 @@ module Thredded
     def content_pipeline_options
       {
         asset_root: Rails.application.config.action_controller.asset_host || '',
-        whitelist: ContentFormatter.whitelist
+        allowlist: ContentFormatter.allowlist
       }
     end
   end

data/lib/thredded/db_tools.rb

@@ -10,11 +10,7 @@ module Thredded
         verbose_was = ActiveRecord::Migration.verbose
         ActiveRecord::Migration.verbose = !quiet
         migrate =
-          if Thredded::Compat.rails_gte_60?
-            -> { ActiveRecord::MigrationContext.new(paths, ActiveRecord::SchemaMigration).migrate(nil, &filter) }
-          else # Rails 5.2
-            -> { ActiveRecord::MigrationContext.new(paths).migrate(nil, &filter) }
-          end
+          -> { ActiveRecord::MigrationContext.new(paths, ActiveRecord::SchemaMigration).migrate(nil, &filter) }
         if quiet
           silence_active_record(&migrate)
         else
@@ -59,7 +55,7 @@ module Thredded
           silence_active_record do
             ActiveRecord::Base.transaction do
               statements.each do |statement|
-                connection.execute(statement) unless statement =~ /(BEGIN TRANSACTION|COMMIT)/
+                connection.execute(statement) unless /(BEGIN TRANSACTION|COMMIT)/.match?(statement)
               end
             end
           end

data/lib/thredded/engine.rb

@@ -12,7 +12,7 @@ module Thredded
 
     config.to_prepare do
       Thredded::AllViewHooks.reset_instance!
-      Thredded.user_class.send(:include, Thredded::UserExtender) if Thredded.user_class
+      Thredded.user_class&.send(:include, Thredded::UserExtender)
     end
 
     initializer 'thredded.setup_assets' do

data/lib/thredded/formatting_demo_content.rb

@@ -7,35 +7,35 @@ module Thredded
       attr_accessor :parts
     end
     self.parts = [
-      <<-'MARKDOWN',
-#### Spoilers
+      <<~'MARKDOWN',
+        #### Spoilers
 
-Use `<spoiler></spoiler>` tags to create spoiler boxes like this one:
+        Use `<spoiler></spoiler>` tags to create spoiler boxes like this one:
 
-<spoiler>
-Harry Potter books are better than the movies.
+        <spoiler>
+        Harry Potter books are better than the movies.
 
-![nyancat](https://storage.googleapis.com/glebm-stuff/nyancat.gif)
+        ![nyancat](https://storage.googleapis.com/glebm-stuff/nyancat.gif)
 
-https://www.youtube.com/watch?v=5lBBUPVuusM
-</spoiler>
+        https://www.youtube.com/watch?v=5lBBUPVuusM
+        </spoiler>
 
-#### Oneboxes
+        #### Oneboxes
 
-URLs of supported resources are replaced with boxes like these:
+        URLs of supported resources are replaced with boxes like these:
 
-**Twitter** `https://twitter.com/thredded/status/838824533477982209`:
-https://twitter.com/thredded/status/838824533477982209
-**StackExchange** `http://codegolf.stackexchange.com/questions/45701`:
-http://codegolf.stackexchange.com/questions/45701
-**Amazon** `https://www.amazon.co.uk/dp/0521797071`:
-https://www.amazon.co.uk/dp/0521797071
-**YouTube** `https://www.youtube.com/watch?v=1QP7elXwpLw`:
-https://www.youtube.com/watch?v=1QP7elXwpLw
-**Google Maps** `https://goo.gl/maps/R6nj3Qwf2LR2`:
-https://goo.gl/maps/R6nj3Qwf2LR2
+        **Twitter** `https://twitter.com/thredded/status/838824533477982209`:
+        https://twitter.com/thredded/status/838824533477982209
+        **StackExchange** `http://codegolf.stackexchange.com/questions/45701`:
+        http://codegolf.stackexchange.com/questions/45701
+        **Amazon** `https://www.amazon.co.uk/dp/0521797071`:
+        https://www.amazon.co.uk/dp/0521797071
+        **YouTube** `https://www.youtube.com/watch?v=1QP7elXwpLw`:
+        https://www.youtube.com/watch?v=1QP7elXwpLw
+        **Google Maps** `https://goo.gl/maps/R6nj3Qwf2LR2`:
+        https://goo.gl/maps/R6nj3Qwf2LR2
 
-Many more resources are [supported](https://github.com/discourse/onebox/tree/master/lib/onebox/engine). Powered by the [onebox](https://github.com/discourse/onebox) library.
+        Many more resources are [supported](https://github.com/discourse/onebox/tree/main/lib/onebox/engine). Powered by the [onebox](https://github.com/discourse/onebox) library.
       MARKDOWN
     ]
   end

data/lib/thredded/html_pipeline/at_mention_filter.rb

@@ -47,7 +47,7 @@ module Thredded
         return if names.blank? || @users_provider.nil?
         @users_provider.call(names, @users_provider_scope).each do |user|
           name = user.send(Thredded.user_name_column)
-          maybe_quoted_name = name =~ /[., ()]/ ? %("#{name}") : name
+          maybe_quoted_name = /[., ()]/.match?(name) ? %("#{name}") : name
           url = Thredded.user_path(@view_context, user)
           text_node_html.gsub!(
             /(^|[\s>])(@#{Regexp.escape maybe_quoted_name})([^a-z\d]|$)/i,

data/lib/thredded/html_pipeline/onebox_filter.rb

@@ -24,7 +24,7 @@ module Thredded
             next unless env[:node_name] == 'a'
             a_tag = env[:node]
             a_tag['href'] ||= '#'
-            if a_tag['href'] =~ %r{^(?:[a-z]+:)?//}
+            if %r{^(?:[a-z]+:)?//}.match?(a_tag['href'])
               a_tag['target'] = '_blank'
               a_tag['rel']    = 'nofollow noopener'
             else
@@ -68,9 +68,9 @@ module Thredded
 
       def render_onebox(url)
         preview = Onebox.preview(url, onebox_options(url))
-        if context[:onebox_placeholders]
+        if context[:onebox_placeholders] && (placeholder_html = preview.placeholder_html.presence)
           %(<p><a href="#{ERB::Util.html_escape(url)}" target="_blank" rel="nofollow noopener">) \
-          "#{preview.placeholder_html}</a></p>"
+          "#{placeholder_html}</a></p>"
         else
           preview.to_s.strip
         end

data/lib/thredded/html_pipeline/utils.rb

@@ -40,7 +40,7 @@ module Thredded
       end
 
       def node_name?(node, node_name)
-        node && node.node_name && node.node_name.casecmp(node_name).zero?
+        node&.node_name && node.node_name.casecmp(node_name).zero?
       end
     end
   end

data/lib/thredded/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Thredded
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-26 00:00:00.000000000 Z
+date: 2023-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_union
@@ -127,20 +127,14 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.10
-    - - "!="
+    - - ">"
       - !ruby/object:Gem::Version
         version: 6.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.10
-    - - "!="
+    - - ">"
       - !ruby/object:Gem::Version
         version: 6.0.0.rc2
 - !ruby/object:Gem::Dependency
@@ -163,14 +157,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -311,6 +305,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: capybara-screenshot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cuprite
   requirement: !ruby/object:Gem::Requirement
@@ -620,7 +628,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: |-
-  The best Rails 4.2+ forums engine ever. Its goal is to be as simple and feature rich as possible.
+  The best Rails 6.0+ forums engine ever. Its goal is to be as simple and feature rich as possible.
   Thredded works with SQLite, MySQL (v5.6.4+), and PostgreSQL. See the demo at https://thredded.org/.
 email:
 - joel@thredded.com
@@ -970,6 +978,8 @@ files:
 - app/views/thredded/users/_posts.html.erb
 - bin/create_migration_fixture
 - bin/rails
+- bin/rubocop
+- bin/run_specs_repeatedly
 - config/i18n-tasks.yml
 - config/locales/de.yml
 - config/locales/en.yml
@@ -1019,7 +1029,6 @@ files:
 - lib/thredded/html_pipeline/spoiler_tag_filter.rb
 - lib/thredded/html_pipeline/utils.rb
 - lib/thredded/html_pipeline/wrap_iframes_filter.rb
-- lib/thredded/rails_lt_5_2_arel_case_node.rb
 - lib/thredded/users_provider.rb
 - lib/thredded/version.rb
 - lib/thredded/view_hooks/config.rb
@@ -1049,7 +1058,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: The best Rails forums engine ever.

data/lib/thredded/rails_lt_5_2_arel_case_node.rb

@@ -1,119 +0,0 @@
-# frozen_string_literal: true
-
-module Arel
-  module Nodes
-    class Case < Arel::Nodes::Node
-      include Arel::OrderPredications
-      include Arel::Predications
-      include Arel::AliasPredication
-
-      attr_accessor :case, :conditions, :default
-
-      def initialize(expression = nil, default = nil)
-        @case = expression
-        @conditions = []
-        @default = default
-      end
-
-      def when(condition, expression = nil)
-        @conditions << When.new(Nodes.build_quoted(condition), expression)
-        self
-      end
-
-      def then(expression)
-        @conditions.last.right = Nodes.build_quoted(expression)
-        self
-      end
-
-      def else(expression)
-        @default = Else.new Nodes.build_quoted(expression)
-        self
-      end
-
-      def initialize_copy(other)
-        super
-        @case = @case.clone if @case
-        @conditions = @conditions.map(&:clone)
-        @default = @default.clone if @default
-      end
-
-      def hash
-        [@case, @conditions, @default].hash
-      end
-
-      def eql?(other)
-        self.class == other.class &&
-          self.case == other.case &&
-          conditions == other.conditions &&
-          default == other.default
-      end
-
-      alias == eql?
-    end
-
-    class When < Binary
-    end
-
-    class Else < Unary
-    end
-  end
-end
-
-module Arel
-  module Visitors
-    class DepthFirst < Arel::Visitors::Visitor
-      alias visit_Arel_Nodes_Else unary
-
-      def visit_Arel_Nodes_Case(o) # rubocop:disable Naming/MethodName
-        visit o.case
-        visit o.conditions
-        visit o.default
-      end
-
-      alias visit_Arel_Nodes_When binary
-    end
-  end
-end
-
-module Arel
-  module Predications
-    def when(right)
-      Nodes::Case.new(self).when quoted_node(right)
-    end
-  end
-end
-
-module Arel
-  module Visitors
-    class ToSql < Arel::Visitors::Reduce
-      def visit_Arel_Nodes_Case(o, collector) # rubocop:disable Naming/MethodName
-        collector << 'CASE '
-        if o.case
-          visit o.case, collector
-          collector << ' '
-        end
-        o.conditions.each do |condition|
-          visit condition, collector
-          collector << ' '
-        end
-        if o.default
-          visit o.default, collector
-          collector << ' '
-        end
-        collector << 'END'
-      end
-
-      def visit_Arel_Nodes_When(o, collector) # rubocop:disable Naming/MethodName
-        collector << 'WHEN '
-        visit o.left, collector
-        collector << ' THEN '
-        visit o.right, collector
-      end
-
-      def visit_Arel_Nodes_Else(o, collector) # rubocop:disable Naming/MethodName
-        collector << 'ELSE '
-        visit o.expr, collector
-      end
-    end
-  end
-end