thredded 0.16.16 → 1.0.0

data/bin/create_migration_fixture

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# edit constants in lib/thredded/db_tools.rb
+# git checkout v0.x.0 -b create-0.x-migration-fixture
+# bundle
+
+DIR=$(pwd)
+
+cd spec/dummy && DB=sqlite3 rails db:environment:set RAILS_ENV=development
+cd $DIR
+DB=sqlite3 rake db:drop db:create db:migrate db:miniseed_dump
+
+cd spec/dummy && DB=postgresql rails db:environment:set RAILS_ENV=development
+cd $DIR
+DB=postgresql rake db:drop db:create db:migrate db:miniseed_dump
+
+cd spec/dummy && DB=mysql2 rails db:environment:set RAILS_ENV=development
+cd $DIR
+DB=mysql2 rake db:drop db:create db:migrate db:miniseed_dump
+
+git add `pwd`/spec/migration/*.dump
+
+git commit -em "add sample data for 0.8 base for migration spec"

data/config/i18n-tasks.yml

@@ -15,3 +15,8 @@ data:
   yaml:
     write:
       line_width: 110
+
+## Exclude these keys from the `i18n-tasks check-consistent-interpolations` report:
+ignore_inconsistent_interpolations:
+- 'thredded.users.posts_count.one'
+- 'thredded.users.started_topics_count.one'

data/config/locales/de.yml

@@ -128,6 +128,8 @@ de:
       moderation_users: Nutzer
       private_topics: Private Unterhaltungen
       settings: Benachrichtigungseinstellungen
+      sign_in: Anmelden
+      sign_out: Ausloggen
       unread_topics: Ungelesen
     null_user_name: Gelöschte Nutzer
     posts:

data/config/locales/en.yml

@@ -127,6 +127,8 @@ en:
       moderation_users: Users
       private_topics: Private Messages
       settings: Notification Settings
+      sign_in: Sign In / Register
+      sign_out: Sign Out
       unread_topics: Unread
     null_user_name: Deleted user
     posts:
@@ -262,7 +264,7 @@ en:
       last_active_html: Last active %{time_ago}
       posted_in_topic_html: Posted in %{topic_link}
       posts_count:
-        one: Posted %{count} time
+        one: Posted once
         other: Posted %{count} times
       recent_activity: :thredded.recent_activity
       send_private_message: Send private message

data/config/locales/es.yml

@@ -129,6 +129,8 @@ es:
       moderation_users: Usuarios
       private_topics: Mensajes Privados
       settings: Ajuste de Notificaciones
+      sign_in: Registrarse
+      sign_out: Desconectar
       unread_topics: No leído
     null_user_name: Usuario eliminado
     posts:

data/config/locales/fr.yml

@@ -127,6 +127,8 @@ fr:
       moderation_users: Utilisateurs
       private_topics: Messages privés
       settings: Paramètres de notifications
+      sign_in: Se connecter
+      sign_out: Déconnexion
       unread_topics: Non lu
     null_user_name: Utilisateur effacé
     posts:

data/config/locales/it.yml

@@ -127,6 +127,8 @@ it:
       moderation_users: Utenti
       private_topics: Messaggi Privati
       settings: Impostazioni Notifiche
+      sign_in: Entra
+      sign_out: Esci
       unread_topics: Non letto
     null_user_name: Utente cancellato
     posts:
@@ -266,13 +268,13 @@ it:
       last_active_html: Ultima attività %{time_ago}
       posted_in_topic_html: Ha scritto in %{topic_link}
       posts_count:
-        one: Ha commentato %{count} volta
+        one: Ha commentato una volta
         other: Ha commentato %{count} volte
       recent_activity: :thredded.recent_activity
       send_private_message: Invia un messaggio privato
       started_topic_html: Ha iniziato %{topic_link}
       started_topics_count:
-        one: Ha iniziato %{count} discussione
+        one: Ha iniziato una discussione
         other: Ha iniziato %{count} discussioni
       user_posted_in_topic_html: "%{user_link} ha commentato in %{topic_link}"
       user_since_html: Utente da %{time_ago}

data/config/locales/pl.yml

@@ -127,6 +127,8 @@ pl:
       moderation_users: Użytkownicy
       private_topics: Prywatne wiadomości
       settings: Ustawienia powiadomień
+      sign_in: Zaloguj
+      sign_out: Wyloguj się
       unread_topics: Nieprzeczytane
     null_user_name: Usunięci użytkownicy
     posts:

data/config/locales/pt-BR.yml

@@ -129,6 +129,8 @@ pt-BR:
       moderation_users: Usuários
       private_topics: Mensagens Privadas
       settings: Configurações de Notificação
+      sign_in: Entrar / Cadastrar
+      sign_out: Sair
       unread_topics: Não lida
     null_user_name: Usuário deletado
     posts:

data/config/locales/ru.yml

@@ -125,6 +125,8 @@ ru:
       moderation_users: Пользователи
       private_topics: Личное
       settings: Настройки
+      sign_in: Войти / Зарегистрироваться
+      sign_out: Выход
       unread_topics: Непрочитанные
     null_user_name: Пользователь удален
     posts:

data/config/locales/zh-CN.yml

@@ -120,6 +120,8 @@ zh-CN:
       moderation_users: 用户
       private_topics: 私人对话
       settings: 通知设置
+      sign_in: 登录/注册
+      sign_out: 登出
       unread_topics: 未读
     null_user_name: 删除用户
     posts:

data/db/upgrade_migrations/20180110200009_upgrade_thredded_v0_14_to_v0_15.rb

@@ -86,6 +86,6 @@ class UpgradeThreddedV014ToV015 < Thredded::BaseMigration
   def remove_string_limit(table, column, type: :text, indices: [])
     indices.each { |(_, options)| remove_index table, name: options[:name] }
     change_column table, column, type, limit: nil
-    indices.each { |args| add_index table, *args }
+    indices.each { |(columns, options)| add_index table, columns, **options }
   end
 end

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

@@ -29,8 +29,8 @@ Thredded.user_path = ->(user) {
 # This method is used by Thredded controllers and views to fetch the currently signed-in user
 Thredded.current_user_method = :"current_#{Thredded.user_class_name.demodulize.underscore}"
 
-# User avatar URL. rb-gravatar gem is used by default:
-Thredded.avatar_url = ->(user) { Gravatar.src(user.email, 156, 'mm') }
+# User avatar URL. rails_gravatar gem is used by default:
+Thredded.avatar_url = ->(user) { RailsGravatar.src(user.email, 156, 'mm') }
 
 # ==> Permissions Configuration
 # By default, thredded uses a simple permission model, where all the users can post to all message boards,

data/lib/thredded/arel_compat.rb

@@ -1,40 +1,9 @@
 # frozen_string_literal: true
 
-unless Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 2 || Rails::VERSION::MAJOR > 5
-  require 'thredded/rails_lt_5_2_arel_case_node.rb'
-end
-
 module Thredded
   module ArelCompat
     module_function
 
-    # On Rails >= 5, this method simply returns `relation.pluck(*columns)`.
-    #
-    # Rails 4 `pluck` does not support Arel nodes and attributes. This method does.
-    #
-    # This is an external method because monkey-patching `pluck` would
-    # have compatibility issues, see:
-    #
-    # https://github.com/thredded/thredded/issues/842
-    # https://blog.newrelic.com/engineering/ruby-agent-module-prepend-alias-method-chains/
-    if Rails::VERSION::MAJOR > 4
-      def pluck(relation, *columns)
-        relation.pluck(*columns)
-      end
-    else
-      def pluck(relation, *columns)
-        relation.pluck(*columns.map do |n|
-          if n.is_a?(Arel::Node)
-            Arel.sql(n.to_sql)
-          elsif n.is_a?(Arel::Attributes::Attribute)
-            n.name
-          else
-            n
-          end
-        end)
-      end
-    end
-
     # @param [#connection] engine
     # @param [Arel::Nodes::Node] a integer node
     # @param [Arel::Nodes::Node] b integer node
@@ -46,15 +15,5 @@ module Thredded
         Arel::Nodes::Division.new(a, b)
       end
     end
-
-    if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 2 || Rails::VERSION::MAJOR > 5
-      def true_value(_engine)
-        true
-      end
-    else
-      def true_value(engine)
-        engine.connection.adapter_name =~ /sqlite|mysql|mariadb/i ? 1 : true
-      end
-    end
   end
 end

data/lib/thredded/base_migration.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Thredded
-  class BaseMigration < (Thredded.rails_gte_51? ? ActiveRecord::Migration[5.1] : ActiveRecord::Migration)
+  class BaseMigration < ActiveRecord::Migration[5.1]
     protected
 
     def user_id_type

data/lib/thredded/collection_to_strings_with_cache_renderer.rb

@@ -22,9 +22,11 @@ module Thredded
     def render_collection_to_strings_with_cache( # rubocop:disable Metrics/ParameterLists
       view_context, collection:, partial:, expires_in:, render_threads: self.class.render_threads, locals: {}, **opts
     )
-      template = @lookup_context.find_template(partial, [], true, locals, {})
+      template = @lookup_context.find_template(partial, [], true, locals.keys, {})
       collection = collection.to_a
-      instrument(:collection, identifier: template.identifier, count: collection.size) do |instrumentation_payload|
+      ActiveSupport::Notifications.instrument(:collection,
+                                              identifier: template.identifier,
+                                              count: collection.size) do |instrumentation_payload|
         return [] if collection.blank?
 
         # Result is a hash with the key represents the
@@ -84,48 +86,48 @@ module Thredded
             # 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]
-            render_partials_serial(view_context.dup, slice, opts)
+            ActiveRecord::Base.connection_pool.with_connection do
+              render_partials_serial(view_context.dup, slice, opts)
+            end
           end
         end.flat_map(&:value)
       end
     end
 
-    # @param [Array<Object>] collection
-    # @param [Hash] opts
-    # @param view_context
-    # @return [Array<String>]
-    def render_partials_serial(view_context, collection, opts)
-      partial_renderer = ActionView::PartialRenderer.new(@lookup_context)
-      collection.map { |object| render_partial(partial_renderer, view_context, opts.merge(object: object)) }
-    end
-
-    if Rails::VERSION::MAJOR >= 5
-      def collection_cache
-        ActionView::PartialRenderer.collection_cache
+    if Thredded::Compat.rails_gte_61?
+      # @param [Array<Object>] collection
+      # @param [Hash] opts
+      # @param view_context
+      # @return [Array<String>]
+      def render_partials_serial(view_context, collection, opts)
+        # https://github.com/rails/rails/pull/38594
+        collection.map do |object|
+          renderer = ActionView::ObjectRenderer.new(@lookup_context, opts)
+          renderer.render_object_with_partial(object, opts[:partial], view_context, nil).body
+        end
       end
     else
-      def collection_cache
-        Rails.application.config.action_controller.cache_store
+      def render_partials_serial(view_context, collection, opts)
+        partial_renderer = ActionView::PartialRenderer.new(@lookup_context)
+        collection.map { |object| render_partial(partial_renderer, view_context, **opts.merge(object: object)) }
       end
     end
 
-    if Rails::VERSION::MAJOR > 5 || (Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 2)
-      def combined_fragment_cache_key(view, key)
-        view.combined_fragment_cache_key(key)
-      end
-    elsif Rails::VERSION::MAJOR >= 5
-      def combined_fragment_cache_key(view, key)
-        view.fragment_cache_key(key)
-      end
-    else
-      def combined_fragment_cache_key(view, key)
-        view.controller.fragment_cache_key(key)
-      end
+    def collection_cache
+      ActionView::PartialRenderer.collection_cache
+    end
+
+    def combined_fragment_cache_key(view, key)
+      view.combined_fragment_cache_key(key)
     end
 
-    if Rails::VERSION::MAJOR >= 6
+    if Thredded::Compat.rails_gte_60?
       def cache_fragment_name(view, key, virtual_path:, digest_path:)
-        view.cache_fragment_name(key, virtual_path: virtual_path, digest_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)

data/lib/thredded/compat.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+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?
+        @rails_gte_61
+      end
+
+      if Rails.gem_version >= Gem::Version.new('7.0.0')
+        # @api private
+        def association_preloader(records:, associations:, scope:)
+          ActiveRecord::Associations::Preloader.new(
+            records: records, associations: associations, scope: scope
+          ).call
+        end
+      else
+        # @api private
+        def association_preloader(records:, associations:, scope:)
+          ActiveRecord::Associations::Preloader.new.preload(
+            records, associations, scope
+          )
+        end
+      end
+    end
+  end
+end

data/lib/thredded/database_seeder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'factory_bot'
-require_relative '../../spec/support/features/fake_content'
+require_relative '../../spec/support/system/fake_content'
 
 # rubocop:disable HandleExceptions
 begin
@@ -40,6 +40,7 @@ module Thredded
     end
 
     include LogTime
+    include Thredded::ApplicationHelper
 
     SKIP_CALLBACKS = [
       [Thredded::Post, :commit, :after, :update_parent_last_user_and_time_from_last_post, on: %i[create destroy]],
@@ -131,7 +132,13 @@ module Thredded
     end
 
     def fake_post_contents
-      @fake_post_contents ? @fake_post_contents.sample : FakeContent.post_content
+      with_mentions(@fake_post_contents ? @fake_post_contents.sample : FakeContent.post_content)
+    end
+
+    def with_mentions(post, mentions_count: rand(3))
+      return post if mentions_count.zero?
+
+      ([post] + Array.new(mentions_count).map { user_mention(@users.sample) }).join(' ')
     end
 
     def first_user
@@ -255,9 +262,9 @@ module Thredded
 
       delegate :log, to: :seeder
 
-      def find_or_create(*args)
+      def find_or_create(*args, **kwargs)
         return @stored if @stored
-        @stored = (find || create(*args))
+        @stored = (find || create(*args, **kwargs))
       end
 
       def range_of_dates_in_order(up_to: Time.zone.now, count: 1)

data/lib/thredded/db_tools.rb

@@ -10,12 +10,10 @@ module Thredded
         verbose_was = ActiveRecord::Migration.verbose
         ActiveRecord::Migration.verbose = !quiet
         migrate =
-          if Rails.gem_version >= Gem::Version.new('6.0.0.rc2')
+          if Thredded::Compat.rails_gte_60?
             -> { ActiveRecord::MigrationContext.new(paths, ActiveRecord::SchemaMigration).migrate(nil, &filter) }
-          elsif Rails::VERSION::STRING >= '5.2'
+          else # Rails 5.2
             -> { ActiveRecord::MigrationContext.new(paths).migrate(nil, &filter) }
-          else
-            -> { ActiveRecord::Migrator.migrate(paths, &filter) }
           end
         if quiet
           silence_active_record(&migrate)

data/lib/thredded/email_transformer.rb

@@ -17,8 +17,8 @@ module Thredded
     end
     @transformers = [Onebox, Spoiler]
 
-    # @param doc [Nokogiri::HTML::Document]
-    def self.call(doc)
+    # @param dom [Nokogiri::HTML::Document]
+    def self.call(doc, *)
       transformers.each { |transformer| transformer.call(doc) }
     end
   end

data/lib/thredded/version.rb

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

data/lib/thredded.rb

@@ -9,7 +9,7 @@ require 'html/pipeline'
 require 'html/pipeline/sanitization_filter'
 require 'rinku'
 require 'kaminari'
-require 'rb-gravatar'
+require 'rails_gravatar'
 require 'active_job'
 require 'inline_svg'
 
@@ -32,6 +32,7 @@ require 'sprockets/es6'
 require 'sassc-rails'
 
 require 'thredded/version'
+require 'thredded/compat'
 require 'thredded/engine'
 require 'thredded/errors'
 
@@ -48,15 +49,6 @@ require 'thredded/collection_to_strings_with_cache_renderer'
 
 require 'thredded/webpack_assets'
 
-if Rails::VERSION::MAJOR < 5
-  begin
-    require 'where-or'
-  rescue LoadError
-    $stderr.puts "\nthredded: Please add gem 'where-or' to your Gemfile"
-    exit 1 # rubocop:disable Rails/Exit
-  end
-end
-
 module Thredded # rubocop:disable Metrics/ModuleLength
   class << self
     #== User
@@ -252,22 +244,10 @@ module Thredded # rubocop:disable Metrics/ModuleLength
           .includes(:postable)
       )
     end
-
-    # @api private
-    def rails_gte_51?
-      @rails_gte_51 = (Rails.gem_version >= Gem::Version.new('5.1.0')) if @rails_gte_51.nil?
-      @rails_gte_51
-    end
-
-    # @api private
-    def rails_supports_csp_nonce?
-      @rails_supports_csp_nonce = (Rails.gem_version >= Gem::Version.new('5.2.0')) if @rails_supports_csp_nonce.nil?
-      @rails_supports_csp_nonce
-    end
   end
 
   self.user_name_column = :name
-  self.avatar_url = ->(user) { Gravatar.src(user.email, 156, 'mm') }
+  self.avatar_url = ->(user) { RailsGravatar.src(user.email, 156, 'mm') }
   self.admin_column = :admin
 
   self.content_visible_while_pending_moderation = true