thredded 0.0.1 → 0.0.3

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

@@ -1,16 +1,19 @@
-<div class="topic_nav">
-  <% if can? :create, messageboard.topics.build %>
-    <ul class="actions">
-      <li class='new_topic'><%= link_to 'new topic', new_messageboard_topic_path(messageboard) %></li>
-      <li class='new_private_topic'><%= link_to 'private topic', new_messageboard_private_topic_path(messageboard) %></li>
-    </ul>
+<div class="topic_nav <%= controller_name %>">
+  <% cache ['topic-nav-actions', current_user] do %>
+    <% if can? :create, messageboard.topics.build %>
+      <ul class="actions">
+        <li class='new_topic'><%= link_to 'new topic', new_messageboard_topic_path(messageboard) %></li>
+        <li class='new_private_topic'><%= link_to 'private topic', new_messageboard_private_topic_path(messageboard) %></li>
+      </ul>
+    <% end %>
   <% end %>
 
   <ul class="listings">
-    <li class="topic_list"><%= link_to 'topics', messageboard_topics_path %></li>
-
-    <% if can? :list, messageboard.private_topics.build %>
-      <li class="private_topic_list"><%= link_to 'private topics', messageboard_private_topics_path %></li>
+    <% cache ['topic-nav-list', current_user] do %>
+      <li class="topic_list"><%= link_to 'topics', messageboard_topics_path %></li>
+      <% if can? :list, messageboard.private_topics.build %>
+        <li class="private_topic_list"><%= link_to 'private topics', messageboard_private_topics_path %></li>
+      <% end %>
     <% end %>
 
     <%= render 'thredded/search/form' %>

data/app/views/thredded/topic_mailer/message_notification.html.erb

@@ -5,7 +5,7 @@
 <hr />
 
 <p>
-  This email was sent to you because <%= @topic.user.name %> included you in a
+  This email was sent to you because <%= @topic.user %> included you in a
   private topic, "<%= link_to @topic.title, messageboard_topic_posts_url(@topic.messageboard, @topic) %>".
   Feel free to reply above or <%= link_to 'head to the thread', messageboard_topic_posts_url(@topic.messageboard, @topic) %>
   to view the conversation.

data/app/views/thredded/topic_mailer/message_notification.text.erb

@@ -4,7 +4,7 @@
 
 ---
 
-This email was sent to you because <%= @topic.user.name %>
+This email was sent to you because <%= @topic.user %>
 included you in the private topic "<%= @topic.title %>". Feel free to reply
 above or head to the following to view the conversation:
   <%= messageboard_topic_posts_url(@topic.messageboard, @topic) %>

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

@@ -0,0 +1,8 @@
+<% if thredded_abilities.can? :read, topic %>
+  <tr>
+    <td class="title table-first-column"> <%= topic.title %> </td>
+    <td class="replies"> <%= topic.posts_count %> </td>
+    <td class="created"> <%= formatted_user_profile_date(topic.created_at) %> </td>
+    <td class="updated"> <%= formatted_user_profile_date(topic.updated_at) %> </td>
+  </tr>
+<% end %>

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

@@ -3,8 +3,12 @@
     <div class="post_count"><%= topic.posts_count %></div>
 
     <h1>
-      <%= link_to topic.title, [messageboard, topic],
-        class: already_read(topic, @tracked_user_reads) %>
+      <%= link_to topic.title,
+        paged_messageboard_topic_posts_path(
+          messageboard.slug,
+          topic.slug,
+          topic.farthest_page
+        ) %>
     </h1>
 
     <cite class="updated_by">

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

@@ -5,48 +5,27 @@
   </ul>
 <% end %>
 
-<% content_for :actions do %>
-  <ul class="actions">
-    <%= render 'thredded/search/form' %>
-
-    <% if can? :create, Thredded::Topic %>
-      <li class='new_topic'>
-        <%= link_to 'new topic', new_messageboard_topic_path(messageboard) %>
-      </li>
-      <li class='new_private_topic'>
-        <%= link_to 'private topic', new_messageboard_private_topic_path(messageboard) %>
-      </li>
-    <% end %>
-  </ul>
-<% end %>
-
 <header>
   <nav>
     <%= yield :breadcrumbs %>
-    <%= yield :actions %>
   </nav>
 
   <%= render 'thredded/shared/currently_online' %>
+  <%= render 'thredded/shared/topic_nav' %>
 </header>
 
-<section class="topics">
-  <% if @sticky.any? %>
-    <div class="stuck">
-      <%= render partial: 'thredded/topics/topic_condensed',
-        collection: @sticky.decorate, as: :topic %>
-    </div>
-  <% end %>
-
+<section class="topics" id="topics_listing">
   <div class="currently">
     <%= render partial: 'thredded/topics/topic_condensed',
-      collection: @topics.decorate, as: :topic %>
+      collection: Thredded::UserTopicDecorator.decorate_all(current_user, @topics),
+      as: :topic %>
   </div>
 </section>
 
 <footer>
   <%= paginate @topics %>
+
   <nav>
-    <%= yield :actions %>
     <%= yield :breadcrumbs %>
   </nav>
 </footer>

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

@@ -8,7 +8,7 @@
   </nav>
 </header>
 
-<div class="topic form">
+<div class="topic forms">
   <%= nested_form_for [messageboard, @topic], html: { multipart: true } do |form| %>
     <ul>
       <%= render 'form', form: form, messageboard: messageboard.decorate %>

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

@@ -1,45 +1,30 @@
 <% content_for :breadcrumbs do %>
   <ul class="breadcrumbs">
     <li><%= link_to 'Forums', thredded.root_path %></li>
-    <li><%= link_to messageboard.title,
+    <li><%= link_to messageboard.name,
       messageboard_topics_path(messageboard) %></li>
     <li><span>Results for "<%= params[:q]%>"</span></li>
   </ul>
 <% end %>
 
-<% content_for :actions do %>
-  <ul class="actions">
-    <%= render 'thredded/search/form' %>
-
-    <% if can? :create, Thredded::Topic %>
-      <li class='new_topic'>
-        <%= link_to 'new topic', new_messageboard_topic_path(messageboard) %>
-      </li>
-      <li class='new_private_topic'>
-        <%= link_to 'private topic', new_messageboard_private_topic_path(messageboard) %>
-      </li>
-    <% end %>
-  </ul>
-<% end %>
-
 <header>
   <nav>
     <%= yield :breadcrumbs %>
-    <%= yield :actions %>
   </nav>
 
-  <%= render partial: 'shared/currently_online' %>
+  <%= render 'thredded/shared/currently_online' %>
+  <%= render 'thredded/shared/topic_nav' %>
 </header>
 
-<section class="topics">
+<section class="topics" id="topics_listing">
   <div class="currently">
-    <%= render partial: 'topics/topic_condensed', collection: @topics, as: :t %>
+    <%= render partial: 'thredded/topics/topic_condensed',
+      collection: @topics.map(&:decorate), as: :topic %>
   </div>
 </section>
 
 <footer>
   <nav>
-    <%= yield :actions %>
     <%= yield :breadcrumbs %>
   </nav>
 </footer>

data/config/initializers/griddler.rb

@@ -0,0 +1,4 @@
+::Griddler.configure do |config|
+  config.processor_class = Thredded::EmailProcessor
+  config.to = :token
+end

data/config/routes.rb

@@ -1,6 +1,8 @@
 require 'thredded/setup_thredded'
 
 Thredded::Engine.routes.draw do
+  post '/mail/receive' => 'emails#create', as: :mail_receive
+
   constraints(Thredded::SetupThredded.new) do
     resources :setups, path: '', only: [:new, :create]
     root to: 'setups#new'
@@ -10,17 +12,18 @@ Thredded::Engine.routes.draw do
     get '/:messageboard_id(.:format)' => 'topics#search', as: :messageboard_search
   end
 
+  get '/:messageboard_id/preferences/edit' => 'preferences#edit'
   get '/:messageboard_id/new(.:format)' => 'topics#new', as: :new_messageboard_topic
-  get '/:messageboard_id/:id/edit.(:format)' => 'topics#edit', as: :edit_messageboard_topic
+  get '/:messageboard_id/:id/edit(.:format)' => 'topics#edit', as: :edit_messageboard_topic
+  get '/:messageboard_id/:topic_id/:page(.:format)' => 'posts#index',
+    as: :paged_messageboard_topic_posts, constraints: { page: /\d+/ }
 
   resources :messageboards, only: [:index], path: '' do
-    resource :preferences
-    resources :private_topics, only: [:new, :create]
+    resource :preferences, only: [:edit, :update]
+    resources :private_topics, only: [:new, :create, :index]
 
     resources :topics, except: [:show], path: '' do
       resources :posts, path: ''
     end
   end
-
-  root to: 'messageboards#index'
 end

data/db/migrate/20131005032727_prevent_null_sticky_and_locked.rb

@@ -0,0 +1,15 @@
+class PreventNullStickyAndLocked < ActiveRecord::Migration
+  def up
+    change_column_null :thredded_topics, :sticky, false, false
+    change_column_null :thredded_topics, :locked, false, false
+    change_column_null :thredded_topics, :posts_count, false, 0
+    remove_column :thredded_topics, :attribs
+  end
+
+  def down
+    add_column :thredded_topics, :attribs, :string, default: '[]'
+    change_column_null :thredded_topics, :posts_count, true
+    change_column_null :thredded_topics, :sticky, true
+    change_column_null :thredded_topics, :locked, true
+  end
+end

data/db/migrate/20131014014258_uniqs_on_user_topic_read.rb

@@ -0,0 +1,9 @@
+class UniqsOnUserTopicRead < ActiveRecord::Migration
+  def up
+    add_index :thredded_user_topic_reads, [:user_id, :topic_id], unique: true
+  end
+
+  def down
+    remove_index :thredded_user_topic_reads, [:user_id, :topic_id]
+  end
+end

data/db/migrate/20131019014258_index_necessary_columns.rb

@@ -0,0 +1,24 @@
+class IndexNecessaryColumns < ActiveRecord::Migration
+  def change
+    add_index :thredded_attachments, :post_id
+    add_index :thredded_categories, :messageboard_id
+    add_index :thredded_images, :post_id
+    add_index :thredded_post_notifications, :post_id
+    add_index :thredded_messageboards, :slug
+
+    add_index :thredded_posts, :user_id
+    add_index :thredded_posts, :topic_id
+    add_index :thredded_posts, :messageboard_id
+
+    add_index :thredded_private_users, :private_topic_id
+    add_index :thredded_private_users, :user_id
+
+    add_index :thredded_topic_categories, :topic_id
+    add_index :thredded_topic_categories, :category_id
+
+    add_index :thredded_topics, :user_id
+    add_index :thredded_topics, :last_user_id
+    add_index :thredded_topics, :messageboard_id
+    add_index :thredded_topics, :hash_id
+  end
+end

data/lib/thredded.rb

@@ -1,9 +1,12 @@
 require 'thredded/engine'
 require 'cancan'
 require 'carrierwave'
+require 'griddler'
 require 'kaminari'
 require 'friendly_id'
 require 'nested_form'
+require 'thredded/email_processor'
+require 'thredded/errors'
 require 'thredded/filter/base'
 require 'thredded/filter/at_notification'
 require 'thredded/filter/attachment'

data/lib/thredded/at_notifier.rb

@@ -18,7 +18,7 @@ module Thredded
 
     def at_notifiable_members
       at_names = Thredded::AtNotificationExtractor.new(post.content).extract
-      members = post.messageboard.members_from_list(at_names).all
+      members = post.messageboard.members_from_list(at_names).to_a
 
       members.delete post.user
       members = exclude_previously_notified(members)
@@ -49,7 +49,9 @@ module Thredded
     end
 
     def exclude_previously_notified(members)
-      emails_notified = post.post_notifications.map(&:email)
+      emails_notified = Thredded::PostNotification
+        .where(post_id: post.id)
+        .map(&:email)
 
       members.reject do |member|
         emails_notified.include? member.email

data/lib/thredded/at_users.rb

@@ -7,8 +7,8 @@ module Thredded
       members = messageboard.members_from_list(at_names)
 
       members.each do |member|
-        content.gsub!(/@#{member.name}/i,
-          %Q{<a href="/users/#{member.name}">@#{member.name}</a>})
+        content.gsub!(/@#{member.to_s}/i,
+          %Q{<a href="/users/#{member.to_s}">@#{member.to_s}</a>})
       end
 
       content

data/lib/thredded/email_processor.rb

@@ -1,74 +1,76 @@
-class EmailProcessor
-  attr_accessor :email, :messageboard, :user
+module Thredded
+  class EmailProcessor
+    attr_accessor :email, :messageboard, :user
 
-  def initialize(email)
-    @email = email
-    @user = find_user
-    @messageboard = find_messageboard
-  end
+    def initialize(email)
+      @email = email
+      @user = find_user
+      @messageboard = find_messageboard
+    end
 
-  def self.process(email)
-    processor = self.new(email)
-    processor.create_or_update_topic
-  end
+    def self.process(email)
+      processor = self.new(email)
+      processor.create_or_update_topic
+    end
 
-  def create_or_update_topic
-    if can_post_to_topic?
-      topic = find_or_build_topic
-      post = topic.posts.build(
-        user: user,
-        content: email.body,
-        source: 'email',
-        messageboard: messageboard,
-        attachments_attributes: attachment_params,
-      )
-      post.user_email = user.email
+    def create_or_update_topic
+      if can_post_to_topic?
+        topic = find_or_build_topic
+        post = topic.posts.build(
+          user: user,
+          content: email.body,
+          source: 'email',
+          messageboard: messageboard,
+          attachments_attributes: attachment_params,
+        )
+        post.user_email = user.email
 
-      topic.save
-    else
-      return false
+        topic.save
+      else
+        return false
+      end
     end
-  end
 
-  private
+    private
+
+    def attachment_params
+      @attachment_params = {}
 
-  def attachment_params
-    @attachment_params = {}
+      email.attachments.each_with_index do |attachment, i|
+        @attachment_params[i.to_s] = { 'attachment' => attachment }
+      end
 
-    email.attachments.each_with_index do |attachment, i|
-      @attachment_params[i.to_s] = { 'attachment' => attachment }
+      @attachment_params
     end
 
-    @attachment_params
-  end
+    def can_post_to_topic?
+      user && messageboard &&
+        Thredded::Ability.new(user).can?(:create, messageboard.topics.new)
+    end
 
-  def can_post_to_topic?
-    user && messageboard &&
-      Ability.new(user).can?(:create, messageboard.topics.new)
-  end
+    def find_or_build_topic
+      topic = find_topic
 
-  def find_or_build_topic
-    topic = find_topic
+      if topic.nil?
+        topic = messageboard.topics.build(title: email.subject)
+        topic.user = user
+        topic.state = 'pending'
+      end
 
-    if topic.nil?
-      topic = messageboard.topics.build(title: email.subject)
-      topic.user = user
-      topic.state = 'pending'
+      topic.last_user = user
+      topic
     end
 
-    topic.last_user = user
-    topic
-  end
-
-  def find_topic
-    Topic.where(hash_id: email.to).first
-  end
+    def find_topic
+      Thredded::Topic.where(hash_id: email.to).first
+    end
 
-  def find_messageboard
-    Messageboard.where(name: email.to).first || find_topic.try(:messageboard)
-  end
+    def find_messageboard
+      Thredded::Messageboard.where(name: email.to).first || find_topic.try(:messageboard)
+    end
 
-  def find_user
-    User.where(email: email.from).first
+    def find_user
+      User.where(email: email.from).first
+    end
   end
 end