Revert "Merge branch 'fix_lazy_queries' into stable"

This reverts commit 853cc8ef357b5eeb2d25cf586fb96bbeab36a785, reversing changes made to a0ef4f259127426b96f8a8ba2bbb2c18c67bf980. This reverts commit b8304468ef6de86accdfd442c889f30b2fdd9539, reversing changes made to ed4938b5272fb57a714c84c3443c7d329c9407aa. This reverts commit 77ee15d0896424d4c02de0a61ad8922e5b38304c, reversing changes made to b52c66dba90218f9dd21b10dee85e293ccf52aa7. This reverts commit a0ef4f259127426b96f8a8ba2bbb2c18c67bf980, reversing changes made to 5c4d0723fb8977e29f0e208e6d3c609933281cec.

Revert "Merge branch 'fix_lazy_queries' into stable"
This reverts commit 853cc8ef357b5eeb2d25cf586fb96bbeab36a785, reversing changes made to a0ef4f259127426b96f8a8ba2bbb2c18c67bf980. This reverts commit b8304468ef6de86accdfd442c889f30b2fdd9539, reversing changes made to ed4938b5272fb57a714c84c3443c7d329c9407aa. This reverts commit 77ee15d0896424d4c02de0a61ad8922e5b38304c, reversing changes made to b52c66dba90218f9dd21b10dee85e293ccf52aa7. This reverts commit a0ef4f259127426b96f8a8ba2bbb2c18c67bf980, reversing changes made to 5c4d0723fb8977e29f0e208e6d3c609933281cec.
Victor Costa
1 parent d9a3fdb3
Showing 13 changed files with 12 additions and 22 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
app/views/comment/_comment.html.erb
config/environments/development.rb
lib/acts_as_having_posts.rb
lib/spammable.rb
test/functional/manage_products_controller_test.rb
@@ -24,10 +24,6 @@ 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.includes(:parent).reorder("case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC, name").paginate(
+    @articles = @article.children.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]
@@ -221,7 +221,7 @@ class ContentViewerController &lt; ApplicationController
       #      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
+      @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).to_a
  
       if blog_with_translation?(@page)
         @posts.replace @posts.map{ |p| p.get_translation_to(FastGettext.locale) }.compact
@@ -258,7 +258,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 ], :include => [:profile]}
+    {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]}
   }
  
   scope :public,
@@ -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 ], :include => [:children]}
+    {:conditions => ['parent_id is null and environment_id = ?', environment.id ]}
   }
  
   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 => ['comments.reply_of_id IS NULL']
+  scope :without_reply, :conditions => ['reply_of_id IS NULL']
  
   #FIXME make this test
   scope :newer_than, lambda { |reference_id|
@@ -444,7 +444,7 @@ roles] }
   end
  
   def already_reported?(profile)
-    abuse_reports.includes({:abuse_complaint => :reported}).any? { |report| report.abuse_complaint.reported == profile && report.abuse_complaint.opened? }
+    abuse_reports.any? { |report| report.abuse_complaint.reported == profile && report.abuse_complaint.opened? }
   end
  
   def register_report(abuse_report, profile)
@@ -229,7 +229,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, :include => [:profile]
+  has_many :articles, :dependent => :destroy
   belongs_to :home_page, :class_name => Article.name, :foreign_key => 'home_page_id'
  
   has_many :files, :class_name => 'UploadedFile'
@@ -64,7 +64,7 @@
  
   <% unless comment.replies.blank? || comment.spam? %>
   <ul class="comment-replies">
-    <% comment.replies.includes([:children, :author]).each do |reply| %>
+    <% comment.replies.each do |reply| %>
       <%= render :partial => 'comment/comment', :locals => { :comment => reply } %>
     <% end %>
   </ul>
@@ -35,10 +35,4 @@ 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', :include => [:parent, :profile] }.merge(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)
  
       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 => ["#{base.table_name}.spam IS NULL OR #{base.table_name}.spam = ?", false]
-          scope :spam, :conditions => ["#{base.table_name}.spam = ?", true]
+          scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]
+          scope :spam, :conditions => ['spam = ?', true]
         end
       end
     end
@@ -150,7 +150,7 @@ class ManageProductsControllerTest &lt; ActionController::TestCase
     category2 = fast_create(ProductCategory, :name => 'Category 2', :parent_id => category1.id)
     category3 = fast_create(ProductCategory, :name => 'Category 3', :parent_id => category2.id)
     get :new, :profile => @enterprise.identifier
-    assert_tag :tag => 'select', :attributes => { :id => 'category_id' }, :descendant => { :tag => 'option', :content => category1.name + " &raquo;" }
+    assert_tag :tag => 'select', :attributes => { :id => 'category_id' }, :descendant => { :tag => 'option', :content => category1.name }
   end
  
   should "create new product categorized" do
...	...	@@ -24,10 +24,6 @@ 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		-
31	27	group :production do
32	28	gem 'dalli', '~> 2.7.0'
33	29	end
...	...
...	...	@@ -59,7 +59,7 @@ class CmsController < MyProfileController
59	59	conditions = ['type != ?', 'RssFeed']
60	60	end
61	61
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(
	62	+ @articles = @article.children.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]
...	...
...	...	@@ -221,7 +221,7 @@ class ContentViewerController < ApplicationController
221	221	# relation.
222	222	posts = posts.native_translations if blog_with_translation?(@page)
223	223
224		- @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).includes(:author).to_a
	224	+ @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).to_a
225	225
226	226	if blog_with_translation?(@page)
227	227	@posts.replace @posts.map{ \|p\| p.get_translation_to(FastGettext.locale) }.compact
...	...
...	...	@@ -258,7 +258,7 @@ class Article < ActiveRecord::Base
258	258	# retrieves all articles belonging to the given +profile+ that are not
259	259	# sub-articles of any other article.
260	260	scope :top_level_for, lambda { \|profile\|
261		- {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ], :include => [:profile]}
	261	+ {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]}
262	262	}
263	263
264	264	scope :public,
...	...
...	...	@@ -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 ], :include => [:children]}
	19	+ {:conditions => ['parent_id is null and environment_id = ?', environment.id ]}
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 => ['comments.reply_of_id IS NULL']
	21	+ scope :without_reply, :conditions => ['reply_of_id IS NULL']
22	22
23	23	#FIXME make this test
24	24	scope :newer_than, lambda { \|reference_id\|
...	...
...	...	@@ -444,7 +444,7 @@ roles] }
444	444	end
445	445
446	446	def already_reported?(profile)
447		- abuse_reports.includes({:abuse_complaint => :reported}).any? { \|report\| report.abuse_complaint.reported == profile && report.abuse_complaint.opened? }
	447	+ abuse_reports.any? { \|report\| report.abuse_complaint.reported == profile && report.abuse_complaint.opened? }
448	448	end
449	449
450	450	def register_report(abuse_report, profile)
...	...
...	...	@@ -229,7 +229,7 @@ class Profile < ActiveRecord::Base
229	229	belongs_to :preferred_domain, :class_name => 'Domain', :foreign_key => 'preferred_domain_id'
230	230	belongs_to :environment
231	231
232		- has_many :articles, :dependent => :destroy, :include => [:profile]
	232	+ has_many :articles, :dependent => :destroy
233	233	belongs_to :home_page, :class_name => Article.name, :foreign_key => 'home_page_id'
234	234
235	235	has_many :files, :class_name => 'UploadedFile'
...	...
...	...	@@ -64,7 +64,7 @@
64	64
65	65	<% unless comment.replies.blank? \|\| comment.spam? %>
66	66	<ul class="comment-replies">
67		- <% comment.replies.includes([:children, :author]).each do \|reply\| %>
	67	+ <% comment.replies.each do \|reply\| %>
68	68	<%= render :partial => 'comment/comment', :locals => { :comment => reply } %>
69	69	<% end %>
70	70	</ul>
...	...
...	...	@@ -35,10 +35,4 @@ 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		-
44	38	end
...	...