Added Contents on navigation bar

Included new named_scopes for browsing contents: * more_recent * more_comments * more_views A named_scope to filter only text articles * text_articles Included new browse_contents_menu on base theme (ActionItem2069)

Added Contents on navigation bar
Included new named_scopes for browsing contents: * more_recent * more_comments * more_views A named_scope to filter only text articles * text_articles Included new browse_contents_menu on base theme (ActionItem2069)
Daniela Feitosa
1 parent fc7e02f2
Showing 13 changed files with 291 additions and 8 deletions Show diff stats
app/controllers/public/browse_controller.rb
app/helpers/application_helper.rb
app/models/article.rb
app/views/browse/_article.rhtml
app/views/browse/_display_results.rhtml
app/views/browse/_person.rhtml
app/views/browse/_profile.rhtml
app/views/browse/contents.rhtml
features/browse.feature
public/designs/themes/base/navigation.rhtml
public/stylesheets/application.css
test/functional/browse_controller_test.rb
test/unit/article_test.rb
@@ -6,6 +6,8 @@ class BrowseController &lt; PublicController
     more_recent
     more_active
     more_popular
+    more_comments
+    more_views
   )
   def per_page
@@ -36,6 +38,18 @@ class BrowseController &lt; PublicController
     @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
   end
+  def contents
+    @filter = filter
+    @title = self.filter_description(params[:action] + '_' + @filter )
+
+    @results = @environment.articles.published.text_articles.send(@filter)
+
+    if !params[:query].blank?
+      @results = @results.find_by_contents(params[:query])
+    end
+    @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
+  end
+
   protected
   def filter
@@ -54,6 +68,9 @@ class BrowseController &lt; PublicController
       'communities_more_recent' => _('More recent communities'),  
       'communities_more_active' => _('More active communities'),  
       'communities_more_popular' => _('More popular communities'),
+      'contents_more_recent' => _('More recent contents'),
+      'contents_more_views' => _('Most viewed contents'),
+      'contents_more_comments' => _('Most commented contents'),
     }[str] || str
   end
@@ -1134,6 +1134,17 @@ module ApplicationHelper
     link_to(content_tag(:span, _('Communities Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
   end
+  def browse_contents_menu
+     links = [
+       {s_('contents|More Comments') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_comments'})}},
+       {s_('contents|More Views') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_views'})}},
+       {s_('contents|More Recent') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_recent'})}}
+     ]
+
+    link_to(content_tag(:span, _('Contents'), :class => 'icon-blog'), {:controller => "browse", :action => 'contents'}, :id => 'submenu-contents') +
+    link_to(content_tag(:span, _('Contents Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
+  end
+
   def pagination_links(collection, options={})
     options = {:prev_label => '&laquo; ' + _('Previous'), :next_label => _('Next') + ' &raquo;'}.merge(options)
     will_paginate(collection, options)
@@ -355,11 +355,20 @@ class Article &lt; ActiveRecord::Base
     ['Folder', 'Blog', 'Forum', 'Gallery']
   end
+  def self.text_article_types
+    ['TextArticle', 'TextileArticle', 'TinyMceArticle']
+  end
+
   named_scope :published, :conditions => { :published => true }
   named_scope :folders, :conditions => { :type => folder_types}
   named_scope :no_folders, :conditions => ['type NOT IN (?)', folder_types]
   named_scope :galleries, :conditions => { :type => 'Gallery' }
   named_scope :images, :conditions => { :is_image => true }
+  named_scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
+
+  named_scope :more_comments, :order => "comments_count DESC"
+  named_scope :more_views, :order => "hits DESC"
+  named_scope :more_recent, :order => "created_at DESC"
   def self.display_filter(user, profile)
     return {:conditions => ['published = ?', true]} if !user
@@ -528,6 +537,28 @@ class Article &lt; ActiveRecord::Base
     end
   end
+  def more_comments_label
+    amount = self.comments_count
+    {
+      0 => _('no comments'),
+      1 => _('one comment')
+    }[amount] || _("%s comments") % amount
+
+  end
+
+  def more_views_label
+    amount = self.hits
+    {
+      0 => _('no views'),
+      1 => _('one view')
+    }[amount] || _("%s views") % amount
+
+  end
+
+  def more_recent_label
+    _('Created at: ')
+  end
+
   private
   def sanitize_tag_list
@@ -0,0 +1,11 @@
+<li class="<%= 'browse-results-type-content ' + icon_for_article(result) %>">
+  <strong><%= link_to(result.title, result.view_url) %></strong>
+  <div class="item_meta">
+    <span class="item_by">
+    <%= _('by %s') % link_to(result.author.name, result.author.url) %>
+    </span>
+    <span class="extra-info">
+      <%= (@filter == 'more_recent' ? result.send(@filter + '_label') + show_date(result.created_at) : result.send(@filter + '_label')) %>
+    </span>
+  </div>
+</li>
@@ -8,7 +8,7 @@
     <% end %>
     <ul class='common-profile-list-block'>
       <% @results.each do |result| %>
-        <%= render :partial => partial_for_class(result.class), :locals => {:profile => result} %>
+        <%= render :partial => partial_for_class(result.class), :locals => {:result => result} %>
       <% end %>
     </ul>
     <br style='clear: both;'>
-<%= profile_image_link profile, :portrait, 'li',
-                                "<span class='adr'>#{profile.city}</span>" +
-                                (@filter == 'more_recent' ? profile.send(@filter + '_label') + show_date(profile.created_at) : profile.send(@filter + '_label')) %>
+<%= profile_image_link result, :portrait, 'li',
+                                "<span class='adr'>#{result.city}</span>" +
+                                (@filter == 'more_recent' ? result.send(@filter + '_label') + show_date(result.created_at) : result.send(@filter + '_label')) %>
-<%= profile_image_link profile, :portrait, 'li', @filter == 'more_recent' ? profile.send(@filter + '_label') + show_date(profile.created_at) : profile.send(@filter + '_label') %>
+<%= profile_image_link result, :portrait, 'li', @filter == 'more_recent' ? result.send(@filter + '_label') + show_date(result.created_at) : result.send(@filter + '_label') %>
@@ -0,0 +1,9 @@
+<%= search_page_title( @title, { :query => @query} ) %>
+
+<%= render :partial => 'search_form', :locals => {:action => 'contents'} %>
+
+<%= render :partial => 'display_results' %>
+
+<%= pagination_links @results %>
+
+<br style="clear:both" />
@@ -84,3 +84,26 @@ Feature: browse
     And I should not see "Pedro Silva"
     And I should not see "Paulo Neto"
     And I should not see "Community Silva"
+
+  @selenium
+  Scenario: Show contents browse menu
+    Given I should not see "More Comments"
+    And I should not see "More Views"
+    And I should not see "More Recent"
+    When I click "#submenu-contents-trigger"
+    Then I should see "More Comments"
+    And I should see "More Views"
+    And I should see "More Recent"
+
+  Scenario: Browse contents by query
+    Given the following articles
+      | owner     | name                      | body                    |
+      | joaosilva | Bees can fly              | this is an article      |
+      | joaosilva | Bees and ants are insects | this is another article |
+      | joaosilva | Ants are small            | this is another article |
+    When I go to /browse/contents
+    And I fill in "bees" for "query"
+    And I press "Search"
+    Then I should see "Bees can fly"
+    And I should see "Bees and ants are insects"
+    And I should not see "Ants are small"
@@ -3,5 +3,8 @@
 </li>
 <li>
   <%= browse_communities_menu %>
+  </li>
+<li>
+  <%= browse_contents_menu %>
 </li>
 <li><a href="/assets/events"><span class='icon-menu-events'><%= _('Events') %></span></a></li>
@@ -4503,23 +4503,30 @@ h1#agenda-title {
 }
 .controller-search #content .search-results-type-article li,
-.controller-search #content .search-results-type-event li {
+.controller-search #content .search-results-type-event li,
+.controller-browse #content li.browse-results-type-content {
   padding: 0px 0px 4px 20px;
   background-repeat: no-repeat;
   border-color: transparent;
 }
 .controller-search #content .search-results-type-article li:hover,
-.controller-search #content .search-results-type-event li:hover {
+.controller-search #content .search-results-type-event li:hover,
+.controller-browse #content li.browse-results-type-content:hover {
   background-color: transparent;
 }
 .controller-search .search-results-type-article .item_meta,
-.controller-search .search-results-type-event .item_meta {
+.controller-search .search-results-type-event .item_meta,
+.controller-browse .browse-results-type-content .item_meta {
   font-size: 10px;
   color: #888;
 }
+.controller-browse .browse-results-type-content .item_meta span {
+  width: auto;
+}
+
 .search-results-type-article.search-results-innerbox {
   overflow: auto;
 }
@@ -19,7 +19,10 @@ class BrowseControllerTest &lt; Test::Unit::TestCase
     user.stubs(:email).returns('some@test.com')
     user.stubs(:save!).returns(true)
     Person.any_instance.stubs(:user).returns(user)
+    @profile = create_user('testinguser').person
+    Article.destroy_all
   end
+  attr_reader :profile
   should 'search for people' do
     Person.delete_all
@@ -274,4 +277,98 @@ class BrowseControllerTest &lt; Test::Unit::TestCase
     assert_not_includes assigns(:results), p1
   end
+  should 'search for contents' do
+    small = create(TinyMceArticle, :name => 'Testing article', :body => 'A small article for testing', :profile => profile)
+    create(TinyMceArticle, :name => 'Testing article 2', :body => 'A big article for testing', :profile => profile)
+
+    get :contents, :query => 'small'
+    assert_equal [small], assigns(:results)
+  end
+
+  should 'list all contents ordered by more recent by default' do
+    c1 = create(TinyMceArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile => profile, :created_at => DateTime.now - 2)
+    c2 = create(TinyMceArticle, :name => 'Testing article 2', :body => 'Article body 2', :profile => profile, :created_at => DateTime.now - 1)
+    c3 = create(TinyMceArticle, :name => 'Testing article 3', :body => 'Article body 3', :profile => profile)
+
+    get :contents
+    assert_equal [c3,c2,c1], assigns(:results)
+  end
+
+  should 'paginate search of contents in groups of 27' do
+    1.upto(30).map do |n|
+      create(TinyMceArticle, :name => "Testing article #{n}", :body => "Article body #{n}", :profile => profile)
+    end
+
+    get :contents
+    assert_equal 27 , assigns(:results).count
+    assert_tag :a, '', :attributes => {:class => 'next_page'}
+  end
+
+  should 'paginate ferret search of contents in groups of 27' do
+    1.upto(30).map do |n|
+      create(TinyMceArticle, :name => "Testing article #{n}", :body => "Article body #{n}", :profile => profile)
+    end
+
+    get :contents, :query => 'Testing'
+    assert_equal 27 , assigns(:results).count
+    assert_tag :a, '', :attributes => {:class => 'next_page'}
+  end
+
+  should 'list all contents filter by more comments' do
+    article1 = fast_create(TinyMceArticle, :body => '<p>Article to test browse contents', :profile_id => profile.id, :comments_count => 5)
+    article2 = fast_create(TinyMceArticle, :body => '<p>Another article to test browse contents</p>', :profile_id => profile.id, :comments_count => 10)
+    article3 = fast_create(TinyMceArticle, :body => '<p>Another article to test browse contents</p>', :profile_id => profile.id, :comments_count => 1)
+
+    get :contents, :filter => 'more_comments'
+    assert_equal [article2,article1,article3] , assigns(:results)
+  end
+
+  should 'list all contents filter by more views' do
+    article1 = fast_create(TinyMceArticle, :body => '<p>Article to test browse contents', :profile_id => profile.id, :hits => 5)
+    article2 = fast_create(TinyMceArticle, :body => '<p>Another article to test browse contents</p>', :profile_id => profile.id, :hits => 10)
+    article3 = fast_create(TinyMceArticle, :body => '<p>Another article to test browse contents</p>', :profile_id => profile.id, :hits => 1)
+
+    get :contents, :filter => 'more_views'
+    assert_equal [article2,article1,article3], assigns(:results)
+  end
+
+  should 'have the more_recent filter by default' do
+    get :contents, :filter => 'more_recent'
+    assert_equal 'more_recent' , assigns(:filter)
+
+    get :contents, :filter => 'more_comments'
+    assert_equal 'more_comments' , assigns(:filter)
+
+    get :contents, :filter => 'more_views'
+    assert_equal 'more_views' , assigns(:filter)
+
+    get :contents, :filter => 'more_anything'
+    assert_equal 'more_recent' , assigns(:filter)
+  end
+
+  should 'the contents filter define the title' do
+    get :contents, :filter => 'more_recent'
+    assert_equal 'More recent contents' , assigns(:title)
+    assert_tag :h1, :content => 'More recent contents'
+
+    get :contents, :filter => 'more_views'
+    assert_equal 'Most viewed contents' , assigns(:title)
+    assert_tag :h1, :content => 'Most viewed contents'
+
+    get :contents, :filter => 'more_comments'
+    assert_equal 'Most commented contents' , assigns(:title)
+    assert_tag :h1, :content => 'Most commented contents'
+
+    get :contents, :filter => 'more_anything'
+    assert_equal 'More recent contents' , assigns(:title)
+    assert_tag :h1, :content => 'More recent contents'
+  end
+
+  should "only include published contents in more_recent filter" do
+    # assuming that all filters behave the same!
+    article = fast_create(TinyMceArticle, :body => '<p>Article to test browse contents', :profile_id => profile.id, :published => false)
+    get :contents, :filter => 'more_recent'
+    assert_not_includes assigns(:results), article
+  end
+
 end
@@ -1562,4 +1562,78 @@ class ArticleTest &lt; Test::Unit::TestCase
     end
   end
+  should 'find more recent contents' do
+    Article.delete_all
+
+    c1 = fast_create(TinyMceArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile_id => profile.id, :created_at => DateTime.now - 4)
+    c2 = fast_create(TinyMceArticle, :name => 'Testing article 2', :body => 'Article body 2', :profile_id => profile.id, :created_at => DateTime.now - 1)
+    c3 = fast_create(TinyMceArticle, :name => 'Testing article 3', :body => 'Article body 3', :profile_id => profile.id, :created_at => DateTime.now - 3)
+
+    assert_equal [c2,c3,c1] , Article.more_recent
+
+    c4 = fast_create(TinyMceArticle, :name => 'Testing article 4', :body => 'Article body 4', :profile_id => profile.id, :created_at => DateTime.now - 2)
+    assert_equal [c2,c4,c3,c1] , Article.more_recent
+  end
+
+  should 'respond to more comments' do
+    assert_respond_to Article, :more_comments
+  end
+
+  should 'respond to more views' do
+    assert_respond_to Article, :more_views
+  end
+
+  should "return the more recent label" do
+    a = Article.new
+    assert_equal "Created at: ", a.more_recent_label
+  end
+
+  should "return no comments if profile has 0 comments" do
+    a = Article.new
+    assert_equal 0, a.comments_count
+    assert_equal "no comments", a.more_comments_label
+  end
+
+  should "return 1 comment on label if the content has 1 comment" do
+    a = Article.new(:comments_count => 1)
+    assert_equal 1, a.comments_count
+    assert_equal "one comment", a.more_comments_label
+  end
+
+  should "return number of comments on label if the content has more than one comment" do
+    a = Article.new(:comments_count => 4)
+    assert_equal 4, a.comments_count
+    assert_equal "4 comments", a.more_comments_label
+  end
+
+  should "return no views if profile has 0 views" do
+    a = Article.new
+    assert_equal 0, a.hits
+    assert_equal "no views", a.more_views_label
+  end
+
+  should "return 1 view on label if the content has 1 view" do
+    a = Article.new(:hits => 1)
+    assert_equal 1, a.hits
+    assert_equal "one view", a.more_views_label
+  end
+
+  should "return number of views on label if the content has more than one view" do
+    a = Article.new(:hits => 4)
+    assert_equal 4, a.hits
+    assert_equal "4 views", a.more_views_label
+  end
+
+  should 'return only text articles' do
+    Article.delete_all
+
+    c1 = fast_create(TinyMceArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile_id => profile.id)
+    c2 = fast_create(TextArticle, :name => 'Testing article 2', :body => 'Article body 2', :profile_id => profile.id)
+    c3 = fast_create(Event, :name => 'Testing article 3', :body => 'Article body 3', :profile_id => profile.id)
+    c4 = fast_create(RssFeed, :name => 'Testing article 4', :body => 'Article body 4', :profile_id => profile.id)
+    c5 = fast_create(TextileArticle, :name => 'Testing article 5', :body => 'Article body 5', :profile_id => profile.id)
+
+    assert_equal [c1,c2,c5], Article.text_articles
+  end
+
 end
	@@ -6,6 +6,8 @@ class BrowseController < PublicController		@@ -6,6 +6,8 @@ class BrowseController < PublicController
6	more_recent	6	more_recent
7	more_active	7	more_active
8	more_popular	8	more_popular
		9	+ more_comments
		10	+ more_views
9	)	11	)
10		12
11	def per_page	13	def per_page
	@@ -36,6 +38,18 @@ class BrowseController < PublicController		@@ -36,6 +38,18 @@ class BrowseController < PublicController
36	@results = @results.compact.paginate(:per_page => per_page, :page => params[:page])	38	@results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
37	end	39	end
38		40
		41	+ def contents
		42	+ @filter = filter
		43	+ @title = self.filter_description(params[:action] + '_' + @filter )
		44	+
		45	+ @results = @environment.articles.published.text_articles.send(@filter)
		46	+
		47	+ if !params[:query].blank?
		48	+ @results = @results.find_by_contents(params[:query])
		49	+ end
		50	+ @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
		51	+ end
		52	+
39	protected	53	protected
40		54
41	def filter	55	def filter
	@@ -54,6 +68,9 @@ class BrowseController < PublicController		@@ -54,6 +68,9 @@ class BrowseController < PublicController
54	'communities_more_recent' => _('More recent communities'),	68	'communities_more_recent' => _('More recent communities'),
55	'communities_more_active' => _('More active communities'),	69	'communities_more_active' => _('More active communities'),
56	'communities_more_popular' => _('More popular communities'),	70	'communities_more_popular' => _('More popular communities'),
		71	+ 'contents_more_recent' => _('More recent contents'),
		72	+ 'contents_more_views' => _('Most viewed contents'),
		73	+ 'contents_more_comments' => _('Most commented contents'),
57	}[str] \|\| str	74	}[str] \|\| str
58	end	75	end
59		76
	@@ -1134,6 +1134,17 @@ module ApplicationHelper		@@ -1134,6 +1134,17 @@ module ApplicationHelper
1134	link_to(content_tag(:span, _('Communities Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')	1134	link_to(content_tag(:span, _('Communities Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
1135	end	1135	end
1136		1136
		1137	+ def browse_contents_menu
		1138	+ links = [
		1139	+ {s_('contents\|More Comments') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_comments'})}},
		1140	+ {s_('contents\|More Views') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_views'})}},
		1141	+ {s_('contents\|More Recent') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_recent'})}}
		1142	+ ]
		1143	+
		1144	+ link_to(content_tag(:span, _('Contents'), :class => 'icon-blog'), {:controller => "browse", :action => 'contents'}, :id => 'submenu-contents') +
		1145	+ link_to(content_tag(:span, _('Contents Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
		1146	+ end
		1147	+
1137	def pagination_links(collection, options={})	1148	def pagination_links(collection, options={})
1138	options = {:prev_label => '« ' + _('Previous'), :next_label => _('Next') + ' »'}.merge(options)	1149	options = {:prev_label => '« ' + _('Previous'), :next_label => _('Next') + ' »'}.merge(options)
1139	will_paginate(collection, options)	1150	will_paginate(collection, options)
	@@ -355,11 +355,20 @@ class Article < ActiveRecord::Base		@@ -355,11 +355,20 @@ class Article < ActiveRecord::Base
355	['Folder', 'Blog', 'Forum', 'Gallery']	355	['Folder', 'Blog', 'Forum', 'Gallery']
356	end	356	end
357		357
		358	+ def self.text_article_types
		359	+ ['TextArticle', 'TextileArticle', 'TinyMceArticle']
		360	+ end
		361	+
358	named_scope :published, :conditions => { :published => true }	362	named_scope :published, :conditions => { :published => true }
359	named_scope :folders, :conditions => { :type => folder_types}	363	named_scope :folders, :conditions => { :type => folder_types}
360	named_scope :no_folders, :conditions => ['type NOT IN (?)', folder_types]	364	named_scope :no_folders, :conditions => ['type NOT IN (?)', folder_types]
361	named_scope :galleries, :conditions => { :type => 'Gallery' }	365	named_scope :galleries, :conditions => { :type => 'Gallery' }
362	named_scope :images, :conditions => { :is_image => true }	366	named_scope :images, :conditions => { :is_image => true }
		367	+ named_scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
		368	+
		369	+ named_scope :more_comments, :order => "comments_count DESC"
		370	+ named_scope :more_views, :order => "hits DESC"
		371	+ named_scope :more_recent, :order => "created_at DESC"
363		372
364	def self.display_filter(user, profile)	373	def self.display_filter(user, profile)
365	return {:conditions => ['published = ?', true]} if !user	374	return {:conditions => ['published = ?', true]} if !user
	@@ -528,6 +537,28 @@ class Article < ActiveRecord::Base		@@ -528,6 +537,28 @@ class Article < ActiveRecord::Base
528	end	537	end
529	end	538	end
530		539
		540	+ def more_comments_label
		541	+ amount = self.comments_count
		542	+ {
		543	+ 0 => _('no comments'),
		544	+ 1 => _('one comment')
		545	+ }[amount] \|\| _("%s comments") % amount
		546	+
		547	+ end
		548	+
		549	+ def more_views_label
		550	+ amount = self.hits
		551	+ {
		552	+ 0 => _('no views'),
		553	+ 1 => _('one view')
		554	+ }[amount] \|\| _("%s views") % amount
		555	+
		556	+ end
		557	+
		558	+ def more_recent_label
		559	+ _('Created at: ')
		560	+ end
		561	+
531	private	562	private
532		563
533	def sanitize_tag_list	564	def sanitize_tag_list
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+<li class="<%= 'browse-results-type-content ' + icon_for_article(result) %>">
	2	+ <strong><%= link_to(result.title, result.view_url) %></strong>
	3	+ <div class="item_meta">
	4	+ <span class="item_by">
	5	+ <%= _('by %s') % link_to(result.author.name, result.author.url) %>
	6	+ </span>
	7	+ <span class="extra-info">
	8	+ <%= (@filter == 'more_recent' ? result.send(@filter + '_label') + show_date(result.created_at) : result.send(@filter + '_label')) %>
	9	+ </span>
	10	+ </div>
	11	+</li>
	@@ -8,7 +8,7 @@		@@ -8,7 +8,7 @@
8	<% end %>	8	<% end %>
9	<ul class='common-profile-list-block'>	9	<ul class='common-profile-list-block'>
10	<% @results.each do \|result\| %>	10	<% @results.each do \|result\| %>
11	- <%= render :partial => partial_for_class(result.class), :locals => {:profile => result} %>	11	+ <%= render :partial => partial_for_class(result.class), :locals => {:result => result} %>
12	<% end %>	12	<% end %>
13	</ul>	13	</ul>
14	<br style='clear: both;'>	14	<br style='clear: both;'>
1	-<%= profile_image_link profile, :portrait, 'li',
2	- "<span class='adr'>#{profile.city}</span>" +
3	- (@filter == 'more_recent' ? profile.send(@filter + '_label') + show_date(profile.created_at) : profile.send(@filter + '_label')) %>	1	+<%= profile_image_link result, :portrait, 'li',
		2	+ "<span class='adr'>#{result.city}</span>" +
		3	+ (@filter == 'more_recent' ? result.send(@filter + '_label') + show_date(result.created_at) : result.send(@filter + '_label')) %>
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+<%= search_page_title( @title, { :query => @query} ) %>
	2	+
	3	+<%= render :partial => 'search_form', :locals => {:action => 'contents'} %>
	4	+
	5	+<%= render :partial => 'display_results' %>
	6	+
	7	+<%= pagination_links @results %>
	8	+
	9	+<br style="clear:both" />
	@@ -84,3 +84,26 @@ Feature: browse		@@ -84,3 +84,26 @@ Feature: browse
84	And I should not see "Pedro Silva"	84	And I should not see "Pedro Silva"
85	And I should not see "Paulo Neto"	85	And I should not see "Paulo Neto"
86	And I should not see "Community Silva"	86	And I should not see "Community Silva"
		87	+
		88	+ @selenium
		89	+ Scenario: Show contents browse menu
		90	+ Given I should not see "More Comments"
		91	+ And I should not see "More Views"
		92	+ And I should not see "More Recent"
		93	+ When I click "#submenu-contents-trigger"
		94	+ Then I should see "More Comments"
		95	+ And I should see "More Views"
		96	+ And I should see "More Recent"
		97	+
		98	+ Scenario: Browse contents by query
		99	+ Given the following articles
		100	+ \| owner \| name \| body \|
		101	+ \| joaosilva \| Bees can fly \| this is an article \|
		102	+ \| joaosilva \| Bees and ants are insects \| this is another article \|
		103	+ \| joaosilva \| Ants are small \| this is another article \|
		104	+ When I go to /browse/contents
		105	+ And I fill in "bees" for "query"
		106	+ And I press "Search"
		107	+ Then I should see "Bees can fly"
		108	+ And I should see "Bees and ants are insects"
		109	+ And I should not see "Ants are small"
	@@ -19,7 +19,10 @@ class BrowseControllerTest < Test::Unit::TestCase		@@ -19,7 +19,10 @@ class BrowseControllerTest < Test::Unit::TestCase
19	user.stubs(:email).returns('some@test.com')	19	user.stubs(:email).returns('some@test.com')
20	user.stubs(:save!).returns(true)	20	user.stubs(:save!).returns(true)
21	Person.any_instance.stubs(:user).returns(user)	21	Person.any_instance.stubs(:user).returns(user)
		22	+ @profile = create_user('testinguser').person
		23	+ Article.destroy_all
22	end	24	end
		25	+ attr_reader :profile
23		26
24	should 'search for people' do	27	should 'search for people' do
25	Person.delete_all	28	Person.delete_all
	@@ -274,4 +277,98 @@ class BrowseControllerTest < Test::Unit::TestCase		@@ -274,4 +277,98 @@ class BrowseControllerTest < Test::Unit::TestCase
274	assert_not_includes assigns(:results), p1	277	assert_not_includes assigns(:results), p1
275	end	278	end
276		279
		280	+ should 'search for contents' do
		281	+ small = create(TinyMceArticle, :name => 'Testing article', :body => 'A small article for testing', :profile => profile)
		282	+ create(TinyMceArticle, :name => 'Testing article 2', :body => 'A big article for testing', :profile => profile)
		283	+
		284	+ get :contents, :query => 'small'
		285	+ assert_equal [small], assigns(:results)
		286	+ end
		287	+
		288	+ should 'list all contents ordered by more recent by default' do
		289	+ c1 = create(TinyMceArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile => profile, :created_at => DateTime.now - 2)
		290	+ c2 = create(TinyMceArticle, :name => 'Testing article 2', :body => 'Article body 2', :profile => profile, :created_at => DateTime.now - 1)
		291	+ c3 = create(TinyMceArticle, :name => 'Testing article 3', :body => 'Article body 3', :profile => profile)
		292	+
		293	+ get :contents
		294	+ assert_equal [c3,c2,c1], assigns(:results)
		295	+ end
		296	+
		297	+ should 'paginate search of contents in groups of 27' do
		298	+ 1.upto(30).map do \|n\|
		299	+ create(TinyMceArticle, :name => "Testing article #{n}", :body => "Article body #{n}", :profile => profile)
		300	+ end
		301	+
		302	+ get :contents
		303	+ assert_equal 27 , assigns(:results).count
		304	+ assert_tag :a, '', :attributes => {:class => 'next_page'}
		305	+ end
		306	+
		307	+ should 'paginate ferret search of contents in groups of 27' do
		308	+ 1.upto(30).map do \|n\|
		309	+ create(TinyMceArticle, :name => "Testing article #{n}", :body => "Article body #{n}", :profile => profile)
		310	+ end
		311	+
		312	+ get :contents, :query => 'Testing'
		313	+ assert_equal 27 , assigns(:results).count
		314	+ assert_tag :a, '', :attributes => {:class => 'next_page'}
		315	+ end
		316	+
		317	+ should 'list all contents filter by more comments' do
		318	+ article1 = fast_create(TinyMceArticle, :body => '<p>Article to test browse contents', :profile_id => profile.id, :comments_count => 5)
		319	+ article2 = fast_create(TinyMceArticle, :body => '<p>Another article to test browse contents</p>', :profile_id => profile.id, :comments_count => 10)
		320	+ article3 = fast_create(TinyMceArticle, :body => '<p>Another article to test browse contents</p>', :profile_id => profile.id, :comments_count => 1)
		321	+
		322	+ get :contents, :filter => 'more_comments'
		323	+ assert_equal [article2,article1,article3] , assigns(:results)
		324	+ end
		325	+
		326	+ should 'list all contents filter by more views' do
		327	+ article1 = fast_create(TinyMceArticle, :body => '<p>Article to test browse contents', :profile_id => profile.id, :hits => 5)
		328	+ article2 = fast_create(TinyMceArticle, :body => '<p>Another article to test browse contents</p>', :profile_id => profile.id, :hits => 10)
		329	+ article3 = fast_create(TinyMceArticle, :body => '<p>Another article to test browse contents</p>', :profile_id => profile.id, :hits => 1)
		330	+
		331	+ get :contents, :filter => 'more_views'
		332	+ assert_equal [article2,article1,article3], assigns(:results)
		333	+ end
		334	+
		335	+ should 'have the more_recent filter by default' do
		336	+ get :contents, :filter => 'more_recent'
		337	+ assert_equal 'more_recent' , assigns(:filter)
		338	+
		339	+ get :contents, :filter => 'more_comments'
		340	+ assert_equal 'more_comments' , assigns(:filter)
		341	+
		342	+ get :contents, :filter => 'more_views'
		343	+ assert_equal 'more_views' , assigns(:filter)
		344	+
		345	+ get :contents, :filter => 'more_anything'
		346	+ assert_equal 'more_recent' , assigns(:filter)
		347	+ end
		348	+
		349	+ should 'the contents filter define the title' do
		350	+ get :contents, :filter => 'more_recent'
		351	+ assert_equal 'More recent contents' , assigns(:title)
		352	+ assert_tag :h1, :content => 'More recent contents'
		353	+
		354	+ get :contents, :filter => 'more_views'
		355	+ assert_equal 'Most viewed contents' , assigns(:title)
		356	+ assert_tag :h1, :content => 'Most viewed contents'
		357	+
		358	+ get :contents, :filter => 'more_comments'
		359	+ assert_equal 'Most commented contents' , assigns(:title)
		360	+ assert_tag :h1, :content => 'Most commented contents'
		361	+
		362	+ get :contents, :filter => 'more_anything'
		363	+ assert_equal 'More recent contents' , assigns(:title)
		364	+ assert_tag :h1, :content => 'More recent contents'
		365	+ end
		366	+
		367	+ should "only include published contents in more_recent filter" do
		368	+ # assuming that all filters behave the same!
		369	+ article = fast_create(TinyMceArticle, :body => '<p>Article to test browse contents', :profile_id => profile.id, :published => false)
		370	+ get :contents, :filter => 'more_recent'
		371	+ assert_not_includes assigns(:results), article
		372	+ end
		373	+
277	end	374	end
	@@ -1562,4 +1562,78 @@ class ArticleTest < Test::Unit::TestCase		@@ -1562,4 +1562,78 @@ class ArticleTest < Test::Unit::TestCase
1562	end	1562	end
1563	end	1563	end
1564		1564
		1565	+ should 'find more recent contents' do
		1566	+ Article.delete_all
		1567	+
		1568	+ c1 = fast_create(TinyMceArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile_id => profile.id, :created_at => DateTime.now - 4)
		1569	+ c2 = fast_create(TinyMceArticle, :name => 'Testing article 2', :body => 'Article body 2', :profile_id => profile.id, :created_at => DateTime.now - 1)
		1570	+ c3 = fast_create(TinyMceArticle, :name => 'Testing article 3', :body => 'Article body 3', :profile_id => profile.id, :created_at => DateTime.now - 3)
		1571	+
		1572	+ assert_equal [c2,c3,c1] , Article.more_recent
		1573	+
		1574	+ c4 = fast_create(TinyMceArticle, :name => 'Testing article 4', :body => 'Article body 4', :profile_id => profile.id, :created_at => DateTime.now - 2)
		1575	+ assert_equal [c2,c4,c3,c1] , Article.more_recent
		1576	+ end
		1577	+
		1578	+ should 'respond to more comments' do
		1579	+ assert_respond_to Article, :more_comments
		1580	+ end
		1581	+
		1582	+ should 'respond to more views' do
		1583	+ assert_respond_to Article, :more_views
		1584	+ end
		1585	+
		1586	+ should "return the more recent label" do
		1587	+ a = Article.new
		1588	+ assert_equal "Created at: ", a.more_recent_label
		1589	+ end
		1590	+
		1591	+ should "return no comments if profile has 0 comments" do
		1592	+ a = Article.new
		1593	+ assert_equal 0, a.comments_count
		1594	+ assert_equal "no comments", a.more_comments_label
		1595	+ end
		1596	+
		1597	+ should "return 1 comment on label if the content has 1 comment" do
		1598	+ a = Article.new(:comments_count => 1)
		1599	+ assert_equal 1, a.comments_count
		1600	+ assert_equal "one comment", a.more_comments_label
		1601	+ end
		1602	+
		1603	+ should "return number of comments on label if the content has more than one comment" do
		1604	+ a = Article.new(:comments_count => 4)
		1605	+ assert_equal 4, a.comments_count
		1606	+ assert_equal "4 comments", a.more_comments_label
		1607	+ end
		1608	+
		1609	+ should "return no views if profile has 0 views" do
		1610	+ a = Article.new
		1611	+ assert_equal 0, a.hits
		1612	+ assert_equal "no views", a.more_views_label
		1613	+ end
		1614	+
		1615	+ should "return 1 view on label if the content has 1 view" do
		1616	+ a = Article.new(:hits => 1)
		1617	+ assert_equal 1, a.hits
		1618	+ assert_equal "one view", a.more_views_label
		1619	+ end
		1620	+
		1621	+ should "return number of views on label if the content has more than one view" do
		1622	+ a = Article.new(:hits => 4)
		1623	+ assert_equal 4, a.hits
		1624	+ assert_equal "4 views", a.more_views_label
		1625	+ end
		1626	+
		1627	+ should 'return only text articles' do
		1628	+ Article.delete_all
		1629	+
		1630	+ c1 = fast_create(TinyMceArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile_id => profile.id)
		1631	+ c2 = fast_create(TextArticle, :name => 'Testing article 2', :body => 'Article body 2', :profile_id => profile.id)
		1632	+ c3 = fast_create(Event, :name => 'Testing article 3', :body => 'Article body 3', :profile_id => profile.id)
		1633	+ c4 = fast_create(RssFeed, :name => 'Testing article 4', :body => 'Article body 4', :profile_id => profile.id)
		1634	+ c5 = fast_create(TextileArticle, :name => 'Testing article 5', :body => 'Article body 5', :profile_id => profile.id)
		1635	+
		1636	+ assert_equal [c1,c2,c5], Article.text_articles
		1637	+ end
		1638	+
1565	end	1639	end