Revert "Blog paginate only with the available post for the user"

This reverts commit 64e4639c91da8a2beadf7639f95357b1db1f3e97. (ActionItem1557, ActionItem1617)

Revert "Blog paginate only with the available post for the user"
This reverts commit 64e4639c91da8a2beadf7639f95357b1db1f3e97. (ActionItem1557, ActionItem1617)
Antonio Terceiro
1 parent 9e88d499
Showing 11 changed files with 104 additions and 93 deletions Show diff stats
app/controllers/public/content_viewer_controller.rb
app/helpers/blog_helper.rb
app/models/article.rb
app/models/blog.rb
app/models/event.rb
app/views/content_viewer/blog_page.rhtml
test/functional/content_viewer_controller_test.rb
test/unit/article_test.rb
test/unit/blog_helper_test.rb
test/unit/blog_test.rb
test/unit/content_viewer_helper_test.rb
@@ -78,13 +78,7 @@ class ContentViewerController &lt; ApplicationController
     end
     if @page.blog?
-      posts = if params[:year] and params[:month]
-        filter_date = DateTime.parse("#{params[:year]}-#{params[:month]}-01")
-        @page.posts.by_range(filter_date..Article.last_day_of_month(filter_date))
-      else
-        @page.posts
-      end
-      @posts = available_articles(posts, user).paginate :page => params[:npage], :per_page => @page.posts_per_page
+      @page.filter = {:year => params[:year], :month => params[:month]}
     end
     if @page.folder? && @page.view_as == 'image_gallery'
@@ -14,7 +14,7 @@ module BlogHelper
     _('Edit blog')
   end
-  def list_posts(articles, format = 'full')
+  def list_posts(user, articles, format = 'full')
     pagination = will_paginate(articles, {
       :param_name => 'npage',
       :prev_label => _('&laquo; Newer posts'),
@@ -25,16 +25,18 @@ module BlogHelper
     articles.each_with_index{ |art,i|
       css_add = [ 'position-'+(i+1).to_s() ]
       position = (i%2 == 0) ? 'odd-post' : 'even-post'
-      css_add << 'first' if i == 0
-      css_add << 'last'  if i == (artic_len-1)
-      css_add << 'not-published' if !art.published?
-      css_add << position + '-inner'
-      content << content_tag('div',
-                             content_tag('div',
-                                         display_post(art, format) + '<br style="clear:both"/>',
-                                         :class => 'blog-post ' + css_add.join(' '),
-                                         :id => "post-#{art.id}"), :class => position
-                            )
+      if art.published? || (user==art.profile)
+        css_add << 'first' if i == 0
+        css_add << 'last'  if i == (artic_len-1)
+        css_add << 'not-published' if !art.published?
+        css_add << position + '-inner'
+        content << content_tag('div',
+                    content_tag('div',
+                       display_post(art, format) + '<br style="clear:both"/>',
+                       :class => 'blog-post ' + css_add.join(' '),
+                       :id => "post-#{art.id}"), :class => position
+                   )
+      end
     }
     content.join("\n<hr class='sep-posts'/>\n") + (pagination or '')
   end
@@ -32,23 +32,6 @@ class Article &lt; ActiveRecord::Base
     {:include => 'categories', :conditions => { 'categories.id' => category.id }}
   }
-  named_scope :by_range, lambda { |range| {
-    :conditions => [
-      'published_at BETWEEN :start_date AND :end_date', { :start_date => range.first, :end_date => range.last }
-    ]
-  }}
-
-  def self.first_day_of_month(date)
-    date ||= Date.today
-    Date.new(date.year, date.month, 1)
-  end
-
-  def self.last_day_of_month(date)
-    date ||= Date.today
-    date >>= 1
-    Date.new(date.year, date.month, 1) - 1.day
-  end
-
   URL_FORMAT = /\A(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?\Z/ix
   validates_format_of :external_link, :with => URL_FORMAT, :if => lambda { |article| !article.external_link.blank? }
@@ -3,6 +3,7 @@ class Blog &lt; Folder
   has_many :posts, :class_name => 'Article', :foreign_key => 'parent_id', :source => :children, :conditions => [ 'type != ?', 'RssFeed' ], :order => 'published_at DESC, id DESC'
   attr_accessor :feed_attrs
+  attr_accessor :filter
   after_create do |blog|
     blog.children << RssFeed.new(:name => 'feed', :profile => blog.profile)
@@ -22,9 +23,7 @@ class Blog &lt; Folder
   # FIXME isn't this too much including just to be able to generate some HTML?
   include ActionView::Helpers::TagHelper
   def to_html(options = {})
-    lambda do
-      render :file => 'content_viewer/blog_page'
-    end
+    posts_list(options[:page])
   end
   def folder?
@@ -50,6 +49,19 @@ class Blog &lt; Folder
     self.feed
   end
+  def posts_list(npage)
+    article = self
+    children = if filter and filter[:year] and filter[:month]
+                filter_date = DateTime.parse("#{filter[:year]}-#{filter[:month]}-01")
+                posts.paginate :page => npage, :per_page => posts_per_page, :conditions => [ 'published_at between ? and ?', filter_date, filter_date + 1.month - 1.day ]
+              else
+                posts.paginate :page => npage, :per_page => posts_per_page
+              end
+    lambda do
+      render :file => 'content_viewer/blog_page', :locals => {:article => article, :children => children}
+    end
+  end
+
   has_one :external_feed, :foreign_key => 'blog_id', :dependent => :destroy
   attr_accessor :external_feed_data
@@ -56,6 +56,17 @@ class Event &lt; Article
     first_day..last_day
   end
+  def self.first_day_of_month(date)
+    date ||= Date.today
+    Date.new(date.year, date.month, 1)
+  end
+
+  def self.last_day_of_month(date)
+    date ||= Date.today
+    date >>= 1
+    Date.new(date.year, date.month, 1) - 1.day
+  end
+
   def date_range
     start_date..(end_date||start_date)
   end
-<% add_rss_feed_to_head(@page.name, @page.feed.url)  if @page.blog? && @page.feed %>
+<% add_rss_feed_to_head(article.name, article.feed.url)  if article.blog? && article.feed %>
-<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if @page.blog? && @page.external_feed && @page.external_feed.enabled && @page.external_feed.fetched_at.nil? %>
+<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if article.blog? && article.external_feed && article.external_feed.enabled && article.external_feed.fetched_at.nil? %>
 <div>
-  <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.blog? && @page.feed %>
+  <%= link_to(image_tag('icons-mime/rss-feed.png'), article.feed.url, :class => 'blog-feed-link') if article.blog? && article.feed %>
   <div class='blog-description'>
-    <%= @page.body %>
+    <%= article.body %>
   </div>
 </div>
 <hr class="pre-posts"/>
 <div class="blog-posts">
-  <%= (@posts.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(@posts, @page.visualization_format)) %>
+  <%= (children.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(user, children, article.visualization_format)) %>
 </div>
@@ -603,27 +603,10 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
     assert_response :missing
   end
-  should 'list unpublished posts to owner with a different class' do
-    login_as('testinguser')
-    blog = Blog.create!(:name => 'A blog test', :profile => profile)
-    blog.posts << TextileArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => false)
-
-    get :view_page, :profile => profile.identifier, :page => [blog.path]
-    assert_tag :tag => 'div', :attributes => {:class => /not-published/}
-  end
-
-  should 'not list unpublished posts to a not logged person' do
-    blog = Blog.create!(:name => 'A blog test', :profile => profile)
-    blog.posts << TextileArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => false)
-
-    get :view_page, :profile => profile.identifier, :page => [blog.path]
-    assert_no_tag :tag => 'a', :content => "Post"
-  end
-
   should 'display pagination links of blog' do
     blog = Blog.create!(:name => 'A blog test', :profile => profile, :posts_per_page => 5)
     for n in 1..10
-      blog.posts << TextileArticle.create!(:name => "Post #{n}", :profile => profile, :parent => blog)
+      blog.children << TextileArticle.create!(:name => "Post #{n}", :profile => profile, :parent => blog)
     end
     assert_equal 10, blog.posts.size
@@ -631,17 +614,11 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'a', :attributes => { :href => "/#{profile.identifier}/#{blog.path}?npage=2", :rel => 'next' }
   end
-  should 'display filtered posts' do
-    blog = Blog.create!(:name => 'A blog test', :profile => profile)
-    not_display_post = TextileArticle.new(:name => "Post 1", :profile => profile, :parent => blog)
-    display_post = TextileArticle.new(:name => "Post 2", :profile => profile, :parent => blog)
-
-    not_display_post.update_attribute(:published_at, DateTime.parse('2009-09-10'))
-    display_post.update_attribute(:published_at, DateTime.parse('2010-09-10'))
-
-    get :view_page, :profile => profile.identifier, :page => [blog.path], :year => 2010, :month => 9
-    assert_no_tag :tag => 'a', :content => "Post 1"
-    assert_tag :tag => 'a', :content => "Post 2"
+  should 'set year and month filter from URL params' do
+    profile.articles << Blog.new(:name => 'A blog test', :profile => profile)
+    year, month = profile.blog.created_at.year.to_s, '%02d' % profile.blog.created_at.month
+    get :view_page, :profile => profile.identifier, :page => [profile.blog.path], :year => year, :month => month
+    assert_equal({ :year => year.to_s, :month => month.to_s }, assigns(:page).filter)
   end
   should 'give link to create new article inside folder when view child of folder' do
@@ -873,22 +873,4 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert_no_match /[<>]/, article.name
   end
-  should 'found articles with published date between a range' do
-    start_date = DateTime.parse('2010-07-06')
-    end_date = DateTime.parse('2010-08-02')
-
-    article_found1 = fast_create(Article, :published_at => start_date)
-    article_found2 = fast_create(Article, :published_at => end_date)
-    article_not_found = fast_create(Article, :published_at => end_date + 1.month)
-
-    assert_includes Article.by_range(start_date..end_date), article_found1
-    assert_includes Article.by_range(start_date..end_date), article_found2
-    assert_not_includes Article.by_range(start_date..end_date), article_not_found
-  end
-
-  should 'calculate first/end day of a month' do
-    assert_equal 1, Article.first_day_of_month(DateTime.parse('2010-07-06')).day
-    assert_equal 31, Article.last_day_of_month(DateTime.parse('2010-07-06')).day
-  end
-
 end
@@ -27,7 +27,28 @@ class BlogHelperTest &lt; Test::Unit::TestCase
     expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-1 first last odd-post-inner', :id => "post-#{published_post.id}").returns('POST')
     expects(:content_tag).with('div', 'POST', {:class => 'odd-post'}).returns('RESULT')
-    assert_equal 'RESULT', list_posts(blog.posts)
+    assert_equal 'RESULT', list_posts(profile, blog.posts)
+  end
+
+  should 'list unpublished posts to owner with a different class' do
+    blog.children << unpublished_post = TextileArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => false)
+
+    expects(:display_post).with(anything, anything).returns('POST')
+    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-1 first last not-published odd-post-inner', :id => "post-#{unpublished_post.id}").returns('POST')
+    expects(:content_tag).with('div', 'POST', {:class => 'odd-post'}).returns('RESULT')
+    assert_equal 'RESULT', list_posts(profile, blog.posts)
+  end
+
+  should 'not list unpublished posts to not owner' do
+    blog.children << unpublished_post = TextileArticle.create!(:name => 'First post', :profile => profile, :parent => blog, :published => false)
+
+    blog.children << published_post = TextileArticle.create!(:name => 'Second post', :profile => profile, :parent => blog, :published => true)
+
+    expects(:display_post).with(anything, anything).returns('POST')
+    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", has_entries(:id => "post-#{unpublished_post.id}")).never
+    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", has_entries(:id => "post-#{published_post.id}")).returns('POST')
+    expects(:content_tag).with('div', 'POST', {:class => 'odd-post'}).returns('RESULT')
+    assert_equal 'RESULT', list_posts(nil, blog.posts)
   end
   should 'list even/odd posts with a different class' do
@@ -43,7 +64,7 @@ class BlogHelperTest &lt; Test::Unit::TestCase
     expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-2 last even-post-inner', :id => "post-#{older_post.id}").returns('POST 2')
     expects(:content_tag).with('div', "POST 2", :class => 'even-post').returns('EVEN-POST')
-    assert_equal "ODD-POST\n<hr class='sep-posts'/>\nEVEN-POST", list_posts(blog.posts)
+    assert_equal "ODD-POST\n<hr class='sep-posts'/>\nEVEN-POST", list_posts(nil, blog.posts)
   end
@@ -82,6 +82,13 @@ class BlogTest &lt; ActiveSupport::TestCase
     assert_equal [newer, older], blog.posts
   end
+  should 'has filter' do
+    p = create_user('testuser').person
+    blog = Blog.create!(:profile => p, :name => 'Blog test')
+    blog.filter = {:param => 'value'}
+    assert_equal 'value', blog.filter[:param]
+  end
+
   should 'has one external feed' do
     p = create_user('testuser').person
     blog = fast_create(Blog, :profile_id => p.id, :name => 'Blog test')
@@ -57,10 +57,32 @@ class ContentViewerHelperTest &lt; Test::Unit::TestCase
   should 'not list feed article' do
     profile.articles << Blog.new(:name => 'Blog test', :profile => profile)
     assert_includes profile.blog.children.map{|i| i.class}, RssFeed
-    result = list_posts(profile.blog.posts)
+    result = list_posts(nil, profile.blog.posts)
     assert_no_match /feed/, result
   end
+  should 'filter blog posts by date' do
+    blog = Blog.create!(:name => 'Blog test', :profile => profile)
+
+    nov = TextileArticle.create!(:name => 'November post', :parent => blog, :profile => profile)
+    nov.update_attributes!(:published_at => DateTime.parse('2008-11-15'))
+
+    sep = TextileArticle.create!(:name => 'September post', :parent => blog, :profile => profile)
+    sep.update_attribute(:published_at, DateTime.parse('2008-09-10'))
+
+    blog.reload
+    blog.filter = {:year => 2008, :month => 11}
+    assert blog.save!
+
+    self.stubs(:params).returns({:npage => nil})
+
+    expects(:render).with(:file => 'content_viewer/blog_page', :locals => {:article => blog, :children => [nov]}).returns("BLI")
+
+    result = article_to_html(blog)
+
+    assert_equal 'BLI', result
+  end
+
 end
 def show_date(date)
	@@ -32,23 +32,6 @@ class Article < ActiveRecord::Base		@@ -32,23 +32,6 @@ class Article < ActiveRecord::Base
32	{:include => 'categories', :conditions => { 'categories.id' => category.id }}	32	{:include => 'categories', :conditions => { 'categories.id' => category.id }}
33	}	33	}
34		34
35	- named_scope :by_range, lambda { \|range\| {
36	- :conditions => [
37	- 'published_at BETWEEN :start_date AND :end_date', { :start_date => range.first, :end_date => range.last }
38	- ]
39	- }}
40	-
41	- def self.first_day_of_month(date)
42	- date \|\|= Date.today
43	- Date.new(date.year, date.month, 1)
44	- end
45	-
46	- def self.last_day_of_month(date)
47	- date \|\|= Date.today
48	- date >>= 1
49	- Date.new(date.year, date.month, 1) - 1.day
50	- end
51	-
52	URL_FORMAT = /\A(http\|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)\.[a-z]{2,5}(([0-9]{1,5})?\/.)?\Z/ix	35	URL_FORMAT = /\A(http\|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)\.[a-z]{2,5}(([0-9]{1,5})?\/.)?\Z/ix
53		36
54	validates_format_of :external_link, :with => URL_FORMAT, :if => lambda { \|article\| !article.external_link.blank? }	37	validates_format_of :external_link, :with => URL_FORMAT, :if => lambda { \|article\| !article.external_link.blank? }
	@@ -56,6 +56,17 @@ class Event < Article		@@ -56,6 +56,17 @@ class Event < Article
56	first_day..last_day	56	first_day..last_day
57	end	57	end
58		58
		59	+ def self.first_day_of_month(date)
		60	+ date \|\|= Date.today
		61	+ Date.new(date.year, date.month, 1)
		62	+ end
		63	+
		64	+ def self.last_day_of_month(date)
		65	+ date \|\|= Date.today
		66	+ date >>= 1
		67	+ Date.new(date.year, date.month, 1) - 1.day
		68	+ end
		69	+
59	def date_range	70	def date_range
60	start_date..(end_date\|\|start_date)	71	start_date..(end_date\|\|start_date)
61	end	72	end
1	-<% add_rss_feed_to_head(@page.name, @page.feed.url) if @page.blog? && @page.feed %>	1	+<% add_rss_feed_to_head(article.name, article.feed.url) if article.blog? && article.feed %>
2		2
3	-<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if @page.blog? && @page.external_feed && @page.external_feed.enabled && @page.external_feed.fetched_at.nil? %>	3	+<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if article.blog? && article.external_feed && article.external_feed.enabled && article.external_feed.fetched_at.nil? %>
4		4
5	<div>	5	<div>
6	- <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.blog? && @page.feed %>	6	+ <%= link_to(image_tag('icons-mime/rss-feed.png'), article.feed.url, :class => 'blog-feed-link') if article.blog? && article.feed %>
7	<div class='blog-description'>	7	<div class='blog-description'>
8	- <%= @page.body %>	8	+ <%= article.body %>
9	</div>	9	</div>
10	</div>	10	</div>
11	<hr class="pre-posts"/>	11	<hr class="pre-posts"/>
12	<div class="blog-posts">	12	<div class="blog-posts">
13	- <%= (@posts.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(@posts, @page.visualization_format)) %>	13	+ <%= (children.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(user, children, article.visualization_format)) %>
14	</div>	14	</div>
	@@ -603,27 +603,10 @@ class ContentViewerControllerTest < Test::Unit::TestCase		@@ -603,27 +603,10 @@ class ContentViewerControllerTest < Test::Unit::TestCase
603	assert_response :missing	603	assert_response :missing
604	end	604	end
605		605
606	- should 'list unpublished posts to owner with a different class' do
607	- login_as('testinguser')
608	- blog = Blog.create!(:name => 'A blog test', :profile => profile)
609	- blog.posts << TextileArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => false)
610	-
611	- get :view_page, :profile => profile.identifier, :page => [blog.path]
612	- assert_tag :tag => 'div', :attributes => {:class => /not-published/}
613	- end
614	-
615	- should 'not list unpublished posts to a not logged person' do
616	- blog = Blog.create!(:name => 'A blog test', :profile => profile)
617	- blog.posts << TextileArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => false)
618	-
619	- get :view_page, :profile => profile.identifier, :page => [blog.path]
620	- assert_no_tag :tag => 'a', :content => "Post"
621	- end
622	-
623	should 'display pagination links of blog' do	606	should 'display pagination links of blog' do
624	blog = Blog.create!(:name => 'A blog test', :profile => profile, :posts_per_page => 5)	607	blog = Blog.create!(:name => 'A blog test', :profile => profile, :posts_per_page => 5)
625	for n in 1..10	608	for n in 1..10
626	- blog.posts << TextileArticle.create!(:name => "Post #{n}", :profile => profile, :parent => blog)	609	+ blog.children << TextileArticle.create!(:name => "Post #{n}", :profile => profile, :parent => blog)
627	end	610	end
628	assert_equal 10, blog.posts.size	611	assert_equal 10, blog.posts.size
629		612
	@@ -631,17 +614,11 @@ class ContentViewerControllerTest < Test::Unit::TestCase		@@ -631,17 +614,11 @@ class ContentViewerControllerTest < Test::Unit::TestCase
631	assert_tag :tag => 'a', :attributes => { :href => "/#{profile.identifier}/#{blog.path}?npage=2", :rel => 'next' }	614	assert_tag :tag => 'a', :attributes => { :href => "/#{profile.identifier}/#{blog.path}?npage=2", :rel => 'next' }
632	end	615	end
633		616
634	- should 'display filtered posts' do
635	- blog = Blog.create!(:name => 'A blog test', :profile => profile)
636	- not_display_post = TextileArticle.new(:name => "Post 1", :profile => profile, :parent => blog)
637	- display_post = TextileArticle.new(:name => "Post 2", :profile => profile, :parent => blog)
638	-
639	- not_display_post.update_attribute(:published_at, DateTime.parse('2009-09-10'))
640	- display_post.update_attribute(:published_at, DateTime.parse('2010-09-10'))
641	-
642	- get :view_page, :profile => profile.identifier, :page => [blog.path], :year => 2010, :month => 9
643	- assert_no_tag :tag => 'a', :content => "Post 1"
644	- assert_tag :tag => 'a', :content => "Post 2"	617	+ should 'set year and month filter from URL params' do
		618	+ profile.articles << Blog.new(:name => 'A blog test', :profile => profile)
		619	+ year, month = profile.blog.created_at.year.to_s, '%02d' % profile.blog.created_at.month
		620	+ get :view_page, :profile => profile.identifier, :page => [profile.blog.path], :year => year, :month => month
		621	+ assert_equal({ :year => year.to_s, :month => month.to_s }, assigns(:page).filter)
645	end	622	end
646		623
647	should 'give link to create new article inside folder when view child of folder' do	624	should 'give link to create new article inside folder when view child of folder' do
	@@ -873,22 +873,4 @@ class ArticleTest < Test::Unit::TestCase		@@ -873,22 +873,4 @@ class ArticleTest < Test::Unit::TestCase
873	assert_no_match /[<>]/, article.name	873	assert_no_match /[<>]/, article.name
874	end	874	end
875		875
876	- should 'found articles with published date between a range' do
877	- start_date = DateTime.parse('2010-07-06')
878	- end_date = DateTime.parse('2010-08-02')
879	-
880	- article_found1 = fast_create(Article, :published_at => start_date)
881	- article_found2 = fast_create(Article, :published_at => end_date)
882	- article_not_found = fast_create(Article, :published_at => end_date + 1.month)
883	-
884	- assert_includes Article.by_range(start_date..end_date), article_found1
885	- assert_includes Article.by_range(start_date..end_date), article_found2
886	- assert_not_includes Article.by_range(start_date..end_date), article_not_found
887	- end
888	-
889	- should 'calculate first/end day of a month' do
890	- assert_equal 1, Article.first_day_of_month(DateTime.parse('2010-07-06')).day
891	- assert_equal 31, Article.last_day_of_month(DateTime.parse('2010-07-06')).day
892	- end
893	-
894	end	876	end
	@@ -27,7 +27,28 @@ class BlogHelperTest < Test::Unit::TestCase		@@ -27,7 +27,28 @@ class BlogHelperTest < Test::Unit::TestCase
27	expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-1 first last odd-post-inner', :id => "post-#{published_post.id}").returns('POST')	27	expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-1 first last odd-post-inner', :id => "post-#{published_post.id}").returns('POST')
28	expects(:content_tag).with('div', 'POST', {:class => 'odd-post'}).returns('RESULT')	28	expects(:content_tag).with('div', 'POST', {:class => 'odd-post'}).returns('RESULT')
29		29
30	- assert_equal 'RESULT', list_posts(blog.posts)	30	+ assert_equal 'RESULT', list_posts(profile, blog.posts)
		31	+ end
		32	+
		33	+ should 'list unpublished posts to owner with a different class' do
		34	+ blog.children << unpublished_post = TextileArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => false)
		35	+
		36	+ expects(:display_post).with(anything, anything).returns('POST')
		37	+ expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-1 first last not-published odd-post-inner', :id => "post-#{unpublished_post.id}").returns('POST')
		38	+ expects(:content_tag).with('div', 'POST', {:class => 'odd-post'}).returns('RESULT')
		39	+ assert_equal 'RESULT', list_posts(profile, blog.posts)
		40	+ end
		41	+
		42	+ should 'not list unpublished posts to not owner' do
		43	+ blog.children << unpublished_post = TextileArticle.create!(:name => 'First post', :profile => profile, :parent => blog, :published => false)
		44	+
		45	+ blog.children << published_post = TextileArticle.create!(:name => 'Second post', :profile => profile, :parent => blog, :published => true)
		46	+
		47	+ expects(:display_post).with(anything, anything).returns('POST')
		48	+ expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", has_entries(:id => "post-#{unpublished_post.id}")).never
		49	+ expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", has_entries(:id => "post-#{published_post.id}")).returns('POST')
		50	+ expects(:content_tag).with('div', 'POST', {:class => 'odd-post'}).returns('RESULT')
		51	+ assert_equal 'RESULT', list_posts(nil, blog.posts)
31	end	52	end
32		53
33	should 'list even/odd posts with a different class' do	54	should 'list even/odd posts with a different class' do
	@@ -43,7 +64,7 @@ class BlogHelperTest < Test::Unit::TestCase		@@ -43,7 +64,7 @@ class BlogHelperTest < Test::Unit::TestCase
43	expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-2 last even-post-inner', :id => "post-#{older_post.id}").returns('POST 2')	64	expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-2 last even-post-inner', :id => "post-#{older_post.id}").returns('POST 2')
44	expects(:content_tag).with('div', "POST 2", :class => 'even-post').returns('EVEN-POST')	65	expects(:content_tag).with('div', "POST 2", :class => 'even-post').returns('EVEN-POST')
45		66
46	- assert_equal "ODD-POST\n<hr class='sep-posts'/>\nEVEN-POST", list_posts(blog.posts)	67	+ assert_equal "ODD-POST\n<hr class='sep-posts'/>\nEVEN-POST", list_posts(nil, blog.posts)
47	end	68	end
48		69
49		70
	@@ -82,6 +82,13 @@ class BlogTest < ActiveSupport::TestCase		@@ -82,6 +82,13 @@ class BlogTest < ActiveSupport::TestCase
82	assert_equal [newer, older], blog.posts	82	assert_equal [newer, older], blog.posts
83	end	83	end
84		84
		85	+ should 'has filter' do
		86	+ p = create_user('testuser').person
		87	+ blog = Blog.create!(:profile => p, :name => 'Blog test')
		88	+ blog.filter = {:param => 'value'}
		89	+ assert_equal 'value', blog.filter[:param]
		90	+ end
		91	+
85	should 'has one external feed' do	92	should 'has one external feed' do
86	p = create_user('testuser').person	93	p = create_user('testuser').person
87	blog = fast_create(Blog, :profile_id => p.id, :name => 'Blog test')	94	blog = fast_create(Blog, :profile_id => p.id, :name => 'Blog test')
	@@ -57,10 +57,32 @@ class ContentViewerHelperTest < Test::Unit::TestCase		@@ -57,10 +57,32 @@ class ContentViewerHelperTest < Test::Unit::TestCase
57	should 'not list feed article' do	57	should 'not list feed article' do
58	profile.articles << Blog.new(:name => 'Blog test', :profile => profile)	58	profile.articles << Blog.new(:name => 'Blog test', :profile => profile)
59	assert_includes profile.blog.children.map{\|i\| i.class}, RssFeed	59	assert_includes profile.blog.children.map{\|i\| i.class}, RssFeed
60	- result = list_posts(profile.blog.posts)	60	+ result = list_posts(nil, profile.blog.posts)
61	assert_no_match /feed/, result	61	assert_no_match /feed/, result
62	end	62	end
63		63
		64	+ should 'filter blog posts by date' do
		65	+ blog = Blog.create!(:name => 'Blog test', :profile => profile)
		66	+
		67	+ nov = TextileArticle.create!(:name => 'November post', :parent => blog, :profile => profile)
		68	+ nov.update_attributes!(:published_at => DateTime.parse('2008-11-15'))
		69	+
		70	+ sep = TextileArticle.create!(:name => 'September post', :parent => blog, :profile => profile)
		71	+ sep.update_attribute(:published_at, DateTime.parse('2008-09-10'))
		72	+
		73	+ blog.reload
		74	+ blog.filter = {:year => 2008, :month => 11}
		75	+ assert blog.save!
		76	+
		77	+ self.stubs(:params).returns({:npage => nil})
		78	+
		79	+ expects(:render).with(:file => 'content_viewer/blog_page', :locals => {:article => blog, :children => [nov]}).returns("BLI")
		80	+
		81	+ result = article_to_html(blog)
		82	+
		83	+ assert_equal 'BLI', result
		84	+ end
		85	+
64	end	86	end
65		87
66	def show_date(date)	88	def show_date(date)