thredded 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbf9d4e29edeea27a73efed02c03710eaa1f7530
-  data.tar.gz: a3c14e476dbbe413c60dc52fce7c712152cd5743
+  metadata.gz: a68e85a7ae96d4689ef3ab6c56affe335882cf0f
+  data.tar.gz: 47792dcbde12d63235c02a4257931777742e1823
 SHA512:
-  metadata.gz: 07f3f002cf28edd4d5a7a30b2f10651eac57327ce22a28481aa07167922a7ad89872df0e1b8b33693b1ce52b034830212f1a6677aed5bb61138c67914f2bba36
-  data.tar.gz: 3d03b68a94ecb9ce235ea772545c930c1b9ed62ea3e2bcbb353bf171a1dd8f63b13c79a46f65ab6d266b81ab6dd48a87478edeb5401fdd4422083140afe8d00a
+  metadata.gz: 34c5c730348e014f85376364231c51c6941fed5e4b0c51bf041c0bb4340427a3fdc54dd4a693aca8a7f3f5e632df13e19b15c1fc2430bd343a323e73bf5aa132
+  data.tar.gz: bc03a54520ce87f0454888ec6e61511d99cffcbca412f77392a60b103879b2b040153496956496785793c26bfa2dcb54f1ebc58a30a38f1c6b5bdd4977e1961f

data/app/controllers/thredded/application_controller.rb

@@ -2,21 +2,27 @@ module Thredded
   class ApplicationController < ::ApplicationController
     helper Thredded::Engine.helpers
     helper_method :messageboard, :topic, :preferences
+    before_filter :update_user_activity
 
     rescue_from CanCan::AccessDenied do |exception|
-      flash[:error] = exception.message
-      redirect_to root_path
+      redirect_to root_path, alert: exception.message
     end
 
     private
 
+    def update_user_activity
+      if messageboard && current_user
+        messageboard.update_activity_for!(current_user)
+      end
+    end
+
     def current_ability
       @current_ability ||= Ability.new(current_user)
     end
 
     def messageboard
       if params.key? :messageboard_id
-        @messageboard ||= Messageboard.find(params[:messageboard_id])
+        @messageboard ||= Messageboard.where(slug: params[:messageboard_id]).first
       end
     end
 
@@ -38,13 +44,5 @@ module Thredded
           flash: { error: 'This messageboard does not exist.' }
       end
     end
-
-    def user_messageboard_preferences
-      @user_messageboard_preferences ||=
-        current_user
-          .thredded_messageboard_preferences
-          .where(messageboard_id: messageboard)
-          .first
-    end
   end
 end

data/app/controllers/thredded/emails_controller.rb

@@ -0,0 +1,4 @@
+module Thredded
+  class EmailsController < ::Griddler::EmailsController
+  end
+end

data/app/controllers/thredded/messageboards_controller.rb

@@ -1,5 +1,5 @@
 module Thredded
-  class MessageboardsController < ApplicationController
+  class MessageboardsController < Thredded::ApplicationController
     before_filter :messageboard, only: :show
 
     def index

data/app/controllers/thredded/posts_controller.rb

@@ -1,28 +1,24 @@
 module Thredded
-  class PostsController < ApplicationController
-    include TopicsHelper
+  class PostsController < Thredded::ApplicationController
     load_and_authorize_resource only: [:index, :show]
-    before_filter :ensure_topic_exists
-    before_filter :pad_post, only: :create
-    helper_method :messageboard, :topic
+    helper_method :messageboard, :topic, :user_topic
+
+    rescue_from Thredded::Errors::TopicNotFound do |exception|
+      redirect_to messageboard_topics_path(messageboard),
+        alert: 'This topic does not exist.'
+    end
 
     def index
       authorize! :read, topic
 
-      @post = messageboard.posts.build(topic: topic, filter: post_filter)
-      @posts = Post.where(topic_id: topic).page(page)
-      @read_status = UserTopicRead
-        .find_or_create_by_user_and_topic(current_user, topic, page)
+      @posts = topic.posts.page(current_page)
+      @post  = messageboard.posts.build(topic: topic, filter: post_filter)
 
-      if not_inside_topic_and_in_an_old_page?
-        redirect_to_later_page and return
-      else
-        UserTopicRead.update_read_status!(current_user, topic, page)
-      end
+      update_read_status!
     end
 
     def create
-      topic.posts.create(params[:post])
+      topic.posts.create(post_params)
       redirect_to :back
     end
 
@@ -31,56 +27,56 @@ module Thredded
     end
 
     def update
-      post.update_attributes(params[:post])
+      post.update_attributes(post_params)
       redirect_to messageboard_topic_posts_url(messageboard, topic)
     end
 
     private
 
-    def topic
-      @topic ||= messageboard.topics.find(params[:topic_id])
-    end
-
-    def post
-      @post ||= topic.posts.find(params[:id])
-    end
-
-    def post_filter
-      user_messageboard_preferences.try(:filter) || :markdown
+    def post_params
+      params
+        .require(:post)
+        .permit!
+        .merge!(
+          ip: request.remote_ip,
+          user: current_user,
+          messageboard: messageboard,
+        )
     end
 
-    def not_inside_topic_and_in_an_old_page?
-      !internal_to_topic? && page == 1 && @read_status.page > 1
-    end
-
-    def page
-      params[:page].nil? ? 1 : params[:page].to_i
+    def update_read_status!
+      if current_user
+        read_history = UserTopicRead.where(
+          user: current_user,
+          topic: topic,
+        ).first_or_initialize
+
+        read_history.update_attributes(
+          farthest_post: @posts.last,
+          posts_count: topic.posts_count,
+          page: current_page,
+        )
+      end
     end
 
-    def extra_data
-      %Q{data-latest-read=#{@read_status.post_id || 0}} if @read_status
+    def topic
+      @topic ||= messageboard.topics.find_by_slug(params[:topic_id])
     end
 
-    def internal_to_topic?
-      referer = request.referer || ''
-      referer.include?("#{topic.id}?page=") || (!topic.slug.nil? && referer.include?("#{topic.slug}?page="))
+    def user_topic
+      @user_topic ||= UserTopicDecorator.new(current_user, topic)
     end
 
-    def redirect_to_later_page
-      redirect_to messageboard_topic_posts_path(messageboard, topic, page: @read_status.page)
+    def post
+      @post ||= topic.posts.find(params[:id])
     end
 
-    def pad_post
-      params[:post][:ip] = request.remote_ip
-      params[:post][:user] = current_user
-      params[:post][:messageboard] = messageboard
+    def post_filter
+      messageboard.preferences_for(current_user).filter
     end
 
-    def ensure_topic_exists
-      if topic.blank?
-        redirect_to default_home,
-          flash: { error: 'This topic does not exist.' }
-      end
+    def current_page
+      params[:page].nil? ? 1 : params[:page].to_i
     end
   end
 end

data/app/controllers/thredded/preferences_controller.rb

@@ -1,12 +1,12 @@
 module Thredded
-  class PreferencesController < ApplicationController
+  class PreferencesController < Thredded::ApplicationController
     helper_method :preference
 
     def edit
     end
 
     def update
-      preference.update_attributes(params[:messageboard_preference])
+      preference.update_attributes(preference_params)
 
       redirect_to :back, flash: { notice: 'Your preferences are updated' }
     end
@@ -16,5 +16,13 @@ module Thredded
         .where(messageboard_id: messageboard.id, user_id: current_user.id)
         .first_or_create!
     end
+
+    private
+
+    def preference_params
+      params
+        .require(:messageboard_preference)
+        .permit(:notify_on_mention, :notify_on_message, :filter)
+    end
   end
 end

data/app/controllers/thredded/private_topics_controller.rb

@@ -1,7 +1,16 @@
 module Thredded
-  class PrivateTopicsController < ApplicationController
+  class PrivateTopicsController < Thredded::ApplicationController
     before_filter :ensure_messageboard_exists
 
+    def index
+      if cannot? :read, messageboard
+        error = 'You are not authorized access to this messageboard.'
+        redirect_to default_home, flash: { error: error }
+      else
+        @private_topics = get_private_topics
+      end
+    end
+
     def new
       @private_topic = messageboard.private_topics.build
       @private_topic.posts.build(
@@ -21,5 +30,13 @@ module Thredded
       @private_topic = PrivateTopic.create(params[:topic])
       redirect_to messageboard_topics_url(messageboard)
     end
+
+    def get_private_topics
+      PrivateTopic
+        .for_messageboard(messageboard)
+        .including_roles_for(current_user)
+        .for_user(current_user)
+        .on_page(params[:page])
+    end
   end
 end

data/app/controllers/thredded/setups_controller.rb

@@ -1,11 +1,10 @@
 module Thredded
-  class SetupsController < ApplicationController
+  class SetupsController < Thredded::ApplicationController
     def new
       @messageboard = Messageboard.new
     end
 
     def create
-      messageboard_params = params[:messageboard]
       @messageboard = Messageboard.create(messageboard_params)
 
       if @messageboard.valid?
@@ -20,6 +19,12 @@ module Thredded
 
     private
 
+    def messageboard_params
+      params
+        .require(:messageboard)
+        .permit(:description, :name, :posting_permissions, :security)
+    end
+
     def topic_params
       {
         user: current_user,
@@ -28,9 +33,9 @@ module Thredded
         posts_attributes: {
           '0' => {
             content: "There's not a whole lot here for now.",
-            user: current_user,
             ip: '127.0.0.1',
-            messageboard: @messageboard
+            messageboard: @messageboard,
+            user: current_user,
           }
         }
       }

data/app/controllers/thredded/topics_controller.rb

@@ -1,6 +1,7 @@
 module Thredded
-  class TopicsController < ApplicationController
+  class TopicsController < Thredded::ApplicationController
     before_filter :ensure_messageboard_exists
+    helper_method :current_page
 
     def index
       if cannot? :read, messageboard
@@ -8,24 +9,24 @@ module Thredded
         redirect_to default_home, flash: { error: error }
       end
 
-      @sticky = get_sticky_topics
-      @topics = get_topics
-      @tracked_user_reads = UserTopicRead.statuses_for(current_user, @topics)
+      @topics = topics
     end
 
     def search
-      @topics = get_search_results
-      @tracked_user_reads = UserTopicRead.statuses_for(current_user, @topics)
+      @topics = search_results
 
       if @topics.empty?
         error = 'No topics found for this search.'
-        redirect_to messageboard_topics_path(messageboard), flash: { error: error }
+        redirect_to messageboard_topics_path(messageboard),
+          flash: { error: error }
       end
     end
 
     def new
       @topic = messageboard.topics.build
-      @topic.posts.build( filter: user_messageboard_preferences.try(:filter) )
+      @topic
+        .posts
+        .build(filter: messageboard.preferences_for(current_user).filter)
 
       unless can? :create, @topic
         error = 'Sorry, you are not authorized to post on this messageboard.'
@@ -35,13 +36,12 @@ module Thredded
     end
 
     def by_category
-      @sticky = get_sticky_topics
-      @topics = get_topics_by_category params[:category_id]
+      @topics = topics_by_category(params[:category_id])
       @category_name = Category.find(params[:category_id]).name
     end
 
     def create
-      @topic = messageboard.topics.create(topic_params)
+      @topic = messageboard.topics.create(topic_and_post_params)
       redirect_to messageboard_topics_path(messageboard)
     end
 
@@ -50,14 +50,7 @@ module Thredded
     end
 
     def update
-      params.deep_merge!({
-        topic: {
-          user: current_user,
-          last_user: current_user
-        }
-      })
-
-      topic.update_attributes(params[:topic])
+      topic.update_attributes(topic_params)
       redirect_to messageboard_topic_posts_url(messageboard, topic)
     end
 
@@ -65,57 +58,62 @@ module Thredded
 
     def topic
       if messageboard
-        @topic ||= messageboard.topics.find(params[:id])
+        @topic ||= messageboard.topics.where(slug: params[:id]).first
       end
     end
 
     def topic_params
-      params[:topic].deep_merge!({
-        last_user: current_user,
-        user: current_user,
-        posts_attributes: {
-          '0' => {
-            messageboard: messageboard,
-            ip: request.remote_ip,
-            user: current_user,
+      params
+        .require(:topic)
+        .permit!
+        .deep_merge!({
+          user: current_user,
+          last_user: current_user
+        })
+    end
+
+    def topic_and_post_params
+      params
+        .require(:topic)
+        .permit!
+        .deep_merge!({
+          last_user: current_user,
+          user: current_user,
+          posts_attributes: {
+            '0' => {
+              messageboard: messageboard,
+              ip: request.remote_ip,
+              user: current_user,
+            }
           }
-        }
-      })
+        })
     end
 
-    def get_search_results
+    def search_results
       Topic.full_text_search(params[:q], messageboard)
     end
 
-    def get_topics_by_category(category_id)
+    def topics_by_category(category_id)
       topics = Category.find(category_id)
         .topics
         .unstuck
+        .public
         .for_messageboard(messageboard)
         .order_by_updated
-        .on_page(params[:page])
+        .on_page(current_page)
     end
 
-    def get_topics
+    def topics
       Topic
-        .unstuck
+        .public
         .for_messageboard(messageboard)
-        .order_by_updated.on_page(params[:page])
-    end
-
-    def get_sticky_topics
-      if on_first_topics_page?
-        Topic
-          .stuck
-          .for_messageboard(messageboard)
-          .order('id DESC')
-      else
-        []
-      end
+        .includes(:user_topic_reads)
+        .order_by_stuck_and_updated_time
+        .on_page(current_page)
     end
 
-    def on_first_topics_page?
-      params[:page].nil? || params[:page] == '1'
+    def current_page
+      params[:page] || 1
     end
   end
 end