thredded 0.10.0 → 0.10.1

data/app/views/thredded/moderation/_post.html.erb

@@ -1,4 +1,4 @@
-<%# @param post [Thredded::PostView] %>
+<% post, content = post_and_content if local_assigns.key?(:post_and_content) %>
 <%= content_tag :article, id: dom_id(post), class: 'thredded--post thredded--post-moderation' do %>
   <%= render 'thredded/posts_common/header_with_user_and_topic',
              post:           post,
@@ -8,7 +8,7 @@
                                content_tag :em, t('thredded.null_user_name')
                              end
   %>
-  <%= render 'thredded/posts_common/content', post: post %>
+  <%= content || render('thredded/posts/content', post: post) %>
   <%= render 'thredded/posts_common/actions', post: post %>
   <% if post.blocked? %>
     <p class="thredded--alert thredded--alert-danger">

data/app/views/thredded/moderation/_user_post.html.erb

@@ -1,7 +1,7 @@
-<%# @param post [Thredded::PostView] %>
+<% post, content = post_and_content if local_assigns.key?(:post_and_content) %>
 <%= content_tag :article, id: dom_id(post), class: 'thredded--post thredded--post-moderation' do %>
   <%= render 'thredded/posts_common/header_with_topic', post: post %>
-  <%= render 'thredded/posts_common/content', post: post %>
+  <%= content || render('thredded/posts/content', post: post) %>
   <%= render 'thredded/posts_common/actions', post: post %>
   <% if post.blocked? %>
     <p class="thredded--alert thredded--alert-danger">

data/app/views/thredded/moderation/activity.html.erb

@@ -11,7 +11,9 @@
       </div>
     <% end %>
     <% if @posts.present? %>
-      <%= render partial: 'post', collection: @posts %>
+      <%= render_posts @posts,
+                       partial: 'thredded/moderation/post',
+                       content_partial: 'thredded/posts/content' %>
       <%= paginate @posts %>
     <% end %>
   <% end %>

data/app/views/thredded/moderation/pending.html.erb

@@ -10,7 +10,9 @@
       </div>
     <% end %>
     <% if @posts.present? %>
-      <%= render partial: 'post', collection: @posts %>
+      <%= render_posts @posts,
+                       partial: 'thredded/moderation/post',
+                       content_partial: 'thredded/posts/content' %>
       <%= paginate @posts %>
     <% else %>
       <div class="thredded--empty">

data/app/views/thredded/moderation/user.html.erb

@@ -42,7 +42,9 @@
   <% end %>
   <% if @posts.present? %>
     <h2><%= t 'thredded.users.recent_activity' %></h2>
-    <%= render partial: 'user_post', collection: @posts, as: :post %>
+    <%= render_posts @posts,
+                     partial: 'thredded/moderation/user_post',
+                     content_partial: 'thredded/posts/content' %>
     <%= paginate @posts %>
   <% end %>
 <% end %>

data/app/views/thredded/posts/_content.html.erb

@@ -0,0 +1 @@
+<%= render 'thredded/posts_common/content', post: post %>

data/app/views/thredded/posts/_post.html.erb

@@ -1,14 +1,13 @@
-<% cache(post, expires_in: 1.week) do %>
-  <%= content_tag :article, id: dom_id(post), class: 'thredded--post' do %>
-    <%= render 'thredded/posts_common/header', post: post %>
-    <%= render 'thredded/posts_common/content', post: post %>
-    <%= render 'thredded/posts_common/actions', post: post %>
-    <% if post.pending_moderation? && !Thredded.content_visible_while_pending_moderation %>
-      <p class="thredded--alert thredded--alert-warning"><%= t 'thredded.posts.pending_moderation_notice' %></p>
-    <% elsif post.blocked? && post.can_moderate? %>
-      <p class="thredded--alert thredded--alert-danger">
-        <%= render 'thredded/shared/content_moderation_blocked_state', moderation_record: post.last_moderation_record %>
-      </p>
-    <% end %>
+<% post, content = post_and_content if local_assigns.key?(:post_and_content) %>
+<%= content_tag :article, id: dom_id(post), class: "thredded--post thredded--#{post.read_state}--post" do %>
+  <%= render 'thredded/posts_common/actions', post: post %>
+  <%= render 'thredded/posts_common/header', post: post %>
+  <%= content || render('thredded/posts/content', post: post) %>
+  <% if post.pending_moderation? && !Thredded.content_visible_while_pending_moderation %>
+    <p class="thredded--alert thredded--alert-warning"><%= t 'thredded.posts.pending_moderation_notice' %></p>
+  <% elsif post.blocked? && post.can_moderate? %>
+    <p class="thredded--alert thredded--alert-danger">
+      <%= render 'thredded/shared/content_moderation_blocked_state', moderation_record: post.last_moderation_record %>
+    </p>
   <% end %>
 <% end %>

data/app/views/thredded/posts/edit.html.erb

@@ -1,4 +1,4 @@
-<% content_for :thredded_page_title, 'Edit Post' %>
+<% content_for :thredded_page_title, t('thredded.nav.edit_post') %>
 <% content_for :thredded_page_id, 'thredded--edit-post' %>
 <% content_for :thredded_breadcrumbs do %>
   <ul class="thredded--navigation-breadcrumbs">
@@ -9,11 +9,10 @@
 <%= thredded_page do %>
   <section class="thredded--main-section">
     <%= render 'thredded/posts/form',
-               messageboard: (messageboard unless @post.private_topic_post?),
+               messageboard: messageboard,
                topic:        topic,
                post:         @post,
-               preview_url:  (@post.private_topic_post? ? private_topic_private_post_preview_path(@post.postable, @post)
-                                                        : messageboard_topic_post_preview_path(messageboard, @post.postable, @post)),
+               preview_url:  messageboard_topic_post_preview_path(messageboard, @post.postable, @post),
                button_text:  t('thredded.posts.form.update_btn'),
                button_submitting_text: t('thredded.posts.form.update_btn_submitting')%>
   </section>

data/app/views/thredded/posts_common/_actions.html.erb

@@ -1,11 +1,24 @@
-<% if post.can_update? %>
-  <%= link_to t('thredded.posts.edit'), post.edit_path, class: 'thredded--post--edit' %>
+<% actions = capture do %>
+  <%= view_hooks.post_common.actions.render self, post: post do %>
+    <% if post.can_update? %>
+      <%= render 'thredded/posts_common/actions/edit', post: post %>
+    <% end %>
+    <% if post.can_destroy? %>
+      <%= render 'thredded/posts_common/actions/delete', post: post %>
+    <% end %>
+    <% if post.read_state %>
+      <%= view_hooks.post_common.mark_as_unread.render self, post: post do %>
+        <%= render 'thredded/posts_common/actions/mark_as_unread', post: post %>
+      <% end %>
+    <% end %>
+  <% end %>
 <% end %>
 
-<% if post.can_destroy? %>
-  <%= link_to t('thredded.posts.delete'), post.destroy_path,
-              method: :delete,
-              class:  'thredded--post--delete',
-              data:   { confirm: I18n.t('thredded.posts.delete_confirm') }
-  %>
+<%- if actions.present? %>
+  <div class='thredded--post--dropdown'>
+    <%= inline_svg 'thredded/three-dot-menu.svg', class: 'thredded--post--dropdown--toggle' %>
+    <div class='thredded--post--dropdown--actions'>
+      <%= actions %>
+    </div>
+  </div>
 <% end %>

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

@@ -0,0 +1,4 @@
+<%= button_to t('thredded.posts.delete'), post.destroy_path,
+              method: :delete,
+              class: 'thredded--post--delete thredded--post--dropdown--actions--item',
+              data: {confirm: I18n.t('thredded.posts.delete_confirm')} %>

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

@@ -0,0 +1,2 @@
+<%= link_to t('thredded.posts.edit'), post.edit_path,
+            class: 'thredded--post--edit thredded--post--dropdown--actions--item' %>

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

@@ -0,0 +1,2 @@
+<%= button_to(t('thredded.topics.mark_as_unread'), post.mark_unread_path, method: :post, class:
+    'thredded--post--mark-as-unread thredded--post--dropdown--actions--item') %>

data/app/views/thredded/private_posts/_content.html.erb

@@ -0,0 +1 @@
+<%= render 'thredded/posts_common/content', post: post %>

data/app/views/thredded/private_posts/_private_post.html.erb

@@ -1,7 +1,6 @@
-<% cache(private_post, expires_in: 1.week) do %>
-  <%= content_tag :article, id: dom_id(private_post), class: 'thredded--post' do %>
-    <%= render 'thredded/posts_common/header', post: private_post %>
-    <%= render 'thredded/posts_common/content', post: private_post %>
-    <%= render 'thredded/posts_common/actions', post: private_post %>
-  <% end %>
+<% private_post, content = post_and_content if local_assigns.key?(:post_and_content) %>
+<%= content_tag :article, id: dom_id(private_post), class: 'thredded--post' do %>
+  <%= render 'thredded/posts_common/actions', post: private_post %>
+  <%= render 'thredded/posts_common/header', post: private_post %>
+  <%= content || render('thredded/private_posts/content', post: post) %>
 <% end %>

data/app/views/thredded/private_posts/edit.html.erb

@@ -0,0 +1,18 @@
+<% content_for :thredded_page_title, t('thredded.nav.edit_post') %>
+<% content_for :thredded_page_id, 'thredded--edit-post' %>
+<% content_for :thredded_breadcrumbs do %>
+  <ul class="thredded--navigation-breadcrumbs">
+    <li><%= link_to t('thredded.nav.edit_post'), edit_post_path(@post) %></li>
+  </ul>
+<% end %>
+
+<%= thredded_page do %>
+  <section class="thredded--main-section">
+    <%= render 'thredded/posts/form',
+               topic:        topic,
+               post:         @post,
+               preview_url:  private_topic_private_post_preview_path(@post.postable, @post),
+               button_text:  t('thredded.posts.form.update_btn'),
+               button_submitting_text: t('thredded.posts.form.update_btn_submitting')%>
+  </section>
+<% end %>

data/app/views/thredded/private_topics/show.html.erb

@@ -11,7 +11,9 @@
     <%= view_hooks.posts_common.pagination_top.render(self, posts: @posts) do %>
       <footer class="thredded--pagination-top"><%= paginate @posts %></footer>
     <% end %>
-    <%= render partial: 'thredded/private_posts/private_post', collection: @posts, cached: true %>
+    <%= render_posts @posts,
+                     partial: 'thredded/private_posts/private_post',
+                     content_partial: 'thredded/private_posts/content' %>
     <%= view_hooks.posts_common.pagination_bottom.render(self, posts: @posts) do %>
       <footer class="thredded--pagination-bottom"><%= paginate @posts %></footer>
     <% end %>

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

@@ -1,6 +1,6 @@
 <nav class="thredded--navigation">
   <ul class="thredded--user-navigation<%= ' thredded--user-navigation-standalone' if Thredded.standalone_layout? %>">
-    <% if signed_in? && Thredded.standalone_layout? %>
+    <% if thredded_signed_in? && Thredded.standalone_layout? %>
       <li class="thredded--user-navigation--profile thredded--user-navigation--item">
         <%= link_to thredded_current_user.thredded_display_name, user_path(thredded_current_user) %>
       </li>

data/app/views/thredded/shared/nav/_standalone.html.erb

@@ -1,6 +1,6 @@
 <li class="thredded--user-navigation--standalone thredded--user-navigation--item">
   <% resource_name = Thredded.user_class.name.underscore %>
-  <% if signed_in? %>
+  <% if thredded_signed_in? %>
     <%= link_to main_app.send(:"destroy_#{resource_name}_session_path"), method: :delete do %>
       <span>Sign Out</span>
     <% end %>

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

@@ -0,0 +1 @@
+<hr class="thredded--topics--sticky-topics-divider">

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

@@ -40,3 +40,7 @@
     </span>
   <% end %>
 <% end %>
+
+<% if !topic_iteration.last? && topic.sticky? && !topics[topic_counter + 1].sticky? %>
+  <%= render 'thredded/topics/sticky_topics_divider' %>
+<% end %>

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

@@ -15,7 +15,7 @@
                css_class: 'thredded--is-compact',
                preview_url: preview_new_messageboard_topic_path(messageboard),
                placeholder: t('thredded.topics.form.title_placeholder_start') if @new_topic %>
-    <%= render @topics %>
+    <%= render partial: 'thredded/topics/topic', collection: @topics, locals: {topics: @topics} %>
   <% end %>
 
   <footer class="thredded--pagination-bottom">

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

@@ -12,7 +12,7 @@
     <%= view_hooks.posts_common.pagination_top.render(self, posts: @posts) do %>
       <footer class="thredded--pagination-top"><%= paginate @posts %></footer>
     <% end %>
-    <%= render partial: 'thredded/posts/post', collection: @posts, cached: true %>
+    <%= render_posts @posts, partial: 'thredded/posts/post', content_partial: 'thredded/posts/content' %>
     <%= view_hooks.posts_common.pagination_bottom.render(self, posts: @posts) do %>
       <footer class="thredded--pagination-bottom"><%= paginate @posts %></footer>
     <% end %>

data/app/views/thredded/users/_post.html.erb

@@ -1,6 +1,6 @@
-<%# @param post [Thredded::PostView] %>
+<% post, content = post_and_content if local_assigns.key?(:post_and_content) %>
 <%= content_tag :article, id: dom_id(post), class: 'thredded--post' do %>
   <%= render 'thredded/posts_common/header_with_topic', post: post %>
-  <%= render 'thredded/posts_common/content', post: post %>
+  <%= content || render('thredded/posts/content', post: post) %>
   <%= render 'thredded/posts_common/actions', post: post %>
 <% end %>

data/app/views/thredded/users/_posts.html.erb

@@ -4,4 +4,4 @@
   TODO: Use a Cell instead. https://github.com/apotonick/cells
 %>
 <%# @param posts [Thredded::PostsPageView] %>
-<%= render partial: 'thredded/users/post', collection: posts %>
+<%= render_posts posts, partial: 'thredded/users/post', content_partial: 'thredded/posts/content' %>

data/config/locales/en.yml

@@ -157,6 +157,7 @@ en:
         update_btn: Update Topic
       locked:
         label: Locked
+      mark_as_unread: Mark unread from here
       not_following: You are not following this topic.
       search:
         no_results_message: There are no results for your search - %{query}

data/config/locales/es.yml

@@ -157,6 +157,7 @@ es:
         update_btn: Actualizar Tema
       locked:
         label: Bloqueado
+      mark_as_unread: Marcar sin leer desde aquí
       not_following: No estás siguiendo este tema.
       search:
         no_results_message: No hay resultados para tu búsqueda - %{query}

data/config/locales/pl.yml

@@ -156,6 +156,7 @@ pl:
         update_btn: Zaktualizuj temat
       locked:
         label: Zablokowany
+      mark_as_unread: Oznacz jako nieprzeczytane stąd
       not_following: Nie obserwujesz tego tematu.
       search:
         no_results_message: 'Nie odnaleziono żadnych wyników dla frazy: %{query}'

data/config/locales/pt-BR.yml

@@ -160,6 +160,7 @@ pt-BR:
         update_btn: Atualizar Tópico
       locked:
         label: Trancado
+      mark_as_unread: Marca não lida a partir daqui
       not_following: Você não está seguindo este tema.
       search:
         no_results_message: Nenhum resultado encontrado para sua busca - %{query}

data/config/routes.rb

@@ -2,8 +2,7 @@
 Thredded::Engine.routes.draw do # rubocop:disable Metrics/BlockLength
   resource :theme_preview, only: [:show], path: 'theme-preview' if %w(development test).include? Rails.env
 
-  positive_int = /[1-9]\d*/
-  page_constraint = { page: positive_int }
+  page_constraint = { page: /[1-9]\d*/ }
 
   scope path: 'private-topics' do
     resource :read_state, only: [:update], as: :mark_all_private_topics_read
@@ -14,14 +13,17 @@ Thredded::Engine.routes.draw do # rubocop:disable Metrics/BlockLength
       member do
         get '(page-:page)', action: :show, as: '', constraints: page_constraint
       end
-      resources :private_posts, path: '', except: [:index, :show], controller: 'posts' do
+      resources :private_posts, path: '', except: [:index, :show] do
         post :preview, on: :new, controller: 'private_post_previews'
         resource :preview, only: [:update], controller: 'private_post_previews'
+        member do
+          post 'mark_as_unread'
+        end
       end
     end
   end
 
-  scope only: [:show], constraints: { id: positive_int } do
+  scope only: [:show], constraints: { id: Thredded.routes_id_constraint } do
     resources :private_post_permalinks, path: 'private-posts'
     resources :post_permalinks, path: 'posts'
   end
@@ -71,6 +73,9 @@ Thredded::Engine.routes.draw do # rubocop:disable Metrics/BlockLength
       resources :posts, except: [:index, :show], path: '' do
         post :preview, on: :new, controller: 'post_previews'
         resource :preview, only: [:update], controller: 'post_previews'
+        member do
+          post 'mark_as_unread'
+        end
       end
     end
   end

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

@@ -29,6 +29,13 @@ Thredded.current_user_method = :"current_#{Thredded.user_class.name.underscore}"
 # User avatar URL. rb-gravatar gem is used by default:
 Thredded.avatar_url = ->(user) { Gravatar.src(user.email, 128, '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.

data/lib/thredded.rb

@@ -39,6 +39,8 @@ require 'thredded/view_hooks/renderer'
 # Require Thredded::ContentFormatter explicitly so that it doesn't need to be required if used in the initializer.
 require 'thredded/content_formatter'
 
+require 'thredded/collection_to_strings_with_cache_renderer'
+
 module Thredded
   mattr_accessor \
     :autocomplete_min_length,
@@ -48,6 +50,7 @@ module Thredded
     :email_outgoing_prefix,
     :layout,
     :messageboards_order,
+    :routes_id_constraint,
     :user_class,
     :user_display_name_method,
     :user_name_column,
@@ -92,6 +95,7 @@ module Thredded
   self.show_topic_followers = false
   self.messageboards_order = :position
   self.autocomplete_min_length = 2
+  self.routes_id_constraint = /[1-9]\d*/
 
   # @return [Thredded::AllViewHooks] View hooks configuration.
   def self.view_hooks

data/lib/thredded/collection_to_strings_with_cache_renderer.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+require 'action_view/renderer/abstract_renderer'
+module Thredded
+  class CollectionToStringsWithCacheRenderer < ActionView::AbstractRenderer
+    # @param view_context
+    # @param collection [Array<T>]
+    # @param partial [String]
+    # @param expires_in [ActiveSupport::Duration]
+    # @return Array<[T, String]>
+    def render_collection_to_strings_with_cache( # rubocop:disable Metrics/ParameterLists
+      view_context, collection:, partial:, expires_in:, locals: {}, **opts
+    )
+      template = @lookup_context.find_template(partial, [], true, locals, {})
+      collection = collection.to_a
+      instrument(:collection, count: collection.size) do |instrumentation_payload|
+        return [] if collection.blank?
+        keyed_collection = collection.each_with_object({}) do |item, hash|
+          key = ActiveSupport::Cache.expand_cache_key(
+            view_context.cache_fragment_name(item, virtual_path: template.virtual_path), :views
+          )
+          # #read_multi & #write may require key mutability, Dalli 2.6.0.
+          hash[key.frozen? ? key.dup : key] = item
+        end
+        cache = collection_cache
+        cached_partials = cache.read_multi(*keyed_collection.keys)
+        instrumentation_payload[:cache_hits] = cached_partials.size if instrumentation_payload
+
+        collection_to_render = keyed_collection.reject { |key, _| cached_partials.key?(key) }.values
+        rendered_partials = render_partials(
+          view_context, collection: collection_to_render, partial: partial, locals: locals, **opts
+        ).each
+
+        keyed_collection.map do |cache_key, item|
+          [item, cached_partials[cache_key] || rendered_partials.next.tap do |rendered|
+            cache.write(cache_key, rendered, expires_in: expires_in)
+          end]
+        end
+      end
+    end
+
+    private
+
+    def collection_cache
+      if ActionView::PartialRenderer.respond_to?(:collection_cache)
+        # Rails 5.0+
+        ActionView::PartialRenderer.collection_cache
+      else
+        # Rails 4.2.x
+        Rails.application.config.action_controller.cache_store
+      end
+    end
+
+    # @return [Array<String>]
+    def render_partials(view_context, collection:, **opts)
+      return [] if collection.empty?
+      partial_renderer = ActionView::PartialRenderer.new(@lookup_context)
+      collection.map do |item|
+        partial_renderer.render(view_context, opts.merge(object: item), nil)
+      end
+    end
+  end
+end