thredded 0.15.4 → 0.15.5

data/app/models/thredded/messageboard_user.rb

@@ -8,7 +8,10 @@ module Thredded
                class_name:  'Thredded::Messageboard',
                foreign_key: :thredded_messageboard_id,
                inverse_of:  :messageboard_users
-    belongs_to :user_detail, class_name: 'Thredded::UserDetail', foreign_key: :thredded_user_detail_id
+    belongs_to :user_detail,
+               class_name: 'Thredded::UserDetail',
+               foreign_key: :thredded_user_detail_id,
+               inverse_of: :messageboard_users
     scope :recently_active, -> { where(arel_table[:last_seen_at].gt(Thredded.active_user_threshold.ago)) }
   end
 end

data/app/models/thredded/post.rb

@@ -10,7 +10,8 @@ module Thredded
                inverse_of: :thredded_posts,
                **(Thredded.rails_gte_51? ? { optional: true } : {})
     belongs_to :messageboard,
-               counter_cache: true
+               counter_cache: true,
+               inverse_of: :posts
     belongs_to :postable,
                class_name:    'Thredded::Topic',
                inverse_of:    :posts,
@@ -27,7 +28,8 @@ module Thredded
     has_many :user_notifications,
              class_name: 'Thredded::UserPostNotification',
              dependent: :destroy
-    has_one :last_moderation_record, -> { order_newest_first },
+    has_one :last_moderation_record, # rubocop:disable Rails/InverseOf
+            -> { order_newest_first },
             class_name: 'Thredded::PostModerationRecord'
 
     validates :messageboard_id, presence: true

data/app/models/thredded/post_moderation_record.rb

@@ -4,9 +4,7 @@ module Thredded
   class PostModerationRecord < ActiveRecord::Base
     include Thredded::ModerationState
     # Rails 4 doesn't support enum _prefix
-    if Rails::VERSION::MAJOR >= 5
-      enum previous_moderation_state: moderation_states, _prefix: :previous
-    end
+    enum previous_moderation_state: moderation_states, _prefix: :previous if Rails::VERSION::MAJOR >= 5
     validates :previous_moderation_state, presence: true
 
     scope :order_newest_first, -> { order(created_at: :desc, id: :desc) }
@@ -26,9 +24,7 @@ module Thredded
                **(Thredded.rails_gte_51? ? { optional: true } : {})
 
     validates_each :moderation_state do |record, attr, value|
-      if record.previous_moderation_state == value
-        record.errors.add attr, "Post moderation_state is already #{value}"
-      end
+      record.errors.add attr, "Post moderation_state is already #{value}" if record.previous_moderation_state == value
     end
 
     paginates_per Thredded.posts_per_page
@@ -40,9 +36,7 @@ module Thredded
     # @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
-      if Rails::VERSION::MAJOR < 5
-        previous_moderation_state = moderation_states[previous_moderation_state.to_s]
-      end
+      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_topic.rb

@@ -27,10 +27,13 @@ module Thredded
              foreign_key: :postable_id,
              inverse_of:  :postable,
              dependent:   :destroy
-    has_one :first_post, -> { order_oldest_first },
+    has_one :first_post, # rubocop:disable Rails/InverseOf
+            -> { order_oldest_first },
             class_name:  'Thredded::PrivatePost',
             foreign_key: :postable_id
-    has_many :private_users, inverse_of: :private_topic
+    has_many :private_users,
+             inverse_of: :private_topic,
+             dependent: :delete_all
     has_many :users, through: :private_users
     has_many :user_read_states,
              class_name: 'Thredded::UserPrivateTopicReadState',
@@ -54,9 +57,7 @@ module Thredded
 
     validates_each :users do |model, _attr, users|
       # Must include the creator + at least one other user
-      if users.length < 2
-        model.errors.add(:user_ids, I18n.t('thredded.private_topics.errors.user_ids_length'))
-      end
+      model.errors.add(:user_ids, I18n.t('thredded.private_topics.errors.user_ids_length')) if users.length < 2
       unless users.include?(model.user)
         # This never happens in the UI, so we don't need to i18n the message.
         model.errors.add(:user_ids, 'must include in user_ids')

data/app/models/thredded/topic.rb

@@ -58,14 +58,16 @@ module Thredded
              foreign_key: :postable_id,
              inverse_of:  :postable,
              dependent:   :destroy
-    has_one :first_post, -> { order_oldest_first },
-            class_name:  'Thredded::Post',
+    has_one :first_post, # rubocop:disable Rails/InverseOf
+            -> { order_oldest_first },
+            class_name: 'Thredded::Post',
             foreign_key: :postable_id
-    has_one :last_post, -> { order_newest_first },
+    has_one :last_post, # rubocop:disable Rails/InverseOf
+            -> { order_newest_first },
             class_name:  'Thredded::Post',
             foreign_key: :postable_id
 
-    has_many :topic_categories, dependent: :destroy
+    has_many :topic_categories, inverse_of: :topic, dependent: :delete_all
     has_many :categories, through: :topic_categories
     has_many :user_read_states,
              class_name: 'Thredded::UserTopicReadState',

data/app/models/thredded/topic_category.rb

@@ -2,7 +2,7 @@
 
 module Thredded
   class TopicCategory < ActiveRecord::Base
-    belongs_to :category
-    belongs_to :topic
+    belongs_to :category, inverse_of: :topic_categories
+    belongs_to :topic, inverse_of: :topic_categories
   end
 end

data/app/models/thredded/user_detail.rb

@@ -7,12 +7,18 @@ module Thredded
     belongs_to :user, class_name: Thredded.user_class_name, inverse_of: :thredded_user_detail
     validates :user_id, uniqueness: true, **(Thredded.rails_gte_51? ? {} : { presence: true })
 
-    has_many :topics, class_name: 'Thredded::Topic', foreign_key: :user_id, primary_key: :user_id
-    has_many :private_topics, class_name: 'Thredded::PrivateTopic', foreign_key: :user_id, primary_key: :user_id
-    has_many :posts, class_name: 'Thredded::Post', foreign_key: :user_id, primary_key: :user_id
-    has_many :private_posts, class_name: 'Thredded::PrivatePost', foreign_key: :user_id, primary_key: :user_id
-    has_many :messageboard_users, class_name: 'Thredded::MessageboardUser', foreign_key: :thredded_user_detail_id,
-                                  inverse_of: :user_detail, dependent: :destroy
+    with_options foreign_key: :user_id, primary_key: :user_id, inverse_of: :user_detail, dependent: :nullify do
+      has_many :topics, class_name: 'Thredded::Topic'
+      has_many :private_topics, class_name: 'Thredded::PrivateTopic'
+      has_many :posts, class_name: 'Thredded::Post'
+      has_many :private_posts, class_name: 'Thredded::PrivatePost'
+    end
+
+    has_many :messageboard_users,
+             class_name: 'Thredded::MessageboardUser',
+             foreign_key: :thredded_user_detail_id,
+             inverse_of: :user_detail,
+             dependent: :delete_all
 
     scope :recently_active, -> { where(arel_table[:last_seen_at].gt(Thredded.active_user_threshold.ago)) }
 

data/app/models/thredded/user_extender.rb

@@ -11,29 +11,29 @@ module Thredded
     include ::Thredded::UserPermissions::Admin::IfAdminColumnTrue
 
     included do # rubocop:disable Metrics/BlockLength
-      with_options dependent: :nullify, foreign_key: 'user_id', inverse_of: :user do |opt|
-        opt.has_many :thredded_posts, class_name: 'Thredded::Post'
-        opt.has_many :thredded_topics, class_name: 'Thredded::Topic'
-        opt.has_many :thredded_private_posts, class_name: 'Thredded::PrivatePost'
-        opt.has_many :thredded_started_private_topics, class_name: 'Thredded::PrivateTopic'
+      with_options dependent: :nullify, foreign_key: 'user_id', inverse_of: :user do
+        has_many :thredded_posts, class_name: 'Thredded::Post'
+        has_many :thredded_topics, class_name: 'Thredded::Topic'
+        has_many :thredded_private_posts, class_name: 'Thredded::PrivatePost'
+        has_many :thredded_started_private_topics, class_name: 'Thredded::PrivateTopic'
       end
 
-      with_options dependent: :nullify, foreign_key: 'last_user_id', inverse_of: :last_user do |opt|
-        opt.has_many :thredded_last_user_topics, class_name: 'Thredded::Topic'
-        opt.has_many :thredded_last_user_private_topics, class_name: 'Thredded::PrivateTopic'
+      with_options dependent: :nullify, foreign_key: 'last_user_id', inverse_of: :last_user do
+        has_many :thredded_last_user_topics, class_name: 'Thredded::Topic'
+        has_many :thredded_last_user_private_topics, class_name: 'Thredded::PrivateTopic'
       end
 
-      with_options dependent: :destroy, foreign_key: 'user_id', inverse_of: :user do |opt|
-        opt.has_many :thredded_user_messageboard_preferences, class_name: 'Thredded::UserMessageboardPreference'
-        opt.has_many :thredded_notifications_for_followed_topics, class_name: 'Thredded::NotificationsForFollowedTopics'
-        opt.has_many :thredded_notifications_for_private_topics, class_name: 'Thredded::NotificationsForPrivateTopics'
-        opt.has_many :thredded_post_notifications, class_name: 'Thredded::UserPostNotification'
-        opt.has_many :thredded_private_users, class_name: 'Thredded::PrivateUser'
-        opt.has_many :thredded_topic_read_states, class_name: 'Thredded::UserTopicReadState'
-        opt.has_many :thredded_private_topic_read_states, class_name: 'Thredded::UserPrivateTopicReadState'
-        opt.has_many :thredded_topic_follows, class_name: 'Thredded::UserTopicFollow'
-        opt.has_one :thredded_user_detail, class_name: 'Thredded::UserDetail'
-        opt.has_one :thredded_user_preference, class_name: 'Thredded::UserPreference'
+      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_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_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'
+        has_one :thredded_user_detail, class_name: 'Thredded::UserDetail'
+        has_one :thredded_user_preference, class_name: 'Thredded::UserPreference'
       end
 
       has_many :thredded_private_topics,
@@ -41,9 +41,9 @@ module Thredded
                class_name: 'Thredded::PrivateTopic',
                source:     :private_topic
 
-      with_options dependent: :nullify, class_name: 'Thredded::PostModerationRecord' do |opt|
-        opt.has_many :thredded_post_moderation_records, foreign_key: 'post_user_id', inverse_of: :post_user
-        opt.has_many :thredded_post_moderated_records, foreign_key: 'moderator_id', inverse_of: :moderator
+      with_options dependent: :nullify, class_name: 'Thredded::PostModerationRecord' do
+        has_many :thredded_post_moderation_records, foreign_key: 'post_user_id', inverse_of: :post_user
+        has_many :thredded_post_moderated_records, foreign_key: 'moderator_id', inverse_of: :moderator
       end
 
       scope :left_join_thredded_user_details, -> {

data/app/models/thredded/user_permissions/moderate/if_moderator_column_true.rb

@@ -10,6 +10,13 @@ module Thredded
         def thredded_can_moderate_messageboards
           send(Thredded.moderator_column) ? Thredded::Messageboard.all : Thredded::Messageboard.none
         end
+
+        # @param [Thredded::Messageboard] messageboard
+        # @return [Boolean] Whether the user can moderate the given messageboard.
+        def thredded_can_moderate_messageboard?(messageboard)
+          scope = thredded_can_moderate_messageboards
+          scope == Thredded::Messageboard.all || scope.include?(messageboard)
+        end
       end
     end
   end

data/app/models/thredded/user_permissions/moderate/none.rb

@@ -10,6 +10,12 @@ module Thredded
         def thredded_can_moderate_messageboards
           Thredded::Messageboard.none
         end
+
+        # @param [Thredded::Messageboard] messageboard
+        # @return [false] Whether the user can moderate the given messageboard.
+        def thredded_can_moderate_messageboard?(messageboard) # rubocop:disable Lint/UnusedMethodArgument
+          false
+        end
       end
     end
   end

data/app/models/thredded/user_permissions/read/all.rb

@@ -12,6 +12,13 @@ module Thredded
           Thredded::Messageboard.all
         end
 
+        # @param [Thredded::Messageboard] messageboard
+        # @return [Boolean] Whether the user can read the given messageboard.
+        def thredded_can_read_messageboard?(messageboard)
+          scope = thredded_can_read_messageboards
+          scope == Thredded::Messageboard.all || scope.include?(messageboard)
+        end
+
         module ClassMethods
           # Users that can read some of the given messageboards.
           #

data/app/models/thredded/user_preference.rb

@@ -5,15 +5,15 @@ module Thredded
     belongs_to :user, class_name: Thredded.user_class_name, inverse_of: :thredded_user_preference
 
     with_options(inverse_of: :user_preference, primary_key: :user_id, foreign_key: :user_id,
-                 dependent: :destroy) do |opt|
-      opt.has_many :messageboard_preferences,
-                   class_name: 'Thredded::UserMessageboardPreference'
-      opt.has_many :messageboard_notifications_for_followed_topics,
-                   class_name: 'Thredded::MessageboardNotificationsForFollowedTopics'
-      opt.has_many :notifications_for_followed_topics,
-                   class_name: 'Thredded::NotificationsForFollowedTopics'
-      opt.has_many :notifications_for_private_topics,
-                   class_name: 'Thredded::NotificationsForPrivateTopics'
+                 dependent: :destroy) do
+      has_many :messageboard_preferences,
+               class_name: 'Thredded::UserMessageboardPreference'
+      has_many :messageboard_notifications_for_followed_topics,
+               class_name: 'Thredded::MessageboardNotificationsForFollowedTopics'
+      has_many :notifications_for_followed_topics,
+               class_name: 'Thredded::NotificationsForFollowedTopics'
+      has_many :notifications_for_private_topics,
+               class_name: 'Thredded::NotificationsForPrivateTopics'
     end
     validates :user_id, presence: true
 

data/app/policies/thredded/messageboard_policy.rb

@@ -13,7 +13,12 @@ module Thredded
 
       # @return [ActiveRecord::Relation<Thredded::Messageboards>]
       def resolve
-        @scope.merge(@user.thredded_can_read_messageboards)
+        readable = @user.thredded_can_read_messageboards
+        if readable == Thredded::Messageboard.all
+          @scope
+        else
+          @scope.merge(readable)
+        end
       end
     end
 
@@ -29,7 +34,7 @@ module Thredded
     end
 
     def read?
-      @user.thredded_admin? || @user.thredded_can_read_messageboards.include?(@messageboard)
+      @user.thredded_admin? || @user.thredded_can_read_messageboard?(@messageboard)
     end
 
     def update?
@@ -43,7 +48,7 @@ module Thredded
     end
 
     def moderate?
-      @user.thredded_admin? || @user.thredded_can_moderate_messageboards.include?(@messageboard)
+      @user.thredded_admin? || @user.thredded_can_moderate_messageboard?(@messageboard)
     end
   end
 end

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

@@ -3,6 +3,7 @@
       <li>
         <%= f.label t('thredded.messageboard.form.title_label') %>
         <%= f.text_field :name, required: true %>
+        <%= render 'thredded/shared/field_errors', messages: f.object.errors[:name] %>
       </li>
       <li>
         <%= f.label t('thredded.messageboard.form.description_label') %>
@@ -20,9 +21,9 @@
       </li>
 
       <li>
-        <%= f.submit @messageboard.persisted? ? t('thredded.messageboard.update') : t('thredded.messageboard.create'),
+        <%= f.submit messageboard.persisted? ? t('thredded.messageboard.update') : t('thredded.messageboard.create'),
                      class: 'thredded--form--submit',
-                     'data-disable-with' => @messageboard.persisted? ?
+                     'data-disable-with' => messageboard.persisted? ?
                          t('thredded.messageboard.form.update_btn_submitting') :
                          t('thredded.messageboard.form.create_btn_submitting') %>
       </li>

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

@@ -10,6 +10,6 @@
 
 <%= thredded_page do %>
   <section class="thredded--main-section">
-    <%= render 'form', messageboard: @messageboard %>
+    <%= render 'form', messageboard: @new_messageboard %>
   </section>
 <% end %>

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

@@ -13,7 +13,7 @@
     <li class="title">
       <%= form.label :title, t('thredded.private_topics.form.title_label') %>
       <%= form.text_field :title, placeholder: placeholder, required: true, autocomplete: 'off' %>
-      <%= render 'thredded/shared/field_errors', messages: form.object.errors[:title] if form.object.errors.include?(:title) %>
+      <%= render 'thredded/shared/field_errors', messages: form.object.errors[:title] %>
     </li>
     <li>
       <%= form.label :user_names, t('thredded.private_topics.form.users_label') %>

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

@@ -22,7 +22,7 @@
                               placeholder: t('thredded.private_topics.form.title_placeholder_new'),
                               autofocus: true,
                               required: true %>
-          <%= render 'thredded/shared/field_errors', messages: form.object.errors[:title] if form.object.errors.include?(:title) %>
+          <%= render 'thredded/shared/field_errors', messages: form.object.errors[:title] %>
         </li>
         <li>
           <button type="submit" class="thredded--form--submit"

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

@@ -1,3 +1,5 @@
-<div class="thredded--alert thredded--alert-danger">
-  <%= safe_join messages, raw("<br>") %>
-</div>
+<% unless messages.blank? %>
+  <div class="thredded--alert thredded--alert-danger">
+    <%= safe_join messages, raw("<br>") %>
+  </div>
+<% end %>

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

@@ -1,4 +1,4 @@
-<% if moderatable_messageboards_ids.present? %>
+<% if thredded_moderator? %>
   <% current = current_page_moderation? %>
   <li class="thredded--user-navigation--item thredded--user-navigation--moderation<%= ' thredded--is-current' if current %>">
     <%= link_to current ? nav_back_path : pending_moderation_path, rel: 'nofollow' do %>

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

@@ -11,7 +11,7 @@
     <li class="title">
       <%= form.label :title, t('thredded.topics.form.title_label') %>
       <%= form.text_field :title, placeholder: placeholder, required: true, autocomplete: 'off' %>
-      <%= render 'thredded/shared/field_errors', messages: form.object.errors[:title] if form.object.errors.include?(:title) %>
+      <%= render 'thredded/shared/field_errors', messages: form.object.errors[:title] %>
     </li>
 
     <% if form.object.category_options.any? %>

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

@@ -22,7 +22,7 @@
                               placeholder: t('thredded.topics.form.title_placeholder'),
                               autofocus: true,
                               required: true %>
-          <%= render 'thredded/shared/field_errors', messages: form.object.errors[:title] if form.object.errors.include?(:title) %>
+          <%= render 'thredded/shared/field_errors', messages: form.object.errors[:title] %>
         </li>
 
         <% if form.object.category_options.any? %>

data/bin/rails

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-APP_PATH = File.expand_path('../../spec/dummy/config/application', __FILE__)
-require    File.expand_path('../../spec/dummy/config/boot', __FILE__)
+APP_PATH = File.expand_path('../spec/dummy/config/application', __dir__)
+require    File.expand_path('../spec/dummy/config/boot', __dir__)
 require    'rails/commands'

data/config/locales/ru.yml

@@ -250,7 +250,7 @@ ru:
     users:
       currently_online: Онлайн
       last_active_html: Последняя активность %{time_ago}
-      posted_in_topic_html: Сделан пост в %{topic_link}
+      posted_in_topic_html: Написал в %{topic_link}
       posts_count:
         few: Сделано %{count} поста
         many: Сделано %{count} постов

data/lib/generators/thredded/install/install_generator.rb

@@ -5,8 +5,8 @@ module Thredded
     class InstallGenerator < Rails::Generators::Base
       def set_source_paths
         @source_paths = [
-          File.expand_path('../templates', __FILE__),
-          File.expand_path('../../../../..', __FILE__),
+          File.expand_path('templates', __dir__),
+          File.expand_path('../../../..', __dir__),
         ]
       end
 

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

@@ -84,6 +84,9 @@ Thredded.layout = 'thredded/application'
 # Thredded.parent_mailer = 'ActionMailer::Base'
 
 # ==> Model configuration
+# The range of valid messageboard name lengths. Default:
+# Thredded.messageboard_name_length_range = (1..60)
+#
 # The range of valid topic title lengths. Default:
 # Thredded.topic_title_length_range = (1..200)
 

data/lib/thredded.rb

@@ -44,7 +44,16 @@ require 'thredded/base_notifier'
 require 'thredded/arel_compat'
 require 'thredded/collection_to_strings_with_cache_renderer'
 
-module Thredded
+if Rails::VERSION::MAJOR < 5
+  begin
+    require 'where-or'
+  rescue LoadError
+    $stderr.puts "\nthredded: Please add gem 'where-or' to your Gemfile"
+    exit 1 # rubocop:disable Rails/Exit
+  end
+end
+
+module Thredded # rubocop:disable Metrics/ModuleLength
   class << self
     #== User
 
@@ -110,7 +119,7 @@ module Thredded
     # :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
+    attr_reader :messageboards_order
 
     # @return [Number] The number of topics to display per page.
     attr_accessor :topics_per_page
@@ -157,6 +166,9 @@ module Thredded
 
     #== Misc
 
+    # @return [Range<Integer>] The range of valid messageboard name lengths.
+    attr_accessor :messageboard_name_length_range
+
     # @return [Range<Integer>] The range of valid topic title lengths.
     attr_accessor :topic_title_length_range
 
@@ -267,5 +279,6 @@ module Thredded
   self.slugifier = ->(input) { input.parameterize }
   self.routes_id_constraint = /[1-9]\d*/
 
+  self.messageboard_name_length_range = (1..60)
   self.topic_title_length_range = (1..200)
 end