thredded 0.16.14 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b96a82c0482d773cd074fdd77a4e67a408ba43e2e079bbbd2a4eefeb55085f37
-  data.tar.gz: 6949b12a03a39430340dbd8870cb6e5cc4dcddc583e093de576e2a3621becdb4
+  metadata.gz: 8a7da465ff23d46ffb17f30aef22bc8195dc7551f485d28d698f3a8e20aaf958
+  data.tar.gz: 24d752703abdc40ba28ffa48d931d70d5c9baeff461467059e7f2c2fbdfea27c
 SHA512:
-  metadata.gz: 4403418748bbb9b7bdcf5a503908fb526d60ff0f6100d11be98d64f625da8e9479c2be127adb2b88435686371d58cb75c39d1e4c73789e5e8297eabf9d01198d
-  data.tar.gz: 154ddbcd92f7e8f705bf4fe27bbc32f03fff0e3af7fdb81aca82143783dfd389eed1cbd516802356288af0c839cd3ddc61087209037c60bc521bee072939efa6
+  metadata.gz: 6dec36328aba9edd1143d2aecaa70970ba48897ed470e97785c534067c6d5f38e0e175d4637a5824f1d09827059ab508147c2c721400a8027e966884f235a74d
+  data.tar.gz: c35c5f19f198b78b0d6426b96e1f15863cb29ff74c5a130d665a1fde1dd89d9f5af8bb194b0991d2a7bf965aa9fe6309af0de03246a6bf7d2711e1356b34d636

data/README.md

@@ -96,7 +96,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.14'
+gem 'thredded', '~> 1.0'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -174,7 +174,7 @@ mkdir -p app/views/thredded/shared/nav && cp "$(bundle show thredded)/$_/_standa
 
 ### Application layout
 
-You can also use Thredded with your application (or other) layout by by setting `Thredded.layout` in the initializer.
+You can also use Thredded with your application (or other) layout by setting `Thredded.layout` in the initializer.
 
 In this case, you will need to reference your paths/routes carefully and pull in thredded assets (styles and javascript):
 
@@ -655,12 +655,24 @@ By default, the dummy app server uses Webpack for JavaScript.
 To use Sprockets instead, run:
 
 ```bash
-THREDDED_TESTAPP_WEBPACK=1 bin/rails s
+THREDDED_TESTAPP_SPROCKETS=1 bin/rails s
 ```
 
+alternatively you can use guard (which comes with activereload to make development more pleasant) with:
+
+    export THREDDED_USE_GUARD=1
+    bundle
+    bundle exec guard
+
+
 ### Testing
 
-To run the tests, just run `rspec`. The test suite will re-create the test database on every run, so there is no need to
+In order to run the tests locally, you will need to be running webpack-dev-server (or do a manual compilation):
+
+    cd spec/dummy && yarn && cd -
+    BUNDLE_GEMFILE="${PWD}/Gemfile" spec/dummy/bin/webpack-dev-server
+
+Then to run the tests, just run `rspec`. The test suite will re-create the test database on every run, so there is no need to
 run tasks that maintain the test database.
 
 By default, SQLite is used in development and test. On Travis, the tests will run using SQLite, PostgreSQL, MySQL,
@@ -677,8 +689,8 @@ sudo apt-get install chromium-chromedriver
 On Mac, run:
 
 ```bash
-brew cask install chromium
-brew cask install chromedriver
+brew install --cask chromium
+brew install --cask chromedriver
 ```
 
 To get better page saves (`page.save_and_open_page`) from local capybara specs ensure you are running the server locally 
@@ -777,7 +789,7 @@ start the included docker-compose.yml file with:
 
 ```console
 docker-compose build
-docker-compose up -d
+docker-compose up
 ```
 
 The above will build and run everything, daemonized, resulting in a running

data/app/assets/javascripts/thredded/components/preview_area.es6

@@ -27,7 +27,9 @@
       }, 200, false);
 
       textarea.addEventListener('input', onChange, false);
-
+      if(textarea.value.trim() !== '') {
+        onChange();
+      }
       this.requestId = 0;
     }
 

data/app/controllers/concerns/thredded/render_preview.rb

@@ -2,6 +2,12 @@
 
 module Thredded
   module RenderPreview
+    extend ActiveSupport::Concern
+
+    included do
+      skip_forgery_protection
+    end
+
     protected
 
     def render_preview

data/app/controllers/thredded/application_controller.rb

@@ -4,7 +4,11 @@ module Thredded
   class ApplicationController < ::ApplicationController # rubocop:disable Metrics/ClassLength
     layout :thredded_layout
     include ::Thredded::UrlsHelper
-    include Pundit
+    if defined?(Pundit::Authorization)
+      include Pundit::Authorization
+    else
+      include Pundit
+    end
 
     helper Thredded::Engine.helpers
     helper_method \
@@ -63,15 +67,6 @@ module Thredded
       @is_thredded_moderator = !thredded_current_user.thredded_can_moderate_messageboards.empty?
     end
 
-    if Rails::VERSION::MAJOR < 5
-      # redirect_back polyfill
-      def redirect_back(fallback_location:, **args)
-        redirect_to :back, args
-      rescue ActionController::RedirectBackError
-        redirect_to fallback_location, args
-      end
-    end
-
     # @param given [Hash]
     # @return [Boolean] whether the given params are a subset of the controller's {#params}.
     def params_match?(given = {})

data/app/controllers/thredded/topics_controller.rb

@@ -203,12 +203,6 @@ module Thredded
       @messageboard = topic.messageboard
     end
 
-    def topic_params
-      params
-        .require(:topic)
-        .permit(:title, :locked, :sticky, category_ids: [])
-    end
-
     def topic_params_for_update
       params
         .require(:topic)

data/app/helpers/thredded/application_helper.rb

@@ -92,7 +92,7 @@ module Thredded
     end
 
     def paginate(collection, args = {})
-      super(collection, args.reverse_merge(views_prefix: 'thredded'))
+      super(collection, **args.reverse_merge(views_prefix: 'thredded'))
     end
 
     # @param topic [BaseTopicView]

data/app/helpers/thredded/icon_helper.rb

@@ -25,7 +25,7 @@ module Thredded
     def inline_svg_once(filename, id:, **transform_params)
       return if @already_inlined_svg_ids&.include?(id)
       record_already_inlined_svg(filename, id)
-      inline_svg(filename, id: id, **transform_params)
+      inline_svg_tag(filename, id: id, **transform_params)
     end
 
     private

data/app/helpers/thredded/urls_helper.rb

@@ -54,7 +54,7 @@ module Thredded
     # @param user [Thredded.user_class] the current user
     # @return [String] path to the topic page with the post anchor.
     def post_path(post, user:, **params)
-      post_url(post, params.merge(user: user, only_path: true))
+      post_url(post, **params.merge(user: user, only_path: true))
     end
 
     # @param post [Post, PrivatePost]

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

@@ -23,12 +23,12 @@ module Thredded
         result = all
         owners_by_id = result.each_with_object({}) { |r, h| h[r.postable_id] = r.postable }
         next result if owners_by_id.empty?
-        preloader = ActiveRecord::Associations::Preloader.new.preload(
-          owners_by_id.values, :first_post,
-          unscoped.where(<<~SQL.delete("\n"))
+        preloader = Thredded::Compat.association_preloader(
+          records: owners_by_id.values, associations: [:first_post],
+          scope: unscoped.where(<<~SQL.delete("\n"))
           #{posts_table_name}.created_at = (
           SELECT MAX(p2.created_at) from #{posts_table_name} p2 WHERE p2.postable_id = #{posts_table_name}.postable_id)
-        SQL
+          SQL
         )
         preloader[0].preloaded_records.each do |post|
           topic = owners_by_id.delete(post.postable_id)
@@ -81,6 +81,7 @@ module Thredded
     protected
 
     def update_unread_posts_count
+      return if destroyed_by_association
       postable.user_read_states.update_post_counts!
     end
 

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

@@ -9,7 +9,7 @@ module Thredded
       belongs_to :last_user, # rubocop:disable Rails/InverseOf
                  class_name: Thredded.user_class_name,
                  foreign_key: 'last_user_id',
-                 **(Thredded.rails_gte_51? ? { optional: true } : {})
+                 optional: true
 
       scope :order_recently_posted_first, -> { order(last_post_at: :desc, id: :desc) }
       scope :on_page, ->(page_num) { page(page_num) }

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

@@ -27,10 +27,9 @@ module Thredded
     end
 
     def calculate_post_counts
+      relation = self.class.visible_posts_scope(user).where(postable_id: postable_id)
       unread_posts_count, read_posts_count =
-        self.class.visible_posts_scope(user)
-          .where(postable_id: postable_id)
-          .pluck(*self.class.post_counts_arel(read_at))[0]
+        relation.pluck(*self.class.post_counts_arel(read_at))[0]
       { unread_posts_count: unread_posts_count || 0, read_posts_count: read_posts_count || 0 }
     end
 
@@ -45,7 +44,7 @@ module Thredded
         selects << states[Arel.star] if !is_a?(ActiveRecord::Relation) || select_values.empty?
         selects += [
           Arel::Nodes::Case.new(states[:unread_posts_count].not_eq(0))
-            .when(Thredded::ArelCompat.true_value(self)).then(
+            .when(true).then(
               Arel::Nodes::Addition.new(
                 Thredded::ArelCompat.integer_division(self, states[:read_posts_count], posts_per_page), 1
               )
@@ -76,11 +75,11 @@ module Thredded
         [
           Arel::Nodes::Sum.new(
             [Arel::Nodes::Case.new(posts[:created_at].gt(read_at))
-               .when(Thredded::ArelCompat.true_value(self)).then(1).else(0)]
+               .when(true).then(1).else(0)]
           ).as('unread_posts_count'),
           Arel::Nodes::Sum.new(
             [Arel::Nodes::Case.new(posts[:created_at].gt(read_at))
-               .when(Thredded::ArelCompat.true_value(self)).then(0).else(1)]
+               .when(true).then(0).else(1)]
           ).as('read_posts_count')
         ]
       end
@@ -89,9 +88,9 @@ module Thredded
       def calculate_post_counts
         states = arel_table
         posts = post_class.arel_table
-        joins(states.join(posts).on(states[:postable_id].eq(posts[:postable_id])).join_sources)
+        relation = joins(states.join(posts).on(states[:postable_id].eq(posts[:postable_id])).join_sources)
           .group(states[:id])
-          .pluck(states[:id], *post_counts_arel(states[:read_at], posts: posts))
+        relation.pluck(states[:id], *post_counts_arel(states[:read_at], posts: posts))
       end
     end
   end

data/app/models/thredded/messageboard.rb

@@ -39,7 +39,7 @@ module Thredded
     has_many :posts, dependent: :destroy, inverse_of: :messageboard
     has_many :topics, dependent: :destroy, inverse_of: :messageboard
 
-    belongs_to :last_topic, class_name: 'Thredded::Topic', **(Thredded.rails_gte_51? ? { optional: true } : {})
+    belongs_to :last_topic, class_name: 'Thredded::Topic', optional: true
 
     has_many :user_details, through: :posts
     has_many :messageboard_users,
@@ -65,7 +65,7 @@ module Thredded
                inverse_of: :messageboards,
                foreign_key: :messageboard_group_id,
                class_name: 'Thredded::MessageboardGroup',
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
 
     has_many :post_moderation_records, inverse_of: :messageboard, dependent: :delete_all
     scope :top_level_messageboards, -> { where(group: nil) }
@@ -139,9 +139,10 @@ module Thredded
             .and(read_states[:user_id].eq(user.id))
             .and(read_states[:unread_posts_count].eq(0))
 
-        joins(:topics).merge(topics_scope).joins(
+        relation = joins(:topics).merge(topics_scope).joins(
           messageboards.outer_join(read_states).on(read_states_join_cond).join_sources
-        ).group(messageboards[:id]).pluck(
+        ).group(messageboards[:id])
+        relation.pluck(
           :id,
           Arel::Nodes::Subtraction.new(topics[:id].count, read_states[:id].count)
         ).to_h

data/app/models/thredded/notifications_for_followed_topics.rb

@@ -7,7 +7,7 @@ module Thredded
                inverse_of: :thredded_notifications_for_followed_topics
     belongs_to :messageboard,
                # If messageboard is `nil`, these are the global preferences.
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
     belongs_to :user_preference,
                primary_key: :user_id,
                foreign_key: :user_id,

data/app/models/thredded/post.rb

@@ -8,7 +8,7 @@ module Thredded
     belongs_to :user,
                class_name: Thredded.user_class_name,
                inverse_of: :thredded_posts,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
     belongs_to :messageboard,
                counter_cache: true,
                inverse_of: :posts
@@ -21,7 +21,7 @@ module Thredded
                primary_key:   :user_id,
                foreign_key:   :user_id,
                counter_cache: true,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
     has_many :moderation_records,
              class_name: 'Thredded::PostModerationRecord',
              dependent: :nullify
@@ -78,6 +78,7 @@ module Thredded
     end
 
     def update_parent_last_user_and_time_from_last_post
+      return if destroyed_by_association
       postable.update_last_user_and_time_from_last_post!
       messageboard.update_last_topic!
     end

data/app/models/thredded/post_moderation_record.rb

@@ -3,25 +3,24 @@
 module Thredded
   class PostModerationRecord < ActiveRecord::Base
     include Thredded::ModerationState
-    # Rails 4 doesn't support enum _prefix
-    enum previous_moderation_state: moderation_states, _prefix: :previous if Rails::VERSION::MAJOR >= 5
+    enum previous_moderation_state: moderation_states, _prefix: :previous
     validates :previous_moderation_state, presence: true
 
     scope :order_newest_first, -> { order(created_at: :desc, id: :desc) }
 
     belongs_to :messageboard, inverse_of: :post_moderation_records
-    validates :messageboard_id, presence: true unless Thredded.rails_gte_51?
+
     belongs_to :post,
                inverse_of: :moderation_records,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
     belongs_to :post_user,
                class_name: Thredded.user_class_name,
                inverse_of: :thredded_post_moderation_records,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
     belongs_to :moderator,
                class_name: Thredded.user_class_name,
                inverse_of: :thredded_post_moderation_records,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
 
     validates_each :moderation_state do |record, attr, value|
       record.errors.add attr, "Post moderation_state is already #{value}" if record.previous_moderation_state == value
@@ -30,7 +29,9 @@ module Thredded
     scope :preload_first_topic_post, -> {
       posts_table_name = Thredded::Post.quoted_table_name
       result = all
-      owners_by_id = result.each_with_object({}) { |r, h| h[r.post.postable_id] = r.post.postable }
+      owners_by_id = result.each_with_object({}) do |r, h|
+        h[r.post.postable_id] = r.post.postable if r.post
+      end
       next result if owners_by_id.empty?
       preloader = ActiveRecord::Associations::Preloader.new.preload(
         owners_by_id.values, :first_post,
@@ -60,8 +61,6 @@ module Thredded
     # @param [Symbol, String] moderation_state
     # @return [Thredded::PostModerationRecord] the newly created persisted record
     def self.record!(moderator:, post:, previous_moderation_state:, moderation_state:)
-      # Rails 4 doesn't support enum _prefix
-      previous_moderation_state = moderation_states[previous_moderation_state.to_s] if Rails::VERSION::MAJOR < 5
       create!(
         previous_moderation_state: previous_moderation_state,
         moderation_state:          moderation_state,

data/app/models/thredded/private_post.rb

@@ -7,7 +7,7 @@ module Thredded
     belongs_to :user,
                class_name: Thredded.user_class_name,
                inverse_of: :thredded_private_posts,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
     belongs_to :postable,
                class_name:    'Thredded::PrivateTopic',
                inverse_of:    :posts,
@@ -16,7 +16,7 @@ module Thredded
                inverse_of:  :private_posts,
                primary_key: :user_id,
                foreign_key: :user_id,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
 
     after_commit :update_parent_last_user_and_timestamp, on: %i[create destroy]
     after_commit :notify_users, on: [:create]

data/app/models/thredded/private_topic.rb

@@ -15,12 +15,12 @@ module Thredded
     belongs_to :user,
                class_name: Thredded.user_class_name,
                inverse_of: :thredded_private_topics,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
     belongs_to :user_detail,
                primary_key:   :user_id,
                foreign_key:   :user_id,
                inverse_of:    :private_topics,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
 
     has_many :posts,
              class_name:  'Thredded::PrivatePost',
@@ -102,6 +102,8 @@ module Thredded
     end
 
     def ensure_user_in_private_users
+      # TODO: investigate performance of this. Seems to take a long time and be repeatedly called in tests
+      #       can we avoid callling this so often
       users << user if user.present? && !users.include?(user)
     end
 

data/app/models/thredded/topic.rb

@@ -37,7 +37,7 @@ module Thredded
     belongs_to :user,
                class_name: Thredded.user_class_name,
                inverse_of: :thredded_topics,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
 
     belongs_to :messageboard,
                counter_cache: true,
@@ -50,7 +50,7 @@ module Thredded
                foreign_key:   :user_id,
                inverse_of:    :topics,
                counter_cache: :topics_count,
-               **(Thredded.rails_gte_51? ? { optional: true } : {})
+               optional: true
 
     has_many :posts,
              autosave: true,

data/app/models/thredded/user_detail.rb

@@ -7,7 +7,7 @@ module Thredded
     belongs_to :user, class_name: Thredded.user_class_name, inverse_of: :thredded_user_detail
     validates :user_id,
               uniqueness: { case_sensitive: true },
-              **(Thredded.rails_gte_51? ? {} : { presence: true })
+              presence: true
 
     with_options foreign_key: :user_id, primary_key: :user_id, inverse_of: :user_detail, dependent: :nullify do
       has_many :topics, class_name: 'Thredded::Topic'

data/app/models/thredded/user_extender.rb

@@ -30,7 +30,7 @@ module Thredded
                  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'
+        has_many :thredded_private_users, class_name: 'Thredded::PrivateUser', inverse_of: :user
         has_many :thredded_topic_read_states, class_name: 'Thredded::UserTopicReadState'
         has_many :thredded_private_topic_read_states, class_name: 'Thredded::UserPrivateTopicReadState'
         has_many :thredded_topic_follows, class_name: 'Thredded::UserTopicFollow'

data/app/models/thredded/user_private_topic_read_state.rb

@@ -27,6 +27,9 @@ module Thredded
         return if !overwrite_newer && state.read_at? && state.read_at >= post.created_at
         state.read_at = post.created_at
         state.update!(state.calculate_post_counts)
+      rescue ActiveRecord::RecordNotUnique
+        # The record has been created from another connection, retry to find it.
+        retry
       end
 
       # @param [Thredded.user_class] user

data/app/models/thredded/user_topic_read_state.rb

@@ -31,6 +31,9 @@ module Thredded
         state.messageboard_id = post.messageboard_id
         state.read_at = post.created_at
         state.update!(state.calculate_post_counts)
+      rescue ActiveRecord::RecordNotUnique
+        # The record has been created from another connection, retry to find it.
+        retry
       end
 
       # @param [Thredded.user_class] user

data/app/view_models/thredded/post_view.rb

@@ -13,6 +13,7 @@ module Thredded
              :blocked?,
              :last_moderation_record,
              :cache_key,
+             :cache_version,
              :cache_key_with_version,
              to: :@post
 

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>