thredded 0.15.3 → 0.15.4

data/app/views/thredded/topics/_topic.html.erb

@@ -29,10 +29,12 @@
     <%= user_link topic.last_user %>
   </cite>
 
-  <cite class="thredded--topics--started-by">
-    <%= time_ago topic.created_at %>
-    <%= user_link topic.user %>
-  </cite>
+  <% if local_assigns[:show_messageboard] %>
+    <span class="thredded--topics--messageboard">
+      <%= t 'thredded.topics.in_messageboard_html',
+            messageboard_link: link_to(topic.messageboard_name, topic.messageboard_path) %>
+    </span>
+  <% end %>
 
   <% if topic.blocked? && topic.can_moderate? %>
     <span class="thredded--topics--moderation-state thredded--alert thredded--alert-danger">

data/app/views/thredded/topics/unread.html.erb

@@ -18,7 +18,10 @@
                  placeholder: t('thredded.topics.form.title_placeholder_start') if @new_topic %>
       <%= render partial: 'thredded/topics/topic',
                  collection: @topics,
-                 locals: { topics: @topics } %>
+                 locals: {
+                     topics: @topics,
+                     show_messageboard: !messageboard_or_nil
+                 } %>
     <% end %>
     <footer class="thredded--pagination-bottom">
       <%= paginate @topics %>

data/config/i18n-tasks.yml

@@ -10,6 +10,7 @@ search:
   paths:
     - app/
     - lib/
+    - spec/dummy/app/
 data:
   yaml:
     write:

data/config/locales/de.yml

@@ -44,8 +44,11 @@ de:
     errors:
       login_required: Bitte zuerst anmelden
       not_authorized: Du hast keinen Zugriff auf diese Seite
+      post_not_found: Dieser Beitrag existiert nicht.
+      private_post_not_found: Diese private Nachricht existiert nicht.
       private_topic_create_denied: Du bist nicht autorisiert, private Unterhaltungen zu erstellen
       private_topic_not_found: Diese private Unterhaltung existiert nicht
+      topic_not_found: Dieses Thema existiert nicht.
     form:
       create_btn_submitting: Erstellen...
       preview: Vorschau
@@ -224,6 +227,7 @@ de:
         title_placeholder: :thredded.topics.form.title_label
         title_placeholder_start: Starte eine neue Diskussion
         update_btn: Beitrag bearbeiten
+      in_messageboard_html: in %{messageboard_link}
       locked:
         label: Gesperrt
         message: Der Beitrag wurde von einem Moderator gesperrt
@@ -257,6 +261,7 @@ de:
         one: Einmalig hochgeladen
         other: "%{count} -mal hochgeladen"
       recent_activity: :thredded.recent_activity
+      send_private_message: Private Nachricht senden
       started_topic_html: "%{topic_link} gestartet"
       started_topics_count:
         one: Eine Diskussion gestartet

data/config/locales/en.yml

@@ -43,8 +43,11 @@ en:
     errors:
       login_required: Please sign in first.
       not_authorized: You are not authorized to access this page.
+      post_not_found: This post does not exist.
+      private_post_not_found: This private message does not exist.
       private_topic_create_denied: You are not authorized to create private topics.
       private_topic_not_found: This private topic does not exist.
+      topic_not_found: This topic does not exist.
     form:
       create_btn_submitting: Creating...
       preview: Preview
@@ -221,6 +224,7 @@ en:
         title_placeholder: :thredded.topics.form.title_label
         title_placeholder_start: Start a New Topic
         update_btn: Update Topic
+      in_messageboard_html: in %{messageboard_link}
       locked:
         label: Locked
         message: This topic has been locked by a moderator.
@@ -253,6 +257,7 @@ en:
         one: Posted once
         other: Posted %{count} times
       recent_activity: :thredded.recent_activity
+      send_private_message: Send private message
       started_topic_html: Started %{topic_link}
       started_topics_count:
         one: Started one topic

data/config/locales/es.yml

@@ -45,8 +45,11 @@ es:
     errors:
       login_required: Por favor, inicia sesión.
       not_authorized: No estás autorizado para ver esta página.
+      post_not_found: Esta publicación no existe.
+      private_post_not_found: Este mensaje privado no existe.
       private_topic_create_denied: No estás autorizado para crear temas privados.
       private_topic_not_found: Este tema privado no existe.
+      topic_not_found: Este tema no existe.
     form:
       create_btn_submitting: Creando...
       preview: Vista previa
@@ -225,6 +228,7 @@ es:
         title_placeholder: :thredded.topics.form.title_label
         title_placeholder_start: Crear un Nuevo Tema
         update_btn: Actualizar Tema
+      in_messageboard_html: en %{messageboard_link}
       locked:
         label: Bloqueado
         message: Este tema ha sido bloqueado por un moderador.
@@ -257,6 +261,7 @@ es:
         one: Ha escrito una vez
         other: Ha escrito %{count} veces
       recent_activity: :thredded.recent_activity
+      send_private_message: Enviar mensaje privado
       started_topic_html: Empezó %{topic_link}
       started_topics_count:
         one: Ha empezado un tema

data/config/locales/fr.yml

@@ -43,8 +43,11 @@ fr:
     errors:
       login_required: Veuillez vous connecter
       not_authorized: Vous n'êtes pas autorisé à accéder à cette page.
+      post_not_found: Ce post n'existe pas.
+      private_post_not_found: Ce message privé n'existe pas.
       private_topic_create_denied: Vous n'êtes pas autorisé à créer des sujets.
       private_topic_not_found: Ce sujet privé n'existe pas.
+      topic_not_found: Ce sujet n'existe pas.
     form:
       create_btn_submitting: Création en cours...
       preview: Aperçu
@@ -222,6 +225,7 @@ fr:
         title_placeholder: :thredded.topics.form.title_label
         title_placeholder_start: Commencer un nouveau sujet
         update_btn: Mettre à jour le sujet
+      in_messageboard_html: dans %{messageboard_link}
       locked:
         label: Verrouillé
         message: Ce sujet a été verrouillé par un modérateur.
@@ -255,6 +259,7 @@ fr:
         one: Commenté une seule fois
         other: Commenté %{count} fois
       recent_activity: :thredded.recent_activity
+      send_private_message: Envoyer un message privé
       started_topic_html: Démarré %{topic_link}
       started_topics_count:
         one: Démarré un sujet

data/config/locales/it.yml

@@ -43,8 +43,11 @@ it:
     errors:
       login_required: Per visualizzare questa pagina bisogna accedere tramite login.
       not_authorized: Non sei autorizzato a vedere questa pagina.
+      post_not_found: Questo post non esiste.
+      private_post_not_found: Questo messaggio privato non esiste.
       private_topic_create_denied: Non sei autorizzato a creare discussioni private.
       private_topic_not_found: Questa discussione privata non esiste.
+      topic_not_found: Questo argomento non esiste.
     form:
       create_btn_submitting: Creazione in corso...
       preview: Anteprima
@@ -225,6 +228,7 @@ it:
         title_placeholder: :thredded.topics.form.title_label
         title_placeholder_start: Inizia una Nuova Discussione
         update_btn: Aggiorna Discussione
+      in_messageboard_html: in %{messageboard_link}
       locked:
         label: Bloccata
         message: Questa discussione è stata bloccata da un moderatore.
@@ -257,6 +261,7 @@ it:
         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 una discussione

data/config/locales/pl.yml

@@ -43,8 +43,11 @@ pl:
     errors:
       login_required: Proszę się najpierw zalogować.
       not_authorized: Nie masz uprawnień aby zobaczyć tę stronę.
+      post_not_found: Ten wpis nie istnieje.
+      private_post_not_found: Ta prywatna wiadomość nie istnieje.
       private_topic_create_denied: Nie masz uprawnień do tworzenia prywatnych tematów.
       private_topic_not_found: Ten prywatny temat nie istnieje.
+      topic_not_found: Ten temat nie istnieje.
     form:
       create_btn_submitting: Tworzenie...
       preview: Zapowiedź
@@ -221,6 +224,7 @@ pl:
         title_placeholder: :thredded.topics.form.title_label
         title_placeholder_start: Rozpocznij nowy temat
         update_btn: Zaktualizuj temat
+      in_messageboard_html: w %{messageboard_link}
       locked:
         label: Zablokowany
         message: Ten temat został zablokowany przez moderatora.
@@ -255,6 +259,7 @@ pl:
         one: Napisał 1 post
         other: Napisał %{count} postów
       recent_activity: :thredded.recent_activity
+      send_private_message: Wyślij Wiadomość Prywatną
       started_topic_html: Rozpoczął %{topic_link}
       started_topics_count:
         few: Rozpoczął %{count} tematy

data/config/locales/pt-BR.yml

@@ -44,8 +44,11 @@ pt-BR:
     errors:
       login_required: Por favor, autentique-se primeiro.
       not_authorized: Você não está autorizado a acessar esta página.
+      post_not_found: Este post não existe.
+      private_post_not_found: Esta mensagem privada não existe.
       private_topic_create_denied: Você não está autorizado a criar tópicos privados.
       private_topic_not_found: Este tópico privado não existe.
+      topic_not_found: Este tópico não existe.
     form:
       create_btn_submitting: Criando...
       preview: Pré-visualização
@@ -226,6 +229,7 @@ pt-BR:
         title_placeholder: :thredded.topics.form.title_label
         title_placeholder_start: Iniciar um novo tópico
         update_btn: Atualizar Tópico
+      in_messageboard_html: em %{messageboard_link}
       locked:
         label: Trancado
         message: Este tópico foi bloqueado por um moderador.
@@ -258,6 +262,7 @@ pt-BR:
         one: Postado uma vez
         other: vezes %{count} Publicado
       recent_activity: :thredded.recent_activity
+      send_private_message: Enviar mensagem privada
       started_topic_html: Começou %{topic_link}
       started_topics_count:
         one: Começou um tópico

data/config/locales/ru.yml

@@ -42,8 +42,11 @@ ru:
     errors:
       login_required: Необходимо зайти на форум.
       not_authorized: Вы не авторизованы.
+      post_not_found: Это сообщение не существует.
+      private_post_not_found: Это личное сообщение не существует.
       private_topic_create_denied: Вы не авторизованы для создания личных сообщений.
       private_topic_not_found: Личное сообщение не найдено.
+      topic_not_found: Эта тема не существует.
     form:
       create_btn_submitting: Создаю...
       preview: Обзор
@@ -219,6 +222,7 @@ ru:
         title_placeholder: :thredded.topics.form.title_label
         title_placeholder_start: Начать новую тему
         update_btn: Обновление темы
+      in_messageboard_html: в %{messageboard_link}
       locked:
         label: Заблокировать тему
         message: Эта тема закрыта модератором.
@@ -253,12 +257,13 @@ ru:
         one: Сделан %{count} пост
         other: Сделано %{count} постов
       recent_activity: :thredded.recent_activity
+      send_private_message: Отправить личное сообщение
       started_topic_html: Начато %{topic_link}
       started_topics_count:
         few: Начато %{count} темы
         many: Начато %{count} тем
         one: Начата %{count} тема
         other: Начато %{count} тем
-      user_posted_in_topic_html: "%{user_link} сделал запись в %{topic_link}"
+      user_posted_in_topic_html: "%{user_link} написал в %{topic_link}"
       user_since_html: Пользователь был %{time_ago}
       user_started_topic_html: "%{user_link} начал %{topic_link}"

data/config/locales/zh-CN.yml

@@ -40,8 +40,11 @@ zh-CN:
     errors:
       login_required: 请先登录
       not_authorized: 你没有权限访问该页面
+      post_not_found: 这篇文章不存在。
+      private_post_not_found: 此私人消息不存在。
       private_topic_create_denied: 你没有权限创建私人对话
       private_topic_not_found: 该私人对话不存在
+      topic_not_found: 此主题不存在。
     form:
       create_btn_submitting: 创建中...
       preview: 预览
@@ -214,6 +217,7 @@ zh-CN:
         title_placeholder: :thredded.topics.form.title_label
         title_placeholder_start: 发布新帖子
         update_btn: 更新帖子
+      in_messageboard_html: 在%{messageboard_link}
       locked:
         label: 锁定
         message: 该帖子被某个审核者锁定
@@ -246,6 +250,7 @@ zh-CN:
         one: 一个回复
         other: "%{count} 个回复"
       recent_activity: :thredded.recent_activity
+      send_private_message: 发送私人讯息
       started_topic_html: 发布帖子 %{topic_link}
       started_topics_count:
         one: 发布一个帖子

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

@@ -21,10 +21,10 @@ Thredded.user_name_column = :name
 # the path or url to your user. This lambda is evaluated in the view context.
 # If the lambda returns nil, a span element is returned instead of a link; so
 # setting this to always return nil effectively disables all user links.
-Thredded.user_path = lambda do |user|
+Thredded.user_path = ->(user) {
   user_path = :"#{Thredded.user_class_name.demodulize.underscore}_path"
   main_app.respond_to?(user_path) ? main_app.send(user_path, user) : "/users/#{user.to_param}"
-end
+}
 
 # 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}"
@@ -32,13 +32,6 @@ Thredded.current_user_method = :"current_#{Thredded.user_class_name.demodulize.u
 # User avatar URL. rb-gravatar gem is used by default:
 Thredded.avatar_url = ->(user) { Gravatar.src(user.email, 156, 'mm') }
 
-# ==> Database Configuration
-# By default, thredded uses integers for record ID route constraints.
-# For integer based IDs (default):
-# Thredded.routes_id_constraint = /[1-9]\d*/
-# For UUID based IDs (example):
-# Thredded.routes_id_constraint = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
-
 # ==> Permissions Configuration
 # By default, thredded uses a simple permission model, where all the users can post to all message boards,
 # and admins and moderators are determined by a flag on the users table.
@@ -71,6 +64,12 @@ Thredded.currently_online_enabled = true
 # Whether private messaging functionality is enabled.
 Thredded.private_messaging_enabled = true
 
+# The number of topics to display per page.
+# Thredded.topics_per_page = 50
+
+# The number of posts to display per page in a topic.
+# Thredded.posts_per_page = 25
+
 # The layout for rendering Thredded views.
 Thredded.layout = 'thredded/application'
 
@@ -88,8 +87,8 @@ Thredded.layout = 'thredded/application'
 # The range of valid topic title lengths. Default:
 # Thredded.topic_title_length_range = (1..200)
 
-# ==> URLs
-# How Thredded generates URL slugs from text.
+# ==> Routes and URLs
+# How Thredded generates URL slugs from text:
 
 # Default:
 # Thredded.slugifier = ->(input) { input.parameterize }
@@ -97,6 +96,13 @@ Thredded.layout = 'thredded/application'
 # If your forum is in a language other than English, you might want to use the babosa gem instead
 # Thredded.slugifier = ->(input) { Babosa::Identifier.new(input).normalize.transliterate(:russian).to_s }
 
+# By default, thredded uses integers for record ID route constraints.
+# For integer based IDs (default):
+# Thredded.routes_id_constraint = /[1-9]\d*/
+#
+# For UUID based IDs (example):
+# Thredded.routes_id_constraint = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
+
 # ==> Post Content Formatting
 # Customize the way Thredded handles post formatting.
 

data/lib/thredded.rb

@@ -46,43 +46,85 @@ require 'thredded/collection_to_strings_with_cache_renderer'
 
 module Thredded
   class << self
-    attr_accessor \
-      :autocomplete_min_length,
-      :active_user_threshold,
-      :avatar_url,
-      :email_from,
-      :email_outgoing_prefix,
-      :layout,
-      :messageboards_order,
-      :routes_id_constraint,
-      :user_name_column
-
-    # A lambda that generates a URL path to the user page for the given user.
-    attr_writer :user_path
+    #== User
+
+    # @return [String] The name of the user class
+    attr_reader :user_class_name
 
     # @return [Symbol] The name of the method used by Thredded controllers and views to get the currently signed-in user
     attr_accessor :current_user_method
 
-    # @return [Symbol] The name of the moderator flag column on the users table for the default permissions model
-    attr_accessor :moderator_column
+    # @return [Symbol] The user table column that contains the username. Must be unique.
+    attr_accessor :user_name_column
+
+    # @return [Symbol] The name of the method used by Thredded to display users
+    attr_writer :user_display_name_method
+
+    # @return [Proc] A lambda that returns the avatar URL for the given user.
+    attr_accessor :avatar_url
+
+    # @return [Proc] A lambda that generates a URL path to the user page for the given user.
+    attr_writer :user_path
 
     # @return [Symbol] The name of the admin flag column on the users table for the default permissions model
     attr_accessor :admin_column
 
+    #== Moderation
+
     # @return [Boolean] Whether posts that are pending moderation are visible to regular users.
     attr_accessor :content_visible_while_pending_moderation
 
+    # @return [Symbol] The name of the moderator flag column on the users table for the default permissions model
+    attr_accessor :moderator_column
+
+    #== UI
+
+    # @return [String] The layout to use for rendering Thredded views.
+    attr_accessor :layout
+
+    #=== Topic page
+
+    # @return [Number] The number of posts to display per page in a topic.
+    attr_accessor :posts_per_page
+
     # @return [Boolean] Whether users that are following a topic are listed on the topic page.
     attr_accessor :show_topic_followers
 
-    # @return [Symbol] The name of the method used by Thredded to display users
-    attr_writer :user_display_name_method
+    #=== Private messages
 
-    # @return [String] The name of the parent mailer class for Thredded mailers.
-    attr_accessor :parent_mailer
+    # @return [Boolean] Whether the private messaging functionality is enabled.
+    attr_accessor :private_messaging_enabled
 
-    # @return [Proc] The proc that Thredded uses to generate URL slugs from text.
-    attr_accessor :slugifier
+    #=== Currently online
+
+    # @return [Boolean] Whether the list of users who are currently online is displayed.
+    attr_accessor :currently_online_enabled
+
+    # @return [ActiveSupport::Duration] How long the users are considered online after their last action.
+    attr_accessor :active_user_threshold
+
+    #=== Other
+
+    # How to calculate the position of messageboards in a list:
+    # :position            set the position manually (new messageboards go to the bottom, by creation timestamp)
+    # :last_post_at_desc   most recent post first
+    # :topics_count_desc   most topics first
+    # @return [:position, :last_post_at_desc, :topics_count_desc]
+    attr_accessor :messageboards_order
+
+    # @return [Number] The number of topics to display per page.
+    attr_accessor :topics_per_page
+
+    # @return [Number] Minimum length to trigger username auto-completion for @-mentions and private message recipients.
+    attr_accessor :autocomplete_min_length
+
+    # @return [Thredded::AllViewHooks] View hooks configuration.
+    def view_hooks
+      Thredded::AllViewHooks.instance ||
+        fail('`Thredded.view_hooks` must be configured in a `Rails.application.config.to_prepare` block!')
+    end
+
+    #== Topic following and notifications
 
     # @return [Boolean] Whether the user should get subscribed to a new topic they've created.
     attr_accessor :auto_follow_when_creating_topic
@@ -90,26 +132,33 @@ module Thredded
     # @return [Boolean] Whether the user should get subscribed to a topic after posting in it.
     attr_accessor :auto_follow_when_posting_in_topic
 
-    # @return [String] The name of the user class
-    attr_reader :user_class_name
+    #== Emails
 
-    # @return [Range<Integer>] The range of valid topic title lengths.
-    attr_accessor :topic_title_length_range
+    # @return [String] The name of the parent mailer class for Thredded mailers.
+    attr_accessor :parent_mailer
 
-    # @return [Boolean] Whether the list of users who are currently online is displayed.
-    attr_accessor :currently_online_enabled
+    # @return [String] Sender email for Thredded notification emails.
+    attr_accessor :email_from
 
-    # @return [Boolean] Whether the private messaging functionality is enabled.
-    attr_accessor :private_messaging_enabled
+    # @return [String] Email subject prefix.
+    attr_accessor :email_outgoing_prefix
 
-    # @return [Thredded::AllViewHooks] View hooks configuration.
-    def view_hooks
-      instance = Thredded::AllViewHooks.instance
-      unless instance
-        fail '`Thredded.view_hooks` must be configured in a `Rails.application.config.to_prepare` block!'
-      end
-      instance
-    end
+    #== Routes
+
+    # @return [Proc] The proc that Thredded uses to generate URL slugs from text.
+    attr_accessor :slugifier
+
+    # By default, thredded uses integers for record ID route constraints.
+    # For integer based IDs (default):
+    #   Thredded.routes_id_constraint = /[1-9]\d*/
+    # For UUID based IDs (example):
+    #   Thredded.routes_id_constraint = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
+    attr_accessor :routes_id_constraint
+
+    #== Misc
+
+    # @return [Range<Integer>] The range of valid topic title lengths.
+    attr_accessor :topic_title_length_range
 
     # @return [Array] The notifiers, by default just the EmailNotifier
     def notifiers
@@ -164,6 +213,8 @@ module Thredded
       layout.is_a?(String) && layout.start_with?('thredded/')
     end
 
+    #== Helper methods for use by main app.
+
     # Returns a view for the given posts' scope, applying read permission filters to the scope.
     # Can be used in main_app, e.g. for showing the recent user posts on the profile page.
     #
@@ -187,22 +238,34 @@ module Thredded
     end
   end
 
-  self.active_user_threshold = 5.minutes
-  self.admin_column = :admin
-  self.auto_follow_when_creating_topic = true
-  self.auto_follow_when_posting_in_topic = true
-  self.autocomplete_min_length = 2
+  self.user_name_column = :name
   self.avatar_url = ->(user) { Gravatar.src(user.email, 156, 'mm') }
+  self.admin_column = :admin
+
   self.content_visible_while_pending_moderation = true
+  self.moderator_column = :admin
+
   self.layout = 'thredded/application'
+
+  self.posts_per_page = 25
+  self.show_topic_followers = false
+
+  self.private_messaging_enabled = true
+
+  self.currently_online_enabled = true
+  self.active_user_threshold = 5.minutes
+
   self.messageboards_order = :position
-  self.moderator_column = :admin
+  self.topics_per_page = 50
+  self.autocomplete_min_length = 2
+
+  self.auto_follow_when_creating_topic = true
+  self.auto_follow_when_posting_in_topic = true
+
   self.parent_mailer = 'ActionMailer::Base'
-  self.routes_id_constraint = /[1-9]\d*/
-  self.show_topic_followers = false
+
   self.slugifier = ->(input) { input.parameterize }
+  self.routes_id_constraint = /[1-9]\d*/
+
   self.topic_title_length_range = (1..200)
-  self.user_name_column = :name
-  self.private_messaging_enabled = true
-  self.currently_online_enabled = true
 end