Conflicts:

app/controllers/public/profile_controller.rb

Conflicts:
app/controllers/public/profile_controller.rb
Daniela Feitosa
1 parent bf859260
Showing 9 changed files with 143 additions and 31 deletions Show diff stats
app/controllers/public/profile_controller.rb
app/models/community.rb
app/models/scrap.rb
app/views/profile/_profile_activities_scraps.rhtml
app/views/profile/_profile_activity.rhtml
app/views/profile/_profile_comment_form.rhtml
config/environments/development.rb
features/profile_activities.feature
public/javascripts/application.js
@@ -185,7 +185,9 @@ class ProfileController &lt; PublicController
   def leave_comment_on_activity
     @comment = Comment.new(params[:comment])
     @comment.author = user
-    @activity = ActionTracker::Record.find(params[:comment][:source_id])
+    @activity = ActionTracker::Record.find(params[:source_id])
+    #FIXME pq n colocar source direto?
+    #@comment.source = ActionTracker::Record.find(params[:source_id])
     @comment.source_type, @comment.source_id = (@activity.target_type == 'Article' ? ['Article', @activity.target_id] : [@activity.class.to_s, @activity.id])
     @tab_action = params[:tab_action]
     @message = @comment.save ? _("Comment successfully added.") : _("You can't leave an empty comment.")
@@ -79,4 +79,8 @@ class Community &lt; Organization
     {:title => __('Community Info and settings'), :icon => 'edit-profile-group'}
   end
+  def activities
+    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.target_id = #{self.id} ORDER BY updated_at DESC")
+  end
+
 end
@@ -11,10 +11,6 @@ class Scrap &lt; ActiveRecord::Base
   named_scope :not_replies, :conditions => {:scrap_id => nil}
-######### COMO OS AMIGOS VÃO SABER Q O AMIGO RECEBEU COMENTÁRIO? ACHO QUE TEM QUE TER AÇÃO
-#  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.receiver != s.sender}, :custom_target => :action_tracker_target 
-#  track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.receiver == s.sender}
-
   after_create do |scrap|
     scrap.root.update_attribute('updated_at', DateTime.now) unless scrap.root.nil?
     Scrap::Notifier.deliver_mail(scrap) if scrap.send_notification?
 <% activities.each do |a| %>
   <% activity = a.klass.constantize.find(a.id) %>
-  <% if activity.kind_of?(ActionTracker::Record) && @profile.person? %>
+  <% if activity.kind_of?(ActionTracker::Record) %>
     <%= render :partial => 'profile_activity', :locals => {:activity => activity} %>
   <% else %>
     <%= render :partial => 'profile_scrap', :locals => {:scrap => activity } %>
@@ -10,18 +10,6 @@
     <%= render :partial => 'comment', :collection => activity.comments %>
   </ul>
-  <div id='profile-wall-reply-<%= activity.id%>' style='display:none;width:auto;'>
-    <div id='profile-wall-reply-form-<%= activity.id%>' style='display:none;'>
-      <p class='profile-wall-reply'>
-        <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity'}, :update => "profile_activities", :success =>"hide_and_show(['#profile-wall-reply-form-#{activity.id}'],['#profile-wall-reply-response-#{activity.id}'])" do %>
-          <%= limited_text_area :comment, :body, 420, "reply_content_#{activity.id}", :cols => 50, :rows => 2 %>
-          <%= hidden_field :comment, :source_id, :id => "activity_id_#{activity.id}" %>
-          <%= submit_button :add, _('Leave a comment') %>
-          <%= button_to_function :cancel, _('Cancel'), "hide_and_show(['#profile-wall-reply-#{activity.id}'],[]);return false" %>
-        <% end %>
-      </p>
-    </div>
-    <div id='profile-wall-message-response-<%=activity.id%>' class='profile-wall-message-response'></div>
-  </div>
+  <%= render :partial => 'profile_comment_form', :locals => { :activity => activity } %> 
 </li>
@@ -0,0 +1,11 @@
+<div id='profile-wall-reply-<%= activity.id%>'>
+  <div id='profile-wall-reply-form-<%= activity.id%>'>
+    <p class='profile-wall-reply'>
+      <% form_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity'}, :update => 'profile_activities' do %>
+        <%= text_area :comment, :body, {:id => "reply_content_#{activity.id}", :cols => 50, :rows => 1, :class => 'submit-with-keypress'} %>
+        <%= hidden_field_tag :source_id, activity.id, :id => "activity_id_#{activity.id}" %>
+      <% end %>
+    </p>
+  </div>
+  <div id='profile-wall-message-response-<%=activity.id%>' class='profile-wall-message-response'></div>
+</div>
 # Settings specified here will take precedence over those in config/environment.rb
-# In the development environment your application's code is reloaded on
-# every request.  This slows down response time but is perfect for development
-# since you don't have to restart the webserver when you make code changes.
-config.cache_classes = false
+# The production environment is meant for finished, "live" apps.
+# Code is not reloaded between requests
+config.cache_classes = true
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
+# Use a different logger for distributed setups
+# config.logger = SyslogLogger.new
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_view.debug_rjs                         = true
-config.action_controller.perform_caching             = false
+# Full error reports are disabled and caching is turned on
+config.action_controller.consider_all_requests_local = false
+config.action_controller.perform_caching             = true
+config.action_view.cache_template_loading            = true
-# Don't care if the mailer can't send
-config.action_mailer.raise_delivery_errors = false
+# Enable serving of images, stylesheets, and javascripts from an asset server
+# config.action_controller.asset_host                  = "http://assets.example.com"
+
+# Disable delivery errors, bad email addresses will be ignored
+# config.action_mailer.raise_delivery_errors = false
+
+config.cache_store = :mem_cache_store, "localhost"
@@ -0,0 +1,86 @@
+Feature: list activities of a profile
+  As a visitor
+  I want to see the activities of a profile
+
+  Background:
+    Given the following users
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And the following articles
+      | owner   | name                 | body            |
+      | booking | article to comment   | first paragraph |
+    And the following comments
+      | article              | author  | title | body         |
+      | article with comment | booking | hi    | how are you? |
+
+  Scenario: see the activity of a profile
+    Given I am logged in as "joaosilva"
+    When I go to Jose Silva's homepage
+    Then I should see "first paragraph" within ".profile-activity-item"
+    And I should see "how are you?" within ".profile-wall-activities-comments"
+
+  @selenium
+  Scenario: post a comment while not authenticated
+    Given I am on /booking/article-to-comment
+    And I fill in "Name" with "Joey Ramone"
+    And I fill in "e-mail" with "joey@ramones.com"
+    And I fill in "Title" with "Hey ho, let's go!"
+    And I fill in "Enter your comment" with "Hey ho, let's go!"
+    When I press "Post comment"
+    Then I should see "Hey ho, let's go"
+
+  @selenium
+  Scenario: post comment while authenticated
+    Given I am logged in as "booking"
+    And I am on /booking/article-to-comment
+    And I fill in "Title" with "Hey ho, let's go!"
+    And I fill in "Enter your comment" with "Hey ho, let's go!"
+    When I press "Post comment"
+    Then I should see "Hey ho, let's go"
+
+  @selenium
+  Scenario: redirect to right place after comment a picture
+    Given the following files
+      | owner   | file      | mime      |
+      | booking | rails.png | image/png |
+    Given I am logged in as "booking"
+    And I am on /booking/rails.png?view=true
+    And I fill in "Title" with "Hey ho, let's go!"
+    And I fill in "Enter your comment" with "Hey ho, let's go!"
+    When I press "Post comment"
+    Then I should be exactly on /booking/rails.png?view=true
+
+  @selenium
+  Scenario: show error messages when make a blank comment
+    Given I am logged in as "booking"
+    And I am on /booking/article-to-comment
+    When I press "Post comment"
+    Then I should see "Title can't be blank"
+    And I should see "Body can't be blank"
+
+  @selenium
+  Scenario: disable post comment button
+    Given I am on /booking/article-to-comment
+    And I fill in "Name" with "Joey Ramone"
+    And I fill in "e-mail" with "joey@ramones.com"
+    And I fill in "Title" with "Hey ho, let's go!"
+    And I fill in "Enter your comment" with "Hey ho, let's go!"
+    When I press "Post comment"
+    Then the "value.Post comment" button should not be enabled
+    And I should see "Hey ho, let's go"
+
+  @selenium
+  Scenario: render comment form and go to bottom
+    Given I am on /booking/article-with-comment
+    When I follow "Post a comment" within ".post-comment-button"
+    Then I should see "Enter your comment" within "div#page-comment-form div.post_comment_box.opened"
+    And I should be exactly on /booking/article-with-comment
+    And I should be moved to anchor "comment_form"
+
+  @selenium
+  Scenario: keep comments field filled while trying to do a comment
+    Given I am on /booking/article-with-comment
+    And I fill in "Name" with "Joey Ramone"
+    When I press "Post comment"
+    Then the "Name" field should contain "Joey Ramone"
+    And I should see "errors prohibited"
@@ -711,3 +711,24 @@ Array.min = function(array) {
   return Math.min.apply(Math, array);
 };
+jQuery(function($){
+  $('.submit-with-keypress').live('keydown', function(e) {
+     field = this;
+     if (e.keyCode == 13) {
+       e.preventDefault();
+       var form = $(field).closest("form");
+       $.ajax({
+           url: form.attr("action"),
+           data: form.serialize(),
+           beforeSend: function() {
+             loading_for_button($(field));
+           },
+           success: function(data) {
+             $('#profile_activities').html(data);
+             $('.submit-with-keypress').val('');
+           }
+       });
+       return false;
+     }
+   });
+});
	@@ -79,4 +79,8 @@ class Community < Organization		@@ -79,4 +79,8 @@ class Community < Organization
79	{:title => __('Community Info and settings'), :icon => 'edit-profile-group'}	79	{:title => __('Community Info and settings'), :icon => 'edit-profile-group'}
80	end	80	end
81		81
		82	+ def activities
		83	+ Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.target_id = #{self.id} ORDER BY updated_at DESC")
		84	+ end
		85	+
82	end	86	end
1	<% activities.each do \|a\| %>	1	<% activities.each do \|a\| %>
2	<% activity = a.klass.constantize.find(a.id) %>	2	<% activity = a.klass.constantize.find(a.id) %>
3	- <% if activity.kind_of?(ActionTracker::Record) && @profile.person? %>	3	+ <% if activity.kind_of?(ActionTracker::Record) %>
4	<%= render :partial => 'profile_activity', :locals => {:activity => activity} %>	4	<%= render :partial => 'profile_activity', :locals => {:activity => activity} %>
5	<% else %>	5	<% else %>
6	<%= render :partial => 'profile_scrap', :locals => {:scrap => activity } %>	6	<%= render :partial => 'profile_scrap', :locals => {:scrap => activity } %>
	@@ -10,18 +10,6 @@		@@ -10,18 +10,6 @@
10	<%= render :partial => 'comment', :collection => activity.comments %>	10	<%= render :partial => 'comment', :collection => activity.comments %>
11	</ul>	11	</ul>
12		12
13	- <div id='profile-wall-reply-<%= activity.id%>' style='display:none;width:auto;'>
14	- <div id='profile-wall-reply-form-<%= activity.id%>' style='display:none;'>
15	- <p class='profile-wall-reply'>
16	- <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity'}, :update => "profile_activities", :success =>"hide_and_show(['#profile-wall-reply-form-#{activity.id}'],['#profile-wall-reply-response-#{activity.id}'])" do %>
17	- <%= limited_text_area :comment, :body, 420, "reply_content_#{activity.id}", :cols => 50, :rows => 2 %>
18	- <%= hidden_field :comment, :source_id, :id => "activity_id_#{activity.id}" %>
19	- <%= submit_button :add, _('Leave a comment') %>
20	- <%= button_to_function :cancel, _('Cancel'), "hide_and_show(['#profile-wall-reply-#{activity.id}'],[]);return false" %>
21	- <% end %>
22	- </p>
23	- </div>
24	- <div id='profile-wall-message-response-<%=activity.id%>' class='profile-wall-message-response'></div>
25	- </div>	13	+ <%= render :partial => 'profile_comment_form', :locals => { :activity => activity } %>
26		14
27	</li>	15	</li>
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+<div id='profile-wall-reply-<%= activity.id%>'>
	2	+ <div id='profile-wall-reply-form-<%= activity.id%>'>
	3	+ <p class='profile-wall-reply'>
	4	+ <% form_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity'}, :update => 'profile_activities' do %>
	5	+ <%= text_area :comment, :body, {:id => "reply_content_#{activity.id}", :cols => 50, :rows => 1, :class => 'submit-with-keypress'} %>
	6	+ <%= hidden_field_tag :source_id, activity.id, :id => "activity_id_#{activity.id}" %>
	7	+ <% end %>
	8	+ </p>
	9	+ </div>
	10	+ <div id='profile-wall-message-response-<%=activity.id%>' class='profile-wall-message-response'></div>
	11	+</div>
1	# Settings specified here will take precedence over those in config/environment.rb	1	# Settings specified here will take precedence over those in config/environment.rb
2		2
3	-# In the development environment your application's code is reloaded on
4	-# every request. This slows down response time but is perfect for development
5	-# since you don't have to restart the webserver when you make code changes.
6	-config.cache_classes = false	3	+# The production environment is meant for finished, "live" apps.
		4	+# Code is not reloaded between requests
		5	+config.cache_classes = true
7		6
8	-# Log error messages when you accidentally call methods on nil.
9	-config.whiny_nils = true	7	+# Use a different logger for distributed setups
		8	+# config.logger = SyslogLogger.new
10		9
11	-# Show full error reports and disable caching
12	-config.action_controller.consider_all_requests_local = true
13	-config.action_view.debug_rjs = true
14	-config.action_controller.perform_caching = false	10	+# Full error reports are disabled and caching is turned on
		11	+config.action_controller.consider_all_requests_local = false
		12	+config.action_controller.perform_caching = true
		13	+config.action_view.cache_template_loading = true
15		14
16	-# Don't care if the mailer can't send
17	-config.action_mailer.raise_delivery_errors = false	15	+# Enable serving of images, stylesheets, and javascripts from an asset server
		16	+# config.action_controller.asset_host = "http://assets.example.com"
		17	+
		18	+# Disable delivery errors, bad email addresses will be ignored
		19	+# config.action_mailer.raise_delivery_errors = false
		20	+
		21	+config.cache_store = :mem_cache_store, "localhost"
@@ -0,0 +1,86 @@		@@ -0,0 +1,86 @@
	1	+Feature: list activities of a profile
	2	+ As a visitor
	3	+ I want to see the activities of a profile
	4	+
	5	+ Background:
	6	+ Given the following users
	7	+ \| login \| name \|
	8	+ \| joaosilva \| Joao Silva \|
	9	+ And the following articles
	10	+ \| owner \| name \| body \|
	11	+ \| booking \| article to comment \| first paragraph \|
	12	+ And the following comments
	13	+ \| article \| author \| title \| body \|
	14	+ \| article with comment \| booking \| hi \| how are you? \|
	15	+
	16	+ Scenario: see the activity of a profile
	17	+ Given I am logged in as "joaosilva"
	18	+ When I go to Jose Silva's homepage
	19	+ Then I should see "first paragraph" within ".profile-activity-item"
	20	+ And I should see "how are you?" within ".profile-wall-activities-comments"
	21	+
	22	+ @selenium
	23	+ Scenario: post a comment while not authenticated
	24	+ Given I am on /booking/article-to-comment
	25	+ And I fill in "Name" with "Joey Ramone"
	26	+ And I fill in "e-mail" with "joey@ramones.com"
	27	+ And I fill in "Title" with "Hey ho, let's go!"
	28	+ And I fill in "Enter your comment" with "Hey ho, let's go!"
	29	+ When I press "Post comment"
	30	+ Then I should see "Hey ho, let's go"
	31	+
	32	+ @selenium
	33	+ Scenario: post comment while authenticated
	34	+ Given I am logged in as "booking"
	35	+ And I am on /booking/article-to-comment
	36	+ And I fill in "Title" with "Hey ho, let's go!"
	37	+ And I fill in "Enter your comment" with "Hey ho, let's go!"
	38	+ When I press "Post comment"
	39	+ Then I should see "Hey ho, let's go"
	40	+
	41	+ @selenium
	42	+ Scenario: redirect to right place after comment a picture
	43	+ Given the following files
	44	+ \| owner \| file \| mime \|
	45	+ \| booking \| rails.png \| image/png \|
	46	+ Given I am logged in as "booking"
	47	+ And I am on /booking/rails.png?view=true
	48	+ And I fill in "Title" with "Hey ho, let's go!"
	49	+ And I fill in "Enter your comment" with "Hey ho, let's go!"
	50	+ When I press "Post comment"
	51	+ Then I should be exactly on /booking/rails.png?view=true
	52	+
	53	+ @selenium
	54	+ Scenario: show error messages when make a blank comment
	55	+ Given I am logged in as "booking"
	56	+ And I am on /booking/article-to-comment
	57	+ When I press "Post comment"
	58	+ Then I should see "Title can't be blank"
	59	+ And I should see "Body can't be blank"
	60	+
	61	+ @selenium
	62	+ Scenario: disable post comment button
	63	+ Given I am on /booking/article-to-comment
	64	+ And I fill in "Name" with "Joey Ramone"
	65	+ And I fill in "e-mail" with "joey@ramones.com"
	66	+ And I fill in "Title" with "Hey ho, let's go!"
	67	+ And I fill in "Enter your comment" with "Hey ho, let's go!"
	68	+ When I press "Post comment"
	69	+ Then the "value.Post comment" button should not be enabled
	70	+ And I should see "Hey ho, let's go"
	71	+
	72	+ @selenium
	73	+ Scenario: render comment form and go to bottom
	74	+ Given I am on /booking/article-with-comment
	75	+ When I follow "Post a comment" within ".post-comment-button"
	76	+ Then I should see "Enter your comment" within "div#page-comment-form div.post_comment_box.opened"
	77	+ And I should be exactly on /booking/article-with-comment
	78	+ And I should be moved to anchor "comment_form"
	79	+
	80	+ @selenium
	81	+ Scenario: keep comments field filled while trying to do a comment
	82	+ Given I am on /booking/article-with-comment
	83	+ And I fill in "Name" with "Joey Ramone"
	84	+ When I press "Post comment"
	85	+ Then the "Name" field should contain "Joey Ramone"
	86	+ And I should see "errors prohibited"
	@@ -711,3 +711,24 @@ Array.min = function(array) {		@@ -711,3 +711,24 @@ Array.min = function(array) {
711	return Math.min.apply(Math, array);	711	return Math.min.apply(Math, array);
712	};	712	};
713		713
		714	+jQuery(function($){
		715	+ $('.submit-with-keypress').live('keydown', function(e) {
		716	+ field = this;
		717	+ if (e.keyCode == 13) {
		718	+ e.preventDefault();
		719	+ var form = $(field).closest("form");
		720	+ $.ajax({
		721	+ url: form.attr("action"),
		722	+ data: form.serialize(),
		723	+ beforeSend: function() {
		724	+ loading_for_button($(field));
		725	+ },
		726	+ success: function(data) {
		727	+ $('#profile_activities').html(data);
		728	+ $('.submit-with-keypress').val('');
		729	+ }
		730	+ });
		731	+ return false;
		732	+ }
		733	+ });
		734	+});