thredded 0.2.2 → 0.3.0

data/app/models/thredded/private_topic.rb

@@ -1,16 +1,48 @@
+# frozen_string_literal: true
 module Thredded
   class PrivateTopic < ActiveRecord::Base
     include TopicCommon
+
+    scope :for_user, -> (user) { joins(:private_users).merge(PrivateUser.where(user_id: user.id)) }
+
     extend FriendlyId
-    friendly_id :title, use: :history
+    friendly_id :slug_candidates,
+                use:            [:history, :reserved],
+                # Avoid route conflicts
+                reserved_words: ::Thredded::FriendlyIdReservedWordsAndPagination.new(%w(new))
+
+    belongs_to :user,
+               class_name: Thredded.user_class,
+               inverse_of: :thredded_private_topics
 
     has_many :posts,
              class_name:  'Thredded::PrivatePost',
              foreign_key: :postable_id,
              inverse_of:  :postable,
              dependent:   :destroy
-    has_many :private_users
+    has_one :first_post, -> { order_oldest_first },
+            class_name:  'Thredded::PrivatePost',
+            foreign_key: :postable_id
+    has_many :private_users, inverse_of: :private_topic
     has_many :users, through: :private_users
+    has_many :user_read_states,
+             class_name: 'Thredded::UserPrivateTopicReadState',
+             foreign_key: :postable_id,
+             inverse_of: :postable,
+             dependent: :destroy
+
+    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
+      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')
+      end
+    end
+
+    before_validation :ensure_user_in_private_users
 
     def self.find_by_slug(slug)
       friendly.find(slug)
@@ -18,43 +50,25 @@ module Thredded
       raise Thredded::Errors::PrivateTopicNotFound
     end
 
-    def decorate
-      TopicDecorator.new(self)
-    end
-
-    def user_topic_reads
-      []
-    end
-
-    def categories
-      []
-    end
-
-    def self.for_user(user)
-      joins(:private_users)
-        .where(thredded_private_users: { user_id: user.id })
-    end
-
-    def add_user(user)
-      if String == user.class
-        user = Thredded.user_class.find_by_name(user)
-      end
-
-      users << user
-    end
-
     def public?
       false
     end
 
-    def user_id=(ids)
-      return unless ids.size > 0
+    def should_generate_new_friendly_id?
+      slug.blank? || title_changed? || super
+    end
+
+    private
 
-      self.users = Thredded.user_class.where(id: ids.uniq)
+    def slug_candidates
+      [
+        :title,
+        [:title, '-topic']
+      ]
     end
 
-    def users_to_sentence
-      users.map { |user| user.to_s.capitalize }.to_sentence
+    def ensure_user_in_private_users
+      users << user if user.present? && !users.include?(user)
     end
   end
 end

data/app/models/thredded/private_user.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 module Thredded
   class PrivateUser < ActiveRecord::Base
-    belongs_to :private_topic
-    belongs_to :user, class_name: Thredded.user_class
+    belongs_to :private_topic, inverse_of: :private_users
+    belongs_to :user, class_name: Thredded.user_class, inverse_of: :thredded_private_users
   end
 end

data/app/models/thredded/stats.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   class Stats
     include ActionView::Helpers::NumberHelper

data/app/models/thredded/topic.rb

@@ -1,17 +1,34 @@
-require 'thredded/search_sql_builder'
-
+# frozen_string_literal: true
+require_dependency 'thredded/topics_search'
 module Thredded
   class Topic < ActiveRecord::Base
     include TopicCommon
 
     scope :for_messageboard, -> messageboard { where(messageboard_id: messageboard.id) }
 
+    scope :stuck, -> { where(sticky: true) }
+    scope :unstuck, -> { where(sticky: false) }
+
+    # Using `search_query` instead of `search` to avoid conflict with Ransack.
+    scope :search_query, -> query { ::Thredded::TopicsSearch.new(query, self).search }
+
+    scope :order_sticky_first, -> { order(sticky: :desc) }
+
     extend FriendlyId
-    friendly_id :title, use: [:history, :scoped], scope: :messageboard
+    friendly_id :slug_candidates,
+                use:            [:history, :reserved, :scoped],
+                scope:          :messageboard,
+                # Avoid route conflicts
+                reserved_words: ::Thredded::FriendlyIdReservedWordsAndPagination.new(%w(topics))
+
+    belongs_to :user,
+               class_name: Thredded.user_class,
+               inverse_of: :thredded_topics
 
     belongs_to :messageboard,
                counter_cache: true,
-               touch: true
+               touch: true,
+               inverse_of: :topics
     validates_presence_of :messageboard_id
 
     belongs_to :user_detail,
@@ -25,80 +42,39 @@ module Thredded
              foreign_key: :postable_id,
              inverse_of:  :postable,
              dependent:   :destroy
+    has_one :first_post, -> { order_oldest_first },
+            class_name:  'Thredded::Post',
+            foreign_key: :postable_id
+
     has_many :topic_categories, dependent: :destroy
     has_many :categories, through: :topic_categories
-    has_many :user_topic_reads, dependent: :destroy
-
-    def self.stuck
-      where(sticky: true)
-    end
-
-    def self.unstuck
-      where(sticky: false)
-    end
-
-    def self.order_by_updated_time
-      order('thredded_topics.updated_at DESC')
-    end
-
-    def self.order_by_stuck_and_updated_time
-      order('thredded_topics.sticky DESC, thredded_topics.updated_at DESC')
-    end
-
-    def self.search(query, messageboard)
-      results = find_by_sql(SearchSqlBuilder.new(query, messageboard).build)
-      fail(Thredded::Errors::EmptySearchResults, query) if results.empty?
-      results
-    end
+    has_many :user_read_states,
+             class_name: 'Thredded::UserTopicReadState',
+             foreign_key: :postable_id,
+             inverse_of: :postable,
+             dependent: :destroy
 
-    def self.find_by_slug_with_user_topic_reads!(slug)
-      includes(:user_topic_reads).friendly.find(slug)
+    def self.find_by_slug!(slug)
+      friendly.find(slug)
     rescue ActiveRecord::RecordNotFound
       raise Thredded::Errors::TopicNotFound
     end
 
-    def decorate
-      TopicDecorator.new(self)
-    end
-
     def public?
       true
     end
 
-    # rubocop:disable all
-    def self.inherited(child)
-      child.instance_eval do
-        def model_name
-          Topic.model_name
-        end
-      end
-
-      super
-    end
-    # rubocop:enable all
-
-    def self.select_options
-      subclasses.map(&:to_s).sort
-    end
-
-    def self.recent
-      limit(10)
-    end
-
-    def updating?
-      id.present?
-    end
-
-    def categories_to_sentence
-      categories.map(&:name).to_sentence if categories.any?
+    def should_generate_new_friendly_id?
+      slug.blank? || title_changed? || super
     end
 
-    def users_to_sentence
-      []
-    end
+    private
 
-    def should_generate_new_friendly_id?
-      title_changed?
+    def slug_candidates
+      [
+        :title,
+        [:title, '-topic'],
+      ]
     end
   end
 end

data/app/models/thredded/topic_category.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   class TopicCategory < ActiveRecord::Base
     belongs_to :category

data/app/models/thredded/user_detail.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 module Thredded
   class UserDetail < ActiveRecord::Base
-    belongs_to :user, class_name: Thredded.user_class
+    belongs_to :user, class_name: Thredded.user_class, inverse_of: :thredded_user_detail
     validates :user_id, presence: true
 
     has_many :topics, class_name: 'Thredded::Topic', foreign_key: :user_id, primary_key: :user_id
@@ -8,19 +9,5 @@ module Thredded
     has_many :private_posts, class_name: 'Thredded::PrivatePost', foreign_key: :user_id, primary_key: :user_id
 
     scope :recently_active, -> { where(arel_table[:last_seen_at].gt(Thredded.active_user_threshold.ago)) }
-
-    # Find or create and return a {UserDetail} for a given user.
-    # @param user [Thredded.user_class]
-    # @return [Thredded::UserDetail] a persisted UserDetail.
-    def self.for_user(user)
-      for_user_id(user.id)
-    end
-
-    # Find or create and return a {UserDetail} for a given user ID.
-    # @param user_id [Fixnum, String]
-    # @return [Thredded::UserDetail] a persisted UserDetail.
-    def self.for_user_id(user_id)
-      where(user_id: user_id).first_or_create!
-    end
   end
 end

data/app/models/thredded/user_extender.rb

@@ -1,9 +1,4 @@
-require_relative './user_permissions/read/all'
-require_relative './user_permissions/write/all'
-require_relative './user_permissions/message/readers_of_writeable_boards'
-require_relative './user_permissions/moderate/if_moderator_column_true'
-require_relative './user_permissions/admin/if_admin_column_true'
-
+# frozen_string_literal: true
 module Thredded
   module UserExtender
     extend ActiveSupport::Concern
@@ -15,15 +10,35 @@ module Thredded
     include ::Thredded::UserPermissions::Admin::IfAdminColumnTrue
 
     included do
-      has_many :thredded_notification_preferences, class_name: 'Thredded::NotificationPreference', foreign_key: 'user_id'
-      has_many :thredded_posts, class_name: 'Thredded::Post', foreign_key: 'user_id'
-      has_many :thredded_private_topics, through: :thredded_private_users, class_name: 'Thredded::PrivateTopic', source: :private_topic
-      has_many :thredded_private_users, class_name: 'Thredded::PrivateUser', foreign_key: 'user_id'
-      has_many :thredded_topics, class_name: 'Thredded::Topic', foreign_key: 'user_id'
-      has_many :thredded_read_topics, class_name: 'Thredded::UserTopicRead', foreign_key: 'user_id'
+      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_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'
+      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_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_one :thredded_user_detail, class_name: 'Thredded::UserDetail'
+        opt.has_one :thredded_user_preference, class_name: 'Thredded::UserPreference'
+      end
+
+      has_many :thredded_private_topics,
+               through:    :thredded_private_users,
+               class_name: 'Thredded::PrivateTopic',
+               source:     :private_topic
+    end
 
-      has_one :thredded_user_detail, class_name: 'Thredded::UserDetail', foreign_key: 'user_id'
-      has_one :thredded_user_preference, class_name: 'Thredded::UserPreference', foreign_key: 'user_id'
+    def thredded_user_preference
+      super || build_thredded_user_preference
     end
 
     def thredded_anonymous?

data/app/models/thredded/user_messageboard_preference.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+module Thredded
+  class UserMessageboardPreference < ActiveRecord::Base
+    belongs_to :user_preference,
+               primary_key: :user_id,
+               foreign_key: :user_id,
+               inverse_of: :messageboard_preferences
+    belongs_to :user,
+               class_name: Thredded.user_class,
+               inverse_of: :thredded_user_messageboard_preferences
+    belongs_to :messageboard
+
+    validates :user_id, presence: true
+    validates :messageboard_id, presence: true
+
+    def self.in(messageboard)
+      where(messageboard_id: messageboard.id).first_or_initialize
+    end
+  end
+end

data/app/models/thredded/user_permissions/admin/if_admin_column_true.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   module UserPermissions
     module Admin

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   module UserPermissions
     module Admin

data/app/models/thredded/user_permissions/message/readers_of_writeable_boards.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   module UserPermissions
     module Message

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   module UserPermissions
     module Moderate

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   module UserPermissions
     module Moderate

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   module UserPermissions
     module Read

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   module UserPermissions
     module Write

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   module UserPermissions
     module Write

data/app/models/thredded/user_preference.rb

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
 module Thredded
   class UserPreference < ActiveRecord::Base
-    belongs_to :user, class_name: Thredded.user_class
+    belongs_to :user, class_name: Thredded.user_class, inverse_of: :thredded_user_preference
+    has_many :messageboard_preferences,
+             class_name: 'Thredded::UserMessageboardPreference',
+             primary_key: :user_id,
+             foreign_key: :user_id,
+             inverse_of: :user_preference
     validates :user_id, presence: true
   end
 end

data/app/models/thredded/user_private_topic_read_state.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module Thredded
+  class UserPrivateTopicReadState < ActiveRecord::Base
+    include UserTopicReadStateCommon
+    belongs_to :user,
+               class_name: Thredded.user_class,
+               inverse_of: :thredded_private_topic_read_states
+    belongs_to :postable,
+               class_name: 'Thredded::PrivateTopic',
+               inverse_of: :user_read_states
+  end
+end