ActionItem904: removing unpublished posts from blogs and feeds

* For blog owner, unpublished articles are listed with hachures and opacity

ActionItem904: removing unpublished posts from blogs and feeds
* For blog owner, unpublished articles are listed with hachures and opacity
Daniela Feitosa · Antonio Terceiro
1 parent d2c9927d
Showing 15 changed files with 153 additions and 46 deletions Show diff stats
app/helpers/blog_helper.rb
app/helpers/content_viewer_helper.rb
app/models/article.rb
app/models/blog.rb
app/models/enterprise_homepage.rb
app/models/event.rb
app/models/folder.rb
app/models/rss_feed.rb
app/models/textile_article.rb
app/models/uploaded_file.rb
app/views/content_viewer/blog_page.rhtml
public/stylesheets/article.css
test/unit/blog_helper_test.rb
test/unit/content_viewer_helper_test.rb
test/unit/rss_feed_test.rb
@@ -14,4 +14,25 @@ module BlogHelper
     _('Edit blog')
   end
+  def list_posts(user, articles)
+    pagination = will_paginate(articles, {
+      :param_name => 'npage',
+      :prev_label => _('&laquo; Newer posts'),
+      :next_label => _('Older posts &raquo;')
+    })
+    content = []
+    articles.map{ |i|
+      css_add = ''
+      if i.published? || (user==i.profile)
+        css_add = '-not-published' if !i.published?
+        content << content_tag('div', display_post(i), :class => 'blog-post' + css_add, :id => "post-#{i.id}")
+      end
+    }
+    content.join("\n") + (pagination or '')
+  end
+
+  def display_post(article)
+    article_title(article) + content_tag('p', article.to_html) +
+    content_tag('p', link_to( number_of_comments(article), article.url.merge(:form => 'opened', :anchor => 'comment_form') ), :class => 'metadata')
+  end
 end
 module ContentViewerHelper
   include GetText
+  include BlogHelper
   def number_of_comments(article)
     n = article.comments.size
@@ -24,37 +25,10 @@ module ContentViewerHelper
     title
   end
-  def list_posts(articles)
-    pagination = will_paginate(articles, {
-      :param_name => 'npage',
-      :page_links => false,
-      :prev_label => _('Newer posts &raquo;'),
-      :next_label => _('&laquo; Older posts')
-    })
-    articles.map{ |i| content_tag('div', display_post(i), :class => 'blog-post', :id => "post-#{i.id}") }.join("\n") +
-      (pagination or '')
-  end
-
-  def display_post(article)
-    article_title(article) + content_tag('p', article.to_html) +
-    content_tag('p', link_to( number_of_comments(article), article.url.merge(:form => 'opened', :anchor => 'comment_form') ), :class => 'metadata')
-  end
-
   def article_to_html(article)
-    content = article.to_html
+    content = article.to_html(:page => params[:npage])
     return self.instance_eval(&content) if content.kind_of?(Proc)
-    
-    if article.blog?
-      children = if article.filter and article.filter[:year] and article.filter[:month]
-        filter_date = DateTime.parse("#{article.filter[:year]}-#{article.filter[:month]}-01")
-        article.posts.paginate :page => params[:npage], :per_page => article.posts_per_page, :conditions => [ 'created_at between ? and ?', filter_date, filter_date + 1.month - 1.day ]
-      else
-        article.posts.paginate :page => params[:npage], :per_page => article.posts_per_page
-      end
-      content + (children.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(children))
-    else
-      content
-    end
+    content
   end
 end
@@ -127,7 +127,7 @@ class Article &lt; ActiveRecord::Base
   # The implementation in this class just provides the +body+ attribute as the
   # HTML.  Other article types can override this method to provide customized
   # views of themselves.
-  def to_html
+  def to_html(options = {})
     body
   end
@@ -28,8 +28,8 @@ 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
-    content_tag('div', body) + tag('hr')
+  def to_html(options = {})
+    posts_list(options[:page])
   end
   def folder?
@@ -52,4 +52,16 @@ class Blog &lt; Folder
     end
   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 => [ 'created_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
 end
@@ -20,7 +20,7 @@ class EnterpriseHomepage &lt; Article
   include EnterpriseHomepageHelper
   include CatalogHelper
-  def to_html
+  def to_html(options ={})
     products = self.profile.products
     display_profile_info(self.profile) + content_tag('div', self.body || '') +
     (self.profile.environment.enabled?('disable_products_for_enterprises') ? '' : display_products_list(self.profile, products))
@@ -58,7 +58,7 @@ class Event &lt; Article
   include ActionController::UrlWriter
   include DatesHelper
-  def to_html
+  def to_html(options = {})
     result = ''
     html = Builder::XmlMarkup.new(:target => result)
@@ -34,7 +34,7 @@ class Folder &lt; Article
   include FolderHelper
   include DatesHelper
-  def to_html
+  def to_html(options = {})
     send(view_as)
   end
@@ -50,7 +50,7 @@ class RssFeed &lt; Article
   validates_inclusion_of :feed_item_description, :in => [ 'body', 'abstract' ], :if => :feed_item_description
   # TODO
-  def to_html
+  def to_html(options = {})
   end
   # RSS feeds have type =text/xml=.
@@ -61,7 +61,7 @@ class RssFeed &lt; Article
   include ActionController::UrlWriter
   def fetch_articles
     if parent && parent.blog?
-      return parent.posts.find(:all, :limit => self.limit, :order => 'id desc')
+      return parent.posts.find(:all, :conditions => ['published = ?', true], :limit => self.limit, :order => 'id desc')
     end
     articles =
@@ -8,7 +8,7 @@ class TextileArticle &lt; TextArticle
     _('Accessible alternative for visually impaired users.')
   end
-  def to_html
+  def to_html(options ={})
     RedCloth.new(self.body|| '').to_html
   end
@@ -50,7 +50,7 @@ class UploadedFile &lt; Article
   # FIXME isn't this too much including just to be able to generate some HTML?
   include ActionView::Helpers::TagHelper
-  def to_html
+  def to_html(options = {})
     tag('img', :src => public_filename, :class => css_class_name, :style => 'max-width: 100%') if image?
   end
@@ -0,0 +1,5 @@
+<div><%= article.body %></div>
+<hr/>
+<%= (children.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(user, children)) %>
+
+
@@ -202,10 +202,38 @@
 #content #article .pagination .prev_page {
   position: absolute;
-  right: 0;
+  left: 0;
 }
 #content #article .pagination .next_page {
   position: absolute;
-  left: 0;
+  right: 0;
+}
+.msie6 #content #article .pagination .prev_page,
+.msie6 #content #article .pagination .next_page {
+  position: relative;
+  display: inline;
+}
+
+/* NOT PUBLISHED BLOG POSTS */
+
+.blog-post-not-published {
+  background: url(/images/hachure.png);
+  opacity: 0.25;
+  filter: alpha(opacity=25);
+  zoom: 1;
+}
+
+.blog-post-not-published a {
+  text-decoration: none;
+}
+
+#content .blog-post-not-published .created-at {
+  text-align: left;
+}
+
+.blog-post-not-published .metadata {
+  display: block;
+  text-align: center;
+  font-size: small;
 }
@@ -6,12 +6,64 @@ class BlogHelperTest &lt; Test::Unit::TestCase
   def setup
     stubs(:show_date).returns('')
+    @environment = Environment.default
     @profile = create_user('blog_helper_test').person
+    @blog = Blog.create!(:profile => profile, :name => 'Blog test')
   end
+
   attr :profile
+  attr :blog
+
+  def _(s); s; end
+
+  should 'list published posts with class blog-post' do
+    blog.children << published_post = TextileArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => true)
-  should 'add real tests' do
-    assert true
+    expects(:display_post).with(anything).returns('POST')
+    expects(:content_tag).with('div', 'POST', :class => 'blog-post', :id => "post-#{published_post.id}").returns('RESULT')
+
+    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).returns('POST')
+    expects(:content_tag).with('div', 'POST', :class => 'blog-post-not-published', :id => "post-#{unpublished_post.id}").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).returns('POST')
+    expects(:content_tag).with('div', 'POST', :class => 'blog-post', :id => "post-#{published_post.id}").returns('RESULT')
+    expects(:content_tag).with('div', 'POST', :class => 'blog-post-not-published', :id => "post-#{unpublished_post.id}").never
+
+    assert_equal 'RESULT', list_posts(nil, blog.posts)
+  end
+
+  should 'display post' do
+    blog.children << article = TextileArticle.create!(:name => 'Second post', :profile => profile, :parent => blog, :published => true)
+    expects(:article_title).with(article).returns('TITLE')
+    expects(:content_tag).with('p', article.to_html).returns(' TO_HTML')
+    expects(:number_of_comments).with(article).returns('NUMBER OF COMMENTS')
+    expects(:content_tag).with('p', 'NUMBER OF COMMENTS', anything).returns(' COMMENTS').at_least_once
+
+    assert_equal 'TITLE TO_HTML COMMENTS', display_post(article)
+  end
+
+  def will_paginate(arg1, arg2)
+  end
+
+  def link_to(content, url)
+    content
+  end
+
+  def content_tag(tag, content, options = {})
+    "<#{tag}>#{content}</#{tag}>"
+  end
 end
@@ -56,7 +56,7 @@ class ContentViewerHelperTest &lt; Test::Unit::TestCase
   should 'not list feed article' do
     profile.articles << Blog.new(:name => 'Blog test')
     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
@@ -75,10 +75,11 @@ class ContentViewerHelperTest &lt; Test::Unit::TestCase
     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_match /November post/, result
-    assert_no_match /September post/, result
+    assert_equal 'BLI', result
   end
 end
@@ -121,6 +121,20 @@ class RssFeedTest &lt; Test::Unit::TestCase
     assert_equal [posts[5], posts[4], posts[3],  posts[2], posts[1]], feed.fetch_articles
   end
+  should 'list only published posts from blog' do
+    profile = create_user('testuser').person
+    blog = Blog.create(:name => 'blog', :profile => profile)
+    posts = []
+    5.times do |i|
+      posts << TextArticle.create!(:name => "post #{i}", :profile => profile, :parent => blog)
+    end
+    posts[0].published = false
+    posts[0].save!
+
+    assert_equal [posts[4], posts[3], posts[2], posts[1]], blog.feed.fetch_articles
+  end
+
+
   should 'provide link to profile' do
     profile = create_user('testuser').person
     feed = RssFeed.new(:name => 'testfeed')
	@@ -14,4 +14,25 @@ module BlogHelper		@@ -14,4 +14,25 @@ module BlogHelper
14	_('Edit blog')	14	_('Edit blog')
15	end	15	end
16		16
		17	+ def list_posts(user, articles)
		18	+ pagination = will_paginate(articles, {
		19	+ :param_name => 'npage',
		20	+ :prev_label => _('« Newer posts'),
		21	+ :next_label => _('Older posts »')
		22	+ })
		23	+ content = []
		24	+ articles.map{ \|i\|
		25	+ css_add = ''
		26	+ if i.published? \|\| (user==i.profile)
		27	+ css_add = '-not-published' if !i.published?
		28	+ content << content_tag('div', display_post(i), :class => 'blog-post' + css_add, :id => "post-#{i.id}")
		29	+ end
		30	+ }
		31	+ content.join("\n") + (pagination or '')
		32	+ end
		33	+
		34	+ def display_post(article)
		35	+ article_title(article) + content_tag('p', article.to_html) +
		36	+ content_tag('p', link_to( number_of_comments(article), article.url.merge(:form => 'opened', :anchor => 'comment_form') ), :class => 'metadata')
		37	+ end
17	end	38	end
1	module ContentViewerHelper	1	module ContentViewerHelper
2		2
3	include GetText	3	include GetText
		4	+ include BlogHelper
4		5
5	def number_of_comments(article)	6	def number_of_comments(article)
6	n = article.comments.size	7	n = article.comments.size
	@@ -24,37 +25,10 @@ module ContentViewerHelper		@@ -24,37 +25,10 @@ module ContentViewerHelper
24	title	25	title
25	end	26	end
26		27
27	- def list_posts(articles)
28	- pagination = will_paginate(articles, {
29	- :param_name => 'npage',
30	- :page_links => false,
31	- :prev_label => _('Newer posts »'),
32	- :next_label => _('« Older posts')
33	- })
34	- articles.map{ \|i\| content_tag('div', display_post(i), :class => 'blog-post', :id => "post-#{i.id}") }.join("\n") +
35	- (pagination or '')
36	- end
37	-
38	- def display_post(article)
39	- article_title(article) + content_tag('p', article.to_html) +
40	- content_tag('p', link_to( number_of_comments(article), article.url.merge(:form => 'opened', :anchor => 'comment_form') ), :class => 'metadata')
41	- end
42	-
43	def article_to_html(article)	28	def article_to_html(article)
44	- content = article.to_html	29	+ content = article.to_html(:page => params[:npage])
45	return self.instance_eval(&content) if content.kind_of?(Proc)	30	return self.instance_eval(&content) if content.kind_of?(Proc)
46	-
47	- if article.blog?
48	- children = if article.filter and article.filter[:year] and article.filter[:month]
49	- filter_date = DateTime.parse("#{article.filter[:year]}-#{article.filter[:month]}-01")
50	- article.posts.paginate :page => params[:npage], :per_page => article.posts_per_page, :conditions => [ 'created_at between ? and ?', filter_date, filter_date + 1.month - 1.day ]
51	- else
52	- article.posts.paginate :page => params[:npage], :per_page => article.posts_per_page
53	- end
54	- content + (children.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(children))
55	- else
56	- content
57	- end	31	+ content
58	end	32	end
59		33
60	end	34	end
	@@ -127,7 +127,7 @@ class Article < ActiveRecord::Base		@@ -127,7 +127,7 @@ class Article < ActiveRecord::Base
127	# The implementation in this class just provides the +body+ attribute as the	127	# The implementation in this class just provides the +body+ attribute as the
128	# HTML. Other article types can override this method to provide customized	128	# HTML. Other article types can override this method to provide customized
129	# views of themselves.	129	# views of themselves.
130	- def to_html	130	+ def to_html(options = {})
131	body	131	body
132	end	132	end
133		133
	@@ -28,8 +28,8 @@ class Blog < Folder		@@ -28,8 +28,8 @@ class Blog < Folder
28		28
29	# FIXME isn't this too much including just to be able to generate some HTML?	29	# FIXME isn't this too much including just to be able to generate some HTML?
30	include ActionView::Helpers::TagHelper	30	include ActionView::Helpers::TagHelper
31	- def to_html
32	- content_tag('div', body) + tag('hr')	31	+ def to_html(options = {})
		32	+ posts_list(options[:page])
33	end	33	end
34		34
35	def folder?	35	def folder?
	@@ -52,4 +52,16 @@ class Blog < Folder		@@ -52,4 +52,16 @@ class Blog < Folder
52	end	52	end
53	end	53	end
54		54
		55	+ def posts_list(npage)
		56	+ article = self
		57	+ children = if filter and filter[:year] and filter[:month]
		58	+ filter_date = DateTime.parse("#{filter[:year]}-#{filter[:month]}-01")
		59	+ posts.paginate :page => npage, :per_page => posts_per_page, :conditions => [ 'created_at between ? and ?', filter_date, filter_date + 1.month - 1.day ]
		60	+ else
		61	+ posts.paginate :page => npage, :per_page => posts_per_page
		62	+ end
		63	+ lambda do
		64	+ render :file => 'content_viewer/blog_page', :locals => {:article => article, :children => children}
		65	+ end
		66	+ end
55	end	67	end
	@@ -20,7 +20,7 @@ class EnterpriseHomepage < Article		@@ -20,7 +20,7 @@ class EnterpriseHomepage < Article
20	include EnterpriseHomepageHelper	20	include EnterpriseHomepageHelper
21	include CatalogHelper	21	include CatalogHelper
22		22
23	- def to_html	23	+ def to_html(options ={})
24	products = self.profile.products	24	products = self.profile.products
25	display_profile_info(self.profile) + content_tag('div', self.body \|\| '') +	25	display_profile_info(self.profile) + content_tag('div', self.body \|\| '') +
26	(self.profile.environment.enabled?('disable_products_for_enterprises') ? '' : display_products_list(self.profile, products))	26	(self.profile.environment.enabled?('disable_products_for_enterprises') ? '' : display_products_list(self.profile, products))
	@@ -58,7 +58,7 @@ class Event < Article		@@ -58,7 +58,7 @@ class Event < Article
58	include ActionController::UrlWriter	58	include ActionController::UrlWriter
59	include DatesHelper	59	include DatesHelper
60		60
61	- def to_html	61	+ def to_html(options = {})
62		62
63	result = ''	63	result = ''
64	html = Builder::XmlMarkup.new(:target => result)	64	html = Builder::XmlMarkup.new(:target => result)
	@@ -34,7 +34,7 @@ class Folder < Article		@@ -34,7 +34,7 @@ class Folder < Article
34	include FolderHelper	34	include FolderHelper
35	include DatesHelper	35	include DatesHelper
36		36
37	- def to_html	37	+ def to_html(options = {})
38	send(view_as)	38	send(view_as)
39	end	39	end
40		40
	@@ -50,7 +50,7 @@ class RssFeed < Article		@@ -50,7 +50,7 @@ class RssFeed < Article
50	validates_inclusion_of :feed_item_description, :in => [ 'body', 'abstract' ], :if => :feed_item_description	50	validates_inclusion_of :feed_item_description, :in => [ 'body', 'abstract' ], :if => :feed_item_description
51		51
52	# TODO	52	# TODO
53	- def to_html	53	+ def to_html(options = {})
54	end	54	end
55		55
56	# RSS feeds have type =text/xml=.	56	# RSS feeds have type =text/xml=.
	@@ -61,7 +61,7 @@ class RssFeed < Article		@@ -61,7 +61,7 @@ class RssFeed < Article
61	include ActionController::UrlWriter	61	include ActionController::UrlWriter
62	def fetch_articles	62	def fetch_articles
63	if parent && parent.blog?	63	if parent && parent.blog?
64	- return parent.posts.find(:all, :limit => self.limit, :order => 'id desc')	64	+ return parent.posts.find(:all, :conditions => ['published = ?', true], :limit => self.limit, :order => 'id desc')
65	end	65	end
66		66
67	articles =	67	articles =
	@@ -8,7 +8,7 @@ class TextileArticle < TextArticle		@@ -8,7 +8,7 @@ class TextileArticle < TextArticle
8	_('Accessible alternative for visually impaired users.')	8	_('Accessible alternative for visually impaired users.')
9	end	9	end
10		10
11	- def to_html	11	+ def to_html(options ={})
12	RedCloth.new(self.body\|\| '').to_html	12	RedCloth.new(self.body\|\| '').to_html
13	end	13	end
14		14
	@@ -50,7 +50,7 @@ class UploadedFile < Article		@@ -50,7 +50,7 @@ class UploadedFile < Article
50	# FIXME isn't this too much including just to be able to generate some HTML?	50	# FIXME isn't this too much including just to be able to generate some HTML?
51	include ActionView::Helpers::TagHelper	51	include ActionView::Helpers::TagHelper
52		52
53	- def to_html	53	+ def to_html(options = {})
54	tag('img', :src => public_filename, :class => css_class_name, :style => 'max-width: 100%') if image?	54	tag('img', :src => public_filename, :class => css_class_name, :style => 'max-width: 100%') if image?
55	end	55	end
56		56