Merge branch 'comment-paragraph-content' into 'master'

comment_paragraph: add discussion content type See merge request !903

Merge branch 'comment-paragraph-content' into 'master'
comment_paragraph: add discussion content type See merge request !903
Leandro Santos
2 parents d05d2562 5e089106
Showing 20 changed files with 180 additions and 6 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/models/article.rb
app/models/event.rb
app/models/textile_article.rb
app/models/tiny_mce_article.rb
plugins/comment_paragraph/lib/comment_paragraph_plugin.rb
plugins/comment_paragraph/lib/comment_paragraph_plugin/discussion.rb
plugins/comment_paragraph/lib/ext/article.rb
plugins/comment_paragraph/test/unit/api_test.rb
plugins/comment_paragraph/test/unit/article_test.rb
plugins/comment_paragraph/test/unit/comment_paragraph_plugin_test.rb
plugins/comment_paragraph/test/unit/discussion_test.rb
plugins/comment_paragraph/views/cms/comment_paragraph_plugin/_discussion.html.erb
plugins/products/models/products_plugin/enterprise_homepage.rb
plugins/products/test/unit/products_plugin/enterprise_homepage_test.rb
test/functional/cms_controller_test.rb
test/unit/article_test.rb
test/unit/event_test.rb
test/unit/textile_article_test.rb
test/unit/tiny_mce_article_test.rb
@@ -443,9 +443,7 @@ class CmsController &lt; MyProfileController
   end
   def refuse_blocks
-    if ['TinyMceArticle', 'TextileArticle', 'Event', 'EnterpriseHomepage'].include?(@type)
-      @no_design_blocks = true
-    end
+    @no_design_blocks = @type.present? && valid_article_type?(@type) ? !@type.constantize.can_display_blocks? : false
   end
   def per_page
@@ -864,6 +864,10 @@ class Article &lt; ApplicationRecord
     HashWithIndifferentAccess.new :name => name, :abstract => abstract, :body => body, :id => id, :parent_id => parent_id, :author => author
   end
+  def self.can_display_blocks?
+    true
+  end
+
   private
   def sanitize_tag_list
@@ -134,6 +134,10 @@ class Event &lt; Article
     true
   end
+  def self.can_display_blocks?
+    false
+  end
+
   include Noosfero::TranslatableContent
   include MaybeAddHttp
@@ -29,6 +29,10 @@ class TextileArticle &lt; TextArticle
     true
   end
+  def self.can_display_blocks?
+    false
+  end
+
   protected
   def convert_to_html(textile)
@@ -32,4 +32,8 @@ class TinyMceArticle &lt; TextArticle
     true
   end
+  def self.can_display_blocks?
+    false
+  end
+
 end
@@ -46,7 +46,7 @@ class CommentParagraphPlugin &lt; Noosfero::Plugin
   def article_extra_toolbar_buttons(article)
     user = context.send :user
-    return [] if !article.comment_paragraph_plugin_enabled? || !article.allow_edit?(user)
+    return [] if !article.comment_paragraph_plugin_enabled? || !article.allow_edit?(user) || article.kind_of?(CommentParagraphPlugin::Discussion)
     {
       :title => article.comment_paragraph_plugin_activated? ? _('Deactivate Comments') : _('Activate Comments'),
       :url => {:controller => 'comment_paragraph_plugin_myprofile', :profile => article.profile.identifier, :action => 'toggle_activation', :id => article.id},
@@ -59,6 +59,10 @@ class CommentParagraphPlugin &lt; Noosfero::Plugin
     [CommentParagraphPlugin::API]
   end
+  def content_types
+    [CommentParagraphPlugin::Discussion]
+  end
+
 end
 require_dependency 'comment_paragraph_plugin/macros/allow_comment'
@@ -0,0 +1,30 @@
+class CommentParagraphPlugin::Discussion < Event
+
+  def self.type_name
+    _('Comments Discussion')
+  end
+
+  def self.short_description
+    _('Comments Discussion')
+  end
+
+  def self.description
+    _('Article with paragraph comments')
+  end
+  
+  def accept_comments?
+    current_time = Time.now
+    super &&
+      (start_date.nil? || current_time >= start_date) &&
+      (end_date.nil? || current_time <= end_date)
+  end
+
+  def comment_paragraph_plugin_activated?
+    environment.plugin_enabled?(CommentParagraphPlugin)
+  end
+
+  def comment_paragraph_plugin_activation_mode
+    "auto"
+  end
+
+end
@@ -12,7 +12,7 @@ class Article
   settings_items :comment_paragraph_plugin_activate, :type => :boolean, :default => false
   def comment_paragraph_plugin_enabled?
-    environment.plugin_enabled?(CommentParagraphPlugin) && self.kind_of?(TextArticle)
+    environment.plugin_enabled?(CommentParagraphPlugin) && (self.kind_of?(TextArticle) || self.kind_of?(CommentParagraphPlugin::Discussion))
   end
   def comment_paragraph_plugin_activated?
@@ -55,7 +55,11 @@ class Article
   def comment_paragraph_plugin_set_initial_value
     self.comment_paragraph_plugin_activate = comment_paragraph_plugin_enabled? &&
-      comment_paragraph_plugin_settings.activation_mode == 'auto'
+      comment_paragraph_plugin_activation_mode == 'auto'
+  end
+
+  def comment_paragraph_plugin_activation_mode
+    comment_paragraph_plugin_settings.activation_mode
   end
   def comment_paragraph_plugin_settings
@@ -81,4 +81,13 @@ class APITest &lt;  ActiveSupport::TestCase
     json = JSON.parse(last_response.body)
     assert_equivalent [comment1.id], json['comments'].map {|c| c['id']}
   end
+
+  should "create discussion article" do
+    article = fast_create(Article, :profile_id => person.id)
+    params[:article] = {name: "Title", type: "CommentParagraphPlugin::Discussion"}
+    post "/api/v1/articles/#{article.id}/children?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal "CommentParagraphPlugin::Discussion", json["article"]["type"]
+    assert json["article"]["setting"]["comment_paragraph_plugin_activate"]
+  end
 end
@@ -170,4 +170,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal nil, article.comment_paragraph_plugin_paragraph_content(1)
   end
+  should 'be enabled if plugin is enabled and article is a kind of Discussion' do
+    assert fast_create(CommentParagraphPlugin::Discussion, profile_id: profile.id).comment_paragraph_plugin_enabled?
+  end
 end
@@ -84,4 +84,12 @@ class CommentParagraphPluginTest &lt; ActiveSupport::TestCase
     assert_equal 'Deactivate Comments', plugin.article_extra_toolbar_buttons(article)[:title]
   end
+  should 'not display button to toggle comment paragraph if article is a discussion' do
+    profile = fast_create(Profile)
+    article = fast_create(CommentParagraphPlugin::Discussion, :profile_id => profile.id)
+    article.expects(:comment_paragraph_plugin_enabled?).returns(true)
+    article.expects(:allow_edit?).with(user).returns(true)
+
+    assert_equal [], plugin.article_extra_toolbar_buttons(article)
+  end
 end
@@ -0,0 +1,36 @@
+require_relative '../test_helper'
+
+class DiscussionTest < ActiveSupport::TestCase
+
+  def setup
+    @profile = fast_create(Community)
+    @discussion = fast_create(TextArticle, :profile_id => profile.id)
+    @environment = Environment.default
+    @environment.enable_plugin(CommentParagraphPlugin)
+  end
+
+  attr_reader :discussion, :environment, :profile
+
+  should 'parse html when save discussion' do
+    discussion = CommentParagraphPlugin::Discussion.new(profile: profile, name: "discussion", start_date: Time.now, end_date: Time.now + 1.day)
+    discussion.body = '<ul><li class="custom_class">item1</li><li>item2</li></ul>'
+    discussion.save!
+    assert discussion.comment_paragraph_plugin_activate
+    assert_mark_paragraph discussion.body, 'li', 'item1'
+    assert_mark_paragraph discussion.body, 'li', 'item2'
+  end
+
+  should 'not allow comments after end date' do
+    discussion = CommentParagraphPlugin::Discussion.create!(profile: profile, name: "discussion", start_date: Time.now - 2.days, end_date: Time.now - 1.day)
+    assert !discussion.accept_comments?
+  end
+
+  should 'not allow comments before start date' do
+    discussion = CommentParagraphPlugin::Discussion.create!(profile: profile, name: "discussion", start_date: Time.now + 1.day, end_date: Time.now + 2.days)
+    assert !discussion.accept_comments?
+  end
+
+  should 'have can_display_blocks with default false' do
+    assert !CommentParagraphPlugin::Discussion.can_display_blocks?
+  end
+end
@@ -0,0 +1,13 @@
+<%= required_fields_message %>
+
+<%= render :file => 'shared/tiny_mce' %>
+
+<div>
+  <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
+
+  <%= render :partial => 'text_fields' %>
+  <%= render :partial => 'general_fields' %>
+  <%= render :partial => 'translatable' %>
+  <%= date_range_field('article[start_date]', 'article[end_date]', @article.start_date, @article.end_date, {:time => true}, {:id => 'article_start_date'} ) %>
+  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true} %>
+</div>
@@ -48,5 +48,9 @@ module ProductsPlugin
       true
     end
+    def self.can_display_blocks?
+      false
+    end
+
   end
 end
@@ -30,4 +30,7 @@ class EnterpriseHomepageTest &lt; ActiveSupport::TestCase
     assert a.can_display_media_panel?
   end
+  should 'have can_display_blocks with default false' do
+    assert !EnterpriseHomepage.can_display_blocks?
+  end
 end
@@ -1993,6 +1993,39 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_match main_article.body, @response.body
   end
+  should 'set no_design_blocks as false when create a new document without type' do
+    get :new, profile: profile.identifier
+    assert !assigns(:no_design_blocks)
+  end
+
+  should 'set no_design_blocks as false when create a new document with invalid type' do
+    assert_raise RuntimeError do
+      get :new, profile: profile.identifier, type: 'InvalidType'
+      assert !assigns(:no_design_blocks)
+    end
+  end
+
+  [TextileArticle, Event, TinyMceArticle].each do |klass|
+    should "set no_design_blocks as true when create #{klass.name}" do
+      get :new, profile: profile.identifier, type: klass.name
+      assert assigns(:no_design_blocks)
+    end
+  end
+
+  should "set no_design_blocks as false when edit Article" do
+    article = fast_create(Article, profile_id: profile.id)
+    get :edit, profile: profile.identifier, id: article.id
+    assert !assigns(:no_design_blocks)
+  end
+
+  [TextileArticle, Event, TinyMceArticle].each do |klass|
+    should "set no_design_blocks as true when edit #{klass.name}" do
+      article = fast_create(klass, profile_id: profile.id)
+      get :edit, profile: profile.identifier, id: article.id
+      assert assigns(:no_design_blocks)
+    end
+  end
+
   protected
   # FIXME this is to avoid adding an extra dependency for a proper JSON parser.
@@ -2327,4 +2327,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_match 'Parent folder is archived', err.message
   end
+  should 'have can_display_blocks with default true' do
+    assert Article.can_display_blocks?
+  end
 end
@@ -333,4 +333,7 @@ class EventTest &lt; ActiveSupport::TestCase
     assert_equal 1, e.duration
   end
+  should 'have can_display_blocks with default false' do
+    assert !Event.can_display_blocks?
+  end
 end
@@ -178,6 +178,10 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
     assert a.can_display_media_panel?
   end
+  should 'have can_display_blocks with default false' do
+    assert !TextileArticle.can_display_blocks?
+  end
+
   protected
   def build_article(input = nil, options = {})
@@ -237,4 +237,7 @@ class TinyMceArticleTest &lt; ActiveSupport::TestCase
     assert a.can_display_media_panel?
   end
+  should 'have can_display_blocks with default false' do
+    assert !TinyMceArticle.can_display_blocks?
+  end
 end
	@@ -32,4 +32,8 @@ class TinyMceArticle < TextArticle		@@ -32,4 +32,8 @@ class TinyMceArticle < TextArticle
32	true	32	true
33	end	33	end
34		34
		35	+ def self.can_display_blocks?
		36	+ false
		37	+ end
		38	+
35	end	39	end
@@ -0,0 +1,30 @@		@@ -0,0 +1,30 @@
	1	+class CommentParagraphPlugin::Discussion < Event
	2	+
	3	+ def self.type_name
	4	+ _('Comments Discussion')
	5	+ end
	6	+
	7	+ def self.short_description
	8	+ _('Comments Discussion')
	9	+ end
	10	+
	11	+ def self.description
	12	+ _('Article with paragraph comments')
	13	+ end
	14	+
	15	+ def accept_comments?
	16	+ current_time = Time.now
	17	+ super &&
	18	+ (start_date.nil? \|\| current_time >= start_date) &&
	19	+ (end_date.nil? \|\| current_time <= end_date)
	20	+ end
	21	+
	22	+ def comment_paragraph_plugin_activated?
	23	+ environment.plugin_enabled?(CommentParagraphPlugin)
	24	+ end
	25	+
	26	+ def comment_paragraph_plugin_activation_mode
	27	+ "auto"
	28	+ end
	29	+
	30	+end
	@@ -81,4 +81,13 @@ class APITest < ActiveSupport::TestCase		@@ -81,4 +81,13 @@ class APITest < ActiveSupport::TestCase
81	json = JSON.parse(last_response.body)	81	json = JSON.parse(last_response.body)
82	assert_equivalent [comment1.id], json['comments'].map {\|c\| c['id']}	82	assert_equivalent [comment1.id], json['comments'].map {\|c\| c['id']}
83	end	83	end
		84	+
		85	+ should "create discussion article" do
		86	+ article = fast_create(Article, :profile_id => person.id)
		87	+ params[:article] = {name: "Title", type: "CommentParagraphPlugin::Discussion"}
		88	+ post "/api/v1/articles/#{article.id}/children?#{params.to_query}"
		89	+ json = JSON.parse(last_response.body)
		90	+ assert_equal "CommentParagraphPlugin::Discussion", json["article"]["type"]
		91	+ assert json["article"]["setting"]["comment_paragraph_plugin_activate"]
		92	+ end
84	end	93	end
	@@ -170,4 +170,7 @@ class ArticleTest < ActiveSupport::TestCase		@@ -170,4 +170,7 @@ class ArticleTest < ActiveSupport::TestCase
170	assert_equal nil, article.comment_paragraph_plugin_paragraph_content(1)	170	assert_equal nil, article.comment_paragraph_plugin_paragraph_content(1)
171	end	171	end
172		172
		173	+ should 'be enabled if plugin is enabled and article is a kind of Discussion' do
		174	+ assert fast_create(CommentParagraphPlugin::Discussion, profile_id: profile.id).comment_paragraph_plugin_enabled?
		175	+ end
173	end	176	end
	@@ -84,4 +84,12 @@ class CommentParagraphPluginTest < ActiveSupport::TestCase		@@ -84,4 +84,12 @@ class CommentParagraphPluginTest < ActiveSupport::TestCase
84	assert_equal 'Deactivate Comments', plugin.article_extra_toolbar_buttons(article)[:title]	84	assert_equal 'Deactivate Comments', plugin.article_extra_toolbar_buttons(article)[:title]
85	end	85	end
86		86
		87	+ should 'not display button to toggle comment paragraph if article is a discussion' do
		88	+ profile = fast_create(Profile)
		89	+ article = fast_create(CommentParagraphPlugin::Discussion, :profile_id => profile.id)
		90	+ article.expects(:comment_paragraph_plugin_enabled?).returns(true)
		91	+ article.expects(:allow_edit?).with(user).returns(true)
		92	+
		93	+ assert_equal [], plugin.article_extra_toolbar_buttons(article)
		94	+ end
87	end	95	end
@@ -0,0 +1,36 @@		@@ -0,0 +1,36 @@
	1	+require_relative '../test_helper'
	2	+
	3	+class DiscussionTest < ActiveSupport::TestCase
	4	+
	5	+ def setup
	6	+ @profile = fast_create(Community)
	7	+ @discussion = fast_create(TextArticle, :profile_id => profile.id)
	8	+ @environment = Environment.default
	9	+ @environment.enable_plugin(CommentParagraphPlugin)
	10	+ end
	11	+
	12	+ attr_reader :discussion, :environment, :profile
	13	+
	14	+ should 'parse html when save discussion' do
	15	+ discussion = CommentParagraphPlugin::Discussion.new(profile: profile, name: "discussion", start_date: Time.now, end_date: Time.now + 1.day)
	16	+ discussion.body = '<ul><li class="custom_class">item1</li><li>item2</li></ul>'
	17	+ discussion.save!
	18	+ assert discussion.comment_paragraph_plugin_activate
	19	+ assert_mark_paragraph discussion.body, 'li', 'item1'
	20	+ assert_mark_paragraph discussion.body, 'li', 'item2'
	21	+ end
	22	+
	23	+ should 'not allow comments after end date' do
	24	+ discussion = CommentParagraphPlugin::Discussion.create!(profile: profile, name: "discussion", start_date: Time.now - 2.days, end_date: Time.now - 1.day)
	25	+ assert !discussion.accept_comments?
	26	+ end
	27	+
	28	+ should 'not allow comments before start date' do
	29	+ discussion = CommentParagraphPlugin::Discussion.create!(profile: profile, name: "discussion", start_date: Time.now + 1.day, end_date: Time.now + 2.days)
	30	+ assert !discussion.accept_comments?
	31	+ end
	32	+
	33	+ should 'have can_display_blocks with default false' do
	34	+ assert !CommentParagraphPlugin::Discussion.can_display_blocks?
	35	+ end
	36	+end
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+<%= required_fields_message %>
	2	+
	3	+<%= render :file => 'shared/tiny_mce' %>
	4	+
	5	+<div>
	6	+ <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
	7	+
	8	+ <%= render :partial => 'text_fields' %>
	9	+ <%= render :partial => 'general_fields' %>
	10	+ <%= render :partial => 'translatable' %>
	11	+ <%= date_range_field('article[start_date]', 'article[end_date]', @article.start_date, @article.end_date, {:time => true}, {:id => 'article_start_date'} ) %>
	12	+ <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true} %>
	13	+</div>
	@@ -30,4 +30,7 @@ class EnterpriseHomepageTest < ActiveSupport::TestCase		@@ -30,4 +30,7 @@ class EnterpriseHomepageTest < ActiveSupport::TestCase
30	assert a.can_display_media_panel?	30	assert a.can_display_media_panel?
31	end	31	end
32		32
		33	+ should 'have can_display_blocks with default false' do
		34	+ assert !EnterpriseHomepage.can_display_blocks?
		35	+ end
33	end	36	end
	@@ -1993,6 +1993,39 @@ class CmsControllerTest < ActionController::TestCase		@@ -1993,6 +1993,39 @@ class CmsControllerTest < ActionController::TestCase
1993	assert_match main_article.body, @response.body	1993	assert_match main_article.body, @response.body
1994	end	1994	end
1995		1995
		1996	+ should 'set no_design_blocks as false when create a new document without type' do
		1997	+ get :new, profile: profile.identifier
		1998	+ assert !assigns(:no_design_blocks)
		1999	+ end
		2000	+
		2001	+ should 'set no_design_blocks as false when create a new document with invalid type' do
		2002	+ assert_raise RuntimeError do
		2003	+ get :new, profile: profile.identifier, type: 'InvalidType'
		2004	+ assert !assigns(:no_design_blocks)
		2005	+ end
		2006	+ end
		2007	+
		2008	+ [TextileArticle, Event, TinyMceArticle].each do \|klass\|
		2009	+ should "set no_design_blocks as true when create #{klass.name}" do
		2010	+ get :new, profile: profile.identifier, type: klass.name
		2011	+ assert assigns(:no_design_blocks)
		2012	+ end
		2013	+ end
		2014	+
		2015	+ should "set no_design_blocks as false when edit Article" do
		2016	+ article = fast_create(Article, profile_id: profile.id)
		2017	+ get :edit, profile: profile.identifier, id: article.id
		2018	+ assert !assigns(:no_design_blocks)
		2019	+ end
		2020	+
		2021	+ [TextileArticle, Event, TinyMceArticle].each do \|klass\|
		2022	+ should "set no_design_blocks as true when edit #{klass.name}" do
		2023	+ article = fast_create(klass, profile_id: profile.id)
		2024	+ get :edit, profile: profile.identifier, id: article.id
		2025	+ assert assigns(:no_design_blocks)
		2026	+ end
		2027	+ end
		2028	+
1996	protected	2029	protected
1997		2030
1998	# FIXME this is to avoid adding an extra dependency for a proper JSON parser.	2031	# FIXME this is to avoid adding an extra dependency for a proper JSON parser.
	@@ -2327,4 +2327,7 @@ class ArticleTest < ActiveSupport::TestCase		@@ -2327,4 +2327,7 @@ class ArticleTest < ActiveSupport::TestCase
2327	assert_match 'Parent folder is archived', err.message	2327	assert_match 'Parent folder is archived', err.message
2328	end	2328	end
2329		2329
		2330	+ should 'have can_display_blocks with default true' do
		2331	+ assert Article.can_display_blocks?
		2332	+ end
2330	end	2333	end