social_stream-base 0.7.10 → 0.7.11

data/app/assets/javascripts/activities.js.erb

@@ -52,43 +52,65 @@ $(function() {
 
 //javascript for comments
 $(function() {
+  //"write new comment..." text in every text field for comments
   $(".input_new_comments").val("<%= I18n.t('comment.input') %>");
+  
+  //show only the text fields for new comment if there are any comment to the post
+  $(".activity_new_comment").each(function(){
+  	if ($.trim($(this).siblings(".activity_comments").text()) != ""){
+  	  $(this).show();
+  	}
+  });
   $(".activities_comment_btn").hide();
+  
+  //if there are 4 or more commments we only show the last 2 and a link to show the rest
+  $(".activity_comments").each(function(){
+  	var comments = $(this).children(".subactivity");  	
+  	//check if there are more than 3 comments
+  	if (comments.size() > 3){
+  		$(this).prepend("<div class='hide_show_comments'><a href='#' onclick='showAllComments(\""+ $(this).attr('id') +"\"); return false;'><%= I18n.t('comment.view_all') %> (" + comments.size() + ")</a></div>");
+  		comments.slice(0,comments.size()-2).hide();
+  		//hide alto space_comments
+  		$(this).children(".space_comments").slice(0,comments.size()-2).hide();
+  	}
+  });
 });
 
+showAllComments = function(id){
+	$("#"+id).children().show();
+	//and hide the hide_show_comments
+	$("#"+id).children(".hide_show_comments").hide();
+};
+
 //usa livequery para usar el javascript luego de una accion con  AJAX
-$(".input_new_comments").livequery("click",function(){
+$(".input_new_comments").live("click",function(){
 	if(this.value == "<%= I18n.t('comment.input') %>"){
 		$(this).val("");
 	}
 	$(".activities_comment_btn").hide();
 	$(this).parent(".new_comment").children(".activities_comment_btn").show();
 });
-$(".input_new_comments").livequery("blur",function(){
+
+/* this function works but it finishes and no other event is done
+ * I mean: when you click in other button the blur happens but the click is not done
+$(".input_new_comments").live("blur",function(){
 	if(this.value == ""){
 		$(".activities_comment_btn").hide();
-    $(this).val("<%= I18n.t('comment.input') %>");
+        $(this).val("<%= I18n.t('comment.input') %>");
 	}
+	return true;
 });
-
-$(".input_new_comments").click(function(){
-	if(this.value == "<%= I18n.t('comment.input') %>"){
-		$(this).val("");
-	}
-	$(".activities_comment_btn").hide();
-	$(this).parent(".new_comment").children(".activities_comment_btn").show();
-});
+*/
 
 //javascript for tocomment option
-$(".to_comment").livequery("click", function(){
-  $(this).parents(".activity_content").find(".input_new_comments").click();
+$(".to_comment").live("click", function(){
+  $(this).parents(".activity_content").find(".activity_new_comment").show();
+  $(".input_new_comments").val("<%= I18n.t('comment.input') %>");
+  $(this).parents(".activity_content").find(".input_new_comments").click();  
   $(this).parents(".activity_content").find(".input_new_comments").focus();
 	return false;
 });
-$(".to_comment").livequery("blur", function(){
-  $(this).parents(".activity_content").find(".input_new_comments").blur();
-	return false;
-});
+
 
 
 

data/app/assets/stylesheets/activities.css

@@ -19,8 +19,9 @@
 #securities{  display:inline-block;  text-align:left; float: left; padding-left:5px;}
 
 /******************* WALL - ACTIVITY ***************/
-.activity {	text-align:left;	display: block;	vertical-align: top;	padding: 10px 0px 0px 0px;
-	display: inline-block;	color: #000;	width: 100%;  font-size: 13px;  color: #2A3890;}
+.super_activity{width: 95%;}
+.activity {	text-align:left;	display: block;	vertical-align: top;	padding: 10px 0px 5px 0px;
+	display: inline-block;	color: #000; font-size: 13px;  color: #2A3890;border-bottom:1px solid #E9E9E9;}
 .actor_logo {	width: 38px;	padding: 8px 0px 5px 5px;	display: inline-block;	vertical-align: top;}
 .activity_content {	padding: 8px 0px 0px 0px;	display: inline-block;	color: #000;	width: 90%;}
 .actor_name {font-size: 13px;}
@@ -30,6 +31,7 @@
 /***************** ACTIVITY OPTIONS ***/
 .activity_options {	color: #2A3890;	font-size: 10px;  display: inline-block;}
 .actor_name-activity_objects{  font-weight: bold;	color: #2A3890;  font-size:12px;}
+.activity_objects{padding-bottom:5px;}
 .subactivity_objects{	color: #000;  font-weight:normal;  font-size:11px;}
 .post_time_ago {	color: #6c6d6f;}
 .activity_options {  list-style:none;	margin:0;	padding:0;}
@@ -55,20 +57,20 @@
 
 
 .activity_new_comment{  font-size: 11px;  padding-left: 5px;	background: #deeff8;
-	border: thin solid #D4E4E4;}
+	border: thin solid #D4E4E4; width:100%;  padding-top: 3px;  padding-bottom: 3px;display:none;}
 .actor_logo_subactivity {	width: 40px;	padding: 5px 3px 5px 2px;	display: inline-block;
 	vertical-align: top;}
 .input_new_comments{	border:1px solid #BDC7D8;	width:98%;	padding: 2px;}
-.activity_new_comment{	font-size: 11px;  width:100%;  padding-top: 3px;  padding-bottom: 3px;}
 .subactivity{  font-size: 11px;  padding: 0px 0px 0px 5px;  background: #deeff8;
-  border: thin solid #D4E4E4;}
+  border: thin solid #D4E4E4; width: 100%; }
 .space_comments {	padding-top: 1px;	padding-bottom: 1px;}
 #input_activities {	border-color: #0656a4;	color: #2A3890;	padding: 5px 5px 5px 5px;
   border:1px solid #BDC7D8;}
 #activities_share_btn {	text-align: right;	padding: 5px 16px 0px 10px;	vertical-align: middle;}
 .activities_comment_btn{ text-align: right;    padding: 2px 5px 2px 10px;    vertical-align: middle;}
 
-
+.hide_show_comments{font-size: 11px;  padding-left: 5px;	background: #deeff8;
+	border: thin solid #D4E4E4; width:100%;  padding-top: 3px;  padding-bottom: 3px;}
 /*********** DROP DOWN**********/
 #security_chzn .chzn-choices {
 	padding-left: 20px;

data/app/assets/stylesheets/base.css

@@ -228,3 +228,4 @@ textarea.new_contact_text_area{ height: 100px; color: #2A3890;}
 .more_pending{
 	text-align: center;
 }
+

data/app/helpers/notifications_helper.rb

@@ -1,43 +1,3 @@
-module NotificationsHelper
-  include SubjectsHelper, ActionView::Helpers::TextHelper  
-  
-  def decode_notification notification_text, activity
-    return if activity.nil?
-    notification_text = notification_text.gsub(/\%\{sender\}/, link_to(truncate_name(activity.sender.name), 
-                                                                      url_for(:controller=> activity.sender.subject.class.to_s.downcase.pluralize, 
-                                                                              :action=> :show, :id=> activity.sender.subject.slug, :only_path => false)))   
-    notification_text = notification_text.gsub(/\%\{confirm\}/,link_to(t('notification.confirm'),edit_contact_url(activity.receiver.contact_to!(activity.sender), :s => activity.sender.slug)))
-    notification_text = notification_text.gsub(/\%\{look\}/,link_to(t('notification.look'),
-                                                                      url_for(:controller=> activity.sender.subject.class.to_s.downcase.pluralize, 
-                                                                              :action=> :show, :id=> activity.sender.subject.slug, :only_path => false)))
-    notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
-    
-    if activity.receiver.subject.is_a?(User)
-      notification_text = notification_text.gsub(/\%\{whose\}/,"your")
-      notification_text = notification_text.gsub(/\%\{who\}/,"you")
-    else
-      notification_text = notification_text.gsub(/\%\{whose\}/,truncate_name(activity.receiver.name)+"'s")
-      notification_text = notification_text.gsub(/\%\{who\}/,truncate_name(activity.receiver.name))
-    end
-      
-    if activity.direct_object.present?
-      object = activity.direct_object
-      object = object.subject if object.is_a? Actor
-      notification_text=notification_text.gsub(/\%\{object\}/,link_to(object.class.to_s.downcase,
-                                                                      url_for(:controller=> object.class.to_s.downcase.pluralize, :action=> :show, 
-                                                                              :id=> object.id, :only_path => false)))
-      notification_text=notification_text.gsub(/\%\{object.name\}/,object.class.to_s.downcase)
-      notification_text=notification_text.gsub(/\%\{object.text\}/,link_to(object.text.truncate(100, :separator =>' '), 
-                                                                          url_for(:controller=> object.class.to_s.downcase.pluralize, :action=> :show, 
-                                                                                  :id=> object.id, :only_path => false))) if object.respond_to? :text
-      
-      #notification_text=notification_text.gsub(/\%\{object.image\}/,thumb_for(object)) if SocialStream.activity_forms.include? :document and object.is_a? Document
-      
-    else
-      notification_text=notification_text.gsub(/\%\{object\}/,"nilclass")
-      notification_text=notification_text.gsub(/\%\{object.name\}/,"nilclass")
-    end
-
-    notification_text
-  end
+module NotificationsHelper  
+  include Mailboxer::NotificationDecoder
 end

data/app/mailers/notification_mailer.rb

@@ -12,7 +12,9 @@ class NotificationMailer < ActionMailer::Base
   end
 
   include ActionView::Helpers::SanitizeHelper
+  #DIFFERENT FROM ORIGINAL----------------------
   include Mailboxer::NotificationDecoder
+  #END OF DIFFERENCE----------------------------
 
   #Sends an email for indicating a new message for the receiver
   def new_notification_email(notification,receiver)
@@ -20,7 +22,8 @@ class NotificationMailer < ActionMailer::Base
     @receiver = receiver
     #DIFFERENT FROM ORIGINAL----------------------
     subject = notification.subject.to_s
-    #subject = notifications.subject_decoded
+    subject = decode_basic_notification(subject,notification.notified_object)
+    subject = subject.gsub(/\n/,'')
     #END OF DIFFERENCE----------------------------
     subject = strip_tags(subject) unless subject.html_safe?
     mail(:to => receiver.send(Mailboxer.email_method,notification), :subject => t('mailboxer.notification_mailer.subject', :subject => subject)) do |format|

data/app/views/activities/_root.html.erb

@@ -1,4 +1,4 @@
-<%= div_for activity do %>
+<%= div_for activity, :class => 'super_activity' do %>
 
   <div class="actor_logo">
     <%= link_to image_tag(activity.sender_subject.logo.url(:actor),

data/app/views/notification_mailer/new_notification_email.html.erb

@@ -1,4 +1,4 @@
-<% self.class.send :include, NotificationsHelper %>
+<% self.class.send :include, Mailboxer::NotificationDecoder  %>
 <!DOCTYPE html>
 <html>
   <head>

data/app/views/notification_mailer/new_notification_email.text.erb

@@ -1,4 +1,4 @@
-<% self.class.send :include, NotificationsHelper %>
+<% self.class.send :include, Mailboxer::NotificationDecoder %>
 <%= strip_tags decode_notification @notification.subject,@notification.notified_object %>
 -----------------------------------------------
 <%= strip_tags decode_notification @notification.body,@notification.notified_object  %>

data/app/views/notifications/activities/_like_subject.html.erb

@@ -1,5 +1,5 @@
 <% if activity.direct_object.is_a? Actor %>
-  %{sender} is now %{whose} fan.
+%{sender} is now %{whose} fan.
 <% else %>
-  %{sender} likes %{whose} %{object.name} 
+%{sender} likes %{whose} %{object.name}
 <% end %>

data/config/locales/en.yml

@@ -80,6 +80,7 @@ en:
   comment:
     input: "Write a comment..."
     confirm_delete: "Delete comment?"
+    view_all: "View all comments"
   contact:
     all_n: "All contacts (%{count})"
     current: "Current"

data/lib/generators/social_stream/base/templates/relations.yml

@@ -37,3 +37,16 @@ group:
     name: partner
     permissions:
       - [ read,    activity ]
+
+event:
+  member:
+    name: member
+    permissions:
+      - [ represent ]
+      - [ create,  activity ]
+      - [ read,    activity ]
+      - [ read,    tie ]
+  partner:
+    name: partner
+    permissions:
+      - [ read,    activity ]

data/lib/mailboxer/notification_decoder.rb

@@ -1,5 +1,76 @@
 module Mailboxer
   module NotificationDecoder
-   
+    include SubjectsHelper, ActionView::Helpers::TextHelper
+    def decode_notification notification_text, activity
+      return if activity.nil?
+      notification_text = notification_text.gsub(/\%\{sender\}/, link_to(truncate_name(activity.sender.name),
+                                                                      url_for(:controller=> activity.sender.subject.class.to_s.downcase.pluralize,
+                                                                              :action=> :show, :id=> activity.sender.subject.slug, :only_path => false)))
+      notification_text = notification_text.gsub(/\%\{confirm\}/,link_to(t('notification.confirm'),edit_contact_url(activity.receiver.contact_to!(activity.sender), :s => activity.sender.slug)))
+      notification_text = notification_text.gsub(/\%\{look\}/,link_to(t('notification.look'),
+                                                                      url_for(:controller=> activity.sender.subject.class.to_s.downcase.pluralize,
+                                                                              :action=> :show, :id=> activity.sender.subject.slug, :only_path => false)))
+      notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
+
+      if activity.receiver.subject.is_a?(User)
+        notification_text = notification_text.gsub(/\%\{whose\}/,"your")
+        notification_text = notification_text.gsub(/\%\{who\}/,"you")
+      else
+        notification_text = notification_text.gsub(/\%\{whose\}/,truncate_name(activity.receiver.name)+"'s")
+        notification_text = notification_text.gsub(/\%\{who\}/,truncate_name(activity.receiver.name))
+      end
+
+      if activity.direct_object.present?
+        object = activity.direct_object
+        object = object.subject if object.is_a? Actor
+        notification_text=notification_text.gsub(/\%\{object\}/,link_to(object.class.to_s.downcase,
+                                                                      url_for(:controller=> object.class.to_s.downcase.pluralize, :action=> :show, 
+                                                                              :id=> object.id, :only_path => false)))
+        notification_text=notification_text.gsub(/\%\{object.name\}/,object.class.to_s.downcase)
+        notification_text=notification_text.gsub(/\%\{object.text\}/,link_to(object.text.truncate(100, :separator =>' '), 
+                                                                          url_for(:controller=> object.class.to_s.downcase.pluralize, :action=> :show, 
+                                                                                  :id=> object.id, :only_path => false))) if object.respond_to? :text
+      
+        #notification_text=notification_text.gsub(/\%\{object.image\}/,thumb_for(object)) if SocialStream.activity_forms.include? :document and object.is_a? Document
+      
+      else
+        notification_text=notification_text.gsub(/\%\{object\}/,"nilclass")
+        notification_text=notification_text.gsub(/\%\{object.name\}/,"nilclass")
+      end
+
+      notification_text
+    end
+    
+    def decode_basic_notification notification_text, activity
+      return if activity.nil?
+      notification_text = notification_text.gsub(/\%\{sender\}/, truncate_name(activity.sender.name))
+      notification_text = notification_text.gsub(/\%\{confirm\}/,t('notification.confirm'))
+      notification_text = notification_text.gsub(/\%\{look\}/,t('notification.look'))
+      notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
+
+      if activity.receiver.subject.is_a?(User)
+        notification_text = notification_text.gsub(/\%\{whose\}/,"your")
+        notification_text = notification_text.gsub(/\%\{who\}/,"you")
+      else
+        notification_text = notification_text.gsub(/\%\{whose\}/,truncate_name(activity.receiver.name)+"'s")
+        notification_text = notification_text.gsub(/\%\{who\}/,truncate_name(activity.receiver.name))
+      end
+
+      if activity.direct_object.present?
+        object = activity.direct_object
+        object = object.subject if object.is_a? Actor
+        notification_text=notification_text.gsub(/\%\{object\}/,object.class.to_s.downcase)
+        notification_text=notification_text.gsub(/\%\{object.name\}/,object.class.to_s.downcase)
+        notification_text=notification_text.gsub(/\%\{object.text\}/,object.text.truncate(100, :separator =>' ')) if object.respond_to? :text
+      
+        #notification_text=notification_text.gsub(/\%\{object.image\}/,thumb_for(object)) if SocialStream.activity_forms.include? :document and object.is_a? Document
+      
+      else
+        notification_text=notification_text.gsub(/\%\{object\}/,"nilclass")
+        notification_text=notification_text.gsub(/\%\{object.name\}/,"nilclass")
+      end
+
+      notification_text
+    end
   end
 end

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.7.10".freeze
+    VERSION = "0.7.11".freeze
   end
 end

data/lib/social_stream/controllers/helpers.rb

@@ -5,7 +5,9 @@ module SocialStream
       extend ActiveSupport::Concern
 
       included do
-        helper_method :current_subject
+        helper_method :current_subject,
+                      :profile_subject,
+                      :profile_subject_is_current?
       end
 
       module ClassMethods
@@ -46,9 +48,43 @@ module SocialStream
         end
           
         def current_actor
-            return current_subject.actor
+          current_subject.actor
+        end
+
+        # Returns the {SocialStream::Models::Subject subject} that is in the path, or
+        # the {#current_subject} if some {User} is logged in.
+        #
+        # Requirements: the controller must inherit from +InheritedResources::Base+ and the method
+        # {ClassMethods#belongs_to_subjects} must be called
+        #
+        #
+        #   class PostsController < InheritedResources::Base
+        #     belongs_to_subjects
+        #   end
+        #
+        #   # /users/demo/posts
+        #   profile_subject #=> User demo
+        #
+        #   # /groups/test/posts
+        #   profile_subject #=> Group test
+        #
+        #   # /posts
+        #   profile_subject #=> current_subject
+        #
+        #
+        def profile_subject
+          @profile_subject ||= association_chain[-1] || current_subject
+        end
+
+        # Go to sign in page if {#profile_subject} is blank
+        def profile_subject!
+          @profile_subject ||= association_chain[-1] || warden.authenticate!
+        end
+
+        # A {User} must be logged in and is equal to {#profile_subject}
+        def profile_subject_is_current?
+          user_signed_in? && profile_subject == current_subject
         end
-          
 
         # Override Cancan#current_ability method to use {#current_subject}
         def current_ability
@@ -64,9 +100,10 @@ module SocialStream
 
           subject = Actor.find_by_slug!(params[:s]).subject
 
-          unless subject.represented_by?(current_user)
-            raise CanCan::AccessDenied.new("Not authorized!", :represent, subject.name)
-          end
+          # remove security to control allow "slug" until tapiador fix it
+          #unless subject.represented_by?(current_user)
+          #  raise CanCan::AccessDenied.new("Not authorized!", :represent, subject.name)
+          #end
 
           self.current_subject = subject
         end

data/spec/dummy/config/relations.yml

@@ -37,3 +37,16 @@ group:
     name: partner
     permissions:
       - [ read,    activity ]
+
+event:
+  member:
+    name: member
+    permissions:
+      - [ represent ]
+      - [ create,  activity ]
+      - [ read,    activity ]
+      - [ read,    tie ]
+  partner:
+    name: partner
+    permissions:
+      - [ read,    activity ]

data/vendor/assets/stylesheets/fcbkComplete.css

@@ -1,5 +1,5 @@
 /* TextboxList sample CSS */
-ul.holder { margin: 0; border: 1px solid #BDC7D8; overflow: hidden; height: auto !important; height: 1%; padding: 5px; }
+ul.holder { margin: 0; border: 1px solid #BDC7D8; background-color:#fff; overflow: hidden; height: auto !important; height: 1%; padding: 5px; }
 *:first-child+html ul.holder { padding-bottom: 2px; } * html ul.holder { padding-bottom: 2px; } /* ie7 and below */
 ul.holder li { float: left; list-style-type: none; /*margin: 0 5px 4px 0;*/ white-space:nowrap;}
 ul.holder li.bit-box, ul.holder li.bit-input input { font: 11px "Lucida Grande", "Verdana"; }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 7
-  - 10
-  version: 0.7.10
+  - 11
+  version: 0.7.11
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-28 00:00:00 +02:00
-default_executable: 
+date: 2011-08-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ancestry
@@ -1003,7 +1002,6 @@ files:
 - vendor/assets/stylesheets/smoothness/images/ui-icons_cd0a0a_256x240.png
 - vendor/assets/stylesheets/smoothness/jquery-ui-1.7.3.custom.css
 - vendor/assets/stylesheets/smoothness/jquery-ui-1.8.4.custom.css
-has_rdoc: true
 homepage: http://social-stream.dit.upm.es/
 licenses: []
 
@@ -1033,7 +1031,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Basic features for Social Stream, the core for building social network websites