social_stream-base 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee108a6d8f73b1340ebede2f72b76b88118d2ff6
-  data.tar.gz: 6da91ab7d4ab780895d3744e7eb53a3a21e52c35
+  metadata.gz: 3e5124e3850b3a546d1aec128165eac20a19e4f0
+  data.tar.gz: 1e56c930444d1e6ba3728aec673b4403ddcd1e73
 SHA512:
-  metadata.gz: 7084015f905d5a3dac7ddbca431996993eb9e945e93823c4abcf3e5e17e76ef3c7713ee6a4e088baa0112a1602fd6896ca9db1b683afe9c5550bff6011ac97d6
-  data.tar.gz: 59559a542cab6358dd8b10836a1cde1367da7c8967c7ae5e90155593bcac81766ca2be3b6744cc888630d9871eda9249eb7cc4ca7ea4169b21db95eb01413cfc
+  metadata.gz: ba14732b219222209d925080c14bccd9c5933f5b5de8eec56975d488582a6acc806988550a7aa6ee9d8d3315227de016f83a90ae8ccf618dab2857e728e313e0
+  data.tar.gz: d180b4b9abc79343be9ab0291468be68111e4319638158c23c7461da2cff3fb3150103bfd71962bbb43bc87ff1113b59ec817b3adf649b15242c5220ab8e58d0

data/Rakefile

@@ -1,21 +1,9 @@
 # encoding: UTF-8
-require 'rake'
-require 'rdoc/task'
-
-require 'rubygems'
-
-require 'rspec/core/rake_task'
-
-require 'ci/reporter/rake/rspec'
-
-require 'bundler'
+require 'bundler/gem_tasks'
 
-require File.join(File.dirname(__FILE__), 'lib', 'social_stream', 'base', 'version')
-
-
-RSpec::Core::RakeTask.new(:spec)
+require 'rdoc/task'
 
-task :default => :spec
+task :default => :rdoc
 
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -25,8 +13,6 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb', 'app/**/*.rb')
 end
 
-Bundler::GemHelper.install_tasks
-
 # Modify this gem's tags
 class Bundler::GemHelper
   def version_tag

data/app/assets/javascripts/social_stream/actor.js

@@ -3,6 +3,7 @@ SocialStream.Actor = (function(SS, $, undefined) {
   var select2 = function(selector) {
     $(selector).select2({
       multiple: true,
+      minimumInputLength: 1,
       ajax: {
         url: $(selector).attr('data-path'),
         dataType: 'json',
@@ -15,7 +16,8 @@ SocialStream.Actor = (function(SS, $, undefined) {
       },
       id: function(object) { return object.id.toString(); },
       formatResult: select2FormatResult,
-      formatSelection: select2FormatSelection
+      formatSelection: select2FormatSelection,
+      initSelection: select2InitSelection
     });
   };
 
@@ -27,6 +29,10 @@ SocialStream.Actor = (function(SS, $, undefined) {
     return '<img src="' + object.image.url + '"> ' + object.name;
   };
 
+  var select2InitSelection = function(element, callback) {
+    callback([ { id: element.val(), name: element.attr('data-actor_name'), locked: true } ]);
+  };
+
   return {
     select2: select2
   };

data/app/assets/javascripts/social_stream/contact.js

@@ -171,6 +171,13 @@ SocialStream.Contact = (function($, SS, undefined) {
 
   // new_ callbacks
   
+  var initHideModal = function() {
+    $('#add-contact-modal').on('hide', function () {
+      $('input[name="actors"]').select2('close');
+      $('select[name="relations[]"]').select2('close');
+    });
+  };
+
   var initActorSelect2 = function() {
     SS.Actor.select2('input[name="actors"]');
   };
@@ -298,6 +305,7 @@ SocialStream.Contact = (function($, SS, undefined) {
                     hideLoading);
 
   callback.register('new_',
+                    initHideModal,
                     initActorSelect2,
                     initRelationSelect2);
 

data/app/assets/javascripts/social_stream/flash.js

@@ -1,4 +1,8 @@
 SocialStream.Flash = (function(Flashy, undefined) {
+  var notice = function(message) {
+    Flashy.message('notice', message);
+  };
+
   var error = function(message) {
     if (message === undefined) {
       message = I18n.t('ajax.error');
@@ -11,8 +15,14 @@ SocialStream.Flash = (function(Flashy, undefined) {
     Flashy.message('success', message);
   };
 
+  var warning = function(message) {
+    Flashy.message('warning', message);
+  };
+
   return {
+    notice: notice,
     error: error,
-    success: success
+    success: success,
+    warning: warning
   };
 })(Flashy);

data/app/controllers/groups_controller.rb

@@ -4,7 +4,7 @@ class GroupsController < ApplicationController
 
   before_filter :authenticate_user!, :except => [ :index, :show ]
 
-  load_and_authorize_resource
+  load_and_authorize_resource except: :index
 
   respond_to :html, :js
 

data/app/controllers/profiles_controller.rb

@@ -1,6 +1,8 @@
 class ProfilesController < ApplicationController
   before_filter :authenticate_user!, :except => [ :show ]
 
+  before_filter :authorize_update, except: [ :show ]
+
   respond_to :html, :js
 
   def show
@@ -14,11 +16,10 @@ class ProfilesController < ApplicationController
   end
 
   def edit
-    current_profile
   end
 
   def update
-    current_profile.update_attributes profile_params
+    subject_profile.update_attributes profile_params
 
     respond_to do |format|
       format.html{ redirect_to [profile_subject, :profile] }
@@ -53,4 +54,8 @@ class ProfilesController < ApplicationController
 
     current_subject.profile
   end
+
+  def authorize_update
+    authorize! :update, subject_profile
+  end
 end

data/app/controllers/search_controller.rb

@@ -45,17 +45,15 @@ class SearchController < ApplicationController
   private
 
   def search mode
-    result = SocialStream::Search.search(params[:q],
-                                         current_subject,
-                                         :mode => mode,
-                                         :key  => params[:type])
-
-    if mode.to_s.eql? "quick"
-      result = Kaminari.paginate_array(result).page(1).per(7)
-    else
-      result = Kaminari.paginate_array(result).page(params[:page]).per(RESULTS_SEARCH_PER_PAGE)
-    end
+    page =  ( mode == "quick" ? 1 : params[:page] )
+    limit = ( mode == "quick" ? 7 : RESULTS_SEARCH_PER_PAGE )
+
+    SocialStream::Search.search(params[:q],
+                                current_subject,
+                                mode:  mode,
+                                key:   params[:type],
+                                page:  page,
+                                limit: limit)
 
-    result
   end
 end

data/app/models/permission.rb

@@ -51,18 +51,19 @@ class Permission < ActiveRecord::Base
     # if the class is not found
     def available(subject)
       class_name = subject.class.to_s.underscore
+      # TODO add further classes
       base_class_name = subject.class.base_class.to_s.underscore
 
-      candidates = [ class_name, class_name.to_sym ]
+      candidates = [ class_name ]
 
       if class_name != base_class_name
-        candidates += [ base_class_name, base_class_name.to_sym ]
+        candidates += [ base_class_name ]
       end
 
       list = nil
 
       candidates.each do |n|
-        list = SocialStream.available_permissions[n]
+        list = SocialStream.available_permissions.with_indifferent_access[n]
 
         break if list.present?
       end

data/app/models/relation/custom.rb

@@ -24,8 +24,8 @@ class Relation::Custom < Relation
   class << self
     def defaults_for(actor)
       subject_type = actor.subject.class.to_s.underscore
-      cfg_rels = SocialStream.custom_relations[subject_type] ||
-        SocialStream.custom_relations[subject_type.to_sym]
+
+      cfg_rels = SocialStream.custom_relations.with_indifferent_access[subject_type]
 
       if cfg_rels.nil?
         raise "Undefined relations for subject type #{ subject_type }. Please, add an entry to config/initializers/social_stream.rb"
@@ -36,10 +36,10 @@ class Relation::Custom < Relation
       cfg_rels.each_pair do |name, cfg_rel|
         rels[name] =
           create! :actor =>         actor,
-                  :name  =>         cfg_rel['name'],
-                  :receiver_type => cfg_rel['receiver_type']
+                  :name  =>         cfg_rel[:name],
+                  :receiver_type => cfg_rel[:receiver_type]
 
-        if (ps = cfg_rel['permissions']).present?
+        if (ps = cfg_rel[:permissions]).present?
           ps.each do |p| 
             p.push(nil) if p.size == 1
 

data/app/models/user.rb

@@ -50,6 +50,8 @@ class User < ActiveRecord::Base
 
   def as_json options = nil
     {
+      id: id,
+      actorId: actor_id,
       nickName: slug,
       displayName: name,
       email: email,

data/app/views/contacts/_new_modal.html.erb

@@ -6,10 +6,10 @@
     </div>
     <div class="modal-body">
       <%= label_tag 'actors', t('actor.title.other') %>
-      <%= text_field_tag 'actors', '', 'data-path' => actors_path(stranger: true, sender_id: Actor.normalize_id(sender)), 'data-type' => Array.wrap(type).compact.join(',') %>
+      <%= text_field_tag 'actors', '', 'data-path' => actors_path(stranger: true, sender_id: Actor.normalize_id(sender)), 'data-type' => Array.wrap(type).compact.join(','), placeholder: t('contact.new.modal.placeholder.actors') %>
 
       <%= label_tag 'relations', t('activerecord.attributes.contact.relation_ids') %>
-      <%= select_tag 'relations', contact_select_options(sender.options_for_contact_select), multiple: true %>
+      <%= select_tag 'relations', contact_select_options(sender.options_for_contact_select), multiple: true, "data-placeholder" => t('contact.new.modal.placeholder.actors') %>
     </div>
     <div class="modal-footer">
       <%= submit_tag t('contact.new.modal.button') %>

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

@@ -20,10 +20,11 @@
         <div id="<%= type %>" class="tab-pane <%= 'active' if current_contact_section?(type) %>">
           <%= text_field_tag "contact-filter-#{ type }", (current_contact_section?(type) ? params[:q] : ""), class: "pull-right contact-filter", placeholder: "filter", autocomplete: "off" %>
 
-          <% if type == :group %>
+          <% if user_signed_in? && type == :group %>
             <%= link_to t('group.new.link'), new_group_path, class: 'new_group-modal-link', 'data-toggle' => 'modal' %>
 
-            <%= render partial: 'groups/new_modal' %>
+            <%= render partial: 'groups/new_modal',
+                       locals: { resource_class: Group } %>
           <% end %>
 
           <div class="contact-list">

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

@@ -1,15 +1 @@
-<%= location(t('account.one'), 
-  link_to(t('settings.main'), settings_path)
-) %>
-
-<h2>
-	<%= t('settings.for')%> <%= current_subject.name %>
-</h2>
-
-<%= render :partial => "edit_user"%>
-<%= render :partial => "settings/language" %>
-<%= render :partial => "settings/notifications" %>
-<% if current_subject.respond_to? :authentication_token%>
-  <%= render :partial => "settings/api_key" %>
-<% end %>
-<%= render :partial => "delete_account"%>
+<%= render template: 'settings/index' %>

data/app/views/groups/_form.html.erb

@@ -18,7 +18,7 @@
   </section>
   <section class="owners">
     <%= f.label :owners %>
-    <%= f.hidden_field :owners, 'data-path' => actors_path(format: :json) %>
+    <%= f.hidden_field :owners, 'data-path' => actors_path(format: :json), "data-actor_name" => current_subject.name %>
   </section>
   <section class="tags">
     <%= f.label :tags_list %>

data/app/views/groups/_new_modal.html.erb

@@ -5,7 +5,7 @@
   </div>
   <div class="modal-body">
     <%= render partial: 'groups/form',
-               object: Group.new,
+               object: resource_class.new(owners: current_subject.actor_id),
                as: :group %>
   </div>
 </div>

data/app/views/groups/new.html.erb

@@ -8,6 +8,6 @@
   <h2><%= t('group.new.title') %></h2>
 
   <%= render partial: 'form',
-             object: @group,
+             object: resource_class.new(owners: current_subject.actor_id),
              as: :group %>
 </section>

data/app/views/profiles/_comunication-info_edit.html.erb

@@ -1,4 +1,4 @@
-<%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
+<%= form_for(@profile, :url => [@profile.subject, :profile]) do |f| %>
   <%= f.label :phone, t('profile.phone') %>
 
   <%= f.phone_field :phone %>

data/app/views/profiles/_experience_edit.html.erb

@@ -1,5 +1,5 @@
-<%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
+<%= form_for(@profile, :url => [@profile.subject, :profile]) do |f| %>
   <%= f.text_area :experience, :maxlength => 246, :rows => 5 %>
 
   <%= f.submit :class => "btn" %>
-<% end %>
+<% end %>

data/app/views/profiles/_personal_edit.html.erb

@@ -1,10 +1,10 @@
-<%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
+<%= form_for(@profile, :url => [@profile.subject, :profile]) do |f| %>
   <span class="required">*</span>
   <%= f.label :name %>
 
   <%= f.text_field :name, :class => "required" %>
 
-  <%= f.label :description, t("profile.#{ current_subject.class.to_s.downcase }.about") %>
+  <%= f.label :description, t("profile.#{ f.object.subject.class.to_s.downcase }.about") %>
 
   <%= f.text_area :description, :maxlength => 200, :rows => 10 %>
 
@@ -12,7 +12,7 @@
 
   <%= f.text_field :organization %>
 
-  <%= f.label :birthday, t('profile.' + current_subject.class.to_s.downcase + '.birthday') %>
+  <%= f.label :birthday, t('profile.' + f.object.subject.class.to_s.downcase + '.birthday') %>
 
   <%= date_select "profile", "birthday", :order => [:day, :month, :year], :end_year => Date.today.year, :start_year => (Date.today.year - 100), :prompt => {:day => 'Day', :month => 'Month', :year => 'Year'} %>
 

data/app/views/relation/customs/destroy.js.erb

@@ -5,4 +5,5 @@
     }
   });
 <% else %>
+  SocialStream.Flash.error('<%= @custom.errors.full_messages.to_sentence %>');
 <% end %>

data/app/views/relation/customs/update.js.erb

@@ -7,5 +7,5 @@
     section: '<%= params[:section] %>'
   });
 <% else %>
-
+  SocialStream.Flash.error('<%= @custom.errors.full_messages.to_sentence %>');
 <% end %>

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

@@ -5,5 +5,5 @@
 <section id="settings">
   <%= render partial: 'toolbar/profile', locals: { subject: current_subject } %>
 
-  <%= render :partial => 'index' %>
+  <%= render partial: 'settings/index' %>
 </section>

data/config/locales/en.yml

@@ -184,6 +184,9 @@ en:
       link: Add contact
       modal:
         button: Add
+        placeholder:
+          actors: Type names
+          relations: Type names
         title: Add contacts
       title: Add %{name} to your contacts
       menu: Add contact

data/config/locales/es.yml

@@ -586,7 +586,7 @@ es:
       query: Más resultados para %{query} >
     name: Buscar
     no_subject_found: No se encontró a %{subject}.
-    nothing: No se ha econtrado nada.
+    nothing: No se ha encontrado nada.
     searching: 'Buscando: %{query}'
     show_all: Todos
     write: Escribe tu búsqueda...

data/lib/social_stream/base/autoload.rb

@@ -1,17 +1,16 @@
 module SocialStream
+
   autoload :Ability, 'social_stream/ability'
   autoload :ActivityStreams, 'social_stream/activity_streams'
+
   module ActivityStreams
     autoload :Supertype, 'social_stream/activity_streams/supertype'
     autoload :Subtype,   'social_stream/activity_streams/subtype'
   end
+
   module Base
     autoload :Ability,   'social_stream/base/ability'
   end
-  autoload :D3,        'social_stream/d3'
-  autoload :Populate,  'social_stream/populate'
-  autoload :Relations, 'social_stream/relations'
-  autoload :TestHelpers, 'social_stream/test_helpers'
 
   module Controllers
     autoload :Authorship,              'social_stream/controllers/authorship'
@@ -23,6 +22,8 @@ module SocialStream
     autoload :Subjects, 'social_stream/controllers/subjects'
   end
 
+  autoload :D3,          'social_stream/d3'
+
   module Devise
     module Controllers
       autoload :UserSignIn, 'social_stream/devise/controllers/user_sign_in'
@@ -36,6 +37,8 @@ module SocialStream
     autoload :Supertype, 'social_stream/models/supertype'
   end
 
+  autoload :Population,  'social_stream/population'
+
   module Population
     autoload :ActivityObject, 'social_stream/population/activity_object'
     autoload :Actor,          'social_stream/population/actor'
@@ -43,6 +46,8 @@ module SocialStream
     autoload :Timestamps,     'social_stream/population/timestamps'
   end
 
+  autoload :Relations,   'social_stream/relations'
+
   module Routing
     module Constraints
       autoload :Custom, 'social_stream/routing/constraints/custom'
@@ -53,12 +58,14 @@ module SocialStream
 
   autoload :Search, 'social_stream/search'
 
-  module Views
-    autoload :List,     'social_stream/views/list'
-    autoload :Location, 'social_stream/views/location'
-  end
+  autoload :TestHelpers, 'social_stream/test_helpers'
 
   module TestHelpers
     autoload :Controllers, 'social_stream/test_helpers/controllers'
   end
+
+  module Views
+    autoload :List,     'social_stream/views/list'
+    autoload :Location, 'social_stream/views/location'
+  end
 end

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "2.2.0".freeze
+    VERSION = "2.2.1".freeze
   end
 end

data/lib/social_stream/population.rb

@@ -0,0 +1,14 @@
+module SocialStream
+  module Population
+    class << self
+      def task message
+        puts message
+        time = Time.now
+
+        yield
+
+        puts "   -> #{ (Time.now - time).round(4) }s"
+      end
+    end
+  end
+end

data/lib/social_stream/search.rb

@@ -117,8 +117,10 @@ module SocialStream
 
         [
           query,
-          :classes => models,
-          :with => with
+          classes: models,
+          with: with,
+          limit: options[:limit],
+          page: options[:page]
         ]
       end
     end

data/lib/tasks/db/populate.rake

@@ -45,171 +45,127 @@ namespace :db 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
+        SocialStream::Population.task "User population (Demo and #{ @USERS } users more)" do
 
-        @USERS.times do
-          User.create! :name => Forgery::Name.full_name,
-                       :email => Forgery::Internet.email_address,
-                       :password => 'demonstration',
-                       :password_confirmation => 'demonstration'
-        end
+          # 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
 
-        # 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'
+          end
 
-        users_end = Time.now
-        puts '   -> ' + (users_end - users_start).round(4).to_s + 's'
+          # Reload actors to include new users
+          @available_actors = Actor.all
+        end
       end
 
 
       # GROUPS
       desc "Create groups"
       task :groups => :read_environment do
-        puts 'Groups population (' + @GROUPS.to_s + ' groups)'
-        groups_start = Time.now
+        SocialStream::Population.task "Groups population (#{ @GROUPS } groups)" do
+          @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,
+                          :author_id => founder.id,
+                          :user_author_id => founder.id
+          end
 
-          Group.create! :name  => Forgery::Name.company_name,
-                        :email => Forgery::Internet.email_address,
-                        :author_id => founder.id,
-                        :user_author_id => founder.id
+          # Reload actors to include groups
+          @available_actors = Actor.all
         end
-
-        # Reload actors to include groups
-        @available_actors = Actor.all
-
-        groups_end = Time.now
-        puts '   -> ' +  (groups_end - groups_start).round(4).to_s + 's'
       end
 
       desc "Populate profiles"
 
       task :profiles => :read_environment do
-        puts "Profiles population"
-        time = Time.now
+        SocialStream::Population.task "Profiles population" do
+          SocialStream::Population::Actor.available.each do |a|
+            p = a.profile
 
-        SocialStream::Population::Actor.available.each do |a|
-          p = a.profile
+            if rand < 0.2
+              a.tag_list = Forgery::LoremIpsum.words(3, random: true).gsub(' ', ',')
+            end
 
-          if rand < 0.2
-            a.tag_list = Forgery::LoremIpsum.words(3, random: true).gsub(' ', ',')
-          end
+            if rand < 0.2
+              p.organization = Forgery::Name.company_name
+            end
 
-          if rand < 0.2
-            p.organization = Forgery::Name.company_name
-          end
+            if rand < 0.2
+              p.birthday = Time.at(Time.now.to_i - (18.years + rand(60.years)))
+            end
 
-          if rand < 0.2
-            p.birthday = Time.at(Time.now.to_i - (18.years + rand(60.years)))
-          end
+            if rand < 0.2
+              p.city = Forgery::Address.city
+            end
 
-          if rand < 0.2
-            p.city = Forgery::Address.city
-          end
+            if rand < 0.2
+              p.country = Forgery::Address.country
+            end
 
-          if rand < 0.2
-            p.country = Forgery::Address.country
-          end
+            if rand < 0.2
+              p.description = Forgery::LoremIpsum.sentences(2, random: true)
+            end
 
-          if rand < 0.2
-            p.description = Forgery::LoremIpsum.sentences(2, random: true)
-          end
+            if rand < 0.2
+              p.phone = Forgery::Address.phone
+            end
 
-          if rand < 0.2
-            p.phone = Forgery::Address.phone
-          end
+            if rand < 0.2
+              p.address = Forgery::Address.street_address
+            end
 
-          if rand < 0.2
-            p.address = Forgery::Address.street_address
-          end
+            if rand < 0.2
+              p.website = "http://#{ Forgery::Internet.domain_name }"
+            end
 
-          if rand < 0.2
-            p.website = "http://#{ Forgery::Internet.domain_name }"
-          end
+            if rand < 0.2
+              p.experience = Forgery::LoremIpsum.sentences(3, random: true)
+            end
 
-          if rand < 0.2
-            p.experience = Forgery::LoremIpsum.sentences(3, random: true)
+            p.save!
           end
-
-          p.save!
         end
-
-        puts '   -> ' + (Time.now - time).round(4).to_s + 's'
       end
 
       # TIES
       desc "Create ties"
       task :ties => :read_environment do
-        puts 'Ties population'
-        ties_start = Time.now
-
-        SocialStream::Population::Actor.available.each do |a|
-          actors = SocialStream::Population::Actor.available
-          actors.delete(a)
-
-          relations = a.relation_customs + [ Relation::Reject.instance ]
-
-          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 ]
+        SocialStream::Population.task 'Ties population' do
+          SocialStream::Population::Actor.available.each do |a|
+            actors = SocialStream::Population::Actor.available
+            actors.delete(a)
+
+            relations = a.relation_customs + [ Relation::Reject.instance ]
+
+            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
-        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_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
 
-      # 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
-
-        SocialStream::Population::Actor.available.each do |a|
-          actors = SocialStream::Population::Actor.available - 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)
+            a.update_attributes :created_at => t.created,
+                                :updated_at => t.updated
           end
         end
-
-        ties_end = Time.now
-        puts '   -> ' +  (ties_end - ties_start).round(4).to_s + 's'
       end
 
-
       # POSTS
       desc "Create posts"
       task :posts => :read_environment do
@@ -223,58 +179,52 @@ namespace :db do
       # MESSAGES
       desc "Create messages using mailboxer"
       task :messages => :read_environment do
-        puts 'Mailboxer population'
-        mailboxer_start = Time.now
+        SocialStream::Population.task 'Mailboxer population' do
+          demo = SocialStream::Population::Actor.demo
+          @available_actors = Actor.all.sample(Actor.count / 3)
+          @available_actors |= [ demo ]
 
-        demo = SocialStream::Population::Actor.demo
-        @available_actors = Actor.all.sample(Actor.count / 3)
-        @available_actors |= [ demo ]
 
+          5.times do
+            actors = @available_actors.dup
 
-        5.times do
-          actors = @available_actors.dup
+            mult_recp = actors.uniq
 
-          mult_recp = actors.uniq
+            actor = mult_recp.sample
 
-          actor = mult_recp.sample
+            mult_recp.delete(actor)
 
-          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))
 
-          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
 
-          [ 'Well', 'Ok', 'Pretty well', 'Finally' ].inject(mail) do |st|
-            break if rand < 0.2
+              actor = mult_recp.sample
 
-            actor = mult_recp.sample
+              mail = actor.reply_to_all(mail, "#{ st }, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
 
-            mail = actor.reply_to_all(mail, "#{ st }, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
-
-            mail
-          end
+              mail
+            end
 
-          if rand > 0.75
-            mail.conversation.move_to_trash(demo)
-          end
+            if rand > 0.75
+              mail.conversation.move_to_trash(demo)
+            end
 
-          @available_actors = (Actor.all.sample(Actor.count / 3) - [ demo ])
+            @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
-              mail = demo.reply_to_sender(mail, "Pretty well #{a.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+            @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 #{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
             end
           end
         end
-
-        mailboxer_end = Time.now
-        puts '   -> ' +  (mailboxer_end - mailboxer_start).round(4).to_s + 's'
-
       end
 
-
       # AVATARS
       desc "Create avatars"
       task :avatars => :read_environment do
@@ -295,11 +245,9 @@ namespace :db do
           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'
+        SocialStream::Population.task 'Avatar population' do
+          SocialStream.subjects.each {|a| set_logos(Kernel.const_get(a.to_s.classify)) }
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - GING - DIT - UPM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -1145,6 +1145,7 @@ files:
 - lib/social_stream/models/subject.rb
 - lib/social_stream/models/subtype.rb
 - lib/social_stream/models/supertype.rb
+- lib/social_stream/population.rb
 - lib/social_stream/population/activity_object.rb
 - lib/social_stream/population/actor.rb
 - lib/social_stream/population/power_law.rb
@@ -1281,7 +1282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Basic features for Social Stream, the core for building social network websites