social_stream-base 0.10.9 → 0.10.10

data/Gemfile

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 # use a local code of mailboxer or avatar_for_rails gems
 #
 # gem 'mailboxer', :path => '../mailboxer'
+# gem 'social_cheesecake', :path => '../../SocialCheesecake/social_cheesecake'
 # gem 'avatars_for_rails', :path => '../avatars_for_rails'
 
 gemspec

data/app/assets/javascripts/cheesecake.js

@@ -0,0 +1,6 @@
+window.requestAnimFrame = (function(callback) {
+	return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || window.oRequestAnimationFrame || window.msRequestAnimationFrame ||
+	function(callback) {
+		window.setTimeout(callback, 1000 / 60);
+	};
+})();

data/app/assets/javascripts/social_stream-base.js

@@ -6,5 +6,6 @@
 //= require jquery.screw
 //
 //= require avatars_for_rails
+//= require social_cheesecake
 //
 //= require_tree .

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

@@ -0,0 +1,55 @@
+@import "colors";
+
+#cheesecake {
+  position: relative;
+  padding: 20px;
+}
+#contacts_cheesecake {
+  width: 440px;
+  height: 440px;
+  padding: 0px;  
+  float: left;
+}
+#contacts_filter {
+  width: 290px;
+  height: 64px;
+  position: relative;
+  float: left;
+  padding: 5px;
+}
+
+#cheesecake #contacts_filter #contacts_filter_input {
+  padding: 0 3px 0 22px;
+  background: url('btn/search_icon.png') 5px 50% no-repeat white;
+  font-size: 11px;
+  color: $main-color;
+  border: solid 1px $input-border-color;
+  height: 25px;
+  width: 200px;
+  margin-left: 26px;
+  margin-top: 18px;
+}
+
+#contacts_grid {
+  width: 300px;
+  height: 370px;
+  overflow: hidden;
+  position: relative;
+  float: left;
+}
+#contacts_grid .actor {
+  width: 64px;
+  height: 64px;
+  float: left;
+  margin: 5px;
+}
+#contacts_grid .actor.focused {
+  border: 2px solid #00F;
+  background-color: #006;
+  margin: 3px;
+}
+#contacts_grid .actor img {
+  width: 64px;
+  height: 64px;
+}
+

data/app/controllers/cheesecake_controller.rb

@@ -0,0 +1,9 @@
+class CheesecakeController < ApplicationController
+  
+  before_filter :authenticate_user!
+  
+  def index
+    @actors = current_subject.contact_actors(:direction => :sent)
+  end
+  
+end

data/app/models/actor.rb

@@ -499,6 +499,16 @@ class Actor < ActiveRecord::Base
     slug
   end
   
+  # JSON compatible with SocialCheesecake
+  def cheesecake_json
+    {
+      :sectors =>
+        relation_customs.includes(:ties => :contact).map { |r|
+          r.to_cheesecake_hash
+        }
+    }.to_json
+  end
+
   private
   
   # After create callback

data/app/models/relation/custom.rb

@@ -96,4 +96,17 @@ class Relation::Custom < Relation
   def stronger_or_equal
     path
   end
+
+  # JSON compatible with SocialCheesecake
+  def to_cheesecake_hash(options = {})
+    { :name => name }.tap do |hash|
+      if options[:subsector]
+        hash[:actors] = ties.map{ |t| [t.contact.receiver_id] }.uniq
+      else
+        hash[:subsectors] = ( weaker.present? ?
+                              weaker.map{ |w| w.to_cheesecake_hash(:subsector => true) } :
+                              Array.wrap(to_cheesecake_hash(:subsector => true)) )
+      end
+    end
+  end
 end

data/app/views/actors/_actor_cheesecake.html.erb

@@ -0,0 +1,4 @@
+<%= div_for actor do %>
+  <%= image_tag(actor.logo.url , :size => "64x64", :alt => actor.name ) %>
+<% end %>
+

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

@@ -0,0 +1,38 @@
+<div id="cheesecake">
+  <div id="contacts_cheesecake"></div>
+  <div id="contacts_filter">
+    <%= text_field_tag :filter_query, nil,:autocomplete => :off, :id => :contacts_filter_input %>    
+  </div>
+  <div id="contacts_grid">
+    
+    <% @actors.each do |actor|%>
+      <%= render :partial => "actors/actor_cheesecake", :locals => {:actor => actor} %>
+    <% end %>
+  </div>
+  <br class="clearfloat">
+  <%= javascript_tag do %>
+  $(function(){
+    $("#center_body").css("width","782px");
+    $("#center_body").css("max-width","782px");
+    $("#content").css("width","782px");
+    $("#contacts_filter_input").Watermark("<%= escape_javascript(I18n.t('search.name')) %>");
+  });
+  window.onload = function() {
+    var cheesecakeData = {
+      container: {
+        id: "contacts_cheesecake",
+        width: 440,
+        height: 440
+      },
+        grid: {
+          id: "contacts_grid",
+          divIdPrefix: "actor_"
+      },
+        rMax : 200, 
+        center: {x : 220, y : 220}           
+      };
+      cheesecakeData.sectors = <%= raw(current_subject.cheesecake_json) %>.sectors;
+      var cheese = new socialCheesecake.Cheesecake(cheesecakeData);  
+  }      
+  <% end %>
+</div>

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

@@ -0,0 +1,10 @@
+<% content_for :title do%>
+  <%= t('contact.other')%>
+<%end%>
+
+<% toolbar :option => :contacts %>
+
+<% location link_to(t("contact.other"),contacts_path) %>
+<%= render :partial => "index"%>
+
+<div class="space_center"></div>

data/config/routes.rb

@@ -84,6 +84,8 @@ Rails.application.routes.draw do
   
   match 'search' => 'search#index', :as => :search  
   
+  match 'cheesecake' => 'cheesecake#index', :as => :cheesecake  
+  
   match 'ties' => 'ties#index', :as => :ties
   
   

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.10.9".freeze
+    VERSION = "0.10.10".freeze
   end
 end

data/lib/tasks/db/populate.rake

@@ -12,10 +12,18 @@ namespace :db do
 
       LOGOS_PATH = File.join(Rails.root, 'lib', 'logos')
       USERS = (ENV["USERS"] || 9).to_i
-      GROUPS =  (ENV["GROUPS"] || 10).to_i
+      GROUPS = (ENV["GROUPS"] || 10).to_i
+      CHEESECAKE_TESTING = (ENV["CHEESECAKE_TESTING"].present? || false)
+      if CHEESECAKE_TESTING
+        puts "Cheesecake Testing mode: ON"
+      end
       if ENV["HARDCORE"].present?
         USERS = 999
         GROUPS = 1000    
+        puts "Hardcore mode: ON (May the Force be with you brave Padawan)"
+        if CHEESECAKE_TESTING
+          puts "WARNING: Hardcore and Cheesecake Modes activated. This situation is really slow. Please, avoid it."
+        end        
       end
       if USERS < 9
         USERS = 9
@@ -110,105 +118,115 @@ namespace :db do
       # = Ties
       available_actors.each do |a|
         actors = available_actors.dup - Array(a)
-        relations = a.relations
+        relations = a.relation_customs + Array.wrap(a.relation_reject)
         break if actors.size==0
         Forgery::Basic.number(:at_most => actors.size).times do
           actor = actors.delete_at((rand * actors.size).to_i)
           a.contact_to!(actor).relation_ids = Array(Forgery::Extensions::Array.new(relations).random.id)
         end
+        if CHEESECAKE_TESTING     
+          actor = Actor.first
+          puts a.name + " connecting with " + actor.name
+          a.contact_to!(actor).relation_ids = Array(Forgery::Extensions::Array.new(relations).random.id)
+        end
       end
 
       ties_end = Time.now
       puts '   -> ' +  (ties_end - ties_start).round(4).to_s + 's'
 
       # = Posts
-
       puts 'Post population'
-      posts_start = Time.now
-
-      SocialStream::Populate.power_law(Tie.all) do |t|
-        updated = Time.at(rand(Time.now.to_i))
-
-        author = t.sender
-        owner  = t.receiver
-        user_author = ( t.sender.subject_type == "User" ? t.sender : t.sender.user_author )
-
-        p = Post.create :text =>
-                      "This post should be for #{ t.relation.name } of #{ t.sender.name }.\n#{ Forgery::LoremIpsum.paragraph(:random => true) }",
-                        :created_at => Time.at(rand(updated.to_i)),
-                        :updated_at => updated,
-                        :author_id  => author.id,
-                        :owner_id   => owner.id,
-                        :user_author_id => user_author.id,
-                        :_relation_ids => Array(t.relation_id)
-
-        p.post_activity.update_attributes(:created_at => p.created_at,
-                                          :updated_at => p.updated_at)
+      unless CHEESECAKE_TESTING
+        posts_start = Time.now
+  
+        SocialStream::Populate.power_law(Tie.all) do |t|
+          updated = Time.at(rand(Time.now.to_i))
+  
+          author = t.sender
+          owner  = t.receiver
+          user_author = ( t.sender.subject_type == "User" ? t.sender : t.sender.user_author )
+  
+          p = Post.create :text =>
+                        "This post sActorhould be for #{ t.relation.name } of #{ t.sender.name }.\n#{ Forgery::LoremIpsum.paragraph(:random => true) }",
+                          :created_at => Time.at(rand(updated.to_i)),
+                          :updated_at => updated,
+                          :author_id  => author.id,
+                          :owner_id   => owner.id,
+                          :user_author_id => user_author.id,
+                          :_relation_ids => Array(t.relation_id)
+  
+          p.post_activity.update_attributes(:created_at => p.created_at,
+                                            :updated_at => p.updated_at)
+        end
+  
+        posts_end = Time.now
+        puts '   -> ' +  (posts_end - posts_start).round(4).to_s + 's'
+      else
+        puts '   -> Cheesecake Testing Mode. Avoiding Post Population.'        
       end
 
-      posts_end = Time.now
-      puts '   -> ' +  (posts_end - posts_start).round(4).to_s + 's'
-
+      # = Mailboxer      
       puts 'Mailboxer population'
-      mailboxer_start = Time.now
-
-      # = Mailboxer
-      available_actors = Actor.all
-
-      available_actors.each do |a|
-        actors = available_actors.dup - Array(a)
-
-        mult_recp = actors.uniq
-        if (demo = User.find_by_name('demo')) and !mult_recp.include? Actor.normalize(demo)
-          mult_recp << Actor.normalize(demo)
-        end
-        actor = mult_recp[(rand * mult_recp.size).to_i]
-        mult_recp.delete(actor)
-        mail = actor.send_message(mult_recp, "Hello all, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}", Forgery::LoremIpsum.words(10,:random => true))
-        actor = mult_recp[(rand * mult_recp.size).to_i]
-        mail = actor.reply_to_all(mail, "Well, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
-        actor = mult_recp[(rand * mult_recp.size).to_i]
-        mail = actor.reply_to_all(mail, "Ok, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
-        actor = mult_recp[(rand * mult_recp.size).to_i]
-        mail = actor.reply_to_all(mail, "Pretty well, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
-        actor = mult_recp[(rand * mult_recp.size).to_i]
-        actor.reply_to_all(mail, "Finally, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
-
-
-        if (demo = User.find_by_name('demo'))
-          next if Actor.normalize(demo)==Actor.normalize(a)
-          mail = a.send_message(demo, "Hello, #{demo.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}", Forgery::LoremIpsum.words(10,:random => true))
-          if rand > 0.5
-            mail = demo.reply_to_sender(mail, "Pretty well #{a.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+      unless CHEESECAKE_TESTING
+        mailboxer_start = Time.now
+        available_actors = Actor.all
+  
+        available_actors.each do |a|
+          actors = available_actors.dup - Array(a)
+  
+          mult_recp = actors.uniq
+          if (demo = User.find_by_name('demo')) and !mult_recp.include? Actor.normalize(demo)
+            mult_recp << Actor.normalize(demo)
+          end
+          actor = mult_recp[(rand * mult_recp.size).to_i]
+          mult_recp.delete(actor)
+          mail = actor.send_message(mult_recp, "Hello all, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}", Forgery::LoremIpsum.words(10,:random => true))
+          actor = mult_recp[(rand * mult_recp.size).to_i]
+          mail = actor.reply_to_all(mail, "Well, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+          actor = mult_recp[(rand * mult_recp.size).to_i]
+          mail = actor.reply_to_all(mail, "Ok, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+          actor = mult_recp[(rand * mult_recp.size).to_i]
+          mail = actor.reply_to_all(mail, "Pretty well, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+          actor = mult_recp[(rand * mult_recp.size).to_i]
+          actor.reply_to_all(mail, "Finally, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+  
+  
+          if (demo = User.find_by_name('demo'))
+            next if Actor.normalize(demo)==Actor.normalize(a)
+            mail = a.send_message(demo, "Hello, #{demo.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}", Forgery::LoremIpsum.words(10,:random => true))
             if rand > 0.5
-              a.reply_to_sender(mail, "Ok #{demo.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+              mail = demo.reply_to_sender(mail, "Pretty well #{a.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+              if rand > 0.5
+                a.reply_to_sender(mail, "Ok #{demo.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+              end
+            end
+            if rand > 0.75
+              mail.conversation.move_to_trash(demo)
             end
           end
-          if rand > 0.75
-            mail.conversation.move_to_trash(demo)
-          end
-        end
-
-        Forgery::Basic.number(:at_most => actors.size).times do
-          actor = actors.delete_at((rand * actors.size).to_i)
-          next if Actor.normalize(actor)==Actor.normalize(a)
-          mail = a.send_message(actor, "Hello, #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}", Forgery::LoremIpsum.words(10,:random => true))
-          if rand > 0.5
-            mail = actor.reply_to_sender(mail, "Pretty well #{a.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+  
+          Forgery::Basic.number(:at_most => actors.size).times do
+            actor = actors.delete_at((rand * actors.size).to_i)
+            next if Actor.normalize(actor)==Actor.normalize(a)
+            mail = a.send_message(actor, "Hello, #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}", Forgery::LoremIpsum.words(10,:random => true))
             if rand > 0.5
-              a.reply_to_sender(mail, "Ok #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+              mail = actor.reply_to_sender(mail, "Pretty well #{a.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+              if rand > 0.5
+                a.reply_to_sender(mail, "Ok #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+              end
+            end
+            if rand > 0.75
+              mail.conversation.move_to_trash(actor)
             end
-          end
-          if rand > 0.75
-            mail.conversation.move_to_trash(actor)
           end
         end
+  
+        mailboxer_end = Time.now
+        puts '   -> ' +  (mailboxer_end - mailboxer_start).round(4).to_s + 's'
+      else
+        puts '   -> Cheesecake Testing Mode. Avoiding Mailboxer Population.'        
       end
 
-      mailboxer_end = Time.now
-      puts '   -> ' +  (mailboxer_end - mailboxer_start).round(4).to_s + 's'
-
-
 
       puts 'Avatar population'
       avatar_start = Time.now

data/social_stream-base.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   # HTML Forms
   s.add_runtime_dependency('formtastic','~> 1.2.3')
   # Simple navigation for menu
-  s.add_runtime_dependency('simple-navigation')
+  s.add_runtime_dependency('simple-navigation', '~> 3.5.1')
   # Background jobs
   s.add_runtime_dependency('resque','~> 1.19.0')
   # Modernizr.js javascript library
@@ -53,6 +53,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('sass-rails', '~> 3.1.0')
   # Autolink text blocks
   s.add_runtime_dependency('rails_autolink', '~> 1.0.4')
+  # SocialCheesecake
+  s.add_runtime_dependency('social_cheesecake','~> 0.0.1')
 
   # Development gem dependencies
   #

data/spec/models/actor_spec.rb

@@ -48,4 +48,33 @@ describe Actor do
 
     Actor.find_by_id(a.id).should be_nil
   end
+
+  context "cheesecake" do
+    before do
+      @user = Factory(:user)
+    end
+
+    it "should build json" do
+      hash = {
+        :sectors => @user.relation_customs.map do |r|
+          { :name => r.name,
+            :subsectors => [ { :name => r.name, :actors => [] } ]
+          }
+        end
+      }
+
+      @user.cheesecake_json.should eq(hash.to_json)
+    end
+
+    context "with tie" do
+      before do
+        @tie =
+          Factory(:friend, :contact => Factory(:contact, :sender => @user.actor))
+      end
+
+      it "should render json" do
+        @user.cheesecake_json.should include(@tie.receiver.id.to_s)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.10.9
+  version: 0.10.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-16 00:00:00.000000000Z
+date: 2011-12-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &77731060 !ruby/object:Gem::Requirement
+  requirement: &76518980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *77731060
+  version_requirements: *76518980
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &77730810 !ruby/object:Gem::Requirement
+  requirement: &76518710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *77730810
+  version_requirements: *76518710
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &77730580 !ruby/object:Gem::Requirement
+  requirement: &76518460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *77730580
+  version_requirements: *76518460
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &77730350 !ruby/object:Gem::Requirement
+  requirement: &76518170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *77730350
+  version_requirements: *76518170
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &77730120 !ruby/object:Gem::Requirement
+  requirement: &76517910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *77730120
+  version_requirements: *76517910
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &77729890 !ruby/object:Gem::Requirement
+  requirement: &76517650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *77729890
+  version_requirements: *76517650
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &77729660 !ruby/object:Gem::Requirement
+  requirement: &76517360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *77729660
+  version_requirements: *76517360
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &77729430 !ruby/object:Gem::Requirement
+  requirement: &76517070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *77729430
+  version_requirements: *76517070
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &77729200 !ruby/object:Gem::Requirement
+  requirement: &76516780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *77729200
+  version_requirements: *76516780
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &77728970 !ruby/object:Gem::Requirement
+  requirement: &76516520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *77728970
+  version_requirements: *76516520
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &77762940 !ruby/object:Gem::Requirement
+  requirement: &76516260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *77762940
+  version_requirements: *76516260
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &77762710 !ruby/object:Gem::Requirement
+  requirement: &76515970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *77762710
+  version_requirements: *76515970
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &77762480 !ruby/object:Gem::Requirement
+  requirement: &76515690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *77762480
+  version_requirements: *76515690
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &77762250 !ruby/object:Gem::Requirement
+  requirement: &76515400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,21 +165,21 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *77762250
+  version_requirements: *76515400
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &77762060 !ruby/object:Gem::Requirement
+  requirement: &76515170 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *77762060
+  version_requirements: *76515170
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &77761790 !ruby/object:Gem::Requirement
+  requirement: &76514880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *77761790
+  version_requirements: *76514880
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &77761540 !ruby/object:Gem::Requirement
+  requirement: &76514590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *77761540
+  version_requirements: *76514590
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &77761310 !ruby/object:Gem::Requirement
+  requirement: &76514300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *77761310
+  version_requirements: *76514300
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &77761080 !ruby/object:Gem::Requirement
+  requirement: &76514030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *77761080
+  version_requirements: *76514030
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &77760850 !ruby/object:Gem::Requirement
+  requirement: &76513780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -231,10 +231,21 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *77760850
+  version_requirements: *76513780
+- !ruby/object:Gem::Dependency
+  name: social_cheesecake
+  requirement: &76513430 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *76513430
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &77760620 !ruby/object:Gem::Requirement
+  requirement: &76513180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -242,10 +253,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *77760620
+  version_requirements: *76513180
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &77760430 !ruby/object:Gem::Requirement
+  requirement: &76512980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -253,10 +264,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77760430
+  version_requirements: *76512980
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &77760190 !ruby/object:Gem::Requirement
+  requirement: &76512720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -264,10 +275,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77760190
+  version_requirements: *76512720
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &77759940 !ruby/object:Gem::Requirement
+  requirement: &76491040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -275,10 +286,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *77759940
+  version_requirements: *76491040
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &77759690 !ruby/object:Gem::Requirement
+  requirement: &76490790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -286,10 +297,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *77759690
+  version_requirements: *76490790
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &77759460 !ruby/object:Gem::Requirement
+  requirement: &76490560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -297,10 +308,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *77759460
+  version_requirements: *76490560
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &77759230 !ruby/object:Gem::Requirement
+  requirement: &76490330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -308,10 +319,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *77759230
+  version_requirements: *76490330
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &77759000 !ruby/object:Gem::Requirement
+  requirement: &76490100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,7 +330,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *77759000
+  version_requirements: *76490100
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -489,6 +500,7 @@ files:
 - app/assets/images/tipsy.gif
 - app/assets/javascripts/activities.js.erb
 - app/assets/javascripts/activities_security_chosen-modified.jquery.js
+- app/assets/javascripts/cheesecake.js
 - app/assets/javascripts/contacts.js
 - app/assets/javascripts/conversations.js
 - app/assets/javascripts/groups.js
@@ -511,6 +523,7 @@ files:
 - app/assets/stylesheets/_colors.scss
 - app/assets/stylesheets/activities.css.scss
 - app/assets/stylesheets/base.css.scss
+- app/assets/stylesheets/cheesecake.css.scss
 - app/assets/stylesheets/contacts.css.scss
 - app/assets/stylesheets/conversations.css
 - app/assets/stylesheets/footer.css.scss
@@ -550,6 +563,7 @@ files:
 - app/controllers/activities_controller.rb
 - app/controllers/api_controller.rb
 - app/controllers/authentications_controller.rb
+- app/controllers/cheesecake_controller.rb
 - app/controllers/comments_controller.rb
 - app/controllers/contacts_controller.rb
 - app/controllers/conversations_controller.rb
@@ -618,9 +632,12 @@ files:
 - app/views/activities/index.js.erb
 - app/views/activity_objects/_activity_object.html.erb
 - app/views/actors/_actor.html.erb
+- app/views/actors/_actor_cheesecake.html.erb
 - app/views/api/activity_atom_feed.atom.builder
 - app/views/avatars/index.html.erb
 - app/views/avatars/update.js.erb
+- app/views/cheesecake/_index.html.erb
+- app/views/cheesecake/index.html.erb
 - app/views/comments/_comment.html.erb
 - app/views/comments/_new.html.erb
 - app/views/comments/create.js.erb