social_stream-base 0.15.1 → 0.15.2

data/app/assets/javascripts/cheesecake.js

@@ -3,4 +3,4 @@ window.requestAnimFrame = (function(callback) {
 	function(callback) {
 		window.setTimeout(callback, 1000 / 60);
 	};
-})();
+})();

data/app/assets/stylesheets/_colors.scss

@@ -8,6 +8,7 @@ $success-background: #DFF2BF;
 
 /**BLUES**/
 $auxiliar-color: #879EB5;
+$auxiliar-bright-color: #97AEC5;
 $input-border-color: #BDC7D8;
 $main-color: #1F4A75; /* #2A3890*/
 $secondary-color: #DEEFF8; /* #E0EEF5*/

data/app/assets/stylesheets/cheesecake.css.scss

@@ -11,6 +11,7 @@
   left: 410px;
   display: none;
   z-index: 3000;
+  cursor: pointer;
 }
 #edit_sector_button img {
   width: 24px;
@@ -30,8 +31,13 @@
   width: 0px;
   padding: 0px;
   margin: 0px;
+  overflow-y: visible;
+  overflow-x: hidden;
+}
+#sector_editor .truncate {
+  white-space: nowrap;
   overflow: hidden;
-  height: 450px;
+  text-overflow: ellipsis;
 }
 #contacts_explorer {
   float: right;
@@ -108,7 +114,6 @@
   height: 30px;
   text-align: right;
   float: left;
-  margin-right: 20px;
 }
 #contacts_save_form {
   overflow: visible; 
@@ -127,7 +132,7 @@
   width: 130px;
   height: 25px;
   float: left;
-  margin-top: 10px;
+  margin: 10px 0px 0px 20px;
   cursor: pointer;
 }
 #contacts_changes_title {
@@ -162,8 +167,7 @@
   display: none;
   width: 514px;
   height: 340px;
-  top: 145px !important;
-  left: 460px !important;
+  top: 135px !important;
 }
 .contacts_changes_tipsy_menu.tipsy .tipsy-arrow {
   display: none;
@@ -270,7 +274,6 @@
 }
 #sector_form {
   width: 300px;
-  height: 450px;
   float: right;
 }
 #sector_form .title {
@@ -282,6 +285,8 @@
 #sector_form .title #edited_sector_name {
   font-size: 14px;
   font-weight: bold;
+  max-width: 150px;
+  display: inline-block;
 }
 #sector_form #edited_sector_color_out {
   border: 1px solid $main-color;
@@ -295,12 +300,28 @@
   width: 14px;
   height: 14px;
 }
+#sector_form .form_row.less_padding {
+  padding: 2px 0px 2px 20px;
+}
 #sector_form .subsector {
-  border: 1px solid $input-border-color;
-  background: $fill-color;
+  border: 1px solid $main-color;
+  background: $secondary-color;
   width: 260px;
   min-height: 20px;
 }
+#sector_form .add_subsector {
+  border: 1px solid $main-color;
+  color: $main-color;
+  background: $auxiliar-color;
+  width: 260px;
+  height: 20px;
+  text-align: center;
+  font-size: 15px;
+  font-weight: bold;
+}
+#sector_form .add_subsector:hover {
+  background: $auxiliar-bright-color;
+}
 #sector_form .subsector .title {
   width: 260px;
   text-align: center;
@@ -310,4 +331,30 @@
 #sector_form .subsector .title .edited_subsector_name {
   font-size: 11px;
   font-weight: bold;
+  max-width: 150px;
+  display: inline-block;
+}
+.permissions_explanation {
+
+}
+.permissions_explanation_tipsy_menu.tipsy {
+  border: 1px solid $main-color;
+  background: $secondary-color;
+  box-shadow: 0 0 5px #000000;
+  -webkit-box-shadow: 0 0 5px #000000;
+  -moz-box-shadow: 0 0 5px #000000;
+  overflow: hidden;
+  max-width: 300px;
+  width: 300px;
+  padding-top: 3px;
+}
+.permissions_explanation_tipsy_menu.tipsy .tipsy-arrow {
+  display: none;
+}
+.permissions_explanation_tipsy_menu.tipsy .tipsy-inner {
+  max-width: 300px;
+  text-align: left;
+}
+.permissions_explanation_tipsy_menu.tipsy .tipsy-inner .permission {
+  padding-top: 3px;
 }

data/app/controllers/contacts_controller.rb

@@ -20,11 +20,12 @@ class ContactsController < ApplicationController
   end
 
   def update
+    # Record who is manipulating the contact, mainly in groups
+    @contact.user_author = current_user
+
     # FIXME: This should be in the model
     params[:contact][:relation_ids].present? &&
-     params[:contact][:relation_ids].delete("0")
-
-    params[:contact][:user_author] = current_user
+      params[:contact][:relation_ids].delete("0")
 
     if @contact.update_attributes(params[:contact])
       redirect_to @contact.receiver_subject

data/app/views/cheesecake/_cheesecake.html.erb

@@ -38,11 +38,8 @@ $(function(){
   cheese.syncSectorFocusCallbacks = false;
   cheese.onSectorFocusBegin = function(cheesecake,callback){
     if((cheese.highlightedSector)&&(cheese.highlightedSector.auxiliar)){
-      $("#contacts_explorer").animate({width: 0},500,function(){        
-        $("#contacts_explorer").hide();
-      });
-      $("#sector_editor").show();
-      $("#sector_editor").animate({width: 300},500);
+      $("#sector_editor").data("prepare")(cheese);
+      $("#sector_editor").data("show")();
     }else{
       $("#contacts_grid_available").fadeOut("fast", callback);      
     }
@@ -52,6 +49,7 @@ $(function(){
       
     }else{
       $("#contacts_grid_available").fadeIn("fast");
+      $("#edit_sector_button").on("click.edit", cheese, $("#edit_sector_button").data("edit_sector_click"));
       $("#edit_sector_button").fadeIn("fast");
     }
   };
@@ -60,19 +58,20 @@ $(function(){
       
     }else{
       $("#contacts_grid_available").fadeOut("fast", callback);
+      $("#edit_sector_button").off("click");
       $("#edit_sector_button").fadeOut("fast");
     }
   };
   cheese.onSectorUnfocusEnd = function(cheesecake){
     if((cheese.highlightedSector)&&(cheese.highlightedSector.auxiliar)){
-      $("#sector_editor").animate({width: 0},500,function(){
-        $("#sector_editor").hide();
-      });
-      $("#contacts_explorer").show();
-      $("#contacts_explorer").animate({width: 300},500);
+      
     }else{
       $("#contacts_grid_available").fadeIn("fast");      
     }
+    if($("#sector_editor").width() > 0){
+      $("#edit_sector_button").html("<%= escape_javascript image_tag "btn/cheese_edit.png" %>");
+      $("#sector_editor").data("hide")();
+    }
   };
   $("#contacts_filter_input").keyup(function(){
     cheese.searchEngine.filter($("#contacts_filter_input").val());

data/app/views/cheesecake/_index.html.erb

@@ -103,33 +103,87 @@
       $("#contacts_changes_button").tipsy("hide");
     }else{
       $("#contacts_changes_button").tipsy("show");
-      $("#contacts_changes_title").click(function(){
+      $(".contacts_changes_tipsy_menu").css({left: $("#cheesecake").offset().left + 132})
+      $(window).on("resize.contacs_changes",function(){
+        $(".contacts_changes_tipsy_menu").css({left: $("#cheesecake").offset().left + 132})
+      });
+      $("#contacts_changes_title").on("click",function(){
         $("#contacts_changes_button").tipsy("hide");
       });
     }
   });
-  var edit_sector_click = function(){
+  $("#sector_editor").data("show", function(callback){
+    $("#contacts_explorer").stop().animate({width: 0},500);
+    $("#sector_editor").stop().animate({width: 300},500, function(){
+      if(callback) callback();
+    });
+  });
+  $("#sector_editor").data("hide", function(callback){
+    $("#sector_editor").stop().animate({width: 0},500, function(){
+      $(".add_subsector_clone").remove();
+    });
+    $("#contacts_explorer").stop().animate({width: 300},500, function(){
+      if(callback) callback();
+    });
+  });
+  $("#sector_editor").data("prepare", function(cheese){
+    var sector = cheese.getFocusedSector();
+    var subsector_count = sector.subsectors.length;
+    var original_add_sector_row = $("#original_add_subsector_row");
+    if(sector){
+      $("#form_sector_name").val(sector.label);
+      $("#edited_sector_name").html(sector.label);
+      $("#form_sector_name").off("keyup");
+      $("#form_sector_name").on("keyup",function(){
+        $("#edited_sector_name").html($("#form_sector_name").val());
+        sector.changeLabel($("#form_sector_name").val());
+      });
+      $(".add_subsector_clone").remove();
+      for(var i = 0; i < 4; i++){
+        var subsector = sector.subsectors[i];
+        if(subsector){
+          var add_subsector_clone = original_add_sector_row.clone().attr("id", "add_subsector_" + i).addClass("add_subsector_clone").show();          
+          $("#subsector_" + i).parent().before(add_subsector_clone);
+          $("#form_subsector_name_" + i).val(subsector.label);
+          $("#edited_subsector_name_" + i).html(subsector.label);
+          $("#form_subsector_name_" + i).off("keyup");
+          $("#form_subsector_name_" + i).on("keyup", [i,subsector],function(event){
+            $("#edited_subsector_name_" + event.data[0]).html($("#form_subsector_name_" + event.data[0]).val());
+            event.data[1].changeLabel($("#form_subsector_name_" + event.data[0]).val());
+          });
+          $("#subsector_" + i).show();
+        }else{
+          if(sector.subsectors[i-1]){
+            var add_subsector_clone = original_add_sector_row.clone().attr("id", "add_subsector_" + i).addClass("add_subsector_clone").show();          
+            $("#subsector_" + (i-1)).parent().after(add_subsector_clone);
+          }
+          $("#subsector_" + i).hide();
+        }
+      }
+    }
+  });
+  $("#edit_sector_button").data("edit_sector_click", function(event){
+    var cheese = event.data;
     $("#edit_sector_button").off("click.edit");
     $("#edit_sector_button").fadeOut("fast",function(){
       $("#edit_sector_button").html("<%= escape_javascript image_tag "btn/cheese_close_edit.png" %>");
       $("#edit_sector_button").fadeIn("fast");
     });
-    $("#contacts_explorer").stop().animate({width: 0},500);
-    $("#sector_editor").stop().animate({width: 300},500, function(){
-      $("#edit_sector_button").on("click.close_edit",close_edit_sector_click);
+    $("#sector_editor").data("prepare")(cheese);
+    $("#sector_editor").data("show")(function(){
+      $("#edit_sector_button").on("click.close_edit", cheese, $("#edit_sector_button").data("close_edit_sector_click"));
     });
-  }
-  var close_edit_sector_click = function(){
+  });
+  $("#edit_sector_button").data("close_edit_sector_click", function(event){
+    var cheese = event.data;
     $("#edit_sector_button").off("click.close_edit");
     $("#edit_sector_button").fadeOut("fast",function(){
       $("#edit_sector_button").html("<%= escape_javascript image_tag "btn/cheese_edit.png" %>");
       $("#edit_sector_button").fadeIn("fast");
     });
-    $("#sector_editor").stop().animate({width: 0},500);
-    $("#contacts_explorer").stop().animate({width: 300},500,function(){
-      $("#edit_sector_button").on("click.edit",edit_sector_click);
+    $("#sector_editor").data("hide")(function(){
+      $("#edit_sector_button").on("click.edit", cheese, $("#edit_sector_button").data("edit_sector_click"));
     });
-  }
-  $("#edit_sector_button").on("click.edit",edit_sector_click);
+  });
   <%= render :partial => 'cheesecake' %>
 <% end %>

data/app/views/cheesecake/_sector_form.html.erb

@@ -1,19 +1,19 @@
 <form id="sector_form">
 	<div class="title">
-		Editing <span id="edited_sector_name">New sector</span>
+		<%= t('cheesecake.form.editing')%> <div id="edited_sector_name" class="truncate">New sector</div>
 	</div>
 	<div class="block">
-		<div class="form_row">
+		<div class="form_row less_padding">
 			<div class="form_label">
-				Name:
+				<%= t('cheesecake.form.fields.name')%>:
 			</div>
 			<div class="form_field">
-				<input type="text" class="form_tag" value="New sector">
+				<input type="text" id="form_sector_name" class="form_tag" value="New sector">
 			</div>
 		</div>
-		<div class="form_row">
+		<div class="form_row less_padding">
 			<div class="form_label">
-				Color:
+				<%= t('cheesecake.form.fields.color')%>:
 			</div>
 			<div class="form_field">
 				<div id="edited_sector_color_out">
@@ -21,41 +21,46 @@
 				</div>
 			</div>
 		</div>
-		<% for i in 1..4 do %>
-		<div class="form_row">
-			<div class="subsector">
+		<div class="form_row less_padding" id="original_add_subsector_row" style="display:none;">
+		  <div class="add_subsector">
+		    +
+		  </div>
+		</div>
+		<% for i in 0..3 do %>
+		<div class="form_row less_padding">
+			<div class="subsector" id="subsector_<%= i %>">
 				<div class="title">
-					Subsector <span class="edited_subsector_name">New subsector <%= i %></span>
+					<%= t('cheesecake.form.fields.subsector')%> <div class="edited_subsector_name truncate" id="edited_subsector_name_<%= i %>">New subsector <%= i %></div>
 				</div>
-				<div class="content" <%= i==1 ? '' : 'style=display:none;' %>>
+				<div class="content" <%= i==0 ? '' : 'style=display:none;' %>>
 					<div class="form_row">
 						<div class="form_label">
-							Name:
+							<%= t('cheesecake.form.fields.name')%>:
 						</div>
 						<div class="form_field">
-							<input type="text" class="form_tag" value="New subsector <%= i %>">
+							<input type="text" class="form_tag" class="form_subsector_name" id="form_subsector_name_<%= i %>" value="New subsector <%= i %>">
 						</div>
 					</div>
-					<div class="form_row">
+					<div class="form_row less_padding">
 						<div class="form_label">
-							Permissions:
+							<%= t('cheesecake.form.fields.permissions')%>:
 						</div>
 					</div>
-					<div class="form_row">
-						<div class="form_field">
-							<table class="tableCheckBoxOptions">
-								<% default_permissions.each_with_index do |p, i| %>
-								<tr>
-									<td>
-									<div contain=<%= dom_id p %> class="checkboxPermissionOptionLeft">
-										<input id=<%= dom_id p %> class="permission" type="checkbox"/>
-										<label for=<%= dom_id p %>><%= p.description(:brief) %></label>
-										<div class="clearfloat"></div>
-									</div></td>
-								</tr>
-								<% end %>
-							</table>
+					<div class="form_row less_padding">
+						<div class="form_field permissions_field">
+							<% default_permissions.each_with_index do |p, i| %>
+								<div contain=<%= dom_id p %> class="checkboxPermissionOptionLeft">
+									<input class="permission <%= dom_id p %>" type="checkbox"/>
+									<label for=<%= dom_id p %>><%= p.description(:brief) %></label>
+									<div class="clearfloat"></div>
+								</div>
+							<% end %>
 						</div>
+						<div class="permissions_explanation" style="display:none;">
+						  <% default_permissions.each_with_index do |p, i| %>
+                  <div class="permission <%= dom_id p %>"> <%= p.description(:detailed) %></div>
+              <% end %>
+					  </div>
 					</div>
 				</div>
 			</div>
@@ -78,4 +83,19 @@
       }
     })
   });
+  $(".permissions_field").each(function(){
+    $(this).tipsy({
+      delayIn: 500,
+      delayOut: 0,
+      gravity: 'e',
+      offset: 100,
+      opacity: 1,
+      className: 'permissions_explanation_tipsy_menu',
+      html: true,
+      hoverable: true,
+      title: function(){
+        return $(this).parent().find('.permissions_explanation').html();
+      }
+    });
+  });  
 <% end %>

data/config/locales/en.yml

@@ -97,6 +97,13 @@ en:
       none: "No changes"
       save: "Save changes"
       saving: "Saving..."
+    form:
+      editing: "Editing"
+      fields:
+        color: "Color"
+        name: "Name"
+        permissions: "Permissions"
+        subsector: "Subsector"
     select:
       hint: "Select by clicking the portraits"
   comment:
@@ -106,6 +113,7 @@ en:
     one: "a comment"
     view_all: "View all comments"
   contact:
+    addressbook: "Addressbook"
     all_n: "All contacts (%{count})"
     confirm_delete: "Delete contact?"
     current: "Current"

data/config/locales/es.yml

@@ -96,7 +96,14 @@ es:
       details: "Cambios detallados"
       none: "Sin cambios"
       save: "Guardar cambios"
-      saving: "Guardando..."
+      saving: "Guardando..."      
+    form:
+      editing: "Editando"
+      fields:
+        color: "Color"
+        name: "Nombre"
+        permissions: "Permisos"
+        subsector: "Subsector"
     select:
       hint: "Selecciona haciendo click en los retratos"
   comment:
@@ -106,6 +113,7 @@ es:
     one: "un comentario"
     view_all: "Ver todos los comentarios"
   contact:
+    addressbook: "Libreta de direcciones"
     all_n: "Todos los contactos (%{count})"
     confirm_delete: "¿Borrar contacto?"
     current: "Actuales"

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.15.1".freeze
+    VERSION = "0.15.2".freeze
   end
 end

data/spec/controllers/contacts_controller_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe ContactsController do
+  include SocialStream::TestHelpers
+  include SocialStream::TestHelpers::Controllers
 
   render_views
 
@@ -108,4 +110,26 @@ describe ContactsController do
       response.should redirect_to(home_path)
     end
   end
+
+  context "representing a group" do
+    before(:all) do
+      @group = Factory(:member, :contact => Factory(:group_contact, :receiver => @user.actor)).sender_subject
+    end
+
+    before do
+      sign_in(@user)
+      represent(@group)
+    end
+
+    it "should add other user as member" do
+      other_user = Factory(:user)
+      contact = @group.contact_to!(other_user)
+
+      put :update, :id => contact.id, :contact => { :relation_ids => @group.relation_customs.map(&:id) }
+
+      response.should redirect_to(other_user)
+
+      @group.receivers.should include(other_user.actor)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000Z
+date: 2012-02-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &72328120 !ruby/object:Gem::Requirement
+  requirement: &88091570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *72328120
+  version_requirements: *88091570
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &72327870 !ruby/object:Gem::Requirement
+  requirement: &88091310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *72327870
+  version_requirements: *88091310
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &72327640 !ruby/object:Gem::Requirement
+  requirement: &88091050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *72327640
+  version_requirements: *88091050
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &72327410 !ruby/object:Gem::Requirement
+  requirement: &88090800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *72327410
+  version_requirements: *88090800
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &72327180 !ruby/object:Gem::Requirement
+  requirement: &88090570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *72327180
+  version_requirements: *88090570
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &72326950 !ruby/object:Gem::Requirement
+  requirement: &88090340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *72326950
+  version_requirements: *88090340
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &72326720 !ruby/object:Gem::Requirement
+  requirement: &88090110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *72326720
+  version_requirements: *88090110
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &72326490 !ruby/object:Gem::Requirement
+  requirement: &88089880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *72326490
+  version_requirements: *88089880
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &72326260 !ruby/object:Gem::Requirement
+  requirement: &88089650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *72326260
+  version_requirements: *88089650
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &72326020 !ruby/object:Gem::Requirement
+  requirement: &88089420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *72326020
+  version_requirements: *88089420
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &72325770 !ruby/object:Gem::Requirement
+  requirement: &88089180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *72325770
+  version_requirements: *88089180
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &72325470 !ruby/object:Gem::Requirement
+  requirement: &88088100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *72325470
+  version_requirements: *88088100
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &72325210 !ruby/object:Gem::Requirement
+  requirement: &88087740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *72325210
+  version_requirements: *88087740
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &72324860 !ruby/object:Gem::Requirement
+  requirement: &88087400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *72324860
+  version_requirements: *88087400
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &72324460 !ruby/object:Gem::Requirement
+  requirement: &88087040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *72324460
+  version_requirements: *88087040
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &72324230 !ruby/object:Gem::Requirement
+  requirement: &88086710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *72324230
+  version_requirements: *88086710
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &72323990 !ruby/object:Gem::Requirement
+  requirement: &88086360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *72323990
+  version_requirements: *88086360
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &72323650 !ruby/object:Gem::Requirement
+  requirement: &88086030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *72323650
+  version_requirements: *88086030
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &72323290 !ruby/object:Gem::Requirement
+  requirement: &88085690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *72323290
+  version_requirements: *88085690
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &72322960 !ruby/object:Gem::Requirement
+  requirement: &88085330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -231,10 +231,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *72322960
+  version_requirements: *88085330
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &72300990 !ruby/object:Gem::Requirement
+  requirement: &88084990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -242,10 +242,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *72300990
+  version_requirements: *88084990
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &72300760 !ruby/object:Gem::Requirement
+  requirement: &88084630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,10 +253,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *72300760
+  version_requirements: *88084630
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &72300520 !ruby/object:Gem::Requirement
+  requirement: &88084300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -264,10 +264,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *72300520
+  version_requirements: *88084300
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &72300270 !ruby/object:Gem::Requirement
+  requirement: &88083950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -275,10 +275,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *72300270
+  version_requirements: *88083950
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &72299980 !ruby/object:Gem::Requirement
+  requirement: &88083610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -286,10 +286,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *72299980
+  version_requirements: *88083610
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &72299730 !ruby/object:Gem::Requirement
+  requirement: &88083320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -297,10 +297,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72299730
+  version_requirements: *88083320
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &72299360 !ruby/object:Gem::Requirement
+  requirement: &88082950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -308,10 +308,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72299360
+  version_requirements: *88082950
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &72299000 !ruby/object:Gem::Requirement
+  requirement: &88082590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +319,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *72299000
+  version_requirements: *88082590
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &72298750 !ruby/object:Gem::Requirement
+  requirement: &88082210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,10 +330,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *72298750
+  version_requirements: *88082210
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &72298450 !ruby/object:Gem::Requirement
+  requirement: &88081870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -341,10 +341,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *72298450
+  version_requirements: *88081870
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &72298120 !ruby/object:Gem::Requirement
+  requirement: &88081510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -352,10 +352,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *72298120
+  version_requirements: *88081510
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &72297780 !ruby/object:Gem::Requirement
+  requirement: &88081180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -363,7 +363,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *72297780
+  version_requirements: *88081180
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.