thredded 0.0.1 → 0.0.3

data/app/decorators/thredded/post_decorator.rb

@@ -9,7 +9,7 @@ module Thredded
 
     def user_name
       if user
-        user.name
+        user.to_s
       else
         'Anonymous'
       end

data/app/decorators/thredded/topic_decorator.rb

@@ -19,19 +19,11 @@ module Thredded
       classes.join(' ')
     end
 
-    def user_link
-      if user.nil?
-        '<a href="#">?</a>'.html_safe
-      else
-        "<a href='/users/#{user_name}'>#{user_name}</a>".html_safe
-      end
-    end
-
     def last_user_link
       if last_user.nil?
         'Anonymous'
       else
-        "<a href='/users/#{last_user.name}'>#{last_user.name}</a>".html_safe
+        "<a href='/users/#{last_user}'>#{last_user}</a>".html_safe
       end
     end
 

data/app/decorators/thredded/user_topic_decorator.rb

@@ -0,0 +1,88 @@
+module Thredded
+  class UserTopicDecorator
+    extend ActiveModel::Naming
+    include ActiveModel::Conversion
+
+    def initialize(user, topic)
+      @user = user || NullUser.new
+      @topic = topic
+    end
+
+    def method_missing(meth, *args)
+      if decorated_topic.respond_to?(meth)
+        decorated_topic.send(meth, *args)
+      else
+        super
+      end
+    end
+
+    def respond_to?(meth)
+      decorated_topic.respond_to?(meth)
+    end
+
+    def self.decorate_all(user, topics)
+      topics.map do |topic|
+        new(user, topic)
+      end
+    end
+
+    def self.model_name
+      ActiveModel::Name.new(self, nil, "Topic")
+    end
+
+    def persisted?
+      false
+    end
+
+    def read?
+      topic.posts_count == read_status.posts_count
+    end
+
+    def farthest_page
+      read_status.page
+    end
+
+    def farthest_post
+      read_status.farthest_post
+    end
+
+    def css_class
+      if read?
+        "read #{decorated_topic.css_class}"
+      else
+        "unread #{decorated_topic.css_class}"
+      end
+    end
+
+    def user_link
+      if user.valid?
+        "<a href='/users/#{topic.user_name}'>#{topic.user_name}</a>".html_safe
+      else
+        '<a href="#">?</a>'.html_safe
+      end
+    end
+
+
+    def decorated_topic
+      @decorated_topic ||= TopicDecorator.new(topic)
+    end
+
+    private
+
+    attr_reader :topic, :user
+
+    def read_status
+      if user.valid?
+        @read_status ||= topic.user_topic_reads.select do |reads|
+          reads.user_id == user.id
+        end
+      end
+
+      if @read_status.blank?
+        NullTopicRead.new
+      else
+        @read_status.first
+      end
+    end
+  end
+end

data/app/helpers/thredded/messageboard_helper.rb

@@ -15,14 +15,6 @@ module Thredded
         #{number_to_human posts} posts".downcase
     end
 
-    def admin_link_for(messageboard)
-      if can? :manage, messageboard
-        '<p class="admin"><a href="#edit">Edit</a></p>'
-      else
-        ''
-      end
-    end
-
     def latest_thread_for(messageboard)
       topic = messageboard.topics.first
 
@@ -43,7 +35,7 @@ module Thredded
 
     def latest_user_for(messageboard)
       if messageboard.topics.first.present? && messageboard.topics.first.user.present?
-        messageboard.topics.first.last_user.name
+        messageboard.topics.first.last_user.to_s
       else
         ''
       end

data/app/helpers/thredded/topics_helper.rb

@@ -1,21 +1,4 @@
 module Thredded
   module TopicsHelper
-    require 'digest/md5'
-
-    def md5(s)
-      Digest::MD5.hexdigest(s)
-    end
-
-    def already_read(topic, tracked_user_reads)
-      if tracked_user_reads
-        topic_status = tracked_user_reads.select{ |t| t.topic_id == topic.id }.first
-
-        if topic_status && topic_status.posts_count == topic.posts_count
-          'read'
-        else
-          'unread'
-        end
-      end
-    end
   end
 end

data/app/models/thredded/ability.rb

@@ -26,6 +26,10 @@ module Thredded
 
       cannot :manage, Thredded::PrivateTopic
 
+      can :list, Thredded::PrivateTopic do |private_topic|
+        Thredded::PrivateTopicUserPermissions.new(private_topic, user, user_details).listable?
+      end
+
       can :manage, Thredded::PrivateTopic do |private_topic|
         Thredded::PrivateTopicUserPermissions.new(private_topic, user, user_details).manageable?
       end
@@ -38,6 +42,10 @@ module Thredded
         Thredded::PrivateTopicUserPermissions.new(private_topic, user, user_details).readable?
       end
 
+      can :edit, Thredded::Post do |post|
+        Thredded::PostUserPermissions.new(post, user, user_details).editable?
+      end
+
       can :manage, Thredded::Post do |post|
         Thredded::PostUserPermissions.new(post, user, user_details).manageable?
       end

data/app/models/thredded/attachment.rb

@@ -2,7 +2,6 @@ module Thredded
   class Attachment < ActiveRecord::Base
     belongs_to :post
     validates_presence_of :attachment
-    attr_accessible :attachment
     mount_uploader :attachment, Thredded::AttachmentUploader
     before_save :update_attachment_attributes
 

data/app/models/thredded/category.rb

@@ -1,10 +1,9 @@
 module Thredded
   class Category < ActiveRecord::Base
-    attr_accessible :description, :messageboard_id, :name
-    validates :name, presence: true
-
     belongs_to :messageboard
     has_many :topic_categories
     has_many :topics, through: :topic_categories
+
+    validates :name, presence: true
   end
 end

data/app/models/thredded/image.rb

@@ -1,7 +1,6 @@
 module Thredded
   class Image < ActiveRecord::Base
     mount_uploader :image, ImageUploader
-    attr_accessible :height, :orientation, :width
     validates :image, presence: true
     before_validation :save_dimensions, :save_orientation, :save_position
 

data/app/models/thredded/messageboard.rb

@@ -6,13 +6,6 @@ module Thredded
     extend FriendlyId
     friendly_id :name
 
-    attr_accessible :description,
-      :name,
-      :posting_permission,
-      :security
-
-    default_scope where(closed: false).order('topics_count DESC')
-
     validates_numericality_of :topics_count
     validates_inclusion_of :security, in: SECURITY
     validates_inclusion_of :posting_permission, in: PERMISSIONS
@@ -32,6 +25,15 @@ module Thredded
     has_many :private_topics
     has_many :users, through: :roles, class_name: Thredded.user_class
 
+    def self.default_scope
+      where(closed: false).order('topics_count DESC')
+    end
+
+    def preferences_for(user)
+      @preferences_for ||=
+        messageboard_preferences.where(user_id: user).first || NullMessageboardPreference.new
+    end
+
     def active_users
       Role
         .joins(:user)
@@ -41,6 +43,12 @@ module Thredded
         .map(&:user)
     end
 
+    def update_activity_for!(user)
+      if role = roles.where(user_id: user).first
+        role.update_attribute(:last_seen, Time.now.utc)
+      end
+    end
+
     def decorate
       MessageboardDecorator.new(self)
     end

data/app/models/thredded/messageboard_decorator.rb

@@ -8,11 +8,11 @@ module Thredded
     end
 
     def category_options
-      messageboard.categories.collect { |cat| [cat.name, cat.id] }
+      messageboard.categories.map { |cat| [cat.name, cat.id] }
     end
 
     def users_options
-      messageboard.users.collect{ |user| [user.name, user.id] }
+      messageboard.users.map { |user| [user.to_s, user.id] }
     end
   end
 end

data/app/models/thredded/messageboard_preference.rb

@@ -1,6 +1,5 @@
 module Thredded
   class MessageboardPreference < ActiveRecord::Base
-    attr_accessible :notify_on_mention, :notify_on_message, :filter
     belongs_to :user
     belongs_to :messageboard
 

data/app/models/thredded/null_messageboard_preference.rb

@@ -0,0 +1,7 @@
+module Thredded
+  class NullMessageboardPreference
+    def filter
+      'markdown'
+    end
+  end
+end

data/app/models/thredded/null_preference.rb

@@ -1,9 +1,11 @@
-class NullPreference
-  def notify_on_mention
-    true
-  end
+module Thredded
+  class NullPreference
+    def notify_on_mention
+      true
+    end
 
-  def notify_on_message
-    true
+    def notify_on_message
+      true
+    end
   end
 end

data/app/models/thredded/null_topic_read.rb

@@ -1,13 +1,19 @@
-class NullTopicRead
-  def update_status(topic)
-    # ¯\_(ツ)_/¯
-  end
+module Thredded
+  class NullTopicRead
+    def page
+      1
+    end
 
-  def page
-    0
-  end
+    def post_id
+      0
+    end
+
+    def posts_count
+      0
+    end
 
-  def post_id
-    0
+    def farthest_post
+      Post.new
+    end
   end
 end

data/app/models/thredded/null_user.rb

@@ -4,6 +4,10 @@ module Thredded
       false
     end
 
+    def thredded_private_topics
+      false
+    end
+
     def can_read_messageboard?(messageboard)
       messageboard.public?
     end
@@ -20,6 +24,10 @@ module Thredded
       'Anonymous User'
     end
 
+    def to_s
+      name
+    end
+
     def valid?
       false
     end

data/app/models/thredded/post.rb

@@ -1,6 +1,8 @@
+require 'thredded/at_notifier'
+require 'gravtastic'
+
 module Thredded
   class Post  < ActiveRecord::Base
-    require 'gravtastic'
     include Gravtastic
     include Thredded::Filter::Base
     include Thredded::Filter::Textile
@@ -13,17 +15,6 @@ module Thredded
     gravtastic :user_email
     paginates_per 50
 
-    attr_accessible :attachments_attributes,
-      :content,
-      :filter,
-      :ip,
-      :messageboard,
-      :source,
-      :topic,
-      :user
-
-    default_scope order: 'id ASC'
-
     belongs_to :messageboard, counter_cache: true
     belongs_to :topic, counter_cache: true
     belongs_to :user, class_name: Thredded.user_class
@@ -35,11 +26,11 @@ module Thredded
     validates_presence_of :content, :messageboard_id
 
     before_validation :set_user_email
-    after_create  :modify_parent_topic
+    after_save :notify_at_users
+    after_create :modify_parent_posts_counts
 
-    def create
-      UserDetail.increment_counter(:posts_count, user_id)
-      super
+    def self.default_scope
+      order('id ASC')
     end
 
     def created_date
@@ -60,7 +51,8 @@ module Thredded
 
     private
 
-    def modify_parent_topic
+    def modify_parent_posts_counts
+      UserDetail.increment_counter(:posts_count, user_id)
       topic.last_user = user
       topic.touch
       topic.save
@@ -71,5 +63,9 @@ module Thredded
         self.user_email = user.email
       end
     end
+
+    def notify_at_users
+      AtNotifier.new(self).notifications_for_at_users
+    end
   end
 end

data/app/models/thredded/post_notification.rb

@@ -1,6 +1,5 @@
 module Thredded
   class PostNotification < ActiveRecord::Base
-    attr_accessible :email, :post_id
     belongs_to :post
   end
 end

data/app/models/thredded/private_topic.rb

@@ -2,7 +2,16 @@ module Thredded
   class PrivateTopic < Thredded::Topic
     has_many :private_users
     has_many :users, through: :private_users
-    attr_accessible :user_id
+
+    def self.including_roles_for(user)
+      joins(messageboard: :roles)
+        .where(thredded_roles: {user_id: user.id})
+    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
@@ -27,7 +36,7 @@ module Thredded
     end
 
     def users_to_sentence
-      users.map{ |user| user.name.capitalize }.to_sentence
+      users.map{ |user| user.to_s.capitalize }.to_sentence
     end
   end
 end