social_stream-base 0.7.2 → 0.7.3

data/app/views/messages/new.html.erb

@@ -7,6 +7,11 @@
 
 <% toolbar :option => :messages %>
 
+<%= location(
+  link_to(image_tag("btn/new.png", :class => "menu_icon")+t('message.other'), conversations_path,:remote => true),
+  link_to(image_tag("btn/message_new.png", :class => "menu_icon")+ t('message.new'), new_message_path, :remote => true)
+) %>
+
 <% content_for :javascript do %>
 
 	var recipients = $("#_recipients").fcbkcomplete({
@@ -16,29 +21,12 @@
 		newel: false,
 		height: 6
 	});	
-
-	/*
-	$('#body').ckeditor(
-	 function(){
-	  $('#cke_top_body').click( updateTextArea);
-	 },
-	 		{ width:493 }
-	);
-	
-	var editor = $('#body').ckeditorGet();
 	
-  editor.on("instanceReady", function(){	   
-    this.document.on("keyup", updateTextArea);
-    this.document.on("paste", updateTextArea);
-		this.document.on("mousedown", updateTextArea);
-  });
-
-  var updateTextArea = function (){ 
-			editor.updateElement();	
-			$("#body").trigger('keyup');       
-  }
-	
-*/
+	$("#body").cleditor({
+	  width:493,
+	  controls:  "<%= t('cleditor.controls')%>"   
+	});
+
 	<% unless @recipient.nil? %>
 		$("#_recipients").trigger("addItem",[{"title": "<%= truncate_name @recipient.name %>", "value": "<%= @recipient.id %>"}]);
 	<% end %>

data/app/views/messages/new.js.erb

@@ -2,6 +2,11 @@ $("#content").html("<%= escape_javascript(render :partial => 'new') %>");
 
 <%= toolbar :option => :messages %>
 
+<%= location(
+  link_to(image_tag("btn/new.png", :class => "menu_icon")+t('message.other'), conversations_path,:remote => true),
+  link_to(image_tag("btn/message_new.png", :class => "menu_icon")+ t('message.new'), new_message_path, :remote => true)
+) %>
+
 
 var recipients = $("#_recipients").fcbkcomplete({
         json_url: "<%= contacts_path(:format => :json) %>",
@@ -11,22 +16,10 @@ var recipients = $("#_recipients").fcbkcomplete({
 	height: 6
 });
 
-
-$('#body').ckeditor(
-);
-
-var editor = $('#body').ckeditorGet();
-
-editor.on("instanceReady", function(){
-	this.document.on("keyup", updateTextArea);
-	this.document.on("paste", updateTextArea);
-	this.document.on("mousedown", updateTextArea);
-});
-
-var updateTextArea = function (){
-	editor.updateElement();
-	$("#body").trigger('keyup');
-}
+  $("#body").cleditor({
+    width:493,
+    controls:  "<%= t('cleditor.controls')%>"   
+  });
 
 <% unless @recipient.nil? %>
 	$("#_recipients").trigger("addItem",[{"title": "<%= @recipient.name %>", "value": "<%= @recipient.id %>"}]);

data/app/views/profiles/_contact.html.erb

@@ -69,7 +69,7 @@
                 <%=t('profile.email')%>:
               </div>
               <div class="field">
-                <%=h @profile.subject.email %>
+                <%= show_if_signed_in(h(@profile.subject.email)) %>
               </div>
             </div>
           <%end%>

data/config/locales/en.yml

@@ -11,7 +11,7 @@ en:
   activity:
     confirm_delete: "Delete activity?"
     delete: "Delete"
-    input: "What do you do?"
+    input: "What are you doing?"
     last: "Last Activities"
     like: "I like"
     one: "Activity"
@@ -69,6 +69,8 @@ en:
     cancel: "Cancel"
     save: "Save"
     update: "Update"
+  cleditor:
+    controls: "bold italic underline strikethrough subscript superscript | size style | bullets | image link unlink"
   comment:
     input: "Write a comment..."
     confirm_delete: "Delete comment?"
@@ -217,6 +219,7 @@ en:
   profile:
     one: "Profile"
     age: "Age"
+    must_be_signed_id: "You must be signed in"
     group:
       about: "About us"
       birthday: "Anniversary"

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.7.2".freeze
+    VERSION = "0.7.3".freeze
   end
 end

data/lib/social_stream/models/supertype.rb

@@ -15,19 +15,21 @@ module SocialStream #:nodoc:
       end
 
       module ClassMethods
+        def subtypes_name
+          @subtypes_name
+        end
+
         def subtypes
-          SocialStream.__send__ @subtypes_name.to_s.tableize # SocialStream.subjects # in Actor
+          SocialStream.__send__ subtypes_name.to_s.tableize # SocialStream.subjects # in Actor
         end
       end 
 
       module InstanceMethods
         def subtype_instance
-          self.class.subtypes.each do |s|
-            i = __send__(s)
-            return i if i.present?
-          end
-
-          nil
+          if __send__("#{ self.class.subtypes_name }_type").present?      # if object_type.present?
+            object_class = __send__("#{ self.class.subtypes_name }_type") #   object_class = object_type # => "Video"
+            __send__ object_class.constantize.base_class.to_s.underscore  #   __send__ "document"
+                       end                                                # end
         end
       end
     end

data/lib/social_stream/toolbar_config.rb

@@ -15,10 +15,10 @@ module SocialStream
         :url => "#",
         :options => {:link => {:id => "messages_menu"}},
         :items => [
-          {:key => :message_new, :name => image_tag("btn/message_new.png")+ t('message.new'), :url => new_message_path},
+          {:key => :message_new, :name => image_tag("btn/message_new.png")+ t('message.new'), :url => new_message_path, :options => {:link =>{:remote=> false}}},
           {:key => :message_inbox, :name => image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
-            :url => conversations_path, :options => {:link =>{:remote=> true}}},
-          {:key => :message_sentbox, :name => image_tag("btn/message_sentbox.png")+t('message.sentbox'), :url => conversations_path(:box => :sentbox), :remote=> true},
+            :url => conversations_path, :options => {:link =>{:remote=> false}}},
+          {:key => :message_sentbox, :name => image_tag("btn/message_sentbox.png")+t('message.sentbox'), :url => conversations_path(:box => :sentbox), :options => {:link =>{:remote=> false}}},
           {:key => :message_trash, :name => image_tag("btn/message_trash.png")+t('message.trash'), :url => conversations_path(:box => :trash)}
         ]}
 
@@ -77,7 +77,7 @@ module SocialStream
         if user_signed_in?
           #Relation button
           items << {:key => :subject_relation,
-            :name => image_tag("btn/btn_friend.png") + contact_status(subject),
+            :name => image_tag("btn/btn_friend.png") + current_subject.contact_to!(subject).status,
             :url => edit_contact_path(current_subject.contact_to!(subject))
           }
           #Send message button
@@ -108,4 +108,4 @@ module SocialStream
       render_items items
     end
   end
-end
+end

data/social_stream-base.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   # OAuth provider
   s.add_runtime_dependency('oauth-plugin','~> 0.4.0.pre1')	
   # Messages
-  s.add_runtime_dependency('mailboxer','~> 0.4.1')
+  s.add_runtime_dependency('mailboxer','~> 0.4.2')
   # Avatar manipulation
   s.add_runtime_dependency('rmagick','~> 2.13.1')
   # Tagging

data/spec/controllers/relation_customs_controller_spec.rb

@@ -69,9 +69,10 @@ describe Relation::CustomsController do
 
     context "a new fake relation" do
       it "should not be created" do
+        actor = Factory(:user).actor
         count = Relation.count
 	begin
-          post :create, :custom => Factory.attributes_for(:relation_custom)
+          post :create, :custom => Factory.attributes_for(:relation_custom, :actor => actor)
 
           assert false
         rescue CanCan::AccessDenied

data/spec/factories/relation_custom.rb

@@ -1,4 +1,4 @@
 Factory.define(:relation_custom, :class => Relation::Custom) do |c|
   c.sequence(:name) { |n| "Relation custom #{ n }" }
-  c.association :actor
+  c.actor { Factory(:user).actor }
 end

data/spec/models/actor_spec.rb

@@ -2,24 +2,24 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Actor do
   it "should generate slug" do
-    assert Factory(:actor).slug.present?
+    assert Factory(:user).actor.slug.present?
   end
 
   it "should generate different slug" do
-    a = Factory(:actor)
-    b = Factory(:actor, :name => a.name)
+    a = Factory(:user).actor
+    b = Factory(:user, :name => a.name).actor
 
     a.name.should == b.name
     a.slug.should_not == b.slug
   end
 
   it "should generate relations" do
-    assert Factory(:actor).relation_customs.present?
+    assert Factory(:user).relation_customs.present?
   end
 
   context 'pending contacts' do
     it 'should not include self' do
-      a = Factory(:actor)
+      a = Factory(:user).actor
       c = a.contact_to!(a)
 
       a.pending_contacts.should_not include(c)

data/spec/models/tie_spec.rb

@@ -39,6 +39,23 @@ describe Tie do
     it "should create pending" do
       @tie.receiver.received_contacts.pending.should be_present
     end
+
+    it "should create activity with follow verb" do
+      @tie.contact.activities.should be_present
+      @tie.contact.activities.first.verb.should eq('follow')
+    end
+
+    context "reciprocal" do
+      before do
+        @reciprocal = Factory(:friend, :contact => @tie.contact.inverse!)
+      end
+
+      it "should create activity with make-friend verb" do
+        @reciprocal.contact.activities.should be_present
+        @reciprocal.contact.activities.first.verb.should eq('make-friend')
+      end
+    end
+
   end
 
   describe "with public relation" do

data/vendor/assets/javascripts/jquery.cleditor.min.js

@@ -0,0 +1,31 @@
+/*
+ CLEditor WYSIWYG HTML Editor v1.3.0
+ http://premiumsoftware.net/cleditor
+ requires jQuery v1.4.2 or later
+
+ Copyright 2010, Chris Landowski, Premium Software, LLC
+ Dual licensed under the MIT or GPL Version 2 licenses.
+*/
+(function(e){function aa(a){var b=this,c=a.target,d=e.data(c,x),h=s[d],f=h.popupName,i=p[f];if(!(b.disabled||e(c).attr(n)==n)){var g={editor:b,button:c,buttonName:d,popup:i,popupName:f,command:h.command,useCSS:b.options.useCSS};if(h.buttonClick&&h.buttonClick(a,g)===false)return false;if(d=="source"){if(t(b)){delete b.range;b.$area.hide();b.$frame.show();c.title=h.title}else{b.$frame.hide();b.$area.show();c.title="Show Rich Text"}setTimeout(function(){u(b)},100)}else if(!t(b))if(f){var j=e(i);if(f==
+"url"){if(d=="link"&&M(b)===""){z(b,"A selection is required when inserting a link.",c);return false}j.children(":button").unbind(q).bind(q,function(){var k=j.find(":text"),o=e.trim(k.val());o!==""&&v(b,g.command,o,null,g.button);k.val("http://");r();w(b)})}else f=="pastetext"&&j.children(":button").unbind(q).bind(q,function(){var k=j.find("textarea"),o=k.val().replace(/\n/g,"<br />");o!==""&&v(b,g.command,o,null,g.button);k.val("");r();w(b)});if(c!==e.data(i,A)){N(b,i,c);return false}return}else if(d==
+"print")b.$frame[0].contentWindow.print();else if(!v(b,g.command,g.value,g.useCSS,c))return false;w(b)}}function O(a){a=e(a.target).closest("div");a.css(H,a.data(x)?"#FFF":"#FFC")}function P(a){e(a.target).closest("div").css(H,"transparent")}function ba(a){var b=a.data.popup,c=a.target;if(!(b===p.msg||e(b).hasClass(B))){var d=e.data(b,A),h=e.data(d,x),f=s[h],i=f.command,g,j=this.options.useCSS;if(h=="font")g=c.style.fontFamily.replace(/"/g,"");else if(h=="size"){if(c.tagName=="DIV")c=c.children[0];
+g=c.innerHTML}else if(h=="style")g="<"+c.tagName+">";else if(h=="color")g=Q(c.style.backgroundColor);else if(h=="highlight"){g=Q(c.style.backgroundColor);if(l)i="backcolor";else j=true}b={editor:this,button:d,buttonName:h,popup:b,popupName:f.popupName,command:i,value:g,useCSS:j};if(!(f.popupClick&&f.popupClick(a,b)===false)){if(b.command&&!v(this,b.command,b.value,b.useCSS,d))return false;r();w(this)}}}function C(a){for(var b=1,c=0,d=0;d<a.length;++d){b=(b+a.charCodeAt(d))%65521;c=(c+b)%65521}return c<<
+16|b}function R(a,b,c,d,h){if(p[a])return p[a];var f=e(m).hide().addClass(ca).appendTo("body");if(d)f.html(d);else if(a=="color"){b=b.colors.split(" ");b.length<10&&f.width("auto");e.each(b,function(i,g){e(m).appendTo(f).css(H,"#"+g)});c=da}else if(a=="font")e.each(b.fonts.split(","),function(i,g){e(m).appendTo(f).css("fontFamily",g).html(g)});else if(a=="size")e.each(b.sizes.split(","),function(i,g){e(m).appendTo(f).html("<font size="+g+">"+g+"</font>")});else if(a=="style")e.each(b.styles,function(i,
+g){e(m).appendTo(f).html(g[1]+g[0]+g[1].replace("<","</"))});else if(a=="url"){f.html('Enter URL:<br><input type=text value="http://" size=35><br><input type=button value="Submit">');c=B}else if(a=="pastetext"){f.html("Paste your content here and click submit.<br /><textarea cols=40 rows=3></textarea><br /><input type=button value=Submit>");c=B}if(!c&&!d)c=S;f.addClass(c);l&&f.attr(I,"on").find("div,font,p,h1,h2,h3,h4,h5,h6").attr(I,"on");if(f.hasClass(S)||h===true)f.children().hover(O,P);p[a]=f[0];
+return f[0]}function T(a,b){if(b){a.$area.attr(n,n);a.disabled=true}else{a.$area.removeAttr(n);delete a.disabled}try{if(l)a.doc.body.contentEditable=!b;else a.doc.designMode=!b?"on":"off"}catch(c){}u(a)}function v(a,b,c,d,h){D(a);if(!l){if(d===undefined||d===null)d=a.options.useCSS;a.doc.execCommand("styleWithCSS",0,d.toString())}d=true;var f;if(l&&b.toLowerCase()=="inserthtml")y(a).pasteHTML(c);else{try{d=a.doc.execCommand(b,0,c||null)}catch(i){f=i.description;d=false}d||("cutcopypaste".indexOf(b)>
+-1?z(a,"For security reasons, your browser does not support the "+b+" command. Try using the keyboard shortcut or context menu instead.",h):z(a,f?f:"Error executing the "+b+" command.",h))}u(a);return d}function w(a){setTimeout(function(){t(a)?a.$area.focus():a.$frame[0].contentWindow.focus();u(a)},0)}function y(a){if(l)return J(a).createRange();return J(a).getRangeAt(0)}function J(a){if(l)return a.doc.selection;return a.$frame[0].contentWindow.getSelection()}function Q(a){var b=/rgba?\((\d+), (\d+), (\d+)/.exec(a),
+c=a.split("");if(b)for(a=(b[1]<<16|b[2]<<8|b[3]).toString(16);a.length<6;)a="0"+a;return"#"+(a.length==6?a:c[1]+c[1]+c[2]+c[2]+c[3]+c[3])}function r(){e.each(p,function(a,b){e(b).hide().unbind(q).removeData(A)})}function U(){var a=e("link[href$='jquery.cleditor.css']").attr("href");return a.substr(0,a.length-19)+"images/"}function K(a){var b=a.$main,c=a.options;a.$frame&&a.$frame.remove();var d=a.$frame=e('<iframe frameborder="0" src="javascript:true;">').hide().appendTo(b),h=d[0].contentWindow,f=
+a.doc=h.document,i=e(f);f.open();f.write(c.docType+"<html>"+(c.docCSSFile===""?"":'<head><link rel="stylesheet" type="text/css" href="'+c.docCSSFile+'" /></head>')+'<body style="'+c.bodyStyle+'"></body></html>');f.close();l&&i.click(function(){w(a)});E(a);if(l){i.bind("beforedeactivate beforeactivate selectionchange keypress",function(g){if(g.type=="beforedeactivate")a.inactive=true;else if(g.type=="beforeactivate"){!a.inactive&&a.range&&a.range.length>1&&a.range.shift();delete a.inactive}else if(!a.inactive){if(!a.range)a.range=
+[];for(a.range.unshift(y(a));a.range.length>2;)a.range.pop()}});d.focus(function(){D(a)})}(e.browser.mozilla?i:e(h)).blur(function(){V(a,true)});i.click(r).bind("keyup mouseup",function(){u(a)});L?a.$area.show():d.show();e(function(){var g=a.$toolbar,j=g.children("div:last"),k=b.width();j=j.offset().top+j.outerHeight()-g.offset().top+1;g.height(j);j=(/%/.test(""+c.height)?b.height():parseInt(c.height))-j;d.width(k).height(j);a.$area.width(k).height(ea?j-2:j);T(a,a.disabled);u(a)})}function u(a){if(!L&&
+e.browser.webkit&&!a.focused){a.$frame[0].contentWindow.focus();window.focus();a.focused=true}var b=a.doc;if(l)b=y(a);var c=t(a);e.each(a.$toolbar.find("."+W),function(d,h){var f=e(h),i=e.cleditor.buttons[e.data(h,x)],g=i.command,j=true;if(a.disabled)j=false;else if(i.getEnabled){j=i.getEnabled({editor:a,button:h,buttonName:i.name,popup:p[i.popupName],popupName:i.popupName,command:i.command,useCSS:a.options.useCSS});if(j===undefined)j=true}else if((c||L)&&i.name!="source"||l&&(g=="undo"||g=="redo"))j=
+false;else if(g&&g!="print"){if(l&&g=="hilitecolor")g="backcolor";if(!l||g!="inserthtml")try{j=b.queryCommandEnabled(g)}catch(k){j=false}}if(j){f.removeClass(X);f.removeAttr(n)}else{f.addClass(X);f.attr(n,n)}})}function D(a){l&&a.range&&a.range[0].select()}function M(a){D(a);if(l)return y(a).text;return J(a).toString()}function z(a,b,c){var d=R("msg",a.options,fa);d.innerHTML=b;N(a,d,c)}function N(a,b,c){var d,h,f=e(b);if(c){var i=e(c);d=i.offset();h=--d.left;d=d.top+i.height()}else{i=a.$toolbar;
+d=i.offset();h=Math.floor((i.width()-f.width())/2)+d.left;d=d.top+i.height()-2}r();f.css({left:h,top:d}).show();if(c){e.data(b,A,c);f.bind(q,{popup:b},e.proxy(ba,a))}setTimeout(function(){f.find(":text,textarea").eq(0).focus().select()},100)}function t(a){return a.$area.is(":visible")}function E(a,b){var c=a.$area.val(),d=a.options,h=d.updateFrame,f=e(a.doc.body);if(h){var i=C(c);if(b&&a.areaChecksum==i)return;a.areaChecksum=i}c=h?h(c):c;c=c.replace(/<(?=\/?script)/ig,"&lt;");if(d.updateTextArea)a.frameChecksum=
+C(c);if(c!=f.html()){f.html(c);e(a).triggerHandler(F)}}function V(a,b){var c=e(a.doc.body).html(),d=a.options,h=d.updateTextArea,f=a.$area;if(h){var i=C(c);if(b&&a.frameChecksum==i)return;a.frameChecksum=i}c=h?h(c):c;if(d.updateFrame)a.areaChecksum=C(c);if(c!=f.val()){f.val(c);e(a).triggerHandler(F)}}e.cleditor={defaultOptions:{width:500,height:250,controls:"bold italic underline strikethrough subscript superscript | font size style | color highlight removeformat | bullets numbering | outdent indent | alignleft center alignright justify | undo redo | rule image link unlink | cut copy paste pastetext | print source",
+colors:"FFF FCC FC9 FF9 FFC 9F9 9FF CFF CCF FCF CCC F66 F96 FF6 FF3 6F9 3FF 6FF 99F F9F BBB F00 F90 FC6 FF0 3F3 6CC 3CF 66C C6C 999 C00 F60 FC3 FC0 3C0 0CC 36F 63F C3C 666 900 C60 C93 990 090 399 33F 60C 939 333 600 930 963 660 060 366 009 339 636 000 300 630 633 330 030 033 006 309 303",fonts:"Arial,Arial Black,Comic Sans MS,Courier New,Narrow,Garamond,Georgia,Impact,Sans Serif,Serif,Tahoma,Trebuchet MS,Verdana",sizes:"1,2,3,4,5,6,7",styles:[["Paragraph","<p>"],["Header 1","<h1>"],["Header 2","<h2>"],
+["Header 3","<h3>"],["Header 4","<h4>"],["Header 5","<h5>"],["Header 6","<h6>"]],useCSS:false,docType:'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',docCSSFile:"",bodyStyle:"margin:4px; font:10pt Arial,Verdana; cursor:text"},buttons:{init:"bold,,|italic,,|underline,,|strikethrough,,|subscript,,|superscript,,|font,,fontname,|size,Font Size,fontsize,|style,,formatblock,|color,Font Color,forecolor,|highlight,Text Highlight Color,hilitecolor,color|removeformat,Remove Formatting,|bullets,,insertunorderedlist|numbering,,insertorderedlist|outdent,,|indent,,|alignleft,Align Text Left,justifyleft|center,,justifycenter|alignright,Align Text Right,justifyright|justify,,justifyfull|undo,,|redo,,|rule,Insert Horizontal Rule,inserthorizontalrule|image,Insert Image,insertimage,url|link,Insert Hyperlink,createlink,url|unlink,Remove Hyperlink,|cut,,|copy,,|paste,,|pastetext,Paste as Text,inserthtml,|print,,|source,Show Source"},
+imagesPath:function(){return U()}};e.fn.cleditor=function(a){var b=e([]);this.each(function(c,d){if(d.tagName=="TEXTAREA"){var h=e.data(d,Y);h||(h=new cleditor(d,a));b=b.add(h)}});return b};var H="backgroundColor",A="button",x="buttonName",F="change",Y="cleditor",q="click",n="disabled",m="<div>",I="unselectable",W="cleditorButton",X="cleditorDisabled",ca="cleditorPopup",S="cleditorList",da="cleditorColor",B="cleditorPrompt",fa="cleditorMsg",l=e.browser.msie,ea=/msie\s6/i.test(navigator.userAgent),
+L=/iphone|ipad|ipod/i.test(navigator.userAgent),p={},Z,s=e.cleditor.buttons;e.each(s.init.split("|"),function(a,b){var c=b.split(","),d=c[0];s[d]={stripIndex:a,name:d,title:c[1]===""?d.charAt(0).toUpperCase()+d.substr(1):c[1],command:c[2]===""?d:c[2],popupName:c[3]===""?d:c[3]}});delete s.init;cleditor=function(a,b){var c=this;c.options=b=e.extend({},e.cleditor.defaultOptions,b);var d=c.$area=e(a).hide().data(Y,c).blur(function(){E(c,true)}),h=c.$main=e(m).addClass("cleditorMain").width(b.width).height(b.height),
+f=c.$toolbar=e(m).addClass("cleditorToolbar").appendTo(h),i=e(m).addClass("cleditorGroup").appendTo(f);e.each(b.controls.split(" "),function(g,j){if(j==="")return true;if(j=="|"){e(m).addClass("cleditorDivider").appendTo(i);i=e(m).addClass("cleditorGroup").appendTo(f)}else{var k=s[j],o=e(m).data(x,k.name).addClass(W).attr("title",k.title).bind(q,e.proxy(aa,c)).appendTo(i).hover(O,P),G={};if(k.css)G=k.css;else if(k.image)G.backgroundImage="url("+U()+k.image+")";if(k.stripIndex)G.backgroundPosition=
+k.stripIndex*-24;o.css(G);l&&o.attr(I,"on");k.popupName&&R(k.popupName,b,k.popupClass,k.popupContent,k.popupHover)}});h.insertBefore(d).append(d);if(!Z){e(document).click(function(g){g=e(g.target);g.add(g.parents()).is("."+B)||r()});Z=true}/auto|%/.test(""+b.width+b.height)&&e(window).resize(function(){K(c)});K(c)};var $=cleditor.prototype;e.each([["clear",function(a){a.$area.val("");E(a)}],["disable",T],["execCommand",v],["focus",w],["hidePopups",r],["sourceMode",t,true],["refresh",K],["select",
+function(a){setTimeout(function(){t(a)?a.$area.select():v(a,"selectall")},0)}],["selectedHTML",function(a){D(a);a=y(a);if(l)return a.htmlText;var b=e("<layer>")[0];b.appendChild(a.cloneContents());return b.innerHTML},true],["selectedText",M,true],["showMessage",z],["updateFrame",E],["updateTextArea",V]],function(a,b){$[b[0]]=function(){for(var c=[this],d=0;d<arguments.length;d++)c.push(arguments[d]);c=b[1].apply(this,c);if(b[2])return c;return this}});$.change=function(a){var b=e(this);return a?b.bind(F,
+a):b.trigger(F)}})(jQuery);

data/vendor/assets/stylesheets/jquery.cleditor.css

@@ -0,0 +1,24 @@
+.cleditorMain {border:1px solid #999; padding:0 1px 1px; background-color:white}
+.cleditorMain iframe {border:none; margin:0; padding:0}
+.cleditorMain textarea {border:none; margin:0; padding:0; overflow-y:scroll; font:10pt Arial,Verdana; resize:none; outline:none /* webkit grip focus */}
+.cleditorToolbar {background: url('cleditor/toolbar.gif') repeat}
+.cleditorGroup {float:left; height:26px}
+.cleditorButton {float:left; width:24px; height:24px; margin:1px 0 1px 0; background: url('cleditor/buttons.gif')}
+.cleditorDisabled {opacity:0.3; filter:alpha(opacity=30)}
+.cleditorDivider {float:left; width:1px; height:23px; margin:1px 0 1px 0; background:#CCC}
+.cleditorPopup {border:solid 1px #999; background-color:white; position:absolute; font:10pt Arial,Verdana; cursor:default; z-index:10000}
+.cleditorList div {padding:2px 4px 2px 4px}
+.cleditorList p,
+.cleditorList h1,
+.cleditorList h2,
+.cleditorList h3,
+.cleditorList h4,
+.cleditorList h5,
+.cleditorList h6,
+.cleditorList font {padding:0; margin:0; background-color:Transparent}
+.cleditorColor {width:150px; padding:1px 0 0 1px}
+.cleditorColor div {float:left; width:14px; height:14px; margin:0 1px 1px 0}
+.cleditorPrompt {background-color:#F6F7F9; padding:4px; font-size:8.5pt}
+.cleditorPrompt input,
+.cleditorPrompt textarea {font:8.5pt Arial,Verdana;}
+.cleditorMsg {background-color:#FDFCEE; width:150px; padding:4px; font-size:8.5pt}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -205,12 +205,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 0
         - 4
-        - 1
-        version: 0.4.1
+        - 2
+        version: 0.4.2
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -566,6 +566,8 @@ files:
 - app/assets/images/btn/viewer.png
 - app/assets/images/btn/warning.png
 - app/assets/images/cancel.png
+- app/assets/images/cleditor/buttons.gif
+- app/assets/images/cleditor/toolbar.gif
 - app/assets/images/frontpage/collaborate.png
 - app/assets/images/frontpage/comments.png
 - app/assets/images/frontpage/green_sq.png
@@ -604,7 +606,6 @@ files:
 - app/assets/images/right.png
 - app/assets/images/title_background.png
 - app/assets/javascripts/activities.js.erb
-- app/assets/javascripts/ckeditor.rails.js.erb
 - app/assets/javascripts/contacts.js
 - app/assets/javascripts/conversations.js
 - app/assets/javascripts/groups.js
@@ -740,7 +741,6 @@ files:
 - app/views/conversations/_conversation_full.html.erb
 - app/views/conversations/_conversations.html.erb
 - app/views/conversations/_index.html.erb
-- app/views/conversations/_menu_options.html.erb
 - app/views/conversations/_show.html.erb
 - app/views/conversations/edit.html.erb
 - app/views/conversations/index.html.erb
@@ -929,7 +929,6 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/factories/activity.rb
-- spec/factories/actor.rb
 - spec/factories/comment.rb
 - spec/factories/contact.rb
 - spec/factories/group.rb
@@ -957,229 +956,10 @@ files:
 - spec/support/migrations.rb
 - spec/support/mock.rb
 - vendor/assets/javascripts/ajax.paginate.js
-- vendor/assets/javascripts/ckeditor/.htaccess
-- vendor/assets/javascripts/ckeditor/adapters/jquery.js
-- vendor/assets/javascripts/ckeditor/ckeditor.js
-- vendor/assets/javascripts/ckeditor/ckeditor_basic.js
-- vendor/assets/javascripts/ckeditor/ckeditor_basic_source.js
-- vendor/assets/javascripts/ckeditor/ckeditor_source.js
-- vendor/assets/javascripts/ckeditor/config.js
-- vendor/assets/javascripts/ckeditor/contents.css
-- vendor/assets/javascripts/ckeditor/images/spacer.gif
-- vendor/assets/javascripts/ckeditor/lang/_languages.js
-- vendor/assets/javascripts/ckeditor/lang/_translationstatus.txt
-- vendor/assets/javascripts/ckeditor/lang/af.js
-- vendor/assets/javascripts/ckeditor/lang/ar.js
-- vendor/assets/javascripts/ckeditor/lang/bg.js
-- vendor/assets/javascripts/ckeditor/lang/bn.js
-- vendor/assets/javascripts/ckeditor/lang/bs.js
-- vendor/assets/javascripts/ckeditor/lang/ca.js
-- vendor/assets/javascripts/ckeditor/lang/cs.js
-- vendor/assets/javascripts/ckeditor/lang/cy.js
-- vendor/assets/javascripts/ckeditor/lang/da.js
-- vendor/assets/javascripts/ckeditor/lang/de.js
-- vendor/assets/javascripts/ckeditor/lang/el.js
-- vendor/assets/javascripts/ckeditor/lang/en-au.js
-- vendor/assets/javascripts/ckeditor/lang/en-ca.js
-- vendor/assets/javascripts/ckeditor/lang/en-gb.js
-- vendor/assets/javascripts/ckeditor/lang/en.js
-- vendor/assets/javascripts/ckeditor/lang/eo.js
-- vendor/assets/javascripts/ckeditor/lang/es.js
-- vendor/assets/javascripts/ckeditor/lang/et.js
-- vendor/assets/javascripts/ckeditor/lang/eu.js
-- vendor/assets/javascripts/ckeditor/lang/fa.js
-- vendor/assets/javascripts/ckeditor/lang/fi.js
-- vendor/assets/javascripts/ckeditor/lang/fo.js
-- vendor/assets/javascripts/ckeditor/lang/fr-ca.js
-- vendor/assets/javascripts/ckeditor/lang/fr.js
-- vendor/assets/javascripts/ckeditor/lang/gl.js
-- vendor/assets/javascripts/ckeditor/lang/gu.js
-- vendor/assets/javascripts/ckeditor/lang/he.js
-- vendor/assets/javascripts/ckeditor/lang/hi.js
-- vendor/assets/javascripts/ckeditor/lang/hr.js
-- vendor/assets/javascripts/ckeditor/lang/hu.js
-- vendor/assets/javascripts/ckeditor/lang/is.js
-- vendor/assets/javascripts/ckeditor/lang/it.js
-- vendor/assets/javascripts/ckeditor/lang/ja.js
-- vendor/assets/javascripts/ckeditor/lang/ka.js
-- vendor/assets/javascripts/ckeditor/lang/km.js
-- vendor/assets/javascripts/ckeditor/lang/ko.js
-- vendor/assets/javascripts/ckeditor/lang/lt.js
-- vendor/assets/javascripts/ckeditor/lang/lv.js
-- vendor/assets/javascripts/ckeditor/lang/mn.js
-- vendor/assets/javascripts/ckeditor/lang/ms.js
-- vendor/assets/javascripts/ckeditor/lang/nb.js
-- vendor/assets/javascripts/ckeditor/lang/nl.js
-- vendor/assets/javascripts/ckeditor/lang/no.js
-- vendor/assets/javascripts/ckeditor/lang/pl.js
-- vendor/assets/javascripts/ckeditor/lang/pt-br.js
-- vendor/assets/javascripts/ckeditor/lang/pt.js
-- vendor/assets/javascripts/ckeditor/lang/ro.js
-- vendor/assets/javascripts/ckeditor/lang/ru.js
-- vendor/assets/javascripts/ckeditor/lang/sk.js
-- vendor/assets/javascripts/ckeditor/lang/sl.js
-- vendor/assets/javascripts/ckeditor/lang/sr-latn.js
-- vendor/assets/javascripts/ckeditor/lang/sr.js
-- vendor/assets/javascripts/ckeditor/lang/sv.js
-- vendor/assets/javascripts/ckeditor/lang/th.js
-- vendor/assets/javascripts/ckeditor/lang/tr.js
-- vendor/assets/javascripts/ckeditor/lang/uk.js
-- vendor/assets/javascripts/ckeditor/lang/vi.js
-- vendor/assets/javascripts/ckeditor/lang/zh-cn.js
-- vendor/assets/javascripts/ckeditor/lang/zh.js
-- vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
-- vendor/assets/javascripts/ckeditor/plugins/a11yhelp/lang/en.js
-- vendor/assets/javascripts/ckeditor/plugins/a11yhelp/lang/he.js
-- vendor/assets/javascripts/ckeditor/plugins/about/dialogs/about.js
-- vendor/assets/javascripts/ckeditor/plugins/about/dialogs/logo_ckeditor.png
-- vendor/assets/javascripts/ckeditor/plugins/adobeair/plugin.js
-- vendor/assets/javascripts/ckeditor/plugins/ajax/plugin.js
-- vendor/assets/javascripts/ckeditor/plugins/autogrow/plugin.js
-- vendor/assets/javascripts/ckeditor/plugins/bbcode/plugin.js
-- vendor/assets/javascripts/ckeditor/plugins/clipboard/dialogs/paste.js
-- vendor/assets/javascripts/ckeditor/plugins/colordialog/dialogs/colordialog.js
-- vendor/assets/javascripts/ckeditor/plugins/devtools/lang/en.js
-- vendor/assets/javascripts/ckeditor/plugins/devtools/plugin.js
-- vendor/assets/javascripts/ckeditor/plugins/dialog/dialogDefinition.js
-- vendor/assets/javascripts/ckeditor/plugins/div/dialogs/div.js
-- vendor/assets/javascripts/ckeditor/plugins/docprops/dialogs/docprops.js
-- vendor/assets/javascripts/ckeditor/plugins/docprops/plugin.js
-- vendor/assets/javascripts/ckeditor/plugins/find/dialogs/find.js
-- vendor/assets/javascripts/ckeditor/plugins/flash/dialogs/flash.js
-- vendor/assets/javascripts/ckeditor/plugins/flash/images/placeholder.png
-- vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/button.js
-- vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/checkbox.js
-- vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/form.js
-- vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/hiddenfield.js
-- vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/radio.js
-- vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/select.js
-- vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/textarea.js
-- vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/textfield.js
-- vendor/assets/javascripts/ckeditor/plugins/forms/images/hiddenfield.gif
-- vendor/assets/javascripts/ckeditor/plugins/iframe/dialogs/iframe.js
-- vendor/assets/javascripts/ckeditor/plugins/iframe/images/placeholder.png
-- vendor/assets/javascripts/ckeditor/plugins/iframedialog/plugin.js
-- vendor/assets/javascripts/ckeditor/plugins/image/dialogs/image.js
-- vendor/assets/javascripts/ckeditor/plugins/link/dialogs/anchor.js
-- vendor/assets/javascripts/ckeditor/plugins/link/dialogs/link.js
-- vendor/assets/javascripts/ckeditor/plugins/link/images/anchor.gif
-- vendor/assets/javascripts/ckeditor/plugins/liststyle/dialogs/liststyle.js
-- vendor/assets/javascripts/ckeditor/plugins/pagebreak/images/pagebreak.gif
-- vendor/assets/javascripts/ckeditor/plugins/pastefromword/filter/default.js
-- vendor/assets/javascripts/ckeditor/plugins/pastetext/dialogs/pastetext.js
-- vendor/assets/javascripts/ckeditor/plugins/placeholder/dialogs/placeholder.js
-- vendor/assets/javascripts/ckeditor/plugins/placeholder/lang/en.js
-- vendor/assets/javascripts/ckeditor/plugins/placeholder/lang/he.js
-- vendor/assets/javascripts/ckeditor/plugins/placeholder/placeholder.gif
-- vendor/assets/javascripts/ckeditor/plugins/placeholder/plugin.js
-- vendor/assets/javascripts/ckeditor/plugins/scayt/dialogs/options.js
-- vendor/assets/javascripts/ckeditor/plugins/scayt/dialogs/toolbar.css
-- vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_address.png
-- vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_blockquote.png
-- vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_div.png
-- vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_h1.png
-- vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_h2.png
-- vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_h3.png
-- vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_h4.png
-- vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_h5.png
-- vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_h6.png
-- vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_p.png
-- vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_pre.png
-- vendor/assets/javascripts/ckeditor/plugins/smiley/dialogs/smiley.js
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/angel_smile.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/angry_smile.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/broken_heart.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/confused_smile.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/cry_smile.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/devil_smile.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/embaressed_smile.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/envelope.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/heart.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/kiss.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/lightbulb.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/omg_smile.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/regular_smile.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/sad_smile.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/shades_smile.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/teeth_smile.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/thumbs_down.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/thumbs_up.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/tounge_smile.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
-- vendor/assets/javascripts/ckeditor/plugins/smiley/images/wink_smile.gif
-- vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/specialchar.js
-- vendor/assets/javascripts/ckeditor/plugins/specialchar/lang/en.js
-- vendor/assets/javascripts/ckeditor/plugins/styles/styles/default.js
-- vendor/assets/javascripts/ckeditor/plugins/stylesheetparser/plugin.js
-- vendor/assets/javascripts/ckeditor/plugins/table/dialogs/table.js
-- vendor/assets/javascripts/ckeditor/plugins/tableresize/plugin.js
-- vendor/assets/javascripts/ckeditor/plugins/tabletools/dialogs/tableCell.js
-- vendor/assets/javascripts/ckeditor/plugins/templates/dialogs/templates.js
-- vendor/assets/javascripts/ckeditor/plugins/templates/templates/default.js
-- vendor/assets/javascripts/ckeditor/plugins/templates/templates/images/template1.gif
-- vendor/assets/javascripts/ckeditor/plugins/templates/templates/images/template2.gif
-- vendor/assets/javascripts/ckeditor/plugins/templates/templates/images/template3.gif
-- vendor/assets/javascripts/ckeditor/plugins/uicolor/dialogs/uicolor.js
-- vendor/assets/javascripts/ckeditor/plugins/uicolor/lang/en.js
-- vendor/assets/javascripts/ckeditor/plugins/uicolor/lang/he.js
-- vendor/assets/javascripts/ckeditor/plugins/uicolor/plugin.js
-- vendor/assets/javascripts/ckeditor/plugins/uicolor/uicolor.gif
-- vendor/assets/javascripts/ckeditor/plugins/uicolor/yui/assets/hue_bg.png
-- vendor/assets/javascripts/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png
-- vendor/assets/javascripts/ckeditor/plugins/uicolor/yui/assets/picker_mask.png
-- vendor/assets/javascripts/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png
-- vendor/assets/javascripts/ckeditor/plugins/uicolor/yui/assets/yui.css
-- vendor/assets/javascripts/ckeditor/plugins/uicolor/yui/yui.js
-- vendor/assets/javascripts/ckeditor/plugins/wsc/dialogs/ciframe.html
-- vendor/assets/javascripts/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
-- vendor/assets/javascripts/ckeditor/plugins/wsc/dialogs/wsc.css
-- vendor/assets/javascripts/ckeditor/plugins/wsc/dialogs/wsc.js
-- vendor/assets/javascripts/ckeditor/plugins/xml/plugin.js
-- vendor/assets/javascripts/ckeditor/skins/kama/dialog.css
-- vendor/assets/javascripts/ckeditor/skins/kama/editor.css
-- vendor/assets/javascripts/ckeditor/skins/kama/icons.png
-- vendor/assets/javascripts/ckeditor/skins/kama/icons_rtl.png
-- vendor/assets/javascripts/ckeditor/skins/kama/images/dialog_sides.gif
-- vendor/assets/javascripts/ckeditor/skins/kama/images/dialog_sides.png
-- vendor/assets/javascripts/ckeditor/skins/kama/images/dialog_sides_rtl.png
-- vendor/assets/javascripts/ckeditor/skins/kama/images/mini.gif
-- vendor/assets/javascripts/ckeditor/skins/kama/images/noimage.png
-- vendor/assets/javascripts/ckeditor/skins/kama/images/sprites.png
-- vendor/assets/javascripts/ckeditor/skins/kama/images/sprites_ie6.png
-- vendor/assets/javascripts/ckeditor/skins/kama/images/toolbar_start.gif
-- vendor/assets/javascripts/ckeditor/skins/kama/skin.js
-- vendor/assets/javascripts/ckeditor/skins/kama/templates.css
-- vendor/assets/javascripts/ckeditor/skins/office2003/dialog.css
-- vendor/assets/javascripts/ckeditor/skins/office2003/editor.css
-- vendor/assets/javascripts/ckeditor/skins/office2003/icons.png
-- vendor/assets/javascripts/ckeditor/skins/office2003/icons_rtl.png
-- vendor/assets/javascripts/ckeditor/skins/office2003/images/dialog_sides.gif
-- vendor/assets/javascripts/ckeditor/skins/office2003/images/dialog_sides.png
-- vendor/assets/javascripts/ckeditor/skins/office2003/images/dialog_sides_rtl.png
-- vendor/assets/javascripts/ckeditor/skins/office2003/images/mini.gif
-- vendor/assets/javascripts/ckeditor/skins/office2003/images/noimage.png
-- vendor/assets/javascripts/ckeditor/skins/office2003/images/sprites.png
-- vendor/assets/javascripts/ckeditor/skins/office2003/images/sprites_ie6.png
-- vendor/assets/javascripts/ckeditor/skins/office2003/skin.js
-- vendor/assets/javascripts/ckeditor/skins/office2003/templates.css
-- vendor/assets/javascripts/ckeditor/skins/v2/dialog.css
-- vendor/assets/javascripts/ckeditor/skins/v2/editor.css
-- vendor/assets/javascripts/ckeditor/skins/v2/icons.png
-- vendor/assets/javascripts/ckeditor/skins/v2/icons_rtl.png
-- vendor/assets/javascripts/ckeditor/skins/v2/images/dialog_sides.gif
-- vendor/assets/javascripts/ckeditor/skins/v2/images/dialog_sides.png
-- vendor/assets/javascripts/ckeditor/skins/v2/images/dialog_sides_rtl.png
-- vendor/assets/javascripts/ckeditor/skins/v2/images/mini.gif
-- vendor/assets/javascripts/ckeditor/skins/v2/images/noimage.png
-- vendor/assets/javascripts/ckeditor/skins/v2/images/sprites.png
-- vendor/assets/javascripts/ckeditor/skins/v2/images/sprites_ie6.png
-- vendor/assets/javascripts/ckeditor/skins/v2/images/toolbar_start.gif
-- vendor/assets/javascripts/ckeditor/skins/v2/skin.js
-- vendor/assets/javascripts/ckeditor/skins/v2/templates.css
-- vendor/assets/javascripts/ckeditor/themes/default/theme.js
 - vendor/assets/javascripts/hoverIntent.js
 - vendor/assets/javascripts/jqcloud-0.1.3.js
 - vendor/assets/javascripts/jquery.ba-url.js
+- vendor/assets/javascripts/jquery.cleditor.min.js
 - vendor/assets/javascripts/jquery.fcbkcomplete.js
 - vendor/assets/javascripts/jquery.livequery.js
 - vendor/assets/javascripts/jquery.scrollTo.min.js
@@ -1191,6 +971,7 @@ files:
 - vendor/assets/stylesheets/fcbkComplete.css
 - vendor/assets/stylesheets/jqcloud.css
 - vendor/assets/stylesheets/jquery-ui.css
+- vendor/assets/stylesheets/jquery.cleditor.css
 - vendor/assets/stylesheets/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
 - vendor/assets/stylesheets/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
 - vendor/assets/stylesheets/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png