social_stream 1.1.12 → 2.0.0.beta1

data/base/lib/social_stream/base/engine.rb

@@ -44,33 +44,9 @@ module SocialStream
         end
       end
 
-      initializer "social_stream-base.views.settings" do
-        SocialStream::Views::Settings.module_eval do
-          include SocialStream::Views::Settings::Base
-        end
-      end
-
-      initializer "social_stream-base.views.sidebar" do
-        SocialStream::Views::Sidebar.module_eval do
-          include SocialStream::Views::Sidebar::Base
-        end
-      end
-
-      initializer "social_stream-base.views.toolbar" do
-        SocialStream::Views::Toolbar.module_eval do
-          include SocialStream::Views::Toolbar::Base
-        end
-      end
-
       initializer "social_stream-base.avatars_for_rails" do
         AvatarsForRails.setup do |config|
-          config.avatarable_model = :actor
-          config.current_avatarable_object = :current_actor
-          config.avatarable_filters = [:authenticate_user!]
-          config.avatarable_styles = { :representation => "20x20>",
-                                       :contact        => "30x30>",
-                                       :actor          => '35x35>',
-                                       :profile        => '119x119'}
+          config.controller_avatarable = :current_actor
         end
       end
 
@@ -82,10 +58,6 @@ module SocialStream
 
       config.to_prepare do
         ApplicationController.rescue_handlers += [["CanCan::AccessDenied", :rescue_from_access_denied]]
-
-        # Load Relation::Public, so it is registered as descendant of Relation::Single
-        # and used in ActivityObject#allowed_relations
-        ::Relation::Public
       end
     end
   end

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "1.1.11".freeze
+    VERSION = "2.0.0.beta1".freeze
   end
 end

data/base/lib/social_stream/controllers/helpers.rb

@@ -5,8 +5,8 @@ module SocialStream
       extend ActiveSupport::Concern
 
       included do
-        helper_method :current_subject,
-                      :profile_subject,
+        helper_method :current_subject, :current_actor,
+                      :profile_subject, :profile_subject?,
                       :profile_or_current_subject,
                       :profile_subject_is_current?
       end
@@ -38,7 +38,7 @@ module SocialStream
       end
         
       def current_actor
-        current_subject.actor
+        current_subject.try(:actor)
       end
 
       # Returns the {SocialStream::Models::Subject subject} that is in the path, or

data/base/lib/social_stream/controllers/mark_notifications_read.rb

@@ -12,7 +12,7 @@ module SocialStream
       def mark_notifications_read
         return if params[:notification_id].blank? or !user_signed_in?
         n = Notification.find(params[:notification_id])
-        current_subject.read n
+        current_subject.mark_as_read n
       end
     end
   end

data/base/lib/social_stream/controllers/objects.rb

@@ -1,6 +1,19 @@
 module SocialStream
   module Controllers
     module Objects
+      COMMON_PARAMS = [
+        :title,
+        :description,
+        :created_at,
+        :updated_at,
+        :author_id,
+        :owner_id,
+        :user_author_id,
+        :_activity_parent_id,
+        :relation_ids,
+        :tag_list
+      ]
+
       extend ActiveSupport::Concern
 
       included do
@@ -22,16 +35,6 @@ module SocialStream
 
       # Methods that should be included after the included block
       module UpperInstanceMethods
-        def allowed_params
-          [] # This should be overriden in controllers to allow extra params
-        end
-      
-        def whitelisted_params
-          return {} if request.present? and request.get?
-          all_allowed_params = allowed_params + [ :created_at, :updated_at, :title, :description, :author_id, :owner_id, :user_author_id, :_activity_parent_id, :relation_ids, :tag_list ]
-          params.require(self.class.model_class.to_s.underscore.to_sym).permit( *all_allowed_params )
-        end
-
         def search
           collection_variable_set self.class.model_class.search(params[:q], search_options)
 
@@ -43,6 +46,14 @@ module SocialStream
 
           destroy!
         end
+        
+        protected
+
+        def whitelisted_params
+          return {} if request.present? and request.get?
+
+          params.require(self.class.model_class.to_s.underscore.to_sym).permit( *all_allowed_params )
+        end
 
         private
 
@@ -52,29 +63,9 @@ module SocialStream
         end
 
         def build_collection
-          collection =
-            self.class.model_class # @posts = Post
-
-          # /users/demo/posts
-          if profile_subject?
-            # get posts posted to demo's wall
-            collection = collection.owned_by(profile_subject)
-
-            # if current_subject != demo, auth filter results
-            unless profile_subject_is_current?
-              collection = collection.shared_with(current_subject)
-            end
-          else
-            # auth filter results
-            collection = collection.shared_with(current_subject)
-
-            # if logged in, show the posts from the people following
-            if user_signed_in?
-              collection = collection.followed_by(current_subject)
-            end
-          end
-
-          collection = collection.page(params[:page])
+          self.class.model_class. # @posts = Post
+            collection(profile_subject, current_subject).
+            page(params[:page])
         end
       end
 
@@ -98,6 +89,23 @@ module SocialStream
         instance_variable_set "@#{ controller_name }", value
       end
 
+      def activity_object_property_params
+        SocialStream.objects.map do |o|
+          "add_holder_#{ o }_id".to_sym
+        end
+      end
+
+      def allowed_params
+        [] # This should be overriden in controllers to allow extra params
+      end
+
+      def all_allowed_params
+        COMMON_PARAMS  |
+          activity_object_property_params |
+          allowed_params
+      end
+
+
       private
       
       def search_options

data/base/lib/social_stream/devise/controllers/user_sign_in.rb

@@ -0,0 +1,36 @@
+module SocialStream
+  module Devise
+    module Controllers
+      module UserSignIn
+        extend ActiveSupport::Concern
+
+        included do
+          helpers = %w(resource resource_name resource_class devise_mapping sign_in_controller? )
+
+          hide_action *helpers
+          helper_method *helpers
+        end
+
+        def resource
+          @user
+        end
+
+        def resource_name
+          :user
+        end
+
+        def resource_class
+          User
+        end
+
+        def devise_mapping
+          ::Devise.mappings[:user]
+        end
+
+        def sign_in_controller?
+          true
+        end
+      end
+    end
+  end
+end

data/base/lib/social_stream/models/object.rb

@@ -43,6 +43,11 @@ module SocialStream
             merge(ActivityObject.shared_with(subject))
         }
 
+        scope :collection, lambda { | profile_subject = nil, current_subject = nil|
+          joins(:activity_object).
+            merge(ActivityObject.collection(profile_subject, current_subject))
+        }
+
         scope :followed_by, lambda { |subject|
           joins(:activity_object).
             merge(ActivityObject.followed_by(subject))

data/base/lib/social_stream/models/subject.rb

@@ -64,6 +64,10 @@ module SocialStream
             __send__ m
           end
         }
+
+        scope :recent, -> {
+          order('groups.updated_at DESC')
+        }
   
         define_index do
           indexes actor.name, :sortable => true
@@ -85,6 +89,13 @@ module SocialStream
           find_by_slug(perm) ||
             raise(ActiveRecord::RecordNotFound)
         end 
+
+        # The types of actors that appear in the contacts/index
+        #
+        # You can customize this in each class
+        def contact_index_models
+          SocialStream.contact_index_models
+        end
       end
 
       def to_param

data/base/lib/social_stream/population/activity_object.rb

@@ -5,8 +5,8 @@ module SocialStream
         puts "#{ klass.name } population"
         start_time = Time.now
 
-        50.times do
-          author = Actor.all[rand(Actor.all.size)]
+        10.times do
+          author = ::Actor.all.sample
           owner = author
           relation_ids = [Relation::Public.instance.id]
 
@@ -14,7 +14,8 @@ module SocialStream
         end
 
         if SocialStream.relation_model == :custom
-          PowerLaw.new(Tie.allowing('create', 'activity').all) do |t|
+          ties = Tie.allowing('create', 'activity').all
+          PowerLaw.new ties.sample(ties.count / 3) do |t|
 
             author = t.receiver
             owner  = t.sender

data/base/lib/social_stream/population/actor.rb

@@ -0,0 +1,12 @@
+module SocialStream
+  module Population
+    module Actor
+      class << self
+        def demo
+          @demo ||=
+            ::Actor.where(slug: "demo").first
+        end
+      end
+    end
+  end
+end

data/base/lib/social_stream/population/timestamps.rb

@@ -1,11 +1,17 @@
 module SocialStream
   module Population
     class Timestamps
+      SCOPE = 1.month
+
       attr_reader :created, :updated
 
       def initialize
-        @updated = Time.at(rand(Time.now.to_i))
-        @created = Time.at(rand(@updated.to_i))
+        created = rand(SCOPE)
+        update = [ true, false ].sample
+        updated = update ? rand(created) : created
+
+        @created = Time.at(Time.now.to_i - created)
+        @updated = Time.at(Time.now.to_i - updated)
       end
     end
   end

data/base/lib/social_stream/search.rb

@@ -1,5 +1,8 @@
 module SocialStream
   module Search
+    #TODO: sync with ThinkingSphinx min_infix_len and min_prefix_len options
+    MIN_QUERY = 3
+
     class << self
       def keys(search_type)
         case search_type
@@ -10,6 +13,12 @@ module SocialStream
         end
       end
 
+      def options_for_type_select
+        keys(:extended).map{ |k|
+          [ I18n.t("#{ k }", count: :other), k ]
+        }.unshift([ I18n.t("search.show_all"), "" ])
+      end
+
       def models(search_type, key = nil)
         case search_type
         when :quick
@@ -28,6 +37,8 @@ module SocialStream
           else
             extended_search_models.values.flatten
           end
+        when :repository
+          SocialStream.repository_models.map{ |m| m.to_s.classify.constantize }
         else
           raise "Unknown search type #{ search_type }"
         end
@@ -41,7 +52,6 @@ module SocialStream
         ThinkingSphinx.count *args_for_search(query, subject, options)
       end
 
-
       private
 
       def quick_search_models
@@ -73,21 +83,21 @@ module SocialStream
       #   }
       #
       def parse_extended_search_models
-          SocialStream.extended_search_models.inject({}) do |hash, entry|
-            case entry
-            when Hash
-              hash.update entry.inject({}){ |h, e|
-                h[e.first] = Array.wrap(e.last).map{ |f| f.to_s.classify.constantize }
-                h
-              }
-            when Symbol
-              hash[entry] = Array.wrap(entry.to_s.classify.constantize)
-            else
-              raise "Unknown entry in config.extended_search_models #{ entry }"
-            end
-
-            hash
+        SocialStream.extended_search_models.inject({}) do |hash, entry|
+          case entry
+          when Hash
+            hash.update entry.inject({}){ |h, e|
+              h[e.first] = Array.wrap(e.last).map{ |f| f.to_s.classify.constantize }
+              h
+            }
+          when Symbol
+            hash[entry] = Array.wrap(entry.to_s.classify.constantize)
+          else
+            raise "Unknown entry in config.extended_search_models #{ entry }"
           end
+
+          hash
+        end
       end
 
       def args_for_search(query, subject, options = {})

data/base/lib/tasks/attachments.rake

@@ -1,22 +1,19 @@
 namespace :social_stream do
-  namespace :avatars do
-    desc "Fix avatar's attachment path from paperclip < 3.0"
-    task :fix => :environment do
-      dir = "#{ Rails.root }/public/system/logos/"
-
-      Avatar.all.each do |a|
-        old_logo_dir = "#{ dir }#{ a.id }/"
-
-        old_logo_contents = Dir["#{ old_logo_dir }*"]
-
-        new_logo_dir = "#{ Rails.root }/public#{ a.logo.to_s.split('original').first }"
-
-        puts "Moving #{ old_logo_dir } to #{ new_logo_dir }"
+  namespace :attachments do
+    desc "Set record timestamps to false"
+    task :freeze_timestamps => :environment do
+      %w(Actor Picture Audio Video).each do |k|
+        k.constantize.record_timestamps = false
+      end
 
-        FileUtils.mkdir_p new_logo_dir
-        FileUtils.mv old_logo_contents, new_logo_dir
+      ActivityObject.class_eval do
+        private
+        def allowed_relations; end
       end
     end
+
+    desc "Fix avatar's attachment path from Social Stream < 2.0"
+    task :fix => [ :freeze_timestamps, 'paperclip:refresh:missing_styles' ]
   end
 end
 

data/base/lib/tasks/db/populate.rake

@@ -1,6 +1,6 @@
 namespace :db do
   desc 'Populate database with fake data for development'
-  task :populate => [ 'db:seed', 'db:populate:create' ]
+  task :populate => 'db:populate:reload'
 
   namespace :populate do
 
@@ -8,10 +8,10 @@ namespace :db do
     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 ]
+    task :cheesecake => [ 'db:reset', :read_environment, 'create:users', 'create:groups', 'create:cheesecake_ties', 'create:avatars' ]
 
     desc "Create populate data"
-    task :create => [ :read_environment, :create_users, :create_groups, :create_ties, :create_posts, :create_messages, :create_avatars ]
+    task :create => [ :read_environment, 'db:seed', '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
@@ -41,232 +41,224 @@ namespace :db do
       end
     end
 
-    # USERS
-    desc "Create users"
-    task :create_users => :read_environment do
-      puts 'User population (Demo and ' + @USERS.to_s + ' users more)'
-      users_start = Time.now
-
-      # Create demo user if not present
-      if User.find_by_name('demo').blank?
-        User.create! :name => 'Demo',
-                     :email => 'demo@social-stream.dit.upm.es',
-                     :password => 'demonstration',
-                     :password_confirmation => 'demonstration'
-      end
+    namespace :create do
+      # USERS
+      desc "Create users"
+      task :users => :read_environment do
+        puts 'User population (Demo and ' + @USERS.to_s + ' users more)'
+        users_start = Time.now
+
+        # Create demo user if not present
+        if Actor.find_by_slug('demo').blank?
+          u = User.create! :name => '<Demo>',
+                           :email => 'demo@social-stream.dit.upm.es',
+                           :password => 'demonstration',
+                           :password_confirmation => 'demonstration'
+          u.actor!.update_attribute :slug, 'demo'
+        end
+
+        @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.times do
-        User.create! :name => Forgery::Name.full_name,
-                     :email => Forgery::Internet.email_address,
-                     :password => 'demonstration',
-                     :password_confirmation => 'demonstration'
+        users_end = Time.now
+        puts '   -> ' + (users_end - users_start).round(4).to_s + 's'
       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
+      # GROUPS
+      desc "Create groups"
+      task :groups => :read_environment do
+        puts 'Groups population (' + @GROUPS.to_s + ' groups)'
+        groups_start = Time.now
+
+        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
-    desc "Create groups"
-    task :create_groups => :read_environment do
-      puts 'Groups population (' + @GROUPS.to_s + ' groups)'
-      groups_start = Time.now
+        @GROUPS.times do
+          founder = @available_actors[rand(@available_actors.size)]
 
-      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!
+          Group.create! :name  => Forgery::Name.company_name,
+                        :email => Forgery::Internet.email_address,
+                        :author_id => founder.id,
+                        :user_author_id => founder.id
         end
-      end
 
+        set_tags(Group)
 
-      @GROUPS.times do
-        founder = @available_actors[rand(@available_actors.size)]
+        # Reload actors to include groups
+        @available_actors = Actor.all
 
-        Group.create! :name  => Forgery::Name.company_name,
-                      :email => Forgery::Internet.email_address,
-                      :author_id => founder.id,
-                      :user_author_id => founder.id
+        groups_end = Time.now
+        puts '   -> ' +  (groups_end - groups_start).round(4).to_s + 's'
       end
 
-      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 :ties => :read_environment do
+        puts 'Ties population'
+        ties_start = Time.now
 
+        @available_actors.each do |a|
+          actors = @available_actors.dup
+          actors.delete(a)
 
-    # TIES
-    desc "Create ties"
-    task :create_ties => :read_environment do
-      puts 'Ties population'
-      ties_start = Time.now
+          relations = a.relation_customs + [ Relation::Reject.instance ]
 
-      @available_actors.each do |a|
-        actors = @available_actors.dup
-        actors.delete(a)
+          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 = [ Forgery::Extensions::Array.new(relations).random.id ]
+          end
+        end
 
-        relations = a.relation_customs + [ Relation::Reject.instance ]
+        Activity.includes(:activity_verb).merge(ActivityVerb.verb_name(["follow", "make-friend"])).each do |a|
+          t = SocialStream::Population::Timestamps.new
 
-        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 = [ Forgery::Extensions::Array.new(relations).random.id ]
+          a.update_attributes :created_at => t.created,
+                              :updated_at => t.updated
         end
+
+        ties_end = Time.now
+        puts '   -> ' +  (ties_end - ties_start).round(4).to_s + 's'
       end
 
-      Activity.includes(:activity_verb).merge(ActivityVerb.verb_name(["follow", "make-friend"])).each do |a|
-        t = SocialStream::Population::Timestamps.new
 
-        a.update_attributes :created_at => t.created,
-                            :updated_at => t.updated
-      end
+      # TIES, special version for cheesecake testing
+      desc "Create cheesecake ties"
+      task :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
+          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
+        ties_end = Time.now
+        puts '   -> ' +  (ties_end - ties_start).round(4).to_s + 's'
+      end
 
 
-    # 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
-        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)
+      # POSTS
+      desc "Create posts"
+      task :posts => :read_environment do
+        SocialStream::Population::ActivityObject.new Post do |p|
+          p.text =
+            "This post should be for #{ p.relations.map(&:name).join(", ") } of #{ p.owner.name }.\n#{ Forgery::LoremIpsum.paragraph(:random => true) }"
         end
       end
 
-      ties_end = Time.now
-      puts '   -> ' +  (ties_end - ties_start).round(4).to_s + 's'
-    end
 
+      # MESSAGES
+      desc "Create messages using mailboxer"
+      task :messages => :read_environment do
+        puts 'Mailboxer population'
+        mailboxer_start = Time.now
 
-    # POSTS
-    desc "Create posts"
-    task :create_posts => :read_environment do
-      SocialStream::Population::ActivityObject.new Post do |p|
-        p.text =
-          "This post should be for #{ p.relations.map(&:name).join(", ") } of #{ p.owner.name }.\n#{ Forgery::LoremIpsum.paragraph(:random => true) }"
-      end
-    end
+        demo = SocialStream::Population::Actor.demo
+        @available_actors = Actor.all.sample(Actor.count / 3)
+        @available_actors |= [ demo ]
 
 
-    # MESSAGES
-    desc "Create messages using mailboxer"
-    task :create_messages => :read_environment do
-      puts 'Mailboxer population'
-      mailboxer_start = Time.now
-      @available_actors = Actor.all
+        5.times do
+          actors = @available_actors.dup
 
-      @available_actors.each do |a|
-        actors = @available_actors.dup - Array(a)
+          mult_recp = actors.uniq
 
-        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
-              a.reply_to_sender(mail, "Ok #{demo.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
-            end
+          actor = mult_recp.sample
+
+          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))
+
+          [ 'Well', 'Ok', 'Pretty well', 'Finally' ].inject(mail) do |st|
+            break if rand < 0.2
+
+            actor = mult_recp.sample
+
+            mail = actor.reply_to_all(mail, "#{ st }, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+
+            mail
           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)}")
+          @available_actors = (Actor.all.sample(Actor.count / 3) - [ demo ])
+
+          @available_actors.each do |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 #{actor.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
           end
-          if rand > 0.75
-            mail.conversation.move_to_trash(actor)
-          end
         end
-      end
 
-      mailboxer_end = Time.now
-      puts '   -> ' +  (mailboxer_end - mailboxer_start).round(4).to_s + 's'
+        mailboxer_end = Time.now
+        puts '   -> ' +  (mailboxer_end - mailboxer_start).round(4).to_s + 's'
 
-    end
+      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
+      # AVATARS
+      desc "Create avatars"
+      task :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, :name => File.basename(avatar), :crop_x => 0, :crop_y => 0, :crop_w => dimensions[:width], :crop_h => dimensions[:height] )
-            l.active = true
-            l.save!
+            if avatar.present? && File.exists?(avatar)
+              i.logo = File.open(avatar)
+              i.save!
+            end
           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'
+        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
 end