Merge branch 'fix_lazy_queries' into stable

Conflicts: app/controllers/public/content_viewer_controller.rb

Merge branch 'fix_lazy_queries' into stable
Conflicts: app/controllers/public/content_viewer_controller.rb
Victor Costa
2 parents 5c4d0723 a1ec80fb
Showing 11 changed files with 164 additions and 90 deletions Show diff stats
Gemfile
app/controllers/my_profile/cms_controller.rb
app/controllers/public/content_viewer_controller.rb
app/models/article.rb
app/models/category.rb
app/models/comment.rb
app/models/person.rb
app/models/profile.rb
config/environments/development.rb
lib/acts_as_having_posts.rb
lib/spammable.rb
@@ -24,6 +24,10 @@ gem &#39;locale&#39;,                   &#39;~&gt; 2.0.5&#39;
 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
 # with their GEM names (not the Debian package names)
  
+group :development do
+  gem 'bullet'
+end
+
 group :production do
   gem 'dalli', '~> 2.7.0'
 end
@@ -59,7 +59,7 @@ class CmsController &lt; MyProfileController
       conditions = ['type != ?', 'RssFeed']
     end
  
-    @articles = @article.children.reorder("case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC, name").paginate(
+    @articles = @article.children.includes(:parent).reorder("case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC, name").paginate(
       :conditions => conditions,
       :per_page => per_page,
       :page => params[:npage]
@@ -8,49 +8,32 @@ class ContentViewerController &lt; ApplicationController
   helper TagsHelper
  
   def view_page
-    path = params[:page]
-    path = path.join('/') if path.kind_of?(Array)
-    path = "#{path}.#{params[:format]}" if params[:format]
+    path = get_path(params[:page], params[:format])
+
     @version = params[:version].to_i
  
     if path.blank?
-      @page = profile.home_page
-      if @page.nil?
-        redirect_to :controller => 'profile', :action => 'index', :profile => profile.identifier
-        return
-      end
+      @page = profile.home_page 
+      return if redirected_to_profile_index
     else
       @page = profile.articles.find_by_path(path)
-      unless @page
-        page_from_old_path = profile.articles.find_by_old_path(path)
-        if page_from_old_path
-          redirect_to profile.url.merge(:page => page_from_old_path.explode_path)
-          return
-        end
-      end
+      return if redirected_page_from_old_path(path)
     end
  
     return unless allow_access_to_page(path)
  
     if @version > 0
       return render_access_denied unless @page.display_versions?
-      @versioned_article = @page.versions.find_by_version(@version)
-      if @versioned_article && @page.versions.latest.version != @versioned_article.version
-        render :template => 'content_viewer/versioned_article.html.erb'
-        return
-      end
+      return if rendered_versioned_article
     end
  
     redirect_to_translation and return if @page.profile.redirect_l10n
  
-    if request.post?
-      if @page.forum? && @page.has_terms_of_use && params[:terms_accepted] == "true"
-        @page.add_agreed_user(user)
-      end
-    elsif !@page.parent.nil? && @page.parent.forum?
-      unless @page.parent.agrees_with_terms?(user)
-        redirect_to @page.parent.url
-      end
+    if request.post? && @page.forum?
+      process_forum_terms_of_use(user, params[:terms_accepted])
+    elsif is_a_forum_topic?(@page) && !@page.parent.agrees_with_terms?(user)
+      redirect_to @page.parent.url
+      return
     end
  
     # At this point the page will be showed
@@ -58,64 +41,22 @@ class ContentViewerController &lt; ApplicationController
  
     @page = FilePresenter.for @page
  
-    if @page.download? params[:view]
-      headers['Content-Type'] = @page.mime_type
-      headers.merge! @page.download_headers
-      data = @page.data
-
-      # TODO test the condition
-      if data.nil?
-        raise "No data for file"
-      end
-
-      render :text => data, :layout => false
-      return
-    end
+    return if rendered_file_download(params[:view])
  
     @form_div = params[:form]
  
     #FIXME see a better way to do this. It's not need to pass this variable anymore
     @comment = Comment.new
  
-    if @page.has_posts?
-      posts = if params[:year] and params[:month]
-        filter_date = DateTime.parse("#{params[:year]}-#{params[:month]}-01")
-        @page.posts.by_range(filter_date..filter_date.at_end_of_month)
-      else
-        @page.posts
-      end
-
-      #FIXME Need to run this before the pagination because this version of
-      #      will_paginate returns a will_paginate collection instead of a
-      #      relation.
-      blog_with_translation = @page.blog? && @page.display_posts_in_current_language?
-      posts = posts.native_translations if blog_with_translation
-
-      @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).to_a
-
-      if blog_with_translation
-        @posts.replace @posts.map{ |p| p.get_translation_to(FastGettext.locale) }.compact
-      end
-    end
+    process_page_posts(params)
  
     if @page.folder? && @page.gallery?
-      @images = @page.images.select{ |a| a.display_to? user }
-      @images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]
+      @images = get_images(@page, params[:npage], params[:slideshow])
     end
  
-    @unfollow_form = params[:unfollow] && params[:unfollow] == 'true'
-    if params[:unfollow] && params[:unfollow] == 'commit' && request.post?
-      @page.followers -= [params[:email]]
-      if @page.save
-        session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
-      end
-    end
+    process_page_followers(params)
  
-    @comments = @page.comments.without_spam
-    @comments = @plugins.filter(:unavailable_comments, @comments)
-    @comments_count = @comments.count
-    @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
-    @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
+    process_comments(params)
  
     if request.xhr? and params[:comment_order]
       if @comment_order == 'newest'
@@ -129,11 +70,11 @@ class ContentViewerController &lt; ApplicationController
       render :action => 'slideshow', :layout => 'slideshow'
       return
     end
-    render @page.view_page, :formats => [:html]
+    render :view_page, :formats => [:html]
   end
  
   def versions_diff
-    path = params[:page].join('/')
+    path = params[:page]
     @page = profile.articles.find_by_path(path)
     @v1, @v2 = @page.versions.find_by_version(params[:v1]), @page.versions.find_by_version(params[:v2])
   end
@@ -203,4 +144,127 @@ class ContentViewerController &lt; ApplicationController
     user_agent.match(/crawler/) ||
     user_agent.match(/\(.*https?:\/\/.*\)/)
   end
+
+  def get_path(page, format = nil)
+    path = page
+    path = path.join('/') if path.kind_of?(Array)
+    path = "#{path}.#{format}" if format
+
+    return path
+  end
+
+  def redirected_to_profile_index
+    if @page.nil?
+      redirect_to :controller => 'profile', :action => 'index', :profile => profile.identifier
+      return true
+    end
+
+    return false
+  end
+
+  def redirected_page_from_old_path(path)
+    unless @page
+      page_from_old_path = profile.articles.find_by_old_path(path)
+      if page_from_old_path
+        redirect_to profile.url.merge(:page => page_from_old_path.explode_path)
+        return true
+      end
+    end
+
+    return false
+  end
+
+  def process_forum_terms_of_use(user, terms_accepted = nil)
+    if @page.forum? && @page.has_terms_of_use && terms_accepted == "true"
+      @page.add_agreed_user(user)
+    end
+  end 
+
+  def is_a_forum_topic? (page)
+    return (!@page.parent.nil? && @page.parent.forum?)
+  end
+
+  def rendered_versioned_article
+    @versioned_article = @page.versions.find_by_version(@version)
+    if @versioned_article && @page.versions.latest.version != @versioned_article.version
+      render :template => 'content_viewer/versioned_article.html.erb'
+      return true
+    end
+
+    return false
+  end
+
+  def rendered_file_download(view = nil)
+    if @page.download? view
+      headers['Content-Type'] = @page.mime_type
+      headers.merge! @page.download_headers
+      data = @page.data
+
+      # TODO test the condition
+      if data.nil?
+        raise "No data for file"
+      end
+
+      render :text => data, :layout => false
+      return true
+    end
+
+    return false
+  end
+
+  def process_page_posts(params)
+    if @page.has_posts?
+      posts = get_posts(params[:year], params[:month])
+
+      #FIXME Need to run this before the pagination because this version of
+      #      will_paginate returns a will_paginate collection instead of a
+      #      relation.
+      posts = posts.native_translations if blog_with_translation?(@page)
+
+      @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).includes(:author).to_a
+
+      if blog_with_translation?(@page)
+        @posts.replace @posts.map{ |p| p.get_translation_to(FastGettext.locale) }.compact
+      end
+    end
+  end
+
+  def get_posts(year = nil, month = nil)
+    if year && month
+      filter_date = DateTime.parse("#{year}-#{month}-01")
+      return @page.posts.by_range(filter_date..filter_date.at_end_of_month)
+    else
+      return @page.posts
+    end
+  end
+
+  def blog_with_translation?(page)
+    return (page.blog? && page.display_posts_in_current_language?)
+  end
+
+  def get_images(page, npage, slideshow)
+    images = page.images.select{ |a| a.display_to? user }
+    images = images.paginate(:per_page => per_page, :page => npage) unless slideshow
+
+    return images
+  end
+
+  def process_page_followers(params)
+    @unfollow_form = params[:unfollow] == 'true'
+    if params[:unfollow] == 'commit' && request.post?
+      @page.followers -= [params[:email]]
+      if @page.save
+        session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
+      end
+    end
+  end
+
+  def process_comments(params)
+    @comments = @page.comments.without_spam.includes(:source)
+    @comments = @plugins.filter(:unavailable_comments, @comments)
+    @comments_count = @comments.count
+    @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
+    @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
+  end
+
 end
@@ -58,10 +58,10 @@ class Article &lt; ActiveRecord::Base
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
   belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id'
  
-  has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
+  has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'comments.created_at asc', :include => [:author, :children]
  
   has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]
-  has_many :categories, :through => :article_categorizations
+  has_many :categories, :through => :article_categorizations, :include => [:environment]
  
   has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization'
   has_many :categories_including_virtual, :through => :article_categorizations_including_virtual, :source => :category
@@ -251,7 +251,7 @@ class Article &lt; ActiveRecord::Base
   # retrieves all articles belonging to the given +profile+ that are not
   # sub-articles of any other article.
   scope :top_level_for, lambda { |profile|
-    {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]}
+    {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ], :include => [:profile]}
   }
  
   scope :public,
@@ -475,7 +475,7 @@ class Article &lt; ActiveRecord::Base
   end
  
   scope :published, :conditions => ['articles.published = ?', true]
-  scope :folders, lambda {|profile|{:conditions => ['articles.type IN (?)', profile.folder_types] }}
+  scope :folders, lambda {|profile|{:conditions => ['articles.type IN (?)', profile.folder_types], :include => [:parent] }}
   scope :no_folders, lambda {|profile|{:conditions => ['articles.type NOT IN (?)', profile.folder_types]}}
   scope :galleries, :conditions => [ "articles.type IN ('Gallery')" ]
   scope :images, :conditions => { :is_image => true }
@@ -484,7 +484,7 @@ class Article &lt; ActiveRecord::Base
  
   scope :more_popular, :order => 'hits DESC'
   scope :more_comments, :order => "comments_count DESC"
-  scope :more_recent, :order => "created_at DESC"
+  scope :more_recent, :order => "articles.created_at DESC"
  
   def self.display_filter(user, profile)
     return {:conditions => ['articles.published = ?', true]} if !user
@@ -16,7 +16,7 @@ class Category &lt; ActiveRecord::Base
  
   # Finds all top level categories for a given environment. 
   scope :top_level_for, lambda { |environment|
-    {:conditions => ['parent_id is null and environment_id = ?', environment.id ]}
+    {:conditions => ['parent_id is null and environment_id = ?', environment.id ], :include => [:children]}
   }
  
   scope :on_level, lambda { |parent| {:conditions => {:parent_id => parent}} }
@@ -18,7 +18,7 @@ class Comment &lt; ActiveRecord::Base
   has_many :children, :class_name => 'Comment', :foreign_key => 'reply_of_id', :dependent => :destroy
   belongs_to :reply_of, :class_name => 'Comment', :foreign_key => 'reply_of_id'
  
-  scope :without_reply, :conditions => ['reply_of_id IS NULL']
+  scope :without_reply, :conditions => ['comments.reply_of_id IS NULL']
  
   #FIXME make this test
   scope :newer_than, lambda { |reference_id|
@@ -434,7 +434,7 @@ class Person &lt; Profile
   end
  
   def already_reported?(profile)
-    abuse_reports.any? { |report| report.abuse_complaint.reported == profile && report.abuse_complaint.opened? }
+    abuse_reports.includes({:abuse_complaint => :reported}).any? { |report| report.abuse_complaint.reported == profile && report.abuse_complaint.opened? }
   end
  
   def register_report(abuse_report, profile)
@@ -228,7 +228,7 @@ class Profile &lt; ActiveRecord::Base
   belongs_to :preferred_domain, :class_name => 'Domain', :foreign_key => 'preferred_domain_id'
   belongs_to :environment
  
-  has_many :articles, :dependent => :destroy
+  has_many :articles, :dependent => :destroy, :include => [:profile]
   belongs_to :home_page, :class_name => Article.name, :foreign_key => 'home_page_id'
  
   has_many :files, :class_name => 'UploadedFile'
@@ -35,4 +35,10 @@ Noosfero::Application.configure do
   config.assets.debug = true
  
   config.consider_all_requests_local = true
+
+  config.after_initialize do
+    Bullet.enable = true
+    Bullet.console = true
+  end
+
 end
@@ -2,7 +2,7 @@ module ActsAsHavingPosts
  
   module ClassMethods
     def  acts_as_having_posts(options = {})
-      has_many :posts, { :class_name => 'Article', :foreign_key => 'parent_id', :source => :children, :conditions => [ 'articles.type != ?', 'RssFeed' ], :order => 'published_at DESC, id DESC' }.merge(options)
+      has_many :posts, { :class_name => 'Article', :foreign_key => 'parent_id', :source => :children, :conditions => [ 'articles.type != ?', 'RssFeed' ], :order => 'published_at DESC, id DESC', :include => [:parent, :profile] }.merge(options)
  
       attr_accessor :feed_attrs
  
@@ -12,8 +12,8 @@ module Spammable
     def self.extended (base)
       if base.respond_to?(:scope)
         base.class_eval do
-          scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]
-          scope :spam, :conditions => ['spam = ?', true]
+          scope :without_spam, :conditions => ["#{base.table_name}.spam IS NULL OR #{base.table_name}.spam = ?", false]
+          scope :spam, :conditions => ["#{base.table_name}.spam = ?", true]
         end
       end
     end
...	...	@@ -24,6 +24,10 @@ gem 'locale', '~> 2.0.5'
24	24	# FIXME list here all actual dependencies (i.e. the ones in debian/control),
25	25	# with their GEM names (not the Debian package names)
26	26
	27	+group :development do
	28	+ gem 'bullet'
	29	+end
	30	+
27	31	group :production do
28	32	gem 'dalli', '~> 2.7.0'
29	33	end
...	...
...	...	@@ -59,7 +59,7 @@ class CmsController < MyProfileController
59	59	conditions = ['type != ?', 'RssFeed']
60	60	end
61	61
62		- @articles = @article.children.reorder("case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC, name").paginate(
	62	+ @articles = @article.children.includes(:parent).reorder("case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC, name").paginate(
63	63	:conditions => conditions,
64	64	:per_page => per_page,
65	65	:page => params[:npage]
...	...
...	...	@@ -8,49 +8,32 @@ class ContentViewerController < ApplicationController
8	8	helper TagsHelper
9	9
10	10	def view_page
11		- path = params[:page]
12		- path = path.join('/') if path.kind_of?(Array)
13		- path = "#{path}.#{params[:format]}" if params[:format]
	11	+ path = get_path(params[:page], params[:format])
	12	+
14	13	@version = params[:version].to_i
15	14
16	15	if path.blank?
17		- @page = profile.home_page
18		- if @page.nil?
19		- redirect_to :controller => 'profile', :action => 'index', :profile => profile.identifier
20		- return
21		- end
	16	+ @page = profile.home_page
	17	+ return if redirected_to_profile_index
22	18	else
23	19	@page = profile.articles.find_by_path(path)
24		- unless @page
25		- page_from_old_path = profile.articles.find_by_old_path(path)
26		- if page_from_old_path
27		- redirect_to profile.url.merge(:page => page_from_old_path.explode_path)
28		- return
29		- end
30		- end
	20	+ return if redirected_page_from_old_path(path)
31	21	end
32	22
33	23	return unless allow_access_to_page(path)
34	24
35	25	if @version > 0
36	26	return render_access_denied unless @page.display_versions?
37		- @versioned_article = @page.versions.find_by_version(@version)
38		- if @versioned_article && @page.versions.latest.version != @versioned_article.version
39		- render :template => 'content_viewer/versioned_article.html.erb'
40		- return
41		- end
	27	+ return if rendered_versioned_article
42	28	end
43	29
44	30	redirect_to_translation and return if @page.profile.redirect_l10n
45	31
46		- if request.post?
47		- if @page.forum? && @page.has_terms_of_use && params[:terms_accepted] == "true"
48		- @page.add_agreed_user(user)
49		- end
50		- elsif !@page.parent.nil? && @page.parent.forum?
51		- unless @page.parent.agrees_with_terms?(user)
52		- redirect_to @page.parent.url
53		- end
	32	+ if request.post? && @page.forum?
	33	+ process_forum_terms_of_use(user, params[:terms_accepted])
	34	+ elsif is_a_forum_topic?(@page) && !@page.parent.agrees_with_terms?(user)
	35	+ redirect_to @page.parent.url
	36	+ return
54	37	end
55	38
56	39	# At this point the page will be showed
...	...	@@ -58,64 +41,22 @@ class ContentViewerController < ApplicationController
58	41
59	42	@page = FilePresenter.for @page
60	43
61		- if @page.download? params[:view]
62		- headers['Content-Type'] = @page.mime_type
63		- headers.merge! @page.download_headers
64		- data = @page.data
65		-
66		- # TODO test the condition
67		- if data.nil?
68		- raise "No data for file"
69		- end
70		-
71		- render :text => data, :layout => false
72		- return
73		- end
	44	+ return if rendered_file_download(params[:view])
74	45
75	46	@form_div = params[:form]
76	47
77	48	#FIXME see a better way to do this. It's not need to pass this variable anymore
78	49	@comment = Comment.new
79	50
80		- if @page.has_posts?
81		- posts = if params[:year] and params[:month]
82		- filter_date = DateTime.parse("#{params[:year]}-#{params[:month]}-01")
83		- @page.posts.by_range(filter_date..filter_date.at_end_of_month)
84		- else
85		- @page.posts
86		- end
87		-
88		- #FIXME Need to run this before the pagination because this version of
89		- # will_paginate returns a will_paginate collection instead of a
90		- # relation.
91		- blog_with_translation = @page.blog? && @page.display_posts_in_current_language?
92		- posts = posts.native_translations if blog_with_translation
93		-
94		- @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).to_a
95		-
96		- if blog_with_translation
97		- @posts.replace @posts.map{ \|p\| p.get_translation_to(FastGettext.locale) }.compact
98		- end
99		- end
	51	+ process_page_posts(params)
100	52
101	53	if @page.folder? && @page.gallery?
102		- @images = @page.images.select{ \|a\| a.display_to? user }
103		- @images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]
	54	+ @images = get_images(@page, params[:npage], params[:slideshow])
104	55	end
105	56
106		- @unfollow_form = params[:unfollow] && params[:unfollow] == 'true'
107		- if params[:unfollow] && params[:unfollow] == 'commit' && request.post?
108		- @page.followers -= [params[:email]]
109		- if @page.save
110		- session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
111		- end
112		- end
	57	+ process_page_followers(params)
113	58
114		- @comments = @page.comments.without_spam
115		- @comments = @plugins.filter(:unavailable_comments, @comments)
116		- @comments_count = @comments.count
117		- @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
118		- @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
	59	+ process_comments(params)
119	60
120	61	if request.xhr? and params[:comment_order]
121	62	if @comment_order == 'newest'
...	...	@@ -129,11 +70,11 @@ class ContentViewerController < ApplicationController
129	70	render :action => 'slideshow', :layout => 'slideshow'
130	71	return
131	72	end
132		- render @page.view_page, :formats => [:html]
	73	+ render :view_page, :formats => [:html]
133	74	end
134	75
135	76	def versions_diff
136		- path = params[:page].join('/')
	77	+ path = params[:page]
137	78	@page = profile.articles.find_by_path(path)
138	79	@v1, @v2 = @page.versions.find_by_version(params[:v1]), @page.versions.find_by_version(params[:v2])
139	80	end
...	...	@@ -203,4 +144,127 @@ class ContentViewerController < ApplicationController
203	144	user_agent.match(/crawler/) \|\|
204	145	user_agent.match(/\(.https?:\/\/.\)/)
205	146	end
	147	+
	148	+ def get_path(page, format = nil)
	149	+ path = page
	150	+ path = path.join('/') if path.kind_of?(Array)
	151	+ path = "#{path}.#{format}" if format
	152	+
	153	+ return path
	154	+ end
	155	+
	156	+ def redirected_to_profile_index
	157	+ if @page.nil?
	158	+ redirect_to :controller => 'profile', :action => 'index', :profile => profile.identifier
	159	+ return true
	160	+ end
	161	+
	162	+ return false
	163	+ end
	164	+
	165	+ def redirected_page_from_old_path(path)
	166	+ unless @page
	167	+ page_from_old_path = profile.articles.find_by_old_path(path)
	168	+ if page_from_old_path
	169	+ redirect_to profile.url.merge(:page => page_from_old_path.explode_path)
	170	+ return true
	171	+ end
	172	+ end
	173	+
	174	+ return false
	175	+ end
	176	+
	177	+ def process_forum_terms_of_use(user, terms_accepted = nil)
	178	+ if @page.forum? && @page.has_terms_of_use && terms_accepted == "true"
	179	+ @page.add_agreed_user(user)
	180	+ end
	181	+ end
	182	+
	183	+ def is_a_forum_topic? (page)
	184	+ return (!@page.parent.nil? && @page.parent.forum?)
	185	+ end
	186	+
	187	+ def rendered_versioned_article
	188	+ @versioned_article = @page.versions.find_by_version(@version)
	189	+ if @versioned_article && @page.versions.latest.version != @versioned_article.version
	190	+ render :template => 'content_viewer/versioned_article.html.erb'
	191	+ return true
	192	+ end
	193	+
	194	+ return false
	195	+ end
	196	+
	197	+ def rendered_file_download(view = nil)
	198	+ if @page.download? view
	199	+ headers['Content-Type'] = @page.mime_type
	200	+ headers.merge! @page.download_headers
	201	+ data = @page.data
	202	+
	203	+ # TODO test the condition
	204	+ if data.nil?
	205	+ raise "No data for file"
	206	+ end
	207	+
	208	+ render :text => data, :layout => false
	209	+ return true
	210	+ end
	211	+
	212	+ return false
	213	+ end
	214	+
	215	+ def process_page_posts(params)
	216	+ if @page.has_posts?
	217	+ posts = get_posts(params[:year], params[:month])
	218	+
	219	+ #FIXME Need to run this before the pagination because this version of
	220	+ # will_paginate returns a will_paginate collection instead of a
	221	+ # relation.
	222	+ posts = posts.native_translations if blog_with_translation?(@page)
	223	+
	224	+ @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).includes(:author).to_a
	225	+
	226	+ if blog_with_translation?(@page)
	227	+ @posts.replace @posts.map{ \|p\| p.get_translation_to(FastGettext.locale) }.compact
	228	+ end
	229	+ end
	230	+ end
	231	+
	232	+ def get_posts(year = nil, month = nil)
	233	+ if year && month
	234	+ filter_date = DateTime.parse("#{year}-#{month}-01")
	235	+ return @page.posts.by_range(filter_date..filter_date.at_end_of_month)
	236	+ else
	237	+ return @page.posts
	238	+ end
	239	+ end
	240	+
	241	+ def blog_with_translation?(page)
	242	+ return (page.blog? && page.display_posts_in_current_language?)
	243	+ end
	244	+
	245	+ def get_images(page, npage, slideshow)
	246	+ images = page.images.select{ \|a\| a.display_to? user }
	247	+ images = images.paginate(:per_page => per_page, :page => npage) unless slideshow
	248	+
	249	+ return images
	250	+ end
	251	+
	252	+ def process_page_followers(params)
	253	+ @unfollow_form = params[:unfollow] == 'true'
	254	+ if params[:unfollow] == 'commit' && request.post?
	255	+ @page.followers -= [params[:email]]
	256	+ if @page.save
	257	+ session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
	258	+ end
	259	+ end
	260	+ end
	261	+
	262	+ def process_comments(params)
	263	+ @comments = @page.comments.without_spam.includes(:source)
	264	+ @comments = @plugins.filter(:unavailable_comments, @comments)
	265	+ @comments_count = @comments.count
	266	+ @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
	267	+ @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
	268	+ end
	269	+
206	270	end
...	...
...	...	@@ -58,10 +58,10 @@ class Article < ActiveRecord::Base
58	58	belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
59	59	belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id'
60	60
61		- has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
	61	+ has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'comments.created_at asc', :include => [:author, :children]
62	62
63	63	has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]
64		- has_many :categories, :through => :article_categorizations
	64	+ has_many :categories, :through => :article_categorizations, :include => [:environment]
65	65
66	66	has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization'
67	67	has_many :categories_including_virtual, :through => :article_categorizations_including_virtual, :source => :category
...	...	@@ -251,7 +251,7 @@ class Article < ActiveRecord::Base
251	251	# retrieves all articles belonging to the given +profile+ that are not
252	252	# sub-articles of any other article.
253	253	scope :top_level_for, lambda { \|profile\|
254		- {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]}
	254	+ {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ], :include => [:profile]}
255	255	}
256	256
257	257	scope :public,
...	...	@@ -475,7 +475,7 @@ class Article < ActiveRecord::Base
475	475	end
476	476
477	477	scope :published, :conditions => ['articles.published = ?', true]
478		- scope :folders, lambda {\|profile\|{:conditions => ['articles.type IN (?)', profile.folder_types] }}
	478	+ scope :folders, lambda {\|profile\|{:conditions => ['articles.type IN (?)', profile.folder_types], :include => [:parent] }}
479	479	scope :no_folders, lambda {\|profile\|{:conditions => ['articles.type NOT IN (?)', profile.folder_types]}}
480	480	scope :galleries, :conditions => [ "articles.type IN ('Gallery')" ]
481	481	scope :images, :conditions => { :is_image => true }
...	...	@@ -484,7 +484,7 @@ class Article < ActiveRecord::Base
484	484
485	485	scope :more_popular, :order => 'hits DESC'
486	486	scope :more_comments, :order => "comments_count DESC"
487		- scope :more_recent, :order => "created_at DESC"
	487	+ scope :more_recent, :order => "articles.created_at DESC"
488	488
489	489	def self.display_filter(user, profile)
490	490	return {:conditions => ['articles.published = ?', true]} if !user
...	...
...	...	@@ -16,7 +16,7 @@ class Category < ActiveRecord::Base
16	16
17	17	# Finds all top level categories for a given environment.
18	18	scope :top_level_for, lambda { \|environment\|
19		- {:conditions => ['parent_id is null and environment_id = ?', environment.id ]}
	19	+ {:conditions => ['parent_id is null and environment_id = ?', environment.id ], :include => [:children]}
20	20	}
21	21
22	22	scope :on_level, lambda { \|parent\| {:conditions => {:parent_id => parent}} }
...	...
...	...	@@ -18,7 +18,7 @@ class Comment < ActiveRecord::Base
18	18	has_many :children, :class_name => 'Comment', :foreign_key => 'reply_of_id', :dependent => :destroy
19	19	belongs_to :reply_of, :class_name => 'Comment', :foreign_key => 'reply_of_id'
20	20
21		- scope :without_reply, :conditions => ['reply_of_id IS NULL']
	21	+ scope :without_reply, :conditions => ['comments.reply_of_id IS NULL']
22	22
23	23	#FIXME make this test
24	24	scope :newer_than, lambda { \|reference_id\|
...	...
...	...	@@ -434,7 +434,7 @@ class Person < Profile
434	434	end
435	435
436	436	def already_reported?(profile)
437		- abuse_reports.any? { \|report\| report.abuse_complaint.reported == profile && report.abuse_complaint.opened? }
	437	+ abuse_reports.includes({:abuse_complaint => :reported}).any? { \|report\| report.abuse_complaint.reported == profile && report.abuse_complaint.opened? }
438	438	end
439	439
440	440	def register_report(abuse_report, profile)
...	...
...	...	@@ -228,7 +228,7 @@ class Profile < ActiveRecord::Base
228	228	belongs_to :preferred_domain, :class_name => 'Domain', :foreign_key => 'preferred_domain_id'
229	229	belongs_to :environment
230	230
231		- has_many :articles, :dependent => :destroy
	231	+ has_many :articles, :dependent => :destroy, :include => [:profile]
232	232	belongs_to :home_page, :class_name => Article.name, :foreign_key => 'home_page_id'
233	233
234	234	has_many :files, :class_name => 'UploadedFile'
...	...
...	...	@@ -35,4 +35,10 @@ Noosfero::Application.configure do
35	35	config.assets.debug = true
36	36
37	37	config.consider_all_requests_local = true
	38	+
	39	+ config.after_initialize do
	40	+ Bullet.enable = true
	41	+ Bullet.console = true
	42	+ end
	43	+
38	44	end
...	...
...	...	@@ -2,7 +2,7 @@ module ActsAsHavingPosts
2	2
3	3	module ClassMethods
4	4	def acts_as_having_posts(options = {})
5		- has_many :posts, { :class_name => 'Article', :foreign_key => 'parent_id', :source => :children, :conditions => [ 'articles.type != ?', 'RssFeed' ], :order => 'published_at DESC, id DESC' }.merge(options)
	5	+ has_many :posts, { :class_name => 'Article', :foreign_key => 'parent_id', :source => :children, :conditions => [ 'articles.type != ?', 'RssFeed' ], :order => 'published_at DESC, id DESC', :include => [:parent, :profile] }.merge(options)
6	6
7	7	attr_accessor :feed_attrs
8	8
...	...