Blogs can't have folders inside

* Forbidding folders to be created inside blogs. * Avoiding folders on the blog's posts until it's decided what's going to be done the the folders that are already inside blogs (migration). (ActionItem1892)

Blogs can't have folders inside
* Forbidding folders to be created inside blogs. * Avoiding folders on the blog's posts until it's decided what's going to be done the the folders that are already inside blogs (migration). (ActionItem1892)
Rodrigo Souto · Daniela Feitosa
1 parent ac0943b0
Showing 11 changed files with 94 additions and 12 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/models/article.rb
app/models/blog.rb
app/models/folder.rb
test/functional/cms_controller_test.rb
test/functional/content_viewer_controller_test.rb
test/functional/profile_controller_test.rb
test/unit/article_test.rb
test/unit/blog_test.rb
test/unit/folder_test.rb
test/unit/rss_feed_test.rb
@@ -49,6 +49,9 @@ class CmsController &lt; MyProfileController
     if profile.enterprise?
       articles << EnterpriseHomepage
     end
+    if @parent && @parent.blog?
+      articles -= Article.folder_types.map(&:constantize)
+    end
     articles
   end
@@ -109,6 +112,7 @@ class CmsController &lt; MyProfileController
     # user must choose an article type first
+    @parent = profile.articles.find(params[:parent_id]) if params && params[:parent_id]
     record_coming
     @type = params[:type]
     if @type.blank?
@@ -339,8 +339,13 @@ class Article &lt; ActiveRecord::Base
     end
   end
+  def self.folder_types
+    ['Folder', 'Blog', 'Forum', 'Gallery']
+  end
+
   named_scope :published, :conditions => { :published => true }
-  named_scope :folders, :conditions => { :type => ['Folder', 'Blog', 'Forum', 'Gallery'] }
+  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 }
@@ -2,6 +2,13 @@ class Blog &lt; Folder
   acts_as_having_posts
+  #FIXME This should be used until there is a migration to fix all blogs that
+  # already have folders inside them
+  def posts_with_no_folders
+    posts_without_no_folders.no_folders
+  end
+  alias_method_chain :posts, :no_folders
+
   def self.short_description
     _('Blog')
   end
 class Folder < Article
+  validate :not_belong_to_blog
+
+  def not_belong_to_blog
+    errors.add(:parent, "A folder should not belong to a blog.") if parent && parent.blog?
+  end
+
   acts_as_having_settings :field => :setting
   xss_terminate :only => [ :body ], :with => 'white_list', :on => 'validation'
@@ -818,6 +818,15 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/new?type=Forum"}
   end
+  should 'not offer folders if in a blog' do
+    blog = fast_create(Blog, :profile_id => profile.id)
+    get :new, :profile => profile.identifier, :parent_id => blog.id, :cms => true
+    types = assigns(:article_types).map {|t| t[:name]}
+    Article.folder_types.each do |type|
+      assert_not_includes types, type
+    end
+  end
+
   should 'offer to edit a blog' do
     profile.articles << Blog.new(:name => 'blog test', :profile => profile)
@@ -714,8 +714,8 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
   should 'add meta tag to rss feed on view post blog' do
     login_as(profile.identifier)
-    profile.articles << Blog.new(:name => 'Blog', :profile => profile)
-    profile.blog.posts << TextileArticle.new(:name => 'first post', :parent => profile.blog, :profile => profile)
+    blog = Blog.create!(:name => 'Blog', :profile => profile)
+    TextileArticle.create!(:name => 'first post', :parent => blog, :profile => profile)
     get :view_page, :profile => profile.identifier, :page => ['blog', 'first-post']
     assert_tag :tag => 'link', :attributes => { :rel => 'alternate', :type => 'application/rss+xml', :title => 'Blog', :href => "http://#{environment.default_hostname}/testinguser/blog/feed" }
   end
@@ -1208,9 +1208,8 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
     FastGettext.stubs(:locale).returns('es')
     blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog')
     blog.stubs(:display_posts_in_current_language).returns(true)
-    en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
-    es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
-    blog.posts = [en_article, es_article]
+    en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
+    es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
     get :view_page, :profile => @profile.identifier, :page => blog.explode_path
     assert_tag :div, :attributes => { :id => "post-#{es_article.id}" }
@@ -1232,8 +1231,8 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
     FastGettext.stubs(:locale).returns('es')
     blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog')
     blog.stubs(:display_posts_in_current_language).returns(true)
-    en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
-    es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
+    en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
+    es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
     blog.posts = [en_article, es_article]
     get :view_page, :profile => @profile.identifier, :page => blog.explode_path
@@ -482,9 +482,9 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
   should 'show number of published posts in index' do
     profile.articles << blog = Blog.create(:name => 'Blog', :profile_id => profile.id)
-    blog.posts << TextileArticle.new(:name => 'Published post', :parent => profile.blog, :profile => profile)
-    blog.posts << TextileArticle.new(:name => 'Other published post', :parent => profile.blog, :profile => profile)
-    blog.posts << TextileArticle.new(:name => 'Unpublished post', :parent => profile.blog, :profile => profile, :published => false)
+    fast_create(TextileArticle, :name => 'Published post', :parent_id => profile.blog.id, :profile_id => profile.id)
+    fast_create(TextileArticle, :name => 'Other published post', :parent_id => profile.blog.id, :profile_id => profile.id)
+    fast_create(TextileArticle, :name => 'Unpublished post', :parent_id => profile.blog.id, :profile_id => profile.id, :published => false)
     get :index, :profile => profile.identifier
     assert_tag :tag => 'a', :content => '2 posts', :attributes => { :href => /\/testuser\/blog/ }
@@ -1444,4 +1444,34 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert !Article.new.tiny_mce?
   end
+  should 'return only folders' do
+    not_folders = [RssFeed, TinyMceArticle, Event, TextileArticle]
+    folders = [Folder, Blog, Gallery, Forum]
+
+    not_folders.each do |klass|
+      item = fast_create(klass)
+      assert_not_includes Article.folders, item
+    end
+
+    folders.each do |klass|
+      item = fast_create(klass)
+      assert_includes Article.folders, item
+    end
+  end
+
+  should 'return no folders' do
+    not_folders = [RssFeed, TinyMceArticle, Event, TextileArticle]
+    folders = [Folder, Blog, Gallery, Forum]
+
+    not_folders.each do |klass|
+      item = fast_create(klass)
+      assert_includes Article.no_folders, item
+    end
+
+    folders.each do |klass|
+      item = fast_create(klass)
+      assert_not_includes Article.no_folders, item
+    end
+  end
+
 end
@@ -195,4 +195,15 @@ class BlogTest &lt; ActiveSupport::TestCase
     assert !blog.reload.display_posts_in_current_language?
   end
+  #FIXME This should be used until there is a migration to fix all blogs that
+  # already have folders inside them
+  should 'not list folders in posts' do
+    blog = fast_create(Blog)
+    folder = fast_create(Folder, :parent_id => blog.id)
+    article = fast_create(TextileArticle, :parent_id => blog.id)
+
+    assert_not_includes blog.posts, folder
+    assert_includes blog.posts, article
+  end
+
 end
@@ -132,4 +132,12 @@ class FolderTest &lt; ActiveSupport::TestCase
     assert_no_match /[<>]/, folder.body
   end
+  should 'not have a blog as parent' do
+    folder = Folder.new
+    folder.parent = Blog.new
+    folder.valid?
+
+    assert folder.errors.on(:parent)
+  end
+
 end
@@ -212,7 +212,10 @@ class RssFeedTest &lt; Test::Unit::TestCase
     a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile, :requestor => fast_create(Person))
     a.finish
-    blog.posts << published_article = article.class.last
+    published_article = article.class.last
+    published_article.parent = blog
+    published_article.save
+
     feed = RssFeed.new(:parent => blog, :profile => profile)
     assert_match "This is the content of the Sample Article", feed.data
	@@ -2,6 +2,13 @@ class Blog < Folder		@@ -2,6 +2,13 @@ class Blog < Folder
2		2
3	acts_as_having_posts	3	acts_as_having_posts
4		4
		5	+ #FIXME This should be used until there is a migration to fix all blogs that
		6	+ # already have folders inside them
		7	+ def posts_with_no_folders
		8	+ posts_without_no_folders.no_folders
		9	+ end
		10	+ alias_method_chain :posts, :no_folders
		11	+
5	def self.short_description	12	def self.short_description
6	_('Blog')	13	_('Blog')
7	end	14	end
1	class Folder < Article	1	class Folder < Article
2		2
		3	+ validate :not_belong_to_blog
		4	+
		5	+ def not_belong_to_blog
		6	+ errors.add(:parent, "A folder should not belong to a blog.") if parent && parent.blog?
		7	+ end
		8	+
3	acts_as_having_settings :field => :setting	9	acts_as_having_settings :field => :setting
4		10
5	xss_terminate :only => [ :body ], :with => 'white_list', :on => 'validation'	11	xss_terminate :only => [ :body ], :with => 'white_list', :on => 'validation'
	@@ -818,6 +818,15 @@ class CmsControllerTest < Test::Unit::TestCase		@@ -818,6 +818,15 @@ class CmsControllerTest < Test::Unit::TestCase
818	assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/new?type=Forum"}	818	assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/new?type=Forum"}
819	end	819	end
820		820
		821	+ should 'not offer folders if in a blog' do
		822	+ blog = fast_create(Blog, :profile_id => profile.id)
		823	+ get :new, :profile => profile.identifier, :parent_id => blog.id, :cms => true
		824	+ types = assigns(:article_types).map {\|t\| t[:name]}
		825	+ Article.folder_types.each do \|type\|
		826	+ assert_not_includes types, type
		827	+ end
		828	+ end
		829	+
821	should 'offer to edit a blog' do	830	should 'offer to edit a blog' do
822	profile.articles << Blog.new(:name => 'blog test', :profile => profile)	831	profile.articles << Blog.new(:name => 'blog test', :profile => profile)
823		832
	@@ -1444,4 +1444,34 @@ class ArticleTest < Test::Unit::TestCase		@@ -1444,4 +1444,34 @@ class ArticleTest < Test::Unit::TestCase
1444	assert !Article.new.tiny_mce?	1444	assert !Article.new.tiny_mce?
1445	end	1445	end
1446		1446
		1447	+ should 'return only folders' do
		1448	+ not_folders = [RssFeed, TinyMceArticle, Event, TextileArticle]
		1449	+ folders = [Folder, Blog, Gallery, Forum]
		1450	+
		1451	+ not_folders.each do \|klass\|
		1452	+ item = fast_create(klass)
		1453	+ assert_not_includes Article.folders, item
		1454	+ end
		1455	+
		1456	+ folders.each do \|klass\|
		1457	+ item = fast_create(klass)
		1458	+ assert_includes Article.folders, item
		1459	+ end
		1460	+ end
		1461	+
		1462	+ should 'return no folders' do
		1463	+ not_folders = [RssFeed, TinyMceArticle, Event, TextileArticle]
		1464	+ folders = [Folder, Blog, Gallery, Forum]
		1465	+
		1466	+ not_folders.each do \|klass\|
		1467	+ item = fast_create(klass)
		1468	+ assert_includes Article.no_folders, item
		1469	+ end
		1470	+
		1471	+ folders.each do \|klass\|
		1472	+ item = fast_create(klass)
		1473	+ assert_not_includes Article.no_folders, item
		1474	+ end
		1475	+ end
		1476	+
1447	end	1477	end
	@@ -195,4 +195,15 @@ class BlogTest < ActiveSupport::TestCase		@@ -195,4 +195,15 @@ class BlogTest < ActiveSupport::TestCase
195	assert !blog.reload.display_posts_in_current_language?	195	assert !blog.reload.display_posts_in_current_language?
196	end	196	end
197		197
		198	+ #FIXME This should be used until there is a migration to fix all blogs that
		199	+ # already have folders inside them
		200	+ should 'not list folders in posts' do
		201	+ blog = fast_create(Blog)
		202	+ folder = fast_create(Folder, :parent_id => blog.id)
		203	+ article = fast_create(TextileArticle, :parent_id => blog.id)
		204	+
		205	+ assert_not_includes blog.posts, folder
		206	+ assert_includes blog.posts, article
		207	+ end
		208	+
198	end	209	end
	@@ -132,4 +132,12 @@ class FolderTest < ActiveSupport::TestCase		@@ -132,4 +132,12 @@ class FolderTest < ActiveSupport::TestCase
132	assert_no_match /[<>]/, folder.body	132	assert_no_match /[<>]/, folder.body
133	end	133	end
134		134
		135	+ should 'not have a blog as parent' do
		136	+ folder = Folder.new
		137	+ folder.parent = Blog.new
		138	+ folder.valid?
		139	+
		140	+ assert folder.errors.on(:parent)
		141	+ end
		142	+
135	end	143	end