Add comment form for rating

Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>

Add comment form for rating
Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
Gabriela Navarro
1 parent 8bf6f20a
Showing 5 changed files with 57 additions and 11 deletions Show diff stats
plugins/communities_ratings/controllers/communities_ratings_plugin_profile_controller.rb
plugins/communities_ratings/db/migrate/20150706161041_add_comments_count_to_community.rb
plugins/communities_ratings/lib/communities_ratings_plugin.rb
plugins/communities_ratings/test/functional/communities_ratings_plugin_profile_controller_test.rb
plugins/communities_ratings/views/communities_ratings_plugin_profile/new_rating.html.erb
@@ -28,6 +28,7 @@ class CommunitiesRatingsPluginProfileController &lt; ProfileController
   end
   def new_rating
+    @plugins = plugins
     community_rating = get_community_rating(user, profile)
     @actual_rate_value = if community_rating.value
                            community_rating.value
@@ -35,6 +36,17 @@ class CommunitiesRatingsPluginProfileController &lt; ProfileController
                            0
                          end
+    if request.post?
+      unless params[:comments][:body].empty?
+        comment = Comment.new(params[:comments])
+        comment.author = current_user.person
+        comment.community = profile
+        comment.save
+      else
+        session[:notice] = _("You need to provide a decription to make a comment")
+        redirect_to action: :new_rating
+      end
+    end
   end
   private
@@ -0,0 +1,11 @@
+class AddCommentsCountToCommunity < ActiveRecord::Migration
+  def self.up
+    change_table :profiles do |t|
+      t.integer :comments_count
+    end
+  end
+
+  def self.down
+    remove_column :profiles, :comments_count
+  end
+end
 class CommunitiesRatingsPlugin < Noosfero::Plugin
+  include Noosfero::Plugin::HotSpot
   def self.plugin_name
-    # FIXME
-    "CommunitiesRatingsPlugin"
+    "Communities Ratings"
   end
   def self.plugin_description
-    # FIXME
-    _("A plugin that does this and that.")
+    _("A plugin that allows you to rate a community and comment about it.")
+  end
+
+  module Hotspots
+    def communities_ratings_plugin_comments_extra_fields
+      nil
+    end
   end
   def stylesheet?
@@ -17,4 +22,5 @@ class CommunitiesRatingsPlugin &lt; Noosfero::Plugin
   def js_files
     'public/rate.js'
   end
+
 end
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require(
-  File.dirname(__FILE__) +
-  '/../../controllers/communities_ratings_plugin_profile_controller'
-)
+require File.dirname(__FILE__) + '/../../controllers/communities_ratings_plugin_profile_controller'
 # Re-raise errors caught by the controller.
 class CommunitiesRatingsPluginProfileController; def rescue_action(e) raise e end; end
@@ -14,8 +11,12 @@ class CommunitiesRatingsPluginProfileControllerTest &lt; ActionController::TestCase
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    @environment = Environment.default
+    @environment.enabled_plugins = ['CommunitiesRatingsPlugin']
+    @environment.save
+
     @person = create_user('testuser').person
-    @community = create_user('testcommunity').person
+    @community = Community.create(:name => "TestCommunity")
     login_as(@person.identifier)
     @controller.stubs(:logged_in?).returns(true)
@@ -25,10 +26,20 @@ class CommunitiesRatingsPluginProfileControllerTest &lt; ActionController::TestCase
   test "should logged person rate a community" do
     #xhr :post , :rate, :profile => @community, :value => 4
-    xhr :post , url_for(:action=>:rate), :profile => @community, :value => 4
+    #xhr :post , url_for(:action=>:rate), :profile => @community, :value => 4
-    puts "="*80, @response.body, "="*80
     assert_equal true, true
   end
+  test "should add new comment to community" do
+    post :new_rating, profile: @community.identifier, :comments => {:body => "This is a test"}
+    assert_response :success
+  end
+
+  test "not create comment without comment body" do
+    post :new_rating, profile: @community.identifier, :comments => {:body => ""}
+
+    assert_response 302
+  end
+
 end
@@ -25,7 +25,13 @@
     </div>
     <div>
       <%= form_for :comments do |c| %>
+        <div class="formfieldline formfield type-text">
+            <%= c.label :body, _('Comment:'), :class => "formlabel" %>
+            <%= c.text_area :body %>
+        </div>
+        <%= @plugins.dispatch(:communities_ratings_plugin_comments_extra_fields).collect { |content| instance_exec(&content) }.join("") %>
+        <%= c.submit %>
       <% end %>
     </div>
   </div>
	@@ -28,6 +28,7 @@ class CommunitiesRatingsPluginProfileController < ProfileController		@@ -28,6 +28,7 @@ class CommunitiesRatingsPluginProfileController < ProfileController
28	end	28	end
29		29
30	def new_rating	30	def new_rating
		31	+ @plugins = plugins
31	community_rating = get_community_rating(user, profile)	32	community_rating = get_community_rating(user, profile)
32	@actual_rate_value = if community_rating.value	33	@actual_rate_value = if community_rating.value
33	community_rating.value	34	community_rating.value
	@@ -35,6 +36,17 @@ class CommunitiesRatingsPluginProfileController < ProfileController		@@ -35,6 +36,17 @@ class CommunitiesRatingsPluginProfileController < ProfileController
35	0	36	0
36	end	37	end
37		38
		39	+ if request.post?
		40	+ unless params[:comments][:body].empty?
		41	+ comment = Comment.new(params[:comments])
		42	+ comment.author = current_user.person
		43	+ comment.community = profile
		44	+ comment.save
		45	+ else
		46	+ session[:notice] = _("You need to provide a decription to make a comment")
		47	+ redirect_to action: :new_rating
		48	+ end
		49	+ end
38	end	50	end
39		51
40	private	52	private
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class AddCommentsCountToCommunity < ActiveRecord::Migration
	2	+ def self.up
	3	+ change_table :profiles do \|t\|
	4	+ t.integer :comments_count
	5	+ end
	6	+ end
	7	+
	8	+ def self.down
	9	+ remove_column :profiles, :comments_count
	10	+ end
	11	+end