social_stream 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c98e8f340abda58ad4fdb221277832f008dd9bc
-  data.tar.gz: 163732a3cfc11f3799990396061ef43efe8fe784
+  metadata.gz: 0fa777d423bc8bdb5da4bdcd89bb767e882b98b3
+  data.tar.gz: ed92fae8cd6c25a55482b4723ebcbf26e8bae22f
 SHA512:
-  metadata.gz: 05918a9619f19d52a3b47c270a6b2438277ba59cfcb5d2323d6b132ac90bccfcd457f8ac630cd3e27988f960941b458ffa0a663573a23e861d871ce63aaee77c
-  data.tar.gz: 39177589b24d9ed84803361c7624dddb8f4deddb72ff2fd9f3d0027b02d3e45e4e9ada54ab479be149f165ded45aa55ec53c317ceb7b6e44b91acc94ba02a579
+  metadata.gz: 6f54c0b15d0b36ac58dadf3347b568b6197900e3caa1e923653b3d36b4663828345d3c6e680de1fc604558030002697b0f3886b53d00bcc4618e365ebb0e98c3
+  data.tar.gz: 36700f4bf7ca3cc7761f2015e587a39579d060a3c9b1f169655a31860313e9160166b59dbd234523b7f342e646a23d306ed6061086c3ae851a14d95de5a4f7f4

data/Gemfile

@@ -3,6 +3,9 @@ source "http://rubygems.org"
 # Uncomment the following lines if you are planing to
 # use a local code of any of these gems
 
+# Travis' bundler does not properly resolve dependencies for railties
+gem 'rails', '3.2.14'
+
 # Gems before social_stream-base
 # gem 'mailboxer', :path => '../mailboxer'
 # gem 'avatars_for_rails', :path => '../avatars_for_rails'
@@ -13,11 +16,11 @@ source "http://rubygems.org"
 # Needs the libsndfile package
 gem 'paperclip_waveform'
 
+gem 'pry-rails'
+
 # social_stream gems
 %w(base documents events linkser presence).each do |g|
   gem "social_stream-#{ g }", :path => g
 end
 
-gem 'pry'
-
 gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Universidad Politécnica de Madrid
+Copyright (c) 2013 Universidad Politécnica de Madrid
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/base/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/base/app/assets/javascripts/social_stream/actor.js

@@ -0,0 +1,34 @@
+SocialStream.Actor = (function(SS, $, undefined) {
+  // Select2
+  var select2 = function(selector) {
+    $(selector).select2({
+      multiple: true,
+      ajax: {
+        url: $(selector).attr('data-path'),
+        dataType: 'json',
+        data: function(term, page) {
+          return { q: term, page: page, type: $(selector).attr('data-type') };
+        },
+        results: function(data, page) {
+          return { results: data };
+        }
+      },
+      id: function(object) { return object.id.toString(); },
+      formatResult: select2FormatResult,
+      formatSelection: select2FormatSelection
+    });
+  };
+
+  var select2FormatSelection = function(object, container, query) {
+    return object.name;
+  };
+
+  var select2FormatResult = function(object, container) {
+    return '<img src="' + object.image.url + '"> ' + object.name;
+  };
+
+  return {
+    select2: select2
+  };
+  
+})(SocialStream, jQuery);

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

@@ -35,7 +35,7 @@ SocialStream.Contact = (function($, SS, undefined) {
     });
   };
 
-  var initContactButtons = function() {
+  var initMultipleButtons = function() {
     $('.edit_contact select[name*="relation_ids"]').multiselect({
       buttonClass: 'btn btn-small',
       buttonText: relationSelectText
@@ -169,6 +169,18 @@ SocialStream.Contact = (function($, SS, undefined) {
     $('html').on('click.dropdown.data-api', saveForms);
   };
 
+  // new_ callbacks
+  
+  var initActorSelect2 = function() {
+    SS.Actor.select2('input[name="actors"]');
+  };
+
+  var initRelationSelect2 = function() {
+    $('select[name="relations[]"]').select2();
+  };
+
+  // update callbacks
+
   var updateForms = function(options) {
     var forms = getForms(options.id);
 
@@ -211,7 +223,7 @@ SocialStream.Contact = (function($, SS, undefined) {
         $(contact).fadeOut('slow', function() {
           $(data).replaceAll(contact).fadeIn();
 
-          initContactButtons();
+          initMultipleButtons();
         });
       }
     });
@@ -263,23 +275,46 @@ SocialStream.Contact = (function($, SS, undefined) {
     callback([ { id: element.val(), name: element.attr('data-recipient-name') } ]);
   };
 
+  var initSimpleButtons = function(){
+    $(".following-button").mouseenter(function(){
+      $(this).hide();
+      $(this).siblings(".unfollow-button").show();
+    });
+
+    $(".unfollow-button").mouseleave(function(){
+      $(this).hide();
+      $(this).siblings(".following-button").show();
+    });
+
+    $(".unfollow-button").hide();
+  };
+
   callback.register('index',
                     initTabs,
-                    initContactButtons,
+                    initMultipleButtons,
+                    initSimpleButtons,
                     initFilter,
                     initNewGroupModal,
                     hideLoading);
 
+  callback.register('new_',
+                    initActorSelect2,
+                    initRelationSelect2);
+
   callback.register('update',
                     updateForms,
                     replaceContact,
+                    initSimpleButtons,
                     checkAndHideContact);
 
-  callback.register('destroy', hideContact);
+  callback.register('destroy',
+                    initSimpleButtons,
+                    hideContact);
 
   // FIXME There is probably a more efficient way to do this..
   $(function() {
-    initContactButtons();
+    initMultipleButtons();
+    initSimpleButtons();
     initContactFormsHtmlListener();
   });
 

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

@@ -7,7 +7,12 @@ SocialStream.Flash = (function(Flashy, undefined) {
     Flashy.message('error', message);
   };
 
+  var success = function(message) {
+    Flashy.message('success', message);
+  };
+
   return {
-    error: error
+    error: error,
+    success: success
   };
 })(Flashy);

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

@@ -4,20 +4,21 @@
 //= require jquery.ba-url
 //
 //= require social_stream/callback
+//= require social_stream/actor
 
 SocialStream.Group = (function(SS, $, undefined){
   var callback = new SS.Callback();
 
-  var initParticipants = function() {
-    SS.Contact.select2("#group__participants");
+  var initParticipants = function(options) {
+    SS.Actor.select2(options.form + ' input[name$="[owners]"]');
   };
 
-  var initTags = function() {
-    SS.Tag.select2("#group_tag_list");
+  var initTags = function(options) {
+    SS.Tag.select2(options.form + ' input[name$="[tag_list]"]');
   };
 
   var initValidate = function(options){
-    $.each(options.validate, function(i, opt){
+    $.each($(options.form), function(i, opt){
       $(opt.form).validate({errorClass: opt.errorClass});
     });
   };

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

@@ -78,7 +78,6 @@ SocialStream.RelationCustom = (function(SS, $, undefined){
     $('#permissions').find('.relation_permissions').hide();
 
     if (radioInput.attr('data-loaded')) {
-      console.log('#relation_' + relVal + '_permissions');
       $('#relation_' + relVal + '_permissions').show();
 
       return;

data/base/app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass

@@ -1,3 +1,6 @@
+body
+  color: red
+  
 #content
   h2
     margin-top: 0px

data/base/app/assets/stylesheets/social_stream/base/buttons/_buttons.scss.sass

@@ -1,2 +0,0 @@
-input[type="submit"]
-  @include btn-primary

data/base/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass

@@ -32,17 +32,7 @@
 #relation_customs
   h2
     @include colorfont-big-size
-
-#relation_customs,
-  .relation_list
-    border-right: 1px solid #c4c4c4
-
-
-#new_relation
-  .new_relation_custom
-    .btn
-
-    
+  
 
 #permissions
   h4

data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass

@@ -60,35 +60,7 @@ input#group_name
 
 
 .relation_customs
-  width: 80%
-  float: left
-  margin-left: 2.5%
-.relation_list
-  @include makeColumn(3, 0)
-  padding-right: 5px
-  input
-    margin-right: 10px
-  label
-    display: inline-block
-
-  .actions
-    display: inline-block
-    float: right
-    margin-right: 10px
-
-  .edit_name
-    margin-top: -22px
-    .edit_relation_custom
-      margin-bottom: 0px
-      #relation_custom_name
-        width: 69% !important
-        margin-left: 23px
-        margin-top: -3px
-      .icon_tool16-ok
-        margin-top: -3px
-
-  .btn
-    margin-left: 32px
+  @include privacity
 
 #relation_custom_name
   width: 215px

data/base/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass

@@ -134,7 +134,6 @@ header
       z-index: 6
       li
         a
-          padding: 7px 7px 7px !important
           img
             width: 20px
           .name

data/base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass

@@ -14,6 +14,8 @@
   @include ie7-restore-left-whitespace()
   @include box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05))
   @include transition(background 1s, color, 1s)
+  @include border-radius(7px)
+
   a
     color: $gray
   
@@ -65,6 +67,7 @@
   @include ie7-restore-left-whitespace()
   @include box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05))
   @include transition(background 1s, color, 1s)
+  @include border-radius(7px)
   a
     color: $gray
   
@@ -138,6 +141,8 @@
       .caret
         border-top-color: $principal-btnColorborder
         border-bottom-color: $principal-btnColorborder
+        margin-top: 8px
+        margin-left: 2px
         &:hover
           border-top-color: $auxiliarColor
           border-bottom-color: $auxiliarColor

data/base/app/assets/stylesheets/social_stream/base/mixins/_layout.css.sass

@@ -1,12 +1,9 @@
 @mixin menuHorizontal 
-  padding: 0
-  text-align: center
-  ul
-    list-style-type: none
-    margin-left: 4em
+  list-style-type: none
+  margin-left: 4em
+  display: inline
+  li
     display: inline
-    li
-      display: inline
 
 @mixin makeColumnoMargin($columns:1, $offset: 0) 
   float: left
@@ -81,3 +78,35 @@
   .add
     margin-top: 2px
     width: auto
+
+@mixin privacity
+  width: 80%
+  float: left
+  margin-left: 2.5%   
+  .relation_list
+    @include makeColumn(3, 0)
+    padding-right: 5px
+    border-right: 1px solid #c4c4c4 
+    input
+      margin-right: 10px
+    label
+      display: inline-block
+
+    .actions
+      display: inline-block
+      float: right
+      margin-right: 10px
+
+    .edit_name
+      margin-top: -22px
+      .edit_relation_custom
+        margin-bottom: 0px
+        #relation_custom_name
+          width: 69% !important
+          margin-left: 23px
+          margin-top: -3px
+        .icon_tool16-ok
+          margin-top: -3px
+
+    .btn
+      margin-left: 32px

data/base/app/controllers/actors_controller.rb

@@ -0,0 +1,25 @@
+class ActorsController < ApplicationController
+  respond_to :json
+
+  def index
+    @actors = Actor.
+      name_search(params[:q]).
+      subject_type(params[:type])
+
+    if params[:stranger].present?
+      @actors = @actors.not_contacted_from(sender)
+    end
+
+    @actors = @actors.page(params[:page])
+
+    render json: @actors, helper: self
+  end
+
+  private
+
+  def sender
+    @sender ||=
+      params[:sender_id] && Actor.find(params[:sender_id]) ||
+        current_subject
+  end
+end

data/base/app/controllers/contacts_controller.rb

@@ -1,7 +1,9 @@
 class ContactsController < ApplicationController
   before_filter :authenticate_user!, except: [ :index ]
-  load_and_authorize_resource except: [ :index, :suggestion, :pending ]
-  before_filter :exclude_reflexive,  except: [ :index, :suggestion, :pending ]
+  load_and_authorize_resource except: [ :index, :create, :suggestion, :pending ]
+  before_filter :exclude_reflexive,  except: [ :index, :create, :suggestion, :pending ]
+  before_filter :create_authorization, only: [ :create ]
+  before_filter :create_filled_params, only: [ :create ]
 
   helper_method :current_subject_contacts_to
 
@@ -18,6 +20,23 @@ class ContactsController < ApplicationController
     end
   end
 
+  def create
+    relation_ids = params[:relations].map(&:to_i)
+
+    params[:actors].split(',').each do |a|
+      c = profile_or_current_subject.contact_to!(a)
+      # Record who is manipulating the contact, mainly in groups
+      c.user_author = current_user
+      c.relation_ids = relation_ids
+    end
+
+    flash[:success] = t "contact.new.added.other",
+                        actors: params[:actors].split(',').map{ |a| Actor.find(a).name }.to_sentence,
+                        relations: relation_ids.map{ |r| Relation.find(r).name }.to_sentence
+
+    redirect_to request.referrer || { action: :index }
+  end
+
   def update
     # Record who is manipulating the contact, mainly in groups
     @contact.user_author = current_user
@@ -92,11 +111,22 @@ class ContactsController < ApplicationController
     end
   end
 
-  def total_contacts
-    @total_contacts ||=
-      Contact.sent_by(current_subject).
-              joins(:receiver).merge(Actor.alphabetic).
-              positive.
-              select("actors.name")
+  def create_authorization
+    authorize! :create, Contact.new(sender: Actor.normalize(profile_or_current_subject!))
+  end
+
+  def create_filled_params
+    errors = []
+
+    %w( actors relations ).each do |p|
+      if params[p].blank?
+        errors << "#{ p } cannot be blank"
+      end
+    end
+
+    if errors.present?
+      flash[:error] = errors.to_sentence
+      redirect_to action: :index
+    end
   end
 end