thredded 0.0.1 → 0.0.3

data/app/models/thredded/private_user.rb

@@ -1,6 +1,5 @@
 module Thredded
   class PrivateUser < ActiveRecord::Base
-    attr_accessible :private_topic_id, :user_id
     belongs_to :private_topic
     belongs_to :user
   end

data/app/models/thredded/role.rb

@@ -10,8 +10,6 @@ module Thredded
     validates_presence_of :messageboard_id
     validates_presence_of :user_id
 
-    attr_accessible :level, :messageboard_id, :user_id
-
     scope :for, lambda { |messageboard| where(messageboard_id: messageboard.id) }
     scope :as,  lambda { |role| where(level: role) }
   end

data/app/models/thredded/topic.rb

@@ -8,9 +8,10 @@ module Thredded
     friendly_id :title, use: :scoped, scope: :messageboard
     paginates_per 50 if self.respond_to?(:paginates_per)
 
-    has_many   :posts, include: :attachments
-    has_many   :topic_categories
-    has_many   :categories, through: :topic_categories
+    has_many :posts, -> { includes :attachments }
+    has_many :topic_categories
+    has_many :categories, through: :topic_categories
+    has_many :user_topic_reads
 
     belongs_to :last_user, class_name: Thredded.user_class,
       foreign_key: 'last_user_id'
@@ -26,28 +27,17 @@ module Thredded
     validates_numericality_of :posts_count
     validates_uniqueness_of :hash_id
 
-    attr_accessible :category_ids,
-      :last_user,
-      :locked,
-      :messageboard,
-      :posts_attributes,
-      :sticky,
-      :type,
-      :title,
-      :user,
-      :usernames
-
     accepts_nested_attributes_for :posts, reject_if: :updating?
     accepts_nested_attributes_for :categories
 
-    default_scope order('updated_at DESC')
-
     delegate :name, :name=, :email, :email=, to: :user, prefix: true
 
     before_validation do
       self.hash_id = SecureRandom.hex(10) if self.hash_id.nil?
     end
 
+    after_create :increment_topics_count
+
     def self.stuck
       where(sticky: true)
     end
@@ -64,8 +54,12 @@ module Thredded
       where(messageboard_id: messageboard.id)
     end
 
-    def self.order_by_updated
-      order('updated_at DESC')
+    def self.public
+      where("type IS NULL")
+    end
+
+    def self.order_by_stuck_and_updated_time
+      order('sticky DESC, updated_at DESC')
     end
 
     def self.full_text_search(query, messageboard)
@@ -85,13 +79,13 @@ module Thredded
       end
     end
 
-    def decorate
-      TopicDecorator.new(self)
+    def self.find_by_slug(slug)
+      where(slug: slug).includes(:user_topic_reads).first or
+        raise Thredded::Errors::TopicNotFound
     end
 
-    def create
-      UserDetail.increment_counter(:topics_count, user_id)
-      super
+    def decorate
+      TopicDecorator.new(self)
     end
 
     def last_user
@@ -132,6 +126,10 @@ module Thredded
       subclasses.map(&:to_s).sort
     end
 
+    def self.recent
+      limit(10)
+    end
+
     def updating?
       id.present?
     end
@@ -141,5 +139,11 @@ module Thredded
         categories.map(&:name).to_sentence
       end
     end
+
+    private
+
+    def increment_topics_count
+      UserDetail.increment_counter(:topics_count, user_id)
+    end
   end
 end

data/app/models/thredded/topic_category.rb

@@ -1,6 +1,5 @@
 module Thredded
   class TopicCategory < ActiveRecord::Base
-    attr_accessible :category_id, :topic_id
     belongs_to :category
     belongs_to :topic
   end

data/app/models/thredded/user_extender.rb

@@ -11,17 +11,11 @@ module Thredded
       has_many :thredded_private_users, class_name: 'Thredded::PrivateUser', foreign_key: 'user_id'
       has_many :thredded_roles, class_name: 'Thredded::Role', 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'
+      has_many :thredded_messageboards, through: :thredded_roles, class_name: 'Thredded::Messageboard', source: :messageboard
 
       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 self.recently_active_in(messageboard)
-        joins(:thredded_roles)
-          .where(thredded_roles: { messageboard_id: messageboard.id })
-          .where('thredded_roles.last_seen > ?', 5.minutes.ago)
-          .order('thredded_roles.last_seen')
-      end
     end
   end
 end

data/app/models/thredded/user_topic_read.rb

@@ -1,67 +1,9 @@
 module Thredded
   class UserTopicRead < ActiveRecord::Base
-    attr_accessible :page,
-      :post_id,
-      :posts_count,
-      :topic_id,
-      :user_id
-
-    attr_accessor :viewing_page, :viewing_topic
-
-    def self.find_or_create_by_user_and_topic(user, topic, page)
-      page = page.nil? ? 1 : page.to_i
-
-      if user
-        user_topic_read = find_by_user_id_and_topic_id(user.id, topic.id)
-
-        if user_topic_read.blank?
-          posts_count = [post_limit * (page - 1), topic.posts.size].min
-          posts_count = [posts_count, 1].max
-          last_post = topic.posts.each_slice(post_limit).to_a[page - 1].first
-
-          user_topic_read = create(
-            user_id: user.id,
-            topic_id: topic.id,
-            post_id: last_post.id,
-            posts_count: posts_count,
-            page: page
-          )
-        end
-
-        user_topic_read
-      else
-        NullTopicRead.new
-      end
-    end
-
-    def self.statuses_for(user, topics)
-      if user && topics
-        topic_ids = topics.map { |topic| topic.id  }
-        where('user_id = ?', user.id).find_all_by_topic_id(topic_ids)
-      end
-    end
-
-    def self.update_read_status!(user, topic, page)
-      user_id = user.nil? ? '0' : user.id
-      page = page.nil? ? 1 : page.to_i
-      post_id = topic.posts.each_slice(post_limit).to_a[page-1].last.id
-      posts_count = [post_limit * page, topic.posts.size].min
-
-      user_topic_read = find_by_user_id_and_topic_id(user_id, topic.id)
-
-      if user_topic_read && page >= user_topic_read.page && user_topic_read.post_id != post_id
-        user_topic_read.update_attributes(
-          post_id: post_id,
-          posts_count: posts_count,
-          page: page
-        )
-      end
-    end
-
-    private
-
-    def self.post_limit
-      Post.default_per_page
-    end
+    belongs_to :topic
+    belongs_to :user, class_name: Thredded.user_class
+    belongs_to :farthest_post,
+      class_name: 'Thredded::Post', foreign_key: 'post_id'
+    validates :user_id, uniqueness: { scope: :topic }
   end
 end

data/app/views/thredded/attachments/_attachment.html.erb

@@ -0,0 +1,7 @@
+<li>
+  <% if attachment.attachment %>
+    <%= link_to attachment.filename,
+                attachment.attachment.to_s,
+                data: { type: attachment.content_type } %>
+  <% end %>
+</li>

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

@@ -4,8 +4,8 @@
       <h2><%= link_or_text_to(messageboard) %></h2>
       <div class="meta"><%= meta_for(messageboard) %></div>
     </header>
+
     <% content_tag :p, messageboard.description if messageboard.description %>
-    <% admin_link_for(messageboard) %>
 
     <footer>
       <p>

data/app/views/thredded/post_mailer/at_notification.html.erb

@@ -5,7 +5,7 @@
 <hr />
 
 <p>
-  This email was sent to you because <%= @post.user.name %> mentioned you in
+  This email was sent to you because <%= @post.user %> mentioned you in
   "<%= link_to @post.topic.title, messageboard_topic_posts_url(@post.messageboard, @post.topic, anchor: "post_#{@post.id}") %>"
   Feel free to reply above or <%= link_to 'head to the thread', messageboard_topic_posts_url(@post.messageboard, @post.topic) %>
   to view the conversation.

data/app/views/thredded/post_mailer/at_notification.text.erb

@@ -4,7 +4,7 @@
 
 ---
 
-This email was sent to you because <%= @post.user.name %> mentioned you in
+This email was sent to you because <%= @post.user %> mentioned you in
 "<%= @post.topic.title %>". Feel free to reply above or head to the following
 to view the conversation:
   <%= messageboard_topic_posts_url @post.messageboard, @post.topic, anchor: "post_#{@post.id}" %>

data/app/views/thredded/posts/_post.html.erb

@@ -1,4 +1,5 @@
 <% post = Thredded::PostDecorator.new(post) %>
+
 <%= content_tag_for(:article, post) do %>
   <% cache post do %>
     <header>
@@ -17,8 +18,11 @@
 
   <footer>
     <% if can? :edit, post.original %>
-      <%= link_to 'edit post',
-        edit_messageboard_topic_post_path(messageboard, topic, post),
+      <%= link_to 'edit post', edit_messageboard_topic_post_path(
+          messageboard,
+          topic,
+          post
+        ),
         class: 'edit' %>
     <% end %>
   </footer>

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

@@ -1,25 +1,23 @@
+<% content_for :breadcrumbs do %>
+  <ul class="breadcrumbs">
+    <li><%= link_to 'Forums', thredded.root_path %></li>
+    <li><%= link_to messageboard.name, messageboard_topics_path(messageboard) %></li>
+    <li>
+      <span>
+        <%= topic.title %>
+
+        <% if can? :edit, topic %>
+          <%= link_to 'edit',
+            edit_messageboard_topic_path(messageboard, topic) %>
+        <% end %>
+      </span>
+    </li>
+  </ul>
+<% end %>
+
 <header>
   <nav>
-    <ul class="breadcrumbs">
-      <li><%= link_to 'Forums', thredded.root_path %></li>
-      <li><%= link_to messageboard.name, messageboard_topics_path(messageboard) %></li>
-      <li>
-        <span>
-          <%= topic.title %>
-
-          <% if can? :edit, topic %>
-            <%= link_to 'edit', edit_messageboard_topic_path(messageboard, topic) %>
-          <% end %>
-        </span>
-      </li>
-    </ul>
-    <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_topic_path(messageboard, type: 'private') %></li>
-      <% end %>
-    </ul>
+    <%= yield :breadcrumbs %>
   </nav>
 
   <% if topic.users_to_sentence.present? %>
@@ -30,10 +28,13 @@
   <%= render 'thredded/shared/topic_nav' %>
 </header>
 
-<%= content_tag_for :section, topic, class: topic.decorate.css_class do %>
+<%= content_tag_for :section, topic,
+  class: user_topic.css_class,
+  data: { 'latest-read' => user_topic.farthest_post.id } do %>
+
   <header><h1><%= topic.title %></h1></header>
 
-  <section class="posts">
+  <section class="posts" id="topics_posts">
     <%= render @posts %>
   </section>
 <% end %>
@@ -55,20 +56,6 @@
   <% end %>
 
   <nav>
-    <ul class="breadcrumbs">
-      <li><%= link_to 'Forums', thredded.root_path %></li>
-      <li><%= link_to messageboard.name,
-        messageboard_topics_path(messageboard) %></li>
-      <li>
-        <span>
-          <%= topic.title %>
-
-          <% if can? :edit, topic %>
-            <%= link_to 'edit',
-              edit_messageboard_topic_path(messageboard, topic) %>
-          <% end %>
-        </span>
-      </li>
-    </ul>
+    <%= yield :breadcrumbs %>
   </nav>
 </footer>

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

@@ -0,0 +1,15 @@
+<li class="title">
+  <%= form.label :title %>
+  <%= form.text_field :title, { placeholder: 'Title', autofocus: 'autofocus' } %>
+</li>
+
+<li class="private_users">
+  <%= form.select :user_id, messageboard.users_options,
+    { selected: form.object.users.map(&:id) },
+    {
+      multiple: true,
+      'data-placeholder' => 'select users to participate in this topic', 
+    } %>
+</li>
+
+<%= render 'thredded/topics/topic_form', form: form, messageboard: messageboard %>

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

@@ -0,0 +1,33 @@
+<% content_for :breadcrumbs do %>
+  <ul class="breadcrumbs">
+    <li><%= link_to 'Forums', thredded.root_path %></li>
+    <li><span><%= messageboard.name %></span></li>
+  </ul>
+<% end %>
+
+<header>
+  <nav>
+    <%= yield :breadcrumbs %>
+  </nav>
+
+  <%= render 'thredded/shared/currently_online' %>
+  <%= render 'thredded/shared/topic_nav' %>
+</header>
+
+<section class="topics" id="topics_listing">
+  <% if @private_topics.any? %>
+    <div class="currently">
+      <%= render partial: 'thredded/topics/topic_condensed',
+        collection: Thredded::UserTopicDecorator.decorate_all(current_user, @private_topics),
+        as: :topic %>
+    </div>
+  <% end %>
+</section>
+
+<footer>
+  <%= paginate @private_topics %>
+
+  <nav>
+    <%= yield :breadcrumbs %>
+  </nav>
+</footer>

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

@@ -0,0 +1,24 @@
+<header>
+  <nav>
+    <ul class="breadcrumbs">
+      <li><%= link_to 'Forums', thredded.root_path %></li>
+      <li><%= link_to messageboard.name, [messageboard, @private_topic] %></li>
+      <li><span>Create New Topic</span></li>
+    </ul>
+  </nav>
+</header>
+
+
+<div class="topics forms">
+  <%= nested_form_for([messageboard, @private_topic],
+    html: { multipart: true, class: :topic_form }) do |form| %>
+
+    <ul>
+      <%= render 'form', form: form, messageboard: messageboard.decorate %>
+
+      <li class="submit">
+        <%= form.submit 'Create New Private Topic' %>
+      </li>
+    </ul>
+  <% end %>
+</div>

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

@@ -2,8 +2,8 @@
   <div class="online">
     <h3>Currently Online</h3>
     <ul>
-      <% messageboard.active_users.each do |u| %>
-       <li><%= u.name %></li>
+      <% messageboard.active_users.each do |user| %>
+       <li><%= user %></li>
       <% end %>
     </ul>
   </div>