ActionItem153: refactoring: changin Article.recent to receive only limit paramet…

…er. Other search arguments will come from scope (e.g. Profile#recent_documents) git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1280 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem153: refactoring: changin Article.recent to receive only limit paramet…
…er. Other search arguments will come from scope (e.g. Profile#recent_documents) git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1280 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 2390ac55
Showing 4 changed files with 8 additions and 14 deletions Show diff stats
app/controllers/public/home_controller.rb
app/models/article.rb
app/models/profile.rb
test/unit/article_test.rb
 class HomeController < PublicController
   def index
-    @articles = TextArticle.recent(nil, 10)
+    @articles = environment.recent_documents(10)
   end
 end
@@ -26,13 +26,10 @@ class Article &lt; ActiveRecord::Base
     self.find(:all, :conditions => [ 'parent_id is null and profile_id = ?', profile.id ])
   end
-  # retrieves the latest +limit+ articles in profile +profile+, sorted from the
-  # most recent to the oldest.
-  #
-  # If +profile+ is +nil+, then all profiles are searched for articles.
-  def self.recent(profile, limit)
+  # retrieves the latest +limit+ articles, sorted from the most recent to the
+  # oldest.
+  def self.recent(limit)
     options = { :limit => limit, :order => 'created_on' }
-    options[:conditions] = { :profile_id => profile.id } if profile
     self.find(:all, options)
   end
@@ -131,7 +131,7 @@ class Profile &lt; ActiveRecord::Base
   # +limit+ is the maximum number of documents to be returned. It defaults to
   # 10.
   def recent_documents(limit = 10)
-    self.articles.recent(self, limit)
+    self.articles.recent(limit)
   end
   class << self
@@ -132,7 +132,7 @@ class ArticleTest &lt; Test::Unit::TestCase
     end
   end
-  should 'search for recent documents for a given profile' do
+  should 'search for recent documents' do
     first = profile.articles.build(:name => 'first'); first.save!
     second = profile.articles.build(:name => 'second'); second.save!
     third = profile.articles.build(:name => 'third'); third.save!
@@ -142,11 +142,8 @@ class ArticleTest &lt; Test::Unit::TestCase
     other_profile = create_user('otherpropfile').person
     other_first = other_profile.articles.build(:name => 'first'); other_first.save!
-    assert_equal [first,second,third], Article.recent(profile, 3)
-    
-    assert_equal [first,second,third,forth,fifth], Article.recent(profile, 10)
-
-    assert_equal [first,second,third,forth,fifth,other_first], Article.recent(nil, 10)
+    assert_equal [first,second,third], Article.recent(3)
+    assert_equal [first,second,third,forth,fifth,other_first], Article.recent(10)
   end
   should 'provied proper descriptions' do
1	class HomeController < PublicController	1	class HomeController < PublicController
2		2
3	def index	3	def index
4	- @articles = TextArticle.recent(nil, 10)	4	+ @articles = environment.recent_documents(10)
5	end	5	end
6		6
7	end	7	end
	@@ -131,7 +131,7 @@ class Profile < ActiveRecord::Base		@@ -131,7 +131,7 @@ class Profile < ActiveRecord::Base
131	# +limit+ is the maximum number of documents to be returned. It defaults to	131	# +limit+ is the maximum number of documents to be returned. It defaults to
132	# 10.	132	# 10.
133	def recent_documents(limit = 10)	133	def recent_documents(limit = 10)
134	- self.articles.recent(self, limit)	134	+ self.articles.recent(limit)
135	end	135	end
136		136
137	class << self	137	class << self