From 5948364ec297017538e036d7e706330b295a618c Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 20 Aug 2015 19:36:01 +0100 Subject: [PATCH] Annotate & fix style --- app/models/topic.rb | 15 ++++++++------- spec/models/forumer_spec.rb | 15 +++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index 31800ab..d1b1fe1 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -42,13 +42,14 @@ class Topic < ActiveRecord::Base acts_as_readable def self.recent_topics - Post.joins("LEFT OUTER JOIN topics ON topics.id = posts.topic_id") - .joins("LEFT OUTER JOIN forums on forums.id = topics.forum_id") - .joins("LEFT OUTER JOIN forumers on forums.id = forumers.forum_id") - .order("posts.id desc") - .where("forumers.id IS NULL") - .select("DISTINCT topic_id") - .limit(5).map(&:topic) + Post.joins("LEFT OUTER JOIN topics ON topics.id = posts.topic_id"). + joins("LEFT OUTER JOIN forums on forums.id = topics.forum_id"). + joins("LEFT OUTER JOIN forumers on forums.id = forumers.forum_id"). + order("posts.id desc"). + where("forumers.id IS NULL"). + select("DISTINCT topic_id"). + limit(5). + map(&:topic) end def to_s diff --git a/spec/models/forumer_spec.rb b/spec/models/forumer_spec.rb index 7c04f29..c66b284 100644 --- a/spec/models/forumer_spec.rb +++ b/spec/models/forumer_spec.rb @@ -1,14 +1,13 @@ # == Schema Information # -# Table name: forums +# Table name: forumers # -# id :integer not null, primary key -# title :string(255) -# description :string(255) -# category_id :integer -# created_at :datetime -# updated_at :datetime -# position :integer +# id :integer not null, primary key +# forum_id :integer +# group_id :integer +# access :integer +# created_at :datetime +# updated_at :datetime # require "spec_helper"