social_stream-base 0.9.12 → 0.9.13

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

@@ -51,6 +51,7 @@ activate_anti_rebounds = function(){
   });
 }
 
+
 unblock_all_forms = function() {  
   //Sharing buttons
   $(".submitActivity").val("<%= I18n.t('share') %>").removeAttr("disabled");  
@@ -103,7 +104,9 @@ $(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>");
+  		$(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><div class='space_comments'></div>");
   		comments.slice(0,comments.size()-2).hide();
   		//hide alto space_comments
   		$(this).children(".space_comments").slice(0,comments.size()-2).hide();
@@ -123,13 +126,22 @@ $(".input_new_comments").live("click", function(){
 	$(".new_comment").removeClass("new_comment_shown");
 	$(".actor_name_new_comment").hide();
 	$(".actor_logo_new_comment").hide();
-	$(this).parent(".new_comment").children(".activities_comment_btn").show();
-	$(this).parent(".new_comment").addClass("new_comment_shown");
-	$(this).parents(".activity_new_comment").find(".actor_name_new_comment").show();
-  $(this).parents(".activity_new_comment").find(".actor_logo_new_comment").show();
+  var comment= $(this).parents(".activity_new_comment");
+  comment.find(".activities_comment_btn").show();
+  $(this).parents(".new_comment").addClass("new_comment_shown");
+  comment.find(".actor_name_new_comment").show();
+  comment.find(".actor_logo_new_comment").show();
   return false;
 });
 
+autoSize= function(activity_dom_id) {
+  // Copy textarea contents; browser will calculate correct height of copy,
+  // which will make overall container taller, which will make textarea taller.
+  var text = $("#comment_text_"+activity_dom_id).val().replace(/\n/g, '<br/>');
+  $("#copy_comment_text_"+activity_dom_id).html(text);
+}  
+    
+
 //javascript for tocomment option
 $(".to_comment").live("click", function(){
   $(this).parents(".activity_content").find(".activity_new_comment").show();

data/app/assets/stylesheets/activities.css

@@ -61,7 +61,8 @@
 	border: thin solid #D4E4E4; padding-top: 3px;  padding-bottom: 3px;display:none;}
 .actor_logo_subactivity, .actor_logo_new_comment{	width: 40px;	padding: 5px 3px 5px 2px;	display: inline-block;
 	vertical-align: top;}
-.input_new_comments{	border:1px solid #BDC7D8;	width:98%;	padding: 2px; color:#2A3890;}
+.input_new_comments{	border:1px solid #BDC7D8;	width:98%;	padding: 2px; color:#2A3890; resize: none;
+                       position: absolute; height: 100%; overflow: hidden; font-size:inherit;}
 .subactivity{  font-size: 11px;  padding: 0px 5px 0px 5px;  background: #deeff8;
   border: thin solid #D4E4E4; display:block; }
 .space_comments {	padding-top: 1px;	padding-bottom: 1px;}
@@ -70,10 +71,14 @@
 #activities_share_btn {	text-align: right;	padding: 5px 16px 0px 10px;	vertical-align: middle;}
 .activities_comment_btn{ text-align: right; padding: 5px 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;}
+.hide_show_comments{font-size: 11px;  padding: 3px 10px;	background: #deeff8;
+	border: thin solid #D4E4E4;}
 .new_comment{ width: 465px;}
 .new_comment_shown{ width: 410px;}
+
+.copy_new_comment{visibility: hidden; padding:6px; padding-bottom: 1.5em;font-size:inherit; line-height: 1.15em;
+                  margin-bottom:7px;}
+.input_new_comments_container{min-height: 30px; position: relative;  }
 /*********** DROP DOWN**********/
 #security_chzn .chzn-choices {
 	padding-left: 20px;

data/app/assets/stylesheets/base.css

@@ -52,30 +52,11 @@ textarea.new_contact_text_area{ height: 100px; color: #2A3890;}
 .select_relations select{ font-size: 12px; color: white; background-color:#1F4A75;} 
 
 /************ Forms - Buttons  SECTION ***************************/
-.myButtonBlue{ cursor:pointer;
-  background-image: -webkit-gradient( linear, left bottom, left top,
-      color-stop(0.16, rgb(0,122,193)), color-stop(0.58, rgb(56,148,209)), color-stop(0.79, rgb(168,222,249)) );
-  background-image: -moz-linear-gradient(center bottom,
-      rgb(0,122,193) 16%, rgb(56,148,209) 58%, rgb(168,222,249) 79%);
-  border-radius: 0.2em;  color: #fff; padding: 0 10px;  height: 22px;  border: none;}
-.myButtonBlue span {  display: block;  line-height: 14px;  padding: 3px 0 3px 10px;}
-.myButtonBlue:active {  background-position: bottom right;  color: #000;  outline: none; }
-.myButtonBlue:active span {  background-position: bottom left;  padding: 3px 0 2px 18px; }
-
-.myButtonLarge{ cursor:pointer;
-  background-image: -webkit-gradient(linear,left bottom,left top,
-          color-stop(0.01, rgb(116,191,67)),color-stop(0.51, rgb(117,189,68)),
-          color-stop(0.76, rgb(195,222,171))  );
-          background-image: -moz-linear-gradient(center bottom,rgb(116,191,67) 1%,
-          rgb(117,189,68) 51%,rgb(195,222,171) 76%);
-          border-radius: 0.2em;color: #fff; width: 200px; height: 26px; border: none;}
-.myButtonLarge span {  display: block;  line-height: 14px;  padding: 5px 0 5px 18px;}
-.myButtonLarge:active {  background-position: bottom right;  color: #000;  outline: none;}
-.myButtonLarge:active span {  background-position: bottom left;  padding: 6px 0 4px 18px;}
-
-.button{margin: 10px 0 10px 0px;padding: 3px 20px 3px 20px;color:#FFFFFF;background-color: #1F4A75;
-        -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px;
-        font-size: 13px;}
+
+
+button, input[type=submit]{margin: 10px 0 10px 0px;padding: 3px 20px 3px 20px;color:#FFFFFF;
+                            background-color: #1F4A75; -moz-border-radius: 6px; -webkit-border-radius: 6px;
+                            border-radius: 6px; font-size: 13px;}
 .optionHeader {
 	color: #fff;
 	overflow: hidden;
@@ -143,7 +124,6 @@ textarea.new_contact_text_area{ height: 100px; color: #2A3890;}
 /********* Menu header SECTION ************/
 .menu_list ul{list-style-type:none;}
 .menu_list li{display: inline;padding-right: 2px; padding-left: 2px; }
-.field_x{  border: thin solid #005C84;  width: 130px;}
 .line{  display:block;  margin:10px 2px 10px 10px;}
 
 /*************MENU ICON SECTION**********/

data/app/assets/stylesheets/header.css

@@ -20,8 +20,8 @@
 .div_login .subtexto{	padding-top: 8px;	height:12px;	font-size: 11px; }
 .div_login .a_border{	border-right:thin solid;	padding-right:7px;	text-decoration:underline; }
 #new_representation {	display: inline-block;}
-#header_notifications a{color: white; background: transparent url('btn/header_notifications.png') no-repeat center center;padding: 4px 8px 6px 7px;}
-#header_inbox_count a{ color: white; background-color: #879eb5; padding: 2px 5px 2px 5px;}
+#header_notifications a{color: white; background: transparent url('btn/header_notifications.png') no-repeat center center;padding: 4px 10px 6px 11px;}
+#header_inbox_count a{ color: white; background-color: #879eb5; padding: 2px 7px 2px 7px;}
 #representation {  display: inline;  padding-left:3px;  padding-right:3px;}
 .txt_config {color: #fff;	vertical-align: top;	display: inline;	padding-top: 2px;	border-right: thin solid;
 	padding-right: 3px;}
@@ -35,14 +35,14 @@
 #menu_home ul {list-style: none;	margin: 0px;	float:left;}
 #menu_home ul li {line-height:20px;	vertical-align:top;}
 
-#header_dropdown_menu,.header_dropdown_li {width: 180px;display:inline-block;vertical-align: top; height:22px; color:#FFF;}
+#header_dropdown_menu,.header_dropdown_li {width: 120px;display:inline-block;vertical-align: top; height:22px; color:#FFF;}
 
-#header_dropdown_menu ul li {width: 180px;line-height: 15px;}
+#header_dropdown_menu ul li {width: 120px;line-height: 15px;}
 #header_dropdown_menu ul li a{padding: .40em 1em .70em 2.5em;}
 #header_dropdown_menu ul li a:hover{color:#1F4A75;}
 #header_dropdown_menu ul li ul li a{padding: .40em 1em .70em 1em;}
 #header_dropdown_menu ul li ul li ul li a{padding: .40em 1em .70em 2.5em;}
-#header_dropdown_menu ul li ul li ul{position: absolute; left: -180px;}
+#header_dropdown_menu ul li ul li ul{position: absolute; left: -120px;}
 #header_dropdown_menu a.session_change{background: transparent url('btn/arrow_session_change.png') no-repeat 3px 6px;}
 
 #menu_home ul li.pipe,#menu_account ul li.pipe{padding:0; margin:0;font-size: 20px;font-weight: bold;}

data/app/models/actor.rb

@@ -198,25 +198,43 @@ class Actor < ActiveRecord::Base
   # Options:
   # * type: Filter by the class of the contacts.
   # * direction: sent or received
-  # * relations: Restrict the relations of considered ties. Defaults to {Relation::Custom relations of custom type}
+  # * relations: Restrict the relations of considered ties. In the case of both directions,
+  #   only relations belonging to {Actor} are valid. It defaults to relations of
+  #   {Relation::Custom custom} and {Relation::Public public} types
   # * include_self: False by default, don't include this actor as subject even they have ties with themselves.
+  # * load_subjects: True by default, make the queries for eager loading of contacts
   #
   def contact_actors(options = {})
     subject_types   = Array(options[:type] || self.class.subtypes)
     subject_classes = subject_types.map{ |s| s.to_s.classify }
     
     as = Actor.select("DISTINCT actors.*").
-               where('actors.subject_type' => subject_classes).
-               includes(subject_types)
+               where('actors.subject_type' => subject_classes)
+
+    if options[:load_subjects].nil? || options[:load_subjects]
+      as = as.includes(subject_types)
+    end
     
+    # Make another query for getting the actors in the other way
+    if options[:direction].blank?
+      rcv_opts = options.dup
+      rcv_opts[:direction] = :received
+      rcv_opts[:load_subjects] = false
+
+      sender_ids = contact_actors(rcv_opts).map(&:id)
+
+      as = as.where(:id => sender_ids)
+
+      options[:direction] = :sent
+    end
     
     case options[:direction]
-      when :sent
-        as = as.joins(:received_ties => :relation).merge(Contact.sent_by(self))
-      when :received
-        as = as.joins(:sent_ties => :relation).merge(Contact.received_by(self))
+    when :sent
+      as = as.joins(:received_ties => :relation).merge(Contact.sent_by(self))
+    when :received
+      as = as.joins(:sent_ties => :relation).merge(Contact.received_by(self))
     else
-      raise "contact actors in both directions are not supported yet"
+      raise "How do you get here?!"
     end
     
     if options[:include_self].blank?

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

@@ -27,6 +27,6 @@
 <% end %>
 
 <div id="activities_share_btn">
-  <%= submit_tag(t('share'), :class => "myButtonBlue submitActivity", :id => "masterSubmitButton") %>
+  <%= submit_tag(t('share'), :class => "button submitActivity", :id => "masterSubmitButton") %>
 </div>
 <% end %>

data/app/views/comments/_new.html.erb

@@ -18,9 +18,12 @@
 
         <%= f.hidden_field :_contact_id %>
         <%= f.hidden_field :_activity_parent_id %>
-    
-        <%= f.text_field :text, :class =>"input_new_comments", :id => "comment_text_"+dom_id(activity) %>
-
+        
+        <div class="input_new_comments_container">
+          <%= f.text_area :text, :class =>"input_new_comments", :id => "comment_text_"+dom_id(activity), :rows => 1 %>
+          <div class="copy_new_comment" id="copy_comment_text_<%= dom_id(activity) %>"></div>
+        </div>
+        
         <div class="activities_comment_btn">
           <div class="activities_security"></div>
           <%= f.submit t('share'), :class =>"myButtonBlue submitActivity", :id => "comment_submit_"+dom_id(activity) %>
@@ -34,5 +37,12 @@
   $(document).ready(function() {
     $("#comment_text_<%= dom_id(activity) %>").Watermark("<%= I18n.t('comment.input') %>","#666");
     activate_anti_rebounds(); 
+ 
+    $("#comment_text_<%= dom_id(activity) %>")
+        .change(function(){autoSize("<%= dom_id(activity) %>");})
+        .keydown(function(){autoSize("<%= dom_id(activity) %>");})
+        .keyup(function(){autoSize("<%= dom_id(activity) %>");});
+    autoSize("<%= dom_id(activity) %>"); 
+
   });
 <% end %>

data/app/views/devise/passwords/edit.html.erb

@@ -15,7 +15,7 @@
     </div>
     <div class="space_height"></div>
     <div class="btn_login">
-      <%= f.submit "Change my password", :class =>"myButtonLarge" %>
+      <%= f.submit "Change my password" %>
     </div>
   <% end %>
 </div>

data/app/views/layouts/_header.erb

@@ -21,7 +21,7 @@
             </li>            
             <li class="pipe">·</li>
             <li>
-              <%= link_to(t('message.inbox'), conversations_path) %>
+              <%= link_to(t('message.other'), conversations_path) %>
               <span id="header_inbox_count">
               <%= link_to(current_subject.mailbox.inbox(:unread => true).count.to_s, conversations_path) %>
               </span>

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.12".freeze
+    VERSION = "0.9.13".freeze
   end
 end

metadata

@@ -1,326 +1,464 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: social_stream-base
-version: !ruby/object:Gem::Version
-  version: 0.9.12
+version: !ruby/object:Gem::Version 
+  hash: 33
   prerelease: 
+  segments: 
+  - 0
+  - 9
+  - 13
+  version: 0.9.13
 platform: ruby
-authors:
+authors: 
 - GING - DIT - UPM
 - CISE - ESPOL
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-29 00:00:00.000000000 +02:00
+
+date: 2011-10-04 00:00:00 +02:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &75516460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
   type: :runtime
-  prerelease: false
-  version_requirements: *75516460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: ancestry
-  requirement: &75516210 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 2
+        - 3
         version: 1.2.3
   type: :runtime
-  prerelease: false
-  version_requirements: *75516210
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: foreigner
-  requirement: &75515980 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 9
+        - 1
         version: 0.9.1
   type: :runtime
-  prerelease: false
-  version_requirements: *75515980
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: devise
-  requirement: &75515750 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 4
+        - 5
         version: 1.4.5
   type: :runtime
-  prerelease: false
-  version_requirements: *75515750
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: inherited_resources
-  requirement: &75515520 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
   type: :runtime
-  prerelease: false
-  version_requirements: *75515520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: stringex
-  requirement: &75515290 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
   type: :runtime
-  prerelease: false
-  version_requirements: *75515290
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: avatars_for_rails
-  requirement: &75515060 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 1
+        - 3
         version: 0.1.3
   type: :runtime
-  prerelease: false
-  version_requirements: *75515060
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: jquery-rails
-  requirement: &75514830 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 0
+        - 9
         version: 1.0.9
   type: :runtime
-  prerelease: false
-  version_requirements: *75514830
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: cancan
-  requirement: &75514600 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
         version: 1.6.4
   type: :runtime
-  prerelease: false
-  version_requirements: *75514600
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: kaminari
-  requirement: &75514370 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 0
+        - 12
+        - 4
         version: 0.12.4
   type: :runtime
-  prerelease: false
-  version_requirements: *75514370
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: omniauth
-  requirement: &75514140 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 2
+        - 6
         version: 0.2.6
   type: :runtime
-  prerelease: false
-  version_requirements: *75514140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: oauth-plugin
-  requirement: &75513910 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: -223651605
+        segments: 
+        - 0
+        - 4
+        - 0
+        - pre
+        - 1
         version: 0.4.0.pre1
   type: :runtime
-  prerelease: false
-  version_requirements: *75513910
-- !ruby/object:Gem::Dependency
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
   name: mailboxer
-  requirement: &75513690 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 5
+        - 3
         version: 0.5.3
   type: :runtime
-  prerelease: false
-  version_requirements: *75513690
-- !ruby/object:Gem::Dependency
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
   name: acts-as-taggable-on
-  requirement: &75513460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        - 6
         version: 2.0.6
   type: :runtime
-  prerelease: false
-  version_requirements: *75513460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
   name: formtastic
-  requirement: &75513230 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 2
+        - 3
         version: 1.2.3
   type: :runtime
-  prerelease: false
-  version_requirements: *75513230
-- !ruby/object:Gem::Dependency
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
   name: simple-navigation
-  requirement: &75545180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *75545180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
   name: resque
-  requirement: &75544910 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 81
+        segments: 
+        - 1
+        - 17
+        - 1
         version: 1.17.1
   type: :runtime
-  prerelease: false
-  version_requirements: *75544910
-- !ruby/object:Gem::Dependency
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
   name: modernizr-rails
-  requirement: &75544660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        - 6
         version: 2.0.6
   type: :runtime
-  prerelease: false
-  version_requirements: *75544660
-- !ruby/object:Gem::Dependency
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
   name: thinking-sphinx
-  requirement: &75544430 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 2
+        - 0
+        - 7
         version: 2.0.7
   type: :runtime
-  prerelease: false
-  version_requirements: *75544430
-- !ruby/object:Gem::Dependency
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
   name: capybara
-  requirement: &75544200 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 3
+        - 9
         version: 0.3.9
   type: :development
-  prerelease: false
-  version_requirements: *75544200
-- !ruby/object:Gem::Dependency
+  version_requirements: *id020
+- !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  requirement: &75544010 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id021
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
   prerelease: false
-  version_requirements: *75544010
-- !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &75543770 !ruby/object:Gem::Requirement
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *75543770
-- !ruby/object:Gem::Dependency
+  version_requirements: *id022
+- !ruby/object:Gem::Dependency 
   name: rspec-rails
-  requirement: &75543520 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 2
+        - 6
+        - 1
         version: 2.6.1
   type: :development
-  prerelease: false
-  version_requirements: *75543520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id023
+- !ruby/object:Gem::Dependency 
   name: factory_girl
-  requirement: &75543270 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
         version: 1.3.2
   type: :development
-  prerelease: false
-  version_requirements: *75543270
-- !ruby/object:Gem::Dependency
+  version_requirements: *id024
+- !ruby/object:Gem::Dependency 
   name: forgery
-  requirement: &75543040 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 4
+        - 2
         version: 0.4.2
   type: :development
-  prerelease: false
-  version_requirements: *75543040
-- !ruby/object:Gem::Dependency
+  version_requirements: *id025
+- !ruby/object:Gem::Dependency 
   name: ci_reporter
-  requirement: &75542810 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id026 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
         version: 1.6.4
   type: :development
-  prerelease: false
-  version_requirements: *75542810
-- !ruby/object:Gem::Dependency
+  version_requirements: *id026
+- !ruby/object:Gem::Dependency 
   name: nifty-generators
-  requirement: &75542580 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id027 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 4
+        - 5
         version: 0.4.5
   type: :development
-  prerelease: false
-  version_requirements: *75542580
-description: ! 'Social Stream is a Ruby on Rails engine providing your application
-  with social networking features and activity streams.
-
-
-  This gem packages the basic functionality, along with basic actors (user, group)
-  and activity objects (post and comments)'
+  version_requirements: *id027
+description: |-
+  Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.
+  
+  This gem packages the basic functionality, along with basic actors (user, group) and activity objects (post and comments)
 email: 
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .yardopts
@@ -913,26 +1051,36 @@ files:
 has_rdoc: true
 homepage: http://social-stream.dit.upm.es/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Basic features for Social Stream, the core for building social network websites
 test_files: []
+