thredded 0.16.12 → 0.16.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd9dbf548a2ae13d2c77b2a49e4022af13b17e5df084dc22baf370e37d7b1a2f
-  data.tar.gz: 6f21adfcf7f040ab397637f03f47df3c4f9f15d3956dfd4fb3a2a09b9a871ddd
+  metadata.gz: 34e83f36d097c95e1f03964b88a49e915ec18e82981667803a68668033adda9d
+  data.tar.gz: 19e36508e79ecf4a9dfa196e022a4c31b96607828843704ad236d55311067d03
 SHA512:
-  metadata.gz: 80692ab8668d1fdbcc60309774f2dcab3e8a6893b1a78892e9507ad4a9f70d9d91d174ce9277058622faba6d562c3187f4cf6dfa2aec92c97a9863a32b858b4f
-  data.tar.gz: dd5c3253a6df6f69512eb5acd778beb0ef7370be4b53b30fb03c865b6669af3e7e5217cc46e5feaf4695c1354cd9b748743b05f66edc94eff5c55a8ef810b886
+  metadata.gz: 2859851223d3889f78331303bdeb8eeb78b3eea60316b2dc40249a8e940fd9a79fa34219f264ebc4afe5b8bc947ab40fda25902cfb71e877f06a510bddda6e88
+  data.tar.gz: a67c187aa11cf3f4a900a2a7aa86da6245b73c221f367790dc111793fbafe531b56f082d105d9e03f07bae4f5818a99da00b69c6aa79889e4526602ee8dc9073

data/README.md

@@ -95,7 +95,7 @@ Then, see the rest of this Readme for more information about using and customizi
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.16.12'
+gem 'thredded', '~> 0.16.13'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.

data/app/assets/stylesheets/thredded/components/_messageboard.scss

@@ -94,6 +94,10 @@
   margin-bottom: 0;
 }
 
+.thredded--messageboard--delete {
+  background-color: $thredded-alert-danger-color;
+}
+
 .thredded--messageboards--actions {
   @extend %thredded--buttons-list;
   @media print {

data/app/controllers/thredded/messageboards_controller.rb

@@ -2,10 +2,10 @@
 
 module Thredded
   class MessageboardsController < Thredded::ApplicationController
-    before_action :thredded_require_login!, only: %i[new create edit update]
+    before_action :thredded_require_login!, only: %i[new create edit update destroy]
 
     after_action :verify_authorized, except: %i[index]
-    after_action :verify_policy_scoped, except: %i[new create edit update]
+    after_action :verify_policy_scoped, except: %i[new create edit update destroy]
 
     def index
       @groups = Thredded::MessageboardGroupView.grouped(
@@ -44,6 +44,13 @@ module Thredded
       end
     end
 
+    def destroy
+      @messageboard = Thredded::Messageboard.friendly_find!(params[:id])
+      authorize @messageboard, :destroy?
+      @messageboard.destroy!
+      redirect_to root_path, notice: t('thredded.messageboard.deleted_notice')
+    end
+
     private
 
     def messageboard_params

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

@@ -62,12 +62,7 @@ module Thredded
 
         unread_scope = reads_class.where(reads[:id].eq(nil).or(reads[:unread_posts_count].not_eq(0)))
 
-        # Work around https://github.com/rails/rails/issues/36761
-        if Thredded.rails_gte_600_rc_2?
-          merge(unread_scope).joins(joins_reads)
-        else
-          joins(joins_reads).merge(unread_scope)
-        end
+        joins(joins_reads).merge(unread_scope)
       end
 
       private

data/app/models/thredded/messageboard.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Thredded
-  class Messageboard < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
+  class Messageboard < ActiveRecord::Base
     extend FriendlyId
     friendly_id :slug_candidates,
                 use: %i[slugged reserved],
@@ -138,21 +138,9 @@ module Thredded
             .and(read_states[:user_id].eq(user.id))
             .and(read_states[:unread_posts_count].eq(0))
 
-        scope =
-          # Work around https://github.com/rails/rails/issues/36761
-          if Thredded.rails_gte_600_rc_2?
-            merge(topics_scope).joins(
-              messageboards.join(topics)
-                .on(topics[:messageboard_id].eq(messageboards[:id]))
-                .outer_join(read_states).on(read_states_join_cond).join_sources
-            )
-          else
-            joins(:topics).merge(topics_scope).joins(
-              messageboards.outer_join(read_states).on(read_states_join_cond).join_sources
-            )
-          end
-
-        scope.group(messageboards[:id]).pluck(
+        joins(:topics).merge(topics_scope).joins(
+          messageboards.outer_join(read_states).on(read_states_join_cond).join_sources
+        ).group(messageboards[:id]).pluck(
           :id,
           Arel::Nodes::Subtraction.new(topics[:id].count, read_states[:id].count)
         ).to_h

data/app/policies/thredded/messageboard_policy.rb

@@ -41,6 +41,10 @@ module Thredded
       @user.thredded_admin?
     end
 
+    def destroy?
+      @user.thredded_admin?
+    end
+
     def post?
       @user.thredded_admin? ||
         (!@messageboard.locked? || moderate?) &&

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

@@ -29,3 +29,11 @@
       </li>
     </ul>
 <% end %>
+<% if messageboard.persisted? and Thredded.show_messageboard_delete_button %>
+  <%= button_to t('thredded.messageboard.form.delete'),
+                messageboard_path(messageboard),
+                method: 'delete',
+                class: 'thredded--messageboard--delete',
+                form_class: 'thredded--form',
+                data: {confirm: t('thredded.messageboard.form.delete_confirm', messageboard_name: messageboard.name)}%>
+<% end %>

data/config/locales/de.yml

@@ -56,8 +56,13 @@ de:
       update_btn_submitting: Änderungen übernehmen...
     messageboard:
       create: Erstelle ein neues Forum
+      deleted_notice: Messageboard gelöscht
       form:
         create_btn_submitting: :thredded.form.create_btn_submitting
+        delete: Messageboard löschen
+        delete_confirm: >-
+          Dadurch werden das Messageboard %{messageboard_name} und alle zugehörigen Posts entfernt. Sie können es
+          nicht wiederherstellen. Möchten Sie das wirklich tun?
         description_label: Beschreibung
         locked_label: Geschlossen
         locked_notice: Dieses Forum ist geschlossen. Nur Moderatoren können hier neue Beiträge erstellen.

data/config/locales/en.yml

@@ -55,8 +55,13 @@ en:
       update_btn_submitting: Updating...
     messageboard:
       create: Create a New Messageboard
+      deleted_notice: Messageboard deleted
       form:
         create_btn_submitting: :thredded.form.create_btn_submitting
+        delete: Delete Messageboard
+        delete_confirm: >-
+          This will remove the messageboard %{messageboard_name} and all of its posts. You will not be able to recover
+          it. Are you sure you want to do this?
         description_label: Description
         locked_label: Locked
         locked_notice: This messageboard is locked. Only moderators can create new topics here.

data/config/locales/es.yml

@@ -57,8 +57,13 @@ es:
       update_btn_submitting: Actualizando...
     messageboard:
       create: Crear un nuevo foro
+      deleted_notice: Tablero de mensajes eliminado
       form:
         create_btn_submitting: :thredded.form.create_btn_submitting
+        delete: Eliminar tablero de mensajes
+        delete_confirm: >-
+          Esto eliminará el tablero de mensajes %{messageboard_name} y todas sus publicaciones. No podrás recuperarlo.
+          ¿Seguro que quieres hacer esto?
         description_label: Descripción
         locked_label: Bloqueado
         locked_notice: Este mensaje está bloqueado. Solo los moderadores pueden crear nuevos temas aquí.

data/config/locales/fr.yml

@@ -55,8 +55,13 @@ fr:
       update_btn_submitting: Mise à jour en cours...
     messageboard:
       create: Créer une nouvelle catégorie
+      deleted_notice: Messageboard supprimé
       form:
         create_btn_submitting: :thredded.form.create_btn_submitting
+        delete: Supprimer le babillard
+        delete_confirm: >-
+          Cela supprimera le panneau de messages %{messageboard_name} et tous ses messages. Vous ne pourrez pas
+          le récupérer. Es-tu sûr de vouloir faire ça?
         description_label: Description
         locked_label: Verrouillé
         locked_notice: Ce message est verrouillé. Seuls les modérateurs peuvent créer de nouveaux sujets ici.

data/config/locales/it.yml

@@ -55,8 +55,13 @@ it:
       update_btn_submitting: Aggiornamento in corso...
     messageboard:
       create: Crea una nuova bacheca
+      deleted_notice: Messageboard cancellato
       form:
         create_btn_submitting: :thredded.form.create_btn_submitting
+        delete: Elimina bacheca
+        delete_confirm: >-
+          Ciò rimuoverà la bacheca %{messageboard_name} e tutti i suoi post. Non sarai in grado di recuperarlo.
+          Sei sicuro di volerlo fare?
         description_label: Descrizione
         locked_label: Bloccato
         locked_notice: Questa bacheca è bloccata. Solo i moderatori possono creare nuove discussioni qui.

data/config/locales/pl.yml

@@ -55,8 +55,13 @@ pl:
       update_btn_submitting: Aktualizowanie...
     messageboard:
       create: Stwórz nową tablicę
+      deleted_notice: Tablica ogłoszeń została usunięta
       form:
         create_btn_submitting: :thredded.form.create_btn_submitting
+        delete: Usuń tablicę wiadomości
+        delete_confirm: >-
+          Spowoduje to usunięcie tablicy %{messageboard_name} i wszystkich jej postów. Nie będziesz w stanie go
+          odzyskać. Czy na pewno chcesz to zrobić?
         description_label: Opis
         locked_label: Zablokowany
         locked_notice: Ta wiadomość jest zablokowana. Tylko moderatorzy mogą tworzyć nowe tematy tutaj.

data/config/locales/pt-BR.yml

@@ -56,8 +56,13 @@ pt-BR:
       update_btn_submitting: Atualizando...
     messageboard:
       create: Criar um novo Fórum de Mensagem
+      deleted_notice: Messageboard excluído
       form:
         create_btn_submitting: :thredded.form.create_btn_submitting
+        delete: Excluir Messageboard
+        delete_confirm: >-
+          Isto irá remover o messageboard %{messageboard_name} e todos os seus posts. Você não poderá recuperá-lo.
+          Você tem certeza de que quer fazer isso?
         description_label: Descrição
         locked_label: Bloqueado
         locked_notice: Este quadro de mensagens está bloqueado. Somente os moderadores podem criar novos tópicos

data/config/locales/ru.yml

@@ -54,8 +54,13 @@ ru:
       update_btn_submitting: Обновляю...
     messageboard:
       create: Создать форум
+      deleted_notice: Доска объявлений удалена
       form:
         create_btn_submitting: :thredded.form.create_btn_submitting
+        delete: Удалить доску объявлений
+        delete_confirm: >-
+          Это удалит доску сообщений %{messageboard_name} и все ее сообщения. Вы не сможете его восстановить. Вы
+          уверены, что хотите это сделать?
         description_label: Описание
         locked_label: Заблокировать
         locked_notice: Этот форум заблокирован. Только модераторы могут создавать новые темы здесь.

data/config/locales/zh-CN.yml

@@ -52,8 +52,11 @@ zh-CN:
       update_btn_submitting: 更新中...
     messageboard:
       create: 创建一个新板块
+      deleted_notice: 留言板已删除
       form:
         create_btn_submitting: :thredded.form.create_btn_submitting
+        delete: 删除留言板
+        delete_confirm: 这将删除留言板%{messageboard_name}及其所有帖子。你将无法恢复它。你确定你要这么做吗？
         description_label: 描述
         locked_label: 锁定
         locked_notice: 这个消息板被锁定。只有版主可以在这里创建新的主题。

data/config/routes.rb

@@ -59,7 +59,7 @@ Thredded::Engine.routes.draw do # rubocop:disable Metrics/BlockLength
 
   resource :preferences, only: %i[edit update], as: :global_preferences
   resource :messageboard, path: 'messageboards', only: [:new]
-  resources :messageboards, only: %i[edit update]
+  resources :messageboards, only: %i[edit update destroy]
   resources :messageboards, only: %i[index create], path: '' do
     resource :preferences, only: %i[edit update]
     resource :topic, path: 'topics', only: [:new] do

data/db/migrate/20160329231848_create_thredded.rb

@@ -225,9 +225,9 @@ class CreateThredded < Thredded::BaseMigration
       t.references :post, index: false
       t.references :messageboard, index: false
       t.text :post_content, limit: 65_535
-      t.references :post_user, index: false
+      t.references :post_user, index: false, type: user_id_type
       t.text :post_user_name
-      t.references :moderator, index: false
+      t.references :moderator, index: false, type: user_id_type
       t.integer :moderation_state, null: false
       t.integer :previous_moderation_state, null: false
       t.timestamp :created_at, null: false

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

@@ -55,6 +55,9 @@ Thredded.content_visible_while_pending_moderation = true
 # :topics_count_desc   most topics first
 Thredded.messageboards_order = :position
 
+# Whether admin users see button to delete entire messageboards on the messageboard edit page.
+Thredded.show_messageboard_delete_button = false
+
 # Whether users that are following a topic are listed on the topic page.
 Thredded.show_topic_followers = false
 

data/lib/thredded.rb

@@ -88,6 +88,9 @@ module Thredded # rubocop:disable Metrics/ModuleLength
     # @return [Symbol] The name of the moderator flag column on the users table for the default permissions model
     attr_accessor :moderator_column
 
+    # @return [Boolean] Whether admin users see button to delete entire messageboards on the messageboard edit page.
+    attr_accessor :show_messageboard_delete_button
+
     #== UI
 
     # @return [String] The layout to use for rendering Thredded views.
@@ -251,13 +254,6 @@ module Thredded # rubocop:disable Metrics/ModuleLength
       @rails_gte_51
     end
 
-    # @api private
-    # Mainly to work around https://github.com/rails/rails/issues/36761
-    def rails_gte_600_rc_2?
-      @rails_gte_600_rc_2 = (Rails.gem_version >= Gem::Version.new('6.0.0.rc2')) if @rails_gte_600_rc_2.nil?
-      @rails_gte_600_rc_2
-    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?
@@ -271,6 +267,7 @@ module Thredded # rubocop:disable Metrics/ModuleLength
 
   self.content_visible_while_pending_moderation = true
   self.moderator_column = :admin
+  self.show_messageboard_delete_button = false
 
   self.layout = 'thredded/application'
 

data/lib/thredded/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.16.12
+  version: 0.16.13
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_union
@@ -130,7 +130,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.10
-    - - "<="
+    - - "!="
       - !ruby/object:Gem::Version
         version: 6.0.0.rc2
   type: :runtime
@@ -140,7 +140,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.10
-    - - "<="
+    - - "!="
       - !ruby/object:Gem::Version
         version: 6.0.0.rc2
 - !ruby/object:Gem::Dependency