social_stream-base 0.16.2 → 0.16.3

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

@@ -318,6 +318,7 @@
   text-align: center;
   font-size: 15px;
   font-weight: bold;
+  cursor: pointer;
 }
 #sector_form .add_subsector:hover {
   background: $auxiliar-bright-color;

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

@@ -73,6 +73,9 @@ $(function(){
       $("#sector_editor").data("hide")();
     }
   };
+  cheese.onSubsectorAdded = function(subsector){
+    $("#sector_editor").data("prepare")(subsector.getCheesecake(),subsector);
+  };
   $("#contacts_filter_input").keyup(function(){
     cheese.searchEngine.filter($("#contacts_filter_input").val());
     //TODO: Make users unfiltered visible again

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

@@ -119,18 +119,20 @@
     });
   });
   $("#sector_editor").data("hide", function(callback){
-    $("#sector_editor").stop().animate({width: 0},500, function(){
-      $(".add_subsector_clone").remove();
-    });
+    $("#sector_editor").stop().animate({width: 0},500);
     $("#contacts_explorer").stop().animate({width: 300},500, function(){
       if(callback) callback();
     });
   });
-  $("#sector_editor").data("prepare", function(cheese){
+  $("#sector_editor").data("prepare", function(cheese, newSubsector){
     var sector = cheese.getFocusedSector();
-    var subsector_count = sector.subsectors.length;
-    var original_add_sector_row = $("#original_add_subsector_row");
+    var newIndex = -1;
+    if(newSubsector){
+      newIndex = newSubsector.getIndex();
+    }
     if(sector){
+      var subsector_count = sector.subsectors.length;
+      var maxReached = (subsector_count==4);
       $("#form_sector_name").val(sector.label);
       $("#edited_sector_name").html(sector.label);
       $("#form_sector_name").off("keyup");
@@ -138,44 +140,89 @@
         $("#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).find(".permissions_field .permission").each(function(){
-            var permission_field = $(this);
-            var update_state = function(){
-              var label_class = permission_field.attr("id").replace("form_", "edited_");
-              if(permission_field.is(":checked")){
-                $("." + label_class).removeClass("negative").addClass("positive");
-                $("." + label_class).find(".negative_message").hide();
-                $("." + label_class).find(".positive_message").show();
-              }else{
-                $("." + label_class).removeClass("positive").addClass("negative");
-                $("." + label_class).find(".positive_message").hide();
-                $("." + label_class).find(".negative_message").show();
+      if(maxReached){
+        $(".add_subsector").each(function(){
+          if($(this).is(':visible')){
+            $(this).slideToggle();
+          }
+        })
+      }
+      for(var i = 3; i >= 0; i--){
+        (function(){
+          var subsector = sector.subsectors[i];
+          var index = i;
+          var recentlyCreated = (newIndex != -1)&&(newIndex == index);
+          if(subsector){
+            if(!$("#subsector_" + i).is(':visible')){
+              $("#subsector_" + i).slideToggle();
+            }
+            if(recentlyCreated || ((newIndex == -1)&&(i == 0))){
+              if(!$("#subsector_" + i).find(".content").is(':visible')){
+                $("#subsector_" + i).find(".content").slideToggle();
+              }
+            }else{
+              if($("#subsector_" + i).find(".content").is(':visible')){
+                $("#subsector_" + i).find(".content").slideToggle();
               }
             }
-            update_state();
-            permission_field.on("change",update_state);
-          });
-          $("#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);
+            if(!maxReached){
+              if(sector.subsectors[i+1]==undefined){
+                $("#add_subsector_" + (i+1)).off("click");
+                if(!$("#add_subsector_" + (i+1)).is(':visible')){
+                  $("#add_subsector_" + (i+1)).slideToggle();
+                }
+                $("#add_subsector_" + (i+1)).on("click",function(){
+                  cheese.addNewSubsector(index+1);
+                  $(".subsector .content").each(function(){
+                    if($(this).is(':visible')){
+                      $(this).slideToggle();
+                    }
+                  });
+                });
+              }
+              $("#add_subsector_" + i).off("click");
+              if(!$("#add_subsector_" + i).is(':visible')){
+                $("#add_subsector_" + i).slideToggle();
+              }
+              $("#add_subsector_" + i).on("click",function(){
+                 cheese.addNewSubsector(index);
+                 $(".subsector .content").each(function(){
+                    if($(this).is(':visible')){
+                      $(this).slideToggle();
+                    }
+                  });
+              });
+            }
+            $("#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).find(".permissions_field .permission").each(function(){
+              var permission_field = $(this);
+              var update_state = function(){
+                var label_class = permission_field.attr("id").replace("form_", "edited_");
+                if(permission_field.is(":checked")){
+                  $("." + label_class).removeClass("negative").addClass("positive");
+                  $("." + label_class).find(".negative_message").hide();
+                  $("." + label_class).find(".positive_message").show();
+                }else{
+                  $("." + label_class).removeClass("positive").addClass("negative");
+                  $("." + label_class).find(".positive_message").hide();
+                  $("." + label_class).find(".negative_message").show();
+                }
+              }
+              update_state();
+              permission_field.on("change",update_state);
+            });
+          }else{
+            $("#subsector_" + i).hide();
+            $("#add_subsector_" + i).off("click");
+            $("#add_subsector_" + i).hide();
           }
-          $("#subsector_" + i).hide();
-        }
+        })();
       }
     }
   });

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

@@ -20,13 +20,8 @@
 					<div id="edited_sector_color_in"></div>
 				</div>
 			</div>
-		</div>
-		<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>		
+		<% 3.downto(0) do |i|%>
 		<div class="form_row less_padding">
 			<div class="subsector" id="subsector_<%= i %>">
 				<div class="title">
@@ -48,17 +43,17 @@
 					</div>
 					<div class="form_row less_padding">
 						<div class="form_field permissions_field">
-							<% default_permissions.each_with_index do |p, i| %>
+							<% default_permissions.each_with_index do |p, j| %>
 								<div contain=<%= dom_id p %> class="checkboxPermissionOptionLeft">
-									<input id="form_subsector_<%= i %>_<%= dom_id p %>" class="permission <%= dom_id p %>" type="checkbox"/>
-									<label for="form_subsector_<%= i %>_<%= dom_id p %>"><%= p.description(:brief, :relation => "%RELATION_NAME%", :subject => current_subject) %></label>
+									<input id="form_subsector_<%= j %>_<%= dom_id p %>" class="permission <%= dom_id p %>" type="checkbox"/>
+									<label for="form_subsector_<%= j %>_<%= dom_id p %>"><%= p.description(:brief, :relation => "%RELATION_NAME%", :subject => current_subject) %></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 %> positive edited_subsector_<%= i %>_<%= dom_id p %>">
+						  <% default_permissions.each_with_index do |p, j| %>
+                  <div class="permission <%= dom_id p %> positive edited_subsector_<%= j %>_<%= dom_id p %>">
                     <div class="positive_message">
                       <%= p.description(:detailed, :relation => "%RELATION_NAME%", :subject => current_subject, :state => "positive") %>
                     </div>
@@ -72,6 +67,11 @@
 				</div>
 			</div>
 		</div>
+		<div class="form_row less_padding">
+      <div class="add_subsector" id="add_subsector_<%= i %>">
+        +
+      </div>
+    </div>
 		<% end %>
 	</div>
 </form>

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.16.2".freeze
+    VERSION = "0.16.3".freeze
   end
 end

data/lib/social_stream/test_helpers/controllers.rb

@@ -33,9 +33,7 @@ module SocialStream
       end
 
       def model_assigned_to contact, relation_ids
-        model_attributes[:author_id] = contact.sender.id
         model_attributes[:owner_id]  = contact.receiver.id
-        model_attributes[:user_author_id] = contact.sender.id
         model_attributes[:_relation_ids] = Array(relation_ids).map(&:id)
       end
 
@@ -67,6 +65,25 @@ module SocialStream
         end
       end
 
+      shared_examples_for "Allow Reading" do
+        it "should read" do
+          get :show, :id => @current_model.to_param
+
+          response.should be_success
+        end
+      end
+
+      shared_examples_for "Deny Reading" do
+        it "should not read" do
+          begin
+            get :show, :id => @current_model.to_param
+
+            assert false
+          rescue CanCan::AccessDenied
+          end
+        end
+      end
+
       shared_examples_for "Allow Updating" do
         it "should update" do
           put :update, updating_attributes

data/lib/tasks/db/populate.rake

@@ -7,73 +7,45 @@ namespace :db do
     desc "Reload populate data"
     task :reload => [ 'db:reset', :create ]
 
+    desc "Reload populate data for Cheesecake testing"
+    task :cheesecake => [ 'db:reset', :read_environment, :create_users, :create_groups, :create_cheesecake_ties, :create_avatars ]
+
     desc "Create populate data"
-    task :create => :environment do
+    task :create => [ :read_environment, :create_users, :create_groups, :create_ties, :create_posts, :create_messages, :create_avatars ]
+
+    desc "INTERNAL: read needed environment data and setup variables"
+    task :read_environment => :environment do
       require 'forgery'
 
-      LOGOS_PATH = File.join(Rails.root, 'lib', 'logos')
-      LOGOS_TOTAL = (ENV["LOGOS_TOTAL"] || 10).to_i
-      USERS = (ENV["USERS"] || 9).to_i
-      GROUPS = (ENV["GROUPS"] || 10).to_i
-      CHEESECAKE = (ENV["CHEESECAKE"].present? || false)
-      if CHEESECAKE
-        puts "Cheesecake Testing mode: ON"
-      end
+      @LOGOS_PATH = File.join(Rails.root, 'lib', 'logos')
+      @LOGOS_TOTAL = (ENV["LOGOS_TOTAL"] || 10).to_i
+      @USERS = (ENV["USERS"] || 9).to_i
+      @GROUPS = (ENV["GROUPS"] || 10).to_i
       if ENV["HARDCORE"].present?
-        USERS = 999
-        GROUPS = 1000    
+        @USERS = 999
+        @GROUPS = 1000
         puts "Hardcore mode: ON (May the Force be with you brave Padawan)"
-        if CHEESECAKE
-          puts "WARNING: Hardcore and Cheesecake Modes activated. This situation is really slow. Please, avoid it."
-        end        
       end
-      if USERS < 9
-        USERS = 9
+      if @USERS < 9
+        @USERS = 9
         puts "WARNING: There should be at least 10 users (Demo user and 9 more). Changing USERS to 9."
       end
-      if GROUPS < 10
-        GROUPS = 10
+      if @GROUPS < 10
+        @GROUPS = 10
         puts "WARNING: There should be at least 10 groups. Changing GROUPS to 10."
       end
 
       Mailboxer.setup do |config|
         config.uses_emails = false
       end
+    end
 
-      def set_logos(klass)
-        klass.all.each do |i|
-          if LOGOS_TOTAL
-            logo = Dir[File.join(LOGOS_PATH, klass.to_s.tableize, "#{ rand(LOGOS_TOTAL) + 1 }.*")].first
-            avatar = Dir[File.join(LOGOS_PATH, klass.to_s.tableize, "#{ rand(LOGOS_TOTAL) + 1 }.*")].first
-          else
-            logo = Dir[File.join(LOGOS_PATH, klass.to_s.tableize, "#{ i.id }.*")].first
-            avatar = Dir[File.join(LOGOS_PATH, klass.to_s.tableize, "#{ i.id }.*")].first            
-          end
-
-          if avatar.present? && File.exists?(avatar)
-            Avatar.copy_to_temp_file(avatar)
-            dimensions = Avatar.get_image_dimensions(avatar)
-            l = Avatar.new(:actor => i.actor,:logo => File.open(avatar), :name => File.basename(avatar), :crop_x => 0, :crop_y => 0, :crop_w => dimensions[:width], :crop_h => dimensions[:height] )
-            l.active = true
-            l.save!
-          end
-        end
-      end
-
-      def set_tags(klass)
-        klass.all.each do |el|
-          el.tag_list = Forgery::LoremIpsum.words(1,:random => true)+", "+
-                        Forgery::LoremIpsum.words(1,:random => true)+", "+
-                        Forgery::LoremIpsum.words(1,:random => true)
-          el.save!
-        end
-      end
-
-      puts 'User population (Demo and ' + USERS.to_s + ' users more)'
+    # USERS
+    desc "Create users"
+    task :create_users => :read_environment do
+      puts 'User population (Demo and ' + @USERS.to_s + ' users more)'
       users_start = Time.now
 
-      # = Users
-
       # Create demo user if not present
       if User.find_by_name('demo').blank?
         User.create! :name => 'Demo',
@@ -82,27 +54,39 @@ namespace :db do
                      :password_confirmation => 'demonstration'
       end
 
-      require 'forgery'
-
-      USERS.times do
+      @USERS.times do
         User.create! :name => Forgery::Name.full_name,
                      :email => Forgery::Internet.email_address,
                      :password => 'demonstration',
                      :password_confirmation => 'demonstration'
       end
 
+      # Reload actors to include new users
+      @available_actors = Actor.all
 
       users_end = Time.now
       puts '   -> ' + (users_end - users_start).round(4).to_s + 's'
+    end
+
 
-      puts 'Groups population (' + GROUPS.to_s + ' groups)'
+    # GROUPS
+    desc "Create groups"
+    task :create_groups => :read_environment do
+      puts 'Groups population (' + @GROUPS.to_s + ' groups)'
       groups_start = Time.now
 
-      # = Groups
-      available_actors = Actor.all
+      def set_tags(klass)
+        klass.all.each do |el|
+          el.tag_list = Forgery::LoremIpsum.words(1,:random => true)+", "+
+                        Forgery::LoremIpsum.words(1,:random => true)+", "+
+                        Forgery::LoremIpsum.words(1,:random => true)
+          el.save!
+        end
+      end
+
 
-      GROUPS.times do
-        founder = available_actors[rand(available_actors.size)]
+      @GROUPS.times do
+        founder = @available_actors[rand(@available_actors.size)]
 
         Group.create! :name  => Forgery::Name.company_name,
                       :email => Forgery::Internet.email_address,
@@ -112,147 +96,188 @@ namespace :db do
 
       set_tags(Group)
 
+      # Reload actors to include groups
+      @available_actors = Actor.all
+
       groups_end = Time.now
       puts '   -> ' +  (groups_end - groups_start).round(4).to_s + 's'
+    end
 
 
+    # TIES
+    desc "Create ties"
+    task :create_ties => :read_environment do
       puts 'Ties population'
       ties_start = Time.now
 
-      # Reload actors to include groups
-      available_actors = Actor.all
+      @available_actors.each do |a|
+        actors = @available_actors.dup - Array(a)
+        relations = a.relation_customs + Array.wrap(Relation::Reject.instance)
+        break if actors.size==0
+        Forgery::Basic.number(:at_most => actors.size).times do
+          actor = actors.delete_at((rand * actors.size).to_i)
+          contact = a.contact_to!(actor)
+          contact.user_author = a.user_author if a.subject_type != "User"
+          contact.relation_ids = Array(Forgery::Extensions::Array.new(relations).random.id) unless a==actor
+        end
+      end
+
+      ties_end = Time.now
+      puts '   -> ' +  (ties_end - ties_start).round(4).to_s + 's'
+    end
 
-      # = Ties
-      available_actors.each do |a|
-        actors = available_actors.dup - Array(a)
+
+    # TIES, special version for cheesecake testing
+    desc "Create cheesecake ties"
+    task :create_cheesecake_ties => :read_environment do
+      puts 'Ties population (Cheesecake version)'
+      ties_start = Time.now
+
+      @available_actors.each do |a|
+        actors = @available_actors.dup - Array(a)
         relations = a.relation_customs + Array.wrap(Relation::Reject.instance)
-        break if actors.size==0        
-        if CHEESECAKE     
-          actor = Actor.first
-          unless a==actor
-            puts a.name + " connecting with " + actor.name
-            # DRY! :-S
-            contact = a.contact_to!(actor)
-            contact.user_author = a.user_author if a.subject_type != "User"
-            contact.relation_ids = Array(Forgery::Extensions::Array.new(a.relation_customs).random.id)
-
-            contact = actor.contact_to!(a)
-            contact.user_author = actor.user_author if actor.subject_type != "User"
-            contact.relation_ids = Array(Forgery::Extensions::Array.new(actor.relation_customs).random.id)
-          end
-        else
-          Forgery::Basic.number(:at_most => actors.size).times do
-            actor = actors.delete_at((rand * actors.size).to_i)          
-            contact = a.contact_to!(actor)
-            contact.user_author = a.user_author if a.subject_type != "User"
-            contact.relation_ids = Array(Forgery::Extensions::Array.new(relations).random.id) unless a==actor
-          end
+        break if actors.size==0
+        actor = Actor.first
+        unless a==actor
+          puts a.name + " connecting with " + actor.name
+          # DRY! :-S
+          contact = a.contact_to!(actor)
+          contact.user_author = a.user_author if a.subject_type != "User"
+          contact.relation_ids = Array(Forgery::Extensions::Array.new(a.relation_customs).random.id)
+
+          contact = actor.contact_to!(a)
+          contact.user_author = actor.user_author if actor.subject_type != "User"
+          contact.relation_ids = Array(Forgery::Extensions::Array.new(actor.relation_customs).random.id)
         end
       end
 
       ties_end = Time.now
       puts '   -> ' +  (ties_end - ties_start).round(4).to_s + 's'
+    end
 
-      # = Posts
+
+    # POSTS
+    desc "Create posts"
+    task :create_posts => :read_environment do
       puts 'Post population'
-      unless CHEESECAKE
-        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.'        
+      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
 
-      # = Mailboxer      
+      posts_end = Time.now
+      puts '   -> ' +  (posts_end - posts_start).round(4).to_s + 's'
+    end
+
+
+    # MESSAGES
+    desc "Create messages using mailboxer"
+    task :create_messages => :read_environment do
       puts 'Mailboxer population'
-      unless CHEESECAKE
-        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))
+      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
+            mail = demo.reply_to_sender(mail, "Pretty well #{a.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
             if rand > 0.5
-              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)
+              a.reply_to_sender(mail, "Ok #{demo.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
             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.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)}")
             if rand > 0.5
-              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)
+              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
-  
-        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'
+
+    end
+
+
+    # AVATARS
+    desc "Create avatars"
+    task :create_avatars => :read_environment do
+      def set_logos(klass)
+        klass.all.each do |i|
+          if @LOGOS_TOTAL
+            logo = Dir[File.join(@LOGOS_PATH, klass.to_s.tableize, "#{ rand(@LOGOS_TOTAL) + 1 }.*")].first
+            avatar = Dir[File.join(@LOGOS_PATH, klass.to_s.tableize, "#{ rand(@LOGOS_TOTAL) + 1 }.*")].first
+          else
+            logo = Dir[File.join(@LOGOS_PATH, klass.to_s.tableize, "#{ i.id }.*")].first
+            avatar = Dir[File.join(@LOGOS_PATH, klass.to_s.tableize, "#{ i.id }.*")].first
+          end
+
+          if avatar.present? && File.exists?(avatar)
+            Avatar.copy_to_temp_file(avatar)
+            dimensions = Avatar.get_image_dimensions(avatar)
+            l = Avatar.new(:actor => i.actor,:logo => File.open(avatar), :name => File.basename(avatar), :crop_x => 0, :crop_y => 0, :crop_w => dimensions[:width], :crop_h => dimensions[:height] )
+            l.active = true
+            l.save!
+          end
+        end
+      end
 
       puts 'Avatar population'
       avatar_start = Time.now
       SocialStream.subjects.each {|a| set_logos(Kernel.const_get(a.to_s.classify)) }
       avatar_end = Time.now
       puts '   -> ' +  (avatar_end - avatar_start).round(4).to_s + 's'
-
     end
   end
 end

data/social_stream-base.gemspec

@@ -58,7 +58,7 @@ Gem::Specification.new do |s|
   # Autolink text blocks
   s.add_runtime_dependency('rails_autolink', '~> 1.0.4')
   # SocialCheesecake
-  s.add_runtime_dependency('social_cheesecake','~> 0.3.0')
+  s.add_runtime_dependency('social_cheesecake','~> 0.4.0')
   # I18n-js
   s.add_runtime_dependency('i18n-js','~>2.1.2')
 

data/spec/controllers/posts_controller_spec.rb

@@ -25,6 +25,7 @@ describe PostsController do
         end
 
         it_should_behave_like "Allow Creating"
+        it_should_behave_like "Allow Reading"
         it_should_behave_like "Allow Destroying"
 
         it "should destroy with js" do
@@ -49,6 +50,7 @@ describe PostsController do
         end
 
         it_should_behave_like "Allow Creating"
+        it_should_behave_like "Allow Reading"
         it_should_behave_like "Allow Destroying"
       end
 
@@ -63,6 +65,7 @@ describe PostsController do
         end
 
         it_should_behave_like "Allow Creating"
+        it_should_behave_like "Allow Reading"
         it_should_behave_like "Allow Destroying"
       end
     end
@@ -72,9 +75,13 @@ describe PostsController do
         friend = Factory(:friend, :contact => Factory(:contact, :receiver => @user.actor)).sender
 
         model_assigned_to @user.contact_to!(friend), friend.relation_custom('friend')
+        @current_model = Factory(:post, :author_id => @user.actor_id,
+                                        :owner_id  => friend.id,
+                                        :user_author_id => @user.actor_id)
       end
 
       it_should_behave_like "Allow Creating"
+      it_should_behave_like "Allow Reading"
     end
 
     describe "post to acquaintance" do
@@ -87,6 +94,14 @@ describe PostsController do
       it_should_behave_like "Deny Creating"
     end
 
+    describe "post from other user" do
+      before do
+        @current_model = Factory(:post)
+      end
+
+      it_should_behave_like "Deny Reading"
+    end
+
     describe "posts represented group" do
       before do
         @group = Factory(:member, :contact => Factory(:group_contact, :receiver => @user.actor)).sender_subject
@@ -105,6 +120,7 @@ describe PostsController do
         end
 
         it_should_behave_like "Allow Creating"
+        it_should_behave_like "Allow Reading"
         it_should_behave_like "Allow Destroying"
       end
 
@@ -125,6 +141,7 @@ describe PostsController do
           end
 
           it_should_behave_like "Allow Creating"
+          it_should_behave_like "Allow Reading"
           it_should_behave_like "Allow Destroying"
         end
 
@@ -140,6 +157,7 @@ describe PostsController do
           end
 
           it_should_behave_like "Allow Creating"
+          it_should_behave_like "Allow Reading"
           it_should_behave_like "Allow Destroying"
         end
 
@@ -155,11 +173,11 @@ describe PostsController do
           end
 
           it_should_behave_like "Allow Creating"
+          it_should_behave_like "Allow Reading"
           it_should_behave_like "Allow Destroying"
         end
       end
     end
-
   end
 
   context "creating post in group's wall" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000Z
+date: 2012-02-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &81495330 !ruby/object:Gem::Requirement
+  requirement: &86562090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *81495330
+  version_requirements: *86562090
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &81494920 !ruby/object:Gem::Requirement
+  requirement: &86561710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *81494920
+  version_requirements: *86561710
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &81494510 !ruby/object:Gem::Requirement
+  requirement: &86514950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *81494510
+  version_requirements: *86514950
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &81494270 !ruby/object:Gem::Requirement
+  requirement: &86514700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *81494270
+  version_requirements: *86514700
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &81494010 !ruby/object:Gem::Requirement
+  requirement: &86514440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *81494010
+  version_requirements: *86514440
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &81493640 !ruby/object:Gem::Requirement
+  requirement: &86514200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *81493640
+  version_requirements: *86514200
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &81486780 !ruby/object:Gem::Requirement
+  requirement: &86513870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *81486780
+  version_requirements: *86513870
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &81486530 !ruby/object:Gem::Requirement
+  requirement: &86513640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *81486530
+  version_requirements: *86513640
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &81486210 !ruby/object:Gem::Requirement
+  requirement: &86513400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *81486210
+  version_requirements: *86513400
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &81485880 !ruby/object:Gem::Requirement
+  requirement: &86513150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *81485880
+  version_requirements: *86513150
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &81485550 !ruby/object:Gem::Requirement
+  requirement: &86512910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *81485550
+  version_requirements: *86512910
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &81485240 !ruby/object:Gem::Requirement
+  requirement: &86512660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *81485240
+  version_requirements: *86512660
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &81485000 !ruby/object:Gem::Requirement
+  requirement: &86512430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *81485000
+  version_requirements: *86512430
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &81484680 !ruby/object:Gem::Requirement
+  requirement: &86512200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *81484680
+  version_requirements: *86512200
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &81484350 !ruby/object:Gem::Requirement
+  requirement: &86511970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *81484350
+  version_requirements: *86511970
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &81483950 !ruby/object:Gem::Requirement
+  requirement: &86511730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *81483950
+  version_requirements: *86511730
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &81483600 !ruby/object:Gem::Requirement
+  requirement: &86511500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *81483600
+  version_requirements: *86511500
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &81483120 !ruby/object:Gem::Requirement
+  requirement: &86511260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *81483120
+  version_requirements: *86511260
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &81482650 !ruby/object:Gem::Requirement
+  requirement: &86511010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *81482650
+  version_requirements: *86511010
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &81482050 !ruby/object:Gem::Requirement
+  requirement: &86510720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -231,10 +231,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *81482050
+  version_requirements: *86510720
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &81481710 !ruby/object:Gem::Requirement
+  requirement: &86510430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -242,10 +242,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *81481710
+  version_requirements: *86510430
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &81481330 !ruby/object:Gem::Requirement
+  requirement: &86510070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,21 +253,21 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *81481330
+  version_requirements: *86510070
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &81480840 !ruby/object:Gem::Requirement
+  requirement: &86509750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *81480840
+  version_requirements: *86509750
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &81480340 !ruby/object:Gem::Requirement
+  requirement: &86509470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -275,10 +275,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *81480340
+  version_requirements: *86509470
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &81480000 !ruby/object:Gem::Requirement
+  requirement: &86509110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -286,10 +286,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *81480000
+  version_requirements: *86509110
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &81479690 !ruby/object:Gem::Requirement
+  requirement: &86508580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -297,10 +297,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81479690
+  version_requirements: *86508580
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &81479310 !ruby/object:Gem::Requirement
+  requirement: &86508210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -308,10 +308,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81479310
+  version_requirements: *86508210
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &81478900 !ruby/object:Gem::Requirement
+  requirement: &86507670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +319,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *81478900
+  version_requirements: *86507670
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &81478590 !ruby/object:Gem::Requirement
+  requirement: &86507130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,10 +330,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *81478590
+  version_requirements: *86507130
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &81478360 !ruby/object:Gem::Requirement
+  requirement: &86314900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -341,10 +341,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *81478360
+  version_requirements: *86314900
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &81478110 !ruby/object:Gem::Requirement
+  requirement: &86314570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -352,10 +352,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *81478110
+  version_requirements: *86314570
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &81477870 !ruby/object:Gem::Requirement
+  requirement: &86314210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -363,7 +363,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *81477870
+  version_requirements: *86314210
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.