thredded 0.16.1 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab83b50d26733e85b80ff5a6c6373c53ddc48b93ac14de35212bdea46ff3330
-  data.tar.gz: a02d079d68535ed32160d9e2d6299dc96918bbda7c694212441cf51091f367e3
+  metadata.gz: 70ed5d5d867753bfd5e7586702685ea7ccd08ec4a40413af3d61da3454188908
+  data.tar.gz: 77c4526fbd5d779651f571112b8b22aef3557340d4fceee20feb0e9397b6c5fa
 SHA512:
-  metadata.gz: 15f36babaaacfeeee4afc75863097638c919bb94bd6bd27501e0c4ebddb851bd45af5a664733ec8a823e1d39598f86bfeafe15eceae7d46942459f32d02e04d0
-  data.tar.gz: c6d79b3effb4bd22ba0b4dfe6e434d55ee445c5237b0e00f5d651a400e48d2c3a6c707503bf8f8803e54b170fef6c44f3c7fb5d131c4357aec1b7e5496b0beea
+  metadata.gz: 3ef7aebf6723efd1ecbce8dd49337e31aee80977ed2eda4b5a9cb07bf05118f2bb0087c513f3977948db5c46ff665aa5c90a016cfefcf16dc3744cf6f1a9398d
+  data.tar.gz: e3030a49d320e4db4d5f97066dac4710837a63e638840f3e4dc9c3ab9dccf431897e4aaff642d4113922c9747c25193dc5965fa44a85a050cb5b9e2e16bee63a

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.1'
+gem 'thredded', '~> 0.16.3'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -359,6 +359,8 @@ If you use [Rails Email Preview], you can include Thredded emails into the list
 You can also turn off the email notifier totally, or add other notifiers (e.g. Pushover, possibly Slack) by adjusting
 the `Thredded.notifiers` configuration in your initializer. See the default initializer for examples.
 
+You must configure the address the email appears to be from (`Thredded.email_from`). This address is also used as the "To" address for both email notifcations, as all the recipients are on bcc.
+ 
 ### Enabling auto-follow
 
 In some cases, you'll want all users to auto-follow new messageboard topics by default. This might be useful
@@ -628,9 +630,13 @@ On Mac, run:
 
 ```bash
 brew cask install chromium
-brew install chromedriver
+brew cask install chromedriver
 ```
 
+To get better page saves (`page.save_and_open_page`) from local capybara specs ensure you are running the server locally 
+and set `export CAPYBARA_ASSET_HOST=http://localhost:3000` (or whatever host/port your server is on) before running your 
+test suite.  
+
 ### Ruby
 
 Thredded Ruby code formatting is ensured by [Rubocop](https://github.com/bbatsov/rubocop). Run `rubocop -a` to ensure a

data/app/controllers/thredded/post_previews_controller.rb

@@ -4,16 +4,21 @@ module Thredded
   class PostPreviewsController < Thredded::ApplicationController
     include Thredded::RenderPreview
 
+    before_action :thredded_require_login!
+    after_action :verify_authorized
+
     # Preview a new post
     def preview
       @post = Thredded::Post.new(post_params)
       @post.postable = Thredded::Topic.friendly_find!(params[:topic_id])
+      authorize @post, :create?
       render_preview
     end
 
     # Preview an update to an existing post
     def update
       @post = Thredded::Post.find!(params[:post_id])
+      authorize @post, :update?
       @post.assign_attributes(post_params)
       render_preview
     end

data/app/controllers/thredded/posts_controller.rb

@@ -7,6 +7,7 @@ module Thredded
     include Thredded::NewPostParams
 
     helper_method :topic
+    before_action :assign_messageboard_for_actions, only: %i[mark_as_read mark_as_unread]
     after_action :update_user_activity
 
     after_action :verify_authorized
@@ -53,10 +54,22 @@ module Thredded
                     notice: I18n.t('thredded.posts.deleted_notice')
     end
 
+    def mark_as_read
+      authorize post, :read?
+      UserTopicReadState.touch!(thredded_current_user.id, post)
+      respond_to do |format|
+        format.html { redirect_back fallback_location: post_path(post, user: thredded_current_user) }
+        format.json { render(json: { read: true }) }
+      end
+    end
+
     def mark_as_unread
       authorize post, :read?
       post.mark_as_unread(thredded_current_user)
-      after_mark_as_unread # customization hook
+      respond_to do |format|
+        format.html { after_mark_as_unread } # customization hook
+        format.json { render(json: { read: false }) }
+      end
     end
 
     def quote
@@ -84,6 +97,10 @@ module Thredded
         .friendly_find!(params[:topic_id])
     end
 
+    def assign_messageboard_for_actions
+      @messageboard = post.postable.messageboard
+    end
+
     def post
       @post ||= Thredded::Post.find!(params[:id])
     end

data/app/controllers/thredded/private_post_previews_controller.rb

@@ -4,16 +4,21 @@ module Thredded
   class PrivatePostPreviewsController < Thredded::ApplicationController
     include Thredded::RenderPreview
 
+    before_action :thredded_require_login!
+    after_action :verify_authorized
+
     # Preview a new post
     def preview
       @private_post = Thredded::PrivatePost.new(private_post_params)
       @private_post.postable = Thredded::PrivateTopic.friendly_find!(params[:private_topic_id])
+      authorize @private_post, :create?
       render_preview
     end
 
     # Preview an update to an existing post
     def update
       @private_post = Thredded::PrivatePost.find!(params[:private_post_id])
+      authorize @private_post, :update?
       @private_post.assign_attributes(private_post_params)
       render_preview
     end

data/app/controllers/thredded/private_posts_controller.rb

@@ -7,7 +7,6 @@ module Thredded
     include NewPrivatePostParams
 
     helper_method :topic
-    after_action :update_user_activity
 
     after_action :verify_authorized
 
@@ -52,10 +51,22 @@ module Thredded
                     notice: I18n.t('thredded.posts.deleted_notice')
     end
 
+    def mark_as_read
+      authorize post, :read?
+      UserPrivateTopicReadState.touch!(thredded_current_user.id, post)
+      respond_to do |format|
+        format.html { redirect_back fallback_location: post_path(post, user: thredded_current_user) }
+        format.json { render(json: { read: true }) }
+      end
+    end
+
     def mark_as_unread
       authorize post, :read?
       post.mark_as_unread(thredded_current_user)
-      after_mark_as_unread # customization hook
+      respond_to do |format|
+        format.html { after_mark_as_unread } # customization hook
+        format.json { render(json: { read: false }) }
+      end
     end
 
     def quote

data/app/controllers/thredded/private_topic_previews_controller.rb

@@ -5,8 +5,12 @@ module Thredded
     include Thredded::NewPrivateTopicParams
     include Thredded::RenderPreview
 
+    before_action :thredded_require_login!
+    after_action :verify_authorized
+
     def preview
       form = Thredded::PrivateTopicForm.new(new_private_topic_params)
+      authorize_creating form.private_topic
       @private_post = form.post
       @private_post.postable = form.private_topic
       render_preview

data/app/controllers/thredded/topic_previews_controller.rb

@@ -5,8 +5,12 @@ module Thredded
     include Thredded::NewTopicParams
     include Thredded::RenderPreview
 
+    before_action :thredded_require_login!
+    after_action :verify_authorized
+
     def preview
       form = Thredded::TopicForm.new(new_topic_params)
+      authorize_creating form.topic
       @post = form.post
       @post.postable = form.topic
       render_preview

data/app/helpers/thredded/urls_helper.rb

@@ -126,9 +126,9 @@ module Thredded
 
     def mark_unread_path(post, _params = {})
       if post.private_topic_post?
-        mark_as_unread_private_topic_private_post_path(post.postable, post)
+        mark_as_unread_private_post_path(post)
       else
-        mark_as_unread_messageboard_topic_post_path(post.messageboard, post.postable, post)
+        mark_as_unread_post_path(post)
       end
     end
 

data/app/models/thredded/messageboard.rb

@@ -8,6 +8,7 @@ module Thredded
                 # Avoid route conflicts
                 reserved_words: ::Thredded::FriendlyIdReservedWordsAndPagination.new(
                   %w[
+                    action
                     admin
                     autocomplete-users
                     messageboards

data/app/models/thredded/messageboard_notifications_for_followed_topics.rb

@@ -8,7 +8,7 @@ module Thredded
                inverse_of: :messageboard_notifications_for_followed_topics
     belongs_to :user,
                class_name: Thredded.user_class_name,
-               inverse_of: :thredded_user_messageboard_preferences
+               inverse_of: :thredded_messageboard_notifications_for_followed_topics
     belongs_to :messageboard
     scope :for_messageboard, ->(messageboard) { where(messageboard_id: messageboard.id) }
 

data/app/models/thredded/user_extender.rb

@@ -26,6 +26,8 @@ module Thredded
       with_options dependent: :destroy, foreign_key: 'user_id', inverse_of: :user do
         has_many :thredded_user_messageboard_preferences, class_name: 'Thredded::UserMessageboardPreference'
         has_many :thredded_notifications_for_followed_topics, class_name: 'Thredded::NotificationsForFollowedTopics'
+        has_many :thredded_messageboard_notifications_for_followed_topics,
+                 class_name: 'Thredded::MessageboardNotificationsForFollowedTopics'
         has_many :thredded_notifications_for_private_topics, class_name: 'Thredded::NotificationsForPrivateTopics'
         has_many :thredded_post_notifications, class_name: 'Thredded::UserPostNotification'
         has_many :thredded_private_users, class_name: 'Thredded::PrivateUser'

data/app/view_hooks/thredded/all_view_hooks.rb

@@ -12,6 +12,8 @@ module Thredded
     attr_reader :messageboards_index
     # @return [ModerationUserPage]
     attr_reader :moderation_user_page
+    # @return [TopicPage]
+    attr_reader :topic_page
 
     @instance = nil
     class << self
@@ -31,6 +33,7 @@ module Thredded
       @post_form = PostForm.new
       @moderation_user_page = ModerationUserPage.new
       @messageboards_index = MessageboardsIndex.new
+      @topic_page = TopicPage.new
     end
 
     # View hooks for collections of public or private posts.
@@ -110,6 +113,15 @@ module Thredded
       end
     end
 
+    class TopicPage
+      # @return [Thredded::AllViewHooks::ViewHook]
+      attr_reader :title
+
+      def initialize
+        @title = ViewHook.new
+      end
+    end
+
     # Contains the view hook content and can render a view hook.
     class ViewHook
       # @return [Thredded::ViewHooks::Config]

data/app/view_models/thredded/post_view.rb

@@ -12,6 +12,8 @@ module Thredded
              :approved?,
              :blocked?,
              :last_moderation_record,
+             :cache_key,
+             :cache_key_with_version,
              to: :@post
 
     # @param post [Thredded::PostCommon]
@@ -71,11 +73,6 @@ module Thredded
       Thredded::UrlsHelper.permalink_path(@post)
     end
 
-    # This cache key is used only for caching the content.
-    def cache_key
-      @post.cache_key
-    end
-
     POST_IS_READ = :read
     POST_IS_UNREAD = :unread
 

data/app/views/thredded/error_pages/forbidden.json.erb

@@ -0,0 +1,5 @@
+{
+  "error": {
+    "message": "Forbidden"
+  }
+}

data/app/views/thredded/error_pages/not_found.json.erb

@@ -0,0 +1,5 @@
+{
+  "error": {
+    "message": "Not Found"
+  }
+}

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

@@ -1,5 +1,7 @@
 <header class="thredded--topic-header">
-  <h1 class="thredded--topic-header--title"><%= topic.title %></h1>
+  <%= view_hooks.topic_page.title.render self, topic: topic do %>
+    <h1 class="thredded--topic-header--title"><%= topic.title %></h1>
+  <% end %>
   <cite class="thredded--topic-header--started-by">
     <%= t 'thredded.topics.started_by_html',
           time_ago: time_ago(topic.created_at),

data/config/locales/pt-BR.yml

@@ -3,7 +3,7 @@ pt-BR:
   thredded:
     content_moderation_states:
       content_blocked_notice: Bloqueado
-      content_blocked_notice_with_record_html: Bloqueados por %{moderator} %{time_ago}
+      content_blocked_notice_with_record_html: Bloqueado por %{moderator} %{time_ago}
     email_notifier:
       by_email: de e-mail
     emails:
@@ -17,9 +17,9 @@ pt-BR:
         text:
           email_sent_reason: |-
             Este e-mail foi enviado para você porque %{user} incluiu você em
-            o tópico privado "%{topic_title}".
+            um tópico privado "%{topic_title}".
 
-            Vá aqui para ver a conversa:
+            Clique aqui para ver a conversa:
             %{post_url}
           post_lead: 'Uma nova mensagem de %{user} em "%{topic_title}":'
           unsubscribe_instructions: :thredded.emails.post_notification.text.unsubscribe_instructions
@@ -59,7 +59,7 @@ pt-BR:
       form:
         create_btn_submitting: :thredded.form.create_btn_submitting
         description_label: Descrição
-        locked_label: Trancado
+        locked_label: Bloqueado
         locked_notice: Este quadro de mensagens está bloqueado. Somente os moderadores podem criar novos tópicos
           aqui.
         messageboard_group_id_label: grupo messageboard
@@ -85,22 +85,22 @@ pt-BR:
       create: Criar um novo grupo de mensagens
       form:
         create_btn_submitting: :thredded.form.create_btn_submitting
-      saved: Groupo de mensagens %{name} salvou
+      saved: Grupo de mensagens %{name} criado
     moderation:
       approve_btn: Aprovar
-      block_btn: Quadra
+      block_btn: Bloquear
       moderation_state:
         name: Estado de moderação
       pending:
         empty:
-          content: Todas as mensagens têm sido moderadas.
+          content: Todas as mensagens foram moderadas.
           title: Bom trabalho!
-      post_approved_html: Pós aprovado por %{moderator} %{time_ago}.
-      post_blocked_html: Pós bloqueado por %{moderator} %{time_ago}.
+      post_approved_html: Post aprovado por %{moderator} %{time_ago}.
+      post_blocked_html: Post bloqueado por %{moderator} %{time_ago}.
       post_deleted_notice: Este post foi apagado.
       posts_content_changed_since_moderation_html: >-
-        O <a href="%{post_url}">de pós</a> alteração de conteúdo, uma vez que foi moderado. Abaixo está o conteúdo
-        no momento em que foi moderado.
+        O conteúdo do <a href="%{post_url}">post</a> foi alterado após a moderação. Abaixo está o conteúdo no momento
+        em que foi moderado.
       search_users:
         form_label: Buscar usuários
         form_placeholder: :thredded.moderation.search_users.form_label
@@ -117,7 +117,7 @@ pt-BR:
       mark_all_read: Marcar Como Lido
       moderation: Moderação
       moderation_activity: Atividade
-      moderation_history: História
+      moderation_history: Histórico
       moderation_pending: Pendente
       moderation_users: Usuários
       private_topics: Mensagens Privadas
@@ -136,7 +136,7 @@ pt-BR:
         title_label: Adicionar um post
         update_btn: Atualizar Post
         update_btn_submitting: :thredded.form.update_btn_submitting
-      pending_moderation_notice: O envio da mensagem será publicada quando foi revisado por um moderador.
+      pending_moderation_notice: O seu post será publicado quando for revisado por um moderador.
       quote_btn: Citar
       spoiler_summary: Spoiler - clique para mostrar.
       spoiler_summary_for_email: 'Spoiler - selecione o conteúdo abaixo para ver:'
@@ -164,7 +164,7 @@ pt-BR:
         messageboard_notifications_for_followed_topics:
           label: :thredded.preferences.form.notifications_for_followed_topics.label
         notifications_for_followed_topics:
-          label: Notificações para tópicos seguido
+          label: Notificações para tópicos seguidos
         notifications_for_private_topics:
           label: Notificações de mensagens privadas
         submit_btn: Atualizar Configurações
@@ -232,20 +232,20 @@ pt-BR:
         update_btn: Atualizar Tópico
       in_messageboard_html: em %{messageboard_link}
       locked:
-        label: Trancado
+        label: Bloqueado
         message: Este tópico foi bloqueado por um moderador.
-      mark_as_unread: Marca não lida a partir daqui
+      mark_as_unread: Marcar como não lida a partir daqui
       not_following: Você não está seguindo este tema.
       search:
         no_results_in_messageboard_message_html: Não há resultados para sua busca <q>%{query}</q> em %{messageboard}
         no_results_message_html: Nenhum resultado encontrado para sua busca <q>%{query}</q>
         page_title: Tópicos dos Resultados da Busca
-        results_in_messageboard_message_html: Resultados da pesquisa para <q>%{query}</q> em %{messageboard}
-        results_message_html: Resultados de busca para <q>%{query}</q>
+        results_in_messageboard_message_html: Resultados da busca para <q>%{query}</q> em %{messageboard}
+        results_message_html: Resultados da busca para <q>%{query}</q>
         search_in_all_messageboards_btn: Buscar em todos os lugares
       started_by_html: Iniciado %{time_ago} por %{user}
       sticky:
-        label: Pegajoso
+        label: Fixo
       unfollow: Pare de seguir
       unfollowed_notice: Você não está mais seguindo este tópico
       updated_notice: Tópico atualizado
@@ -257,11 +257,11 @@ pt-BR:
       page_title_in_messageboard: "%{messageboard}: Tópicos não lidos"
     users:
       currently_online: Atualmente Online
-      last_active_html: Última %{time_ago} ativa
+      last_active_html: Última atividade %{time_ago}
       posted_in_topic_html: Postou em %{topic_link}
       posts_count:
         one: Postado uma vez
-        other: vezes %{count} Publicado
+        other: Postado %{count} vezes
       recent_activity: :thredded.recent_activity
       send_private_message: Enviar mensagem privada
       started_topic_html: Começou %{topic_link}
@@ -269,5 +269,5 @@ pt-BR:
         one: Começou um tópico
         other: tópicos iniciados %{count}
       user_posted_in_topic_html: "%{user_link} postou em %{topic_link}"
-      user_since_html: Utilizador desde %{time_ago}
+      user_since_html: Usuário desde %{time_ago}
       user_started_topic_html: "%{user_link} começou %{topic_link}"

data/config/routes.rb

@@ -19,7 +19,6 @@ Thredded::Engine.routes.draw do # rubocop:disable Metrics/BlockLength
         resource :preview, only: [:update], controller: 'private_post_previews'
         member do
           get 'quote'
-          post 'mark_as_unread'
         end
       end
     end
@@ -84,11 +83,27 @@ Thredded::Engine.routes.draw do # rubocop:disable Metrics/BlockLength
         resource :preview, only: [:update], controller: 'post_previews'
         member do
           get 'quote'
-          post 'mark_as_unread'
         end
       end
     end
   end
 
+  scope path: 'action' do
+    # flat urls under here for anything which is non-visible to users & search engines (typically json actions)
+    resources :posts, only: %i[] do
+      member do
+        post 'mark_as_read'
+        post 'mark_as_unread'
+      end
+    end
+
+    resources :private_posts, only: %i[] do
+      member do
+        post 'mark_as_read'
+        post 'mark_as_unread'
+      end
+    end
+  end
+
   root to: 'messageboards#index'
 end

data/db/upgrade_migrations/20161113161801_upgrade_v0_8_to_v0_9.rb

@@ -29,12 +29,13 @@ class UpgradeV08ToV09 < Thredded::BaseMigration
     end
 
     Thredded::UserPreference.all.each do |pref|
-      pref.notifications_for_private_topics.create(notifier_key: 'email', enabled: pref.notify_on_message)
-      pref.notifications_for_followed_topics.create(notifier_key: 'email', enabled: pref.followed_topic_emails)
+      pref.notifications_for_private_topics.create!(notifier_key: 'email', enabled: pref.notify_on_message)
+      pref.notifications_for_followed_topics.create!(notifier_key: 'email', enabled: pref.followed_topic_emails)
     end
     Thredded::UserMessageboardPreference.pluck(:user_id, :messageboard_id, :followed_topic_emails)
       .each do |user_id, messageboard_id, emails|
-      Thredded::MessageboardNotificationsForFollowedTopics.create(
+      Thredded::UserPreference.find_or_create_by!(user_id: user_id)
+      Thredded::MessageboardNotificationsForFollowedTopics.create!(
         user_id: user_id,
         messageboard_id: messageboard_id,
         notifier_key: 'email',

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

@@ -75,6 +75,7 @@ Thredded.layout = 'thredded/application'
 
 # ==> Email Configuration
 # Email "From:" field will use the following
+# (this is also used as the "To" address for both email notifcations, as all the recipients are on bcc)
 # Thredded.email_from = 'no-reply@example.com'
 
 # Emails going out will prefix the "Subject:" with the following string

data/lib/thredded.rb

@@ -28,6 +28,7 @@ require 'thredded/html_pipeline/spoiler_tag_filter'
 require 'autoprefixer-rails'
 require 'timeago_js'
 require 'sprockets/es6'
+require 'sassc-rails'
 
 require 'thredded/version'
 require 'thredded/engine'

data/lib/thredded/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.3
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-21 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_union
@@ -242,19 +242,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.21
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.21
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: sprockets-es6
   requirement: !ruby/object:Gem::Requirement
@@ -541,14 +541,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: roadie-rails
   requirement: !ruby/object:Gem::Requirement
@@ -869,7 +869,9 @@ files:
 - app/views/layouts/thredded/application.html.erb
 - app/views/thredded/categories/_category.html.erb
 - app/views/thredded/error_pages/forbidden.html.erb
+- app/views/thredded/error_pages/forbidden.json.erb
 - app/views/thredded/error_pages/not_found.html.erb
+- app/views/thredded/error_pages/not_found.json.erb
 - app/views/thredded/kaminari/_first_page.html.erb
 - app/views/thredded/kaminari/_gap.html.erb
 - app/views/thredded/kaminari/_last_page.html.erb
@@ -1066,7 +1068,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: The best Rails forums engine ever.