thredded 0.16.15 → 1.0.1

data/app/view_models/thredded/posts_page_view.rb

@@ -3,24 +3,25 @@
 module Thredded
   # A view model for a page of PostViews.
   class PostsPageView
-    delegate :to_a,
+    delegate :each,
+             :each_with_index,
+             :map,
+             :size,
+             :to_a,
              :to_ary,
              :present?,
              to: :@post_views
     delegate :total_pages,
              :current_page,
              :limit_value,
-             to: :@paginated_scope
-
-    # @return [Thredded::BaseTopicView]
-    attr_reader :topic
+             to: :@posts_paginator
 
     # @param user [Thredded.user_class] the user who is viewing the posts page
-    # @param paginated_scope [ActiveRecord::Relation<Thredded::PostCommon>]
-    def initialize(user, paginated_scope, topic_view: nil)
-      @paginated_scope = paginated_scope
+    # @param paginated_scope [ActiveRecord::Relation<Thredded::PostCommon>] a kaminari-decorated ".page" scope
+    def initialize(user, paginated_scope)
+      @posts_paginator = paginated_scope
       @post_views = paginated_scope.map do |post|
-        Thredded::PostView.new(post, Pundit.policy!(user, post), topic_view: topic_view)
+        Thredded::PostView.new(post, Pundit.policy!(user, post))
       end
     end
   end

data/app/view_models/thredded/private_topics_page_view.rb

@@ -3,7 +3,11 @@
 module Thredded
   # A view model for a page of BaseTopicViews.
   class PrivateTopicsPageView
-    delegate :to_a,
+    delegate :each,
+             :each_with_index,
+             :map,
+             :size,
+             :to_a,
              :to_ary,
              :blank?,
              :empty?,
@@ -11,13 +15,13 @@ module Thredded
     delegate :total_pages,
              :current_page,
              :limit_value,
-             to: :@topics_page_scope
+             to: :@topics_paginator
 
-    # @param user [Thredded.user_class] the user who is viewing the posts page
-    # @param topics_page_scope [ActiveRecord::Relation<Thredded::Topic>]
+    # @param user [Thredded.user_class] the user who is viewing the private topics page
+    # @param topics_page_scope [ActiveRecord::Relation<Thredded::PrivateTopic>] a kaminari-decorated ".page" scope
     def initialize(user, topics_page_scope)
-      @topics_page_scope = refine_scope(topics_page_scope)
-      @topic_views = @topics_page_scope.with_read_states(user).map do |(topic, read_state)|
+      @topics_paginator = refine_scope(topics_page_scope)
+      @topic_views = @topics_paginator.with_read_states(user).map do |(topic, read_state)|
         Thredded::PrivateTopicView.new(topic, read_state, Pundit.policy!(user, topic))
       end
     end

data/app/view_models/thredded/topic_posts_page_view.rb

@@ -2,15 +2,28 @@
 
 module Thredded
   # A view model for a page of PostViews of a Topic.
-  class TopicPostsPageView < Thredded::PostsPageView
+  class TopicPostsPageView
+    delegate :each,
+             :each_with_index,
+             :map,
+             :size,
+             :to_a,
+             :to_ary,
+             :present?,
+             to: :@post_views
+    delegate :total_pages,
+             :current_page,
+             :limit_value,
+             to: :@posts_paginator
+
     # @return [Thredded::BaseTopicView]
     attr_reader :topic
 
     # @param user [Thredded.user_class] the user who is viewing the posts page
     # @param topic [Thredded::TopicCommon]
-    # @param paginated_scope [ActiveRecord::Relation<Thredded::PostCommon>]
+    # @param paginated_scope [ActiveRecord::Relation<Thredded::PostCommon>] a kaminari-decorated ".page" scope
     def initialize(user, topic, paginated_scope)
-      @paginated_scope = paginated_scope
+      @posts_paginator = paginated_scope
       @topic = "#{paginated_scope.reflect_on_association(:postable).klass}View".constantize.from_user(topic, user)
       prev_read = false
       @post_views = paginated_scope.map.with_index do |post, i|

data/app/view_models/thredded/topics_page_view.rb

@@ -8,18 +8,21 @@ module Thredded
              :blank?,
              :empty?,
              :[],
+             :each,
+             :map,
+             :size,
              to: :@topic_views
     delegate :total_pages,
              :current_page,
              :limit_value,
-             to: :@topics_page_scope
+             to: :@topics_paginator
 
-    # @param user [Thredded.user_class] the user who is viewing the posts page
-    # @param topics_page_scope [ActiveRecord::Relation<Thredded::Topic>]
-    # @param topic_view_class [Class] view_model for topic instances
+    # @param user [Thredded.user_class] the user who is viewing the topics page
+    # @param topics_page_scope [ActiveRecord::Relation<Thredded::Topic>] a kaminari-decorated ".page" scope
+    # @param topic_view_class [Class<TopicView>] view_model for topic instances
     def initialize(user, topics_page_scope, topic_view_class: TopicView)
-      @topics_page_scope = refine_scope(topics_page_scope)
-      @topic_views = @topics_page_scope.with_read_and_follow_states(user).map do |(topic, read_state, follow)|
+      @topics_paginator = refine_scope(topics_page_scope)
+      @topic_views = @topics_paginator.with_read_and_follow_states(user).map do |(topic, read_state, follow)|
         topic_view_class.new(topic, read_state, follow, Pundit.policy!(user, topic))
       end
     end

data/app/views/layouts/thredded/application.html.erb

@@ -5,12 +5,12 @@
     <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
     <%= stylesheet_link_tag 'thredded', 'data-turbolinks-track': 'reload' %>
     <%= csrf_meta_tag %>
-    <%= csp_meta_tag if Thredded.rails_supports_csp_nonce? %>
+    <%= csp_meta_tag %>
     <%= javascript_include_tag 'thredded',
                                async: !Rails.application.config.assets.debug,
                                defer: true,
                                'data-turbolinks-track': 'reload' %>
-    <%== Gravatar.prefetch_dns %>
+    <%= RailsGravatar.prefetch_dns_tag %>
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
   </head>
   <body>

data/app/views/thredded/messageboards/_form.html.erb

@@ -1,16 +1,16 @@
 <%= form_for messageboard, html: { class: 'thredded--form' } do |f| %>
     <ul class="thredded--form-list">
       <li>
-        <%= f.label t('thredded.messageboard.form.title_label') %>
+        <%= f.label :name, t('thredded.messageboard.form.title_label') %>
         <%= f.text_field :name, required: true %>
         <%= render 'thredded/shared/field_errors', messages: f.object.errors[:name] %>
       </li>
       <li>
-        <%= f.label t('thredded.messageboard.form.description_label') %>
+        <%= f.label :description, t('thredded.messageboard.form.description_label') %>
         <%= f.text_field :description %>
       </li>
       <li>
-        <%= f.label t('thredded.messageboard.form.messageboard_group_id_label') %>
+        <%= f.label :messageboard_group_id, t('thredded.messageboard.form.messageboard_group_id_label') %>
         <%= f.collection_select :messageboard_group_id, Thredded::MessageboardGroup.all, :id, :name,
                                 include_blank: t('thredded.messageboard.form.no_group') %>
       </li>

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/posts_common/_content.html.erb

@@ -1,3 +1,3 @@
 <div class="thredded--post--content">
-  <%= post.filtered_content(self, local_assigns[:options] || {}) %>
+  <%= post.filtered_content(self, **(local_assigns[:options] || {})) %>
 </div>

data/app/views/thredded/posts_common/actions/_quote.html.erb

@@ -1,4 +1,4 @@
-<%= link_to t('thredded.posts.quote_btn'), url_for(post.quote_url_params),
+<%= link_to t('thredded.posts.quote_btn'), post.quote_url_params,
             'data-thredded-quote-post' => post.quote_path,
             class: 'thredded--post--quote thredded--post--dropdown--actions--item',
             rel: 'nofollow' %>

data/app/views/thredded/shared/_page.html.erb

@@ -8,7 +8,7 @@
 <%# If thredded JS is loaded via an [async] script, the JS may
 run before or after DOMContentLoaded. Expose a flag to Thredded
 so it can initialize correctly. %>
-<%= javascript_tag 'data-turbolinks-eval': 'false', **(Thredded.rails_supports_csp_nonce? ? {nonce: true} : {}) do %>
+<%= javascript_tag 'data-turbolinks-eval': 'false', nonce: true do %>
   document.addEventListener('DOMContentLoaded', function() {
     (window.Thredded = window.Thredded || {}).DOMContentLoadedFired = true;
   });

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 %>
-      Sign Out
+      <%= t('thredded.nav.sign_out') %>
     <% end %>
   <% else %>
     <%= link_to main_app.send(:"new_#{resource_name}_session_path") do %>
-      Sign In / Register
+      <%= t('thredded.nav.sign_in') %>
     <% end %>
   <% end %>
 </li>

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/bin/rubocop

@@ -12,6 +12,17 @@ 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'
 

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

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