social_stream 0.19.2 → 0.19.3

data/.travis.yml

@@ -1,7 +1,7 @@
 rvm:
   - 1.8.7
   - 1.9.2
-  - ree
+  - 1.9.3
 env:
   - DB=mysql
   - DB=postgres

data/README.rdoc

@@ -32,7 +32,7 @@ add your own activities easily.
 
 Add to your Gemfile:
 
-  gem 'social_stream'
+  gem 'social_stream', '>= 0.19.0'
 
 and run:
 

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

@@ -13,6 +13,24 @@
   float: left;
   position: relative;
 }
+#sector_form {
+  float: left;
+  position: relative;
+  width: 0px;
+  padding: 0px;
+  margin: 0px;
+  overflow: hidden;
+  height: 450px;
+}
+#contacts_explorer {
+  float: right;
+  position: relative;
+  width: 300px;
+  padding: 0px;
+  margin: 0px;
+  overflow: hidden;
+  height: 450px;
+}
 #contacts_filter {
   width: 290px;
   height: 45px;
@@ -49,14 +67,14 @@
 
 #contacts_grid {
   width: 300px;
-  height: 336px;
+  height: 340px;
   overflow: hidden;
   position: relative;
   float: left;
 }
 #contacts_grid_available {
   width: 300px;
-  height: 336px;
+  height: 308px;
   position: relative;
   float: left;
   overflow: auto;
@@ -71,13 +89,14 @@
   text-align: center;
   vertical-align: middle;
   background-color: $fill-color;
+  z-index: 2000;
 }
 #contacts_save {
   width: 130px;
   padding-right: 5px;
   height: 30px;
   text-align: right;
-  float: right;
+  float: left;
   margin-right: 20px;
 }
 #contacts_save_form {
@@ -96,7 +115,7 @@
 #contacts_changes_button {
   width: 130px;
   height: 25px;
-  float: right;
+  float: left;
   margin-top: 10px;
   cursor: pointer;
 }
@@ -163,7 +182,7 @@
   width: 48px;
   height: 48px;
   float: left;
-  margin: 4px;
+  padding: 4px;
   opacity: 0.8;
 }
 #contacts_grid .actor img {
@@ -172,7 +191,9 @@
 }
 #contacts_grid .actor.focused {
   opacity: 1;
-  
+  padding: 3px;
+  background: $secondary-color;
+  border: 1px solid $main-color;
 }
 #contacts_grid .actor.focused img {
   
@@ -183,14 +204,18 @@
   width: 24px;
   height: 24px;
   float: left;
-  margin: 2px 2px 0px 2px;
+  padding: 2px 2px 0px 2px;
+  background-color: $fill-color;
 }
 #contacts_grid_selected .actor img {
   width: 24px;
   height: 24px;
 }
-#contacts_grid_selected.focused .actor {
-  
+#contacts_grid_selected .actor.focused {
+  opacity: 1;
+  background: $header-notification-color;
+  padding: 2px 2px 2px 2px;
+  border: 0px;
 }
 #contacts_grid_selected .actor.focused img {
   
@@ -198,10 +223,16 @@
 #contacts_grid_selected {
   width: 280px;
   min-height: 28px;
-  background-color: $fill-color;
+  background-color: $secondary-color;
   border: 1px solid $main-color;
-  display: none;
-  padding-bottom: 2px;
+  padding: 0px;
+  margin-bottom: 2px;
+}
+#contacts_grid_selected_hint {
+  padding-top: 5px;
+  margin: auto;
+  height: 11px;
+  text-align: center;
 }
 .cheesecake_actor_tipsy.tipsy {
   padding-top: 2px;

data/base/app/controllers/contacts_controller.rb

@@ -34,7 +34,7 @@ class ContactsController < ApplicationController
   end
 
   def destroy
-    @contact.relation_ids = [current_subject.relation_reject.id]
+    @contact.relation_ids = [Relation::Reject.instance.id]
 
     respond_to do |format|
       format.js

data/base/app/models/activity.rb

@@ -228,7 +228,10 @@ class Activity < ActiveRecord::Base
 
       rels = Relation.normalize(relation_ids)
 
-      own_rels     = rels.select{ |r| r.actor_id == channel.author_id }
+      own_rels = rels.select{ |r| r.actor_id == channel.author_id }
+      # Consider Relation::Single as own_relations
+      own_rels += rels.select{ |r| r.is_a?(Relation::Single) }
+
       foreign_rels = rels - own_rels
 
       # Only posting to own relations or allowed to post to foreign relations

data/base/app/models/actor.rb

@@ -205,16 +205,6 @@ class Actor < ActiveRecord::Base
     relations.joins(:relation_permissions => :permission).where('permissions.action' => 'notify')
   end
 
-  # The {Relation::Public} for this {Actor} 
-  def relation_public
-    Relation::Public.of(self)
-  end
-
-  # The {Relation::Reject} for this {Actor} 
-  def relation_reject
-    Relation::Reject.of(self)
-  end
- 
   # All the {Actor Actors} this one has ties with:
   # 
   #   actor.contact_actors #=> array of actors that sent and receive ties from actor
@@ -381,7 +371,7 @@ class Actor < ActiveRecord::Base
   #
   def activity_relations(subject, options = {})
     if Actor.normalize(subject) == self
-      return relation_customs + Array.wrap(relation_public)
+      return relation_customs + Array.wrap(Relation::Public.instance)
     else
       Array.new
     end
@@ -507,7 +497,7 @@ class Actor < ActiveRecord::Base
                                                                     id
     a = Activity.new :verb => "like",
                      :channel => channel,
-                     :relation_ids => Array(subject.relation_public.id)
+                     :relation_ids => Array(Relation::Public.instance.id)
     
     a.activity_objects << activity_object           
                     
@@ -534,8 +524,6 @@ class Actor < ActiveRecord::Base
   # After create callback
   def create_initial_relations
     Relation::Custom.defaults_for(self)
-    Relation::Public.default_for(self)
-    Relation::Reject.default_for(self)
   end
 
   # After create callback

data/base/app/models/relation.rb

@@ -55,8 +55,6 @@ class Relation < ActiveRecord::Base
   has_many :audiences, :dependent => :destroy
   has_many :activities, :through => :audiences
 
-  validates_presence_of :actor_id
-
   scope :actor, lambda { |a|
     where(:actor_id => Actor.normalize_id(a))
   }
@@ -125,12 +123,12 @@ class Relation < ActiveRecord::Base
 
       conds =
         Permission.arel_table[:action].eq(action).and(Permission.arel_table[:object].eq(object))
-
-      # Relation::Public permissions cannot be customized yet
+      # Relation::Public permissions cannot be customized and should not depend on the subject
       if action == 'read' && object == 'activity' && (options[:public].nil? || options[:public])
         conds = conds.or(Relation.arel_table[:type].eq('Relation::Public'))
       end
 
+
       # Add in condition
       if ! options[:in].nil?
         conds = conds.and(Relation.arel_table[:id].in(Relation.normalize_id(Array(options[:in]))))

data/base/app/models/relation/single.rb

@@ -5,13 +5,8 @@
 #
 class Relation::Single < Relation
   class << self
-    def default_for(actor)
-      create! :actor => actor
-    end
-
-    # The {Relation::Public} belonging to actor
-    def of(actor)
-      actor(actor).first
+    def instance
+      first || create!
     end
   end
 

data/base/app/models/tie.rb

@@ -141,7 +141,8 @@ class Tie < ActiveRecord::Base
 
   def relation_belongs_to_sender
     errors.add(:relation, "must belong to sender") unless
-      contact.sender_id == relation.actor_id
+      relation.is_a?(Relation::Single) ||
+        contact.sender_id == relation.actor_id
   end
 end
 

data/base/app/views/activities/_new.html.erb

@@ -25,7 +25,7 @@
 <div id="securities">
   <% if current_subject == receiver %>  
     <%= javascript_tag do %>
-      var relation_public = <%= receiver.relation_public.id %>;
+      var relation_public = <%= Relation::Public.instance.id %>;
       var public_selected = false;
       var relation_options = <%= escape_javascript(current_subject.activity_relations(receiver).sort.map{ |r| r.id }.to_json) %>;
       var relation_public_pos = 0;

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

@@ -5,121 +5,186 @@ $(function(){
       width: 440,
       height: 440
     },
-      grid: {
+    grid: {
         id: "contacts_grid",
-        divIdPrefix: "actor_"
+        divIdPrefix: "actor_",
+        maxOpacity: 0.8
     },
-      rMax : 200, 
-      center: {x : 220, y : 220}           
-    };
-    cheesecakeData.sectors = <%= raw(current_subject.cheesecake_json) %>.sectors;
-    var cheese = new socialCheesecake.Cheesecake(cheesecakeData);
-    cheese.syncSectorFocusCallbacks = true;
-    cheese.onSectorFocusBegin = function(cheesecake,callback){
-      $("#contacts_grid_available").fadeOut("fast", callback);
-    };
-    cheese.onSectorFocusEnd = function(cheesecake){
-      console.log("end"); $("#contacts_grid_available").fadeIn("fast");
-    };
-    $("#contacts_filter_input").keyup(function(){
-      cheese.searchEngine.filter($("#contacts_filter_input").val());
-      //TODO: Make users unfiltered visible again
-    });    
-    cheese.onChange = function(cheesecake){
-      var initial = cheesecake.getInitialState();
-      var changes = cheesecake.getChanges();
-      if((changes.actors)&&(changes.actors.length==0)&&(changes.sectors)&&(changes.sectors.length==0)&&(changes.subsectors)&&(changes.subsectors.length==0)){
-        $("#contacts_changes_button").hide();
-        $("#contacts_save").hide();
-      }else{
-        $("#contacts_changes_button").show();
-        $("#contacts_save").show();
-        var total = 0;
-        if(changes.actors)
-            total += changes.actors.length;
-        if(changes.sectors)
-            total += changes.sectors.length;
-        if(changes.subsectors)
-            total += changes.subsectors.length;
-        $("#contacts_changes_button_total").html(total);
+    colors : {
+      normalSector : {
+        background : "#DEEFF8",
+        border : "#1F4A75",
+        font : "#1F4A75",
+        click : "#BDC7D8",
+        mouseover : "#D4E4EA",
+        mouseup : "#DEEFF8",
+        mouseout : "#DEEFF8"
+      },
+      extraSector : {
+        background : "#879EB5",
+        border : "#1F4A75",
+        font : "#1F4A75",
+        click : "#97AEC5",
+        mouseover : "#97AEC5",
+        mouseup : "#879EB5",
+        mouseout : "#879EB5"
       }
-      var changes_html = "";
-      var actors = changes.actors;
-      $("#contacts_save_changes").val(JSON.stringify(changes));
-      for(var i in actors){
-        actor = actors[i];
-        if(actor.justAdded){
-          var new_subsectors = actor.subsectors;
-          var new_subsectors_string = "";
-          for(var i in new_subsectors){
-            if(i > 0) new_subsectors_string += ", ";
-            new_subsectors_string += cheesecake.getSubsectorById(new_subsectors[i]).label;
-          }
-          changes_html += "<div class=\"change_added\">" + actor.name + " has been removed from " + old_subsectors_string + "</div>";
-        }else if(actor.subsectors.length==0){
-          var old_subsectors = [];
-          var old_subsectors_string = "";
-          for(var i in initial.actors){
-            if(actor.id==initial.actors[i].id){
-              old_subsectors = initial.actors[i].subsectors;
-              break;
-            }
-          }
-          for(var i in old_subsectors){
-            if(i > 0) old_subsectors_string += ", ";
-            old_subsectors_string += cheesecake.getSubsectorById(old_subsectors[i]).label;
+    },
+    rMax : 200,
+    center: {x : 220, y : 220}
+  };
+  cheesecakeData.sectors = <%= raw(current_subject.cheesecake_json) %>.sectors;
+  var cheese = new socialCheesecake.Cheesecake(cheesecakeData);
+  cheese.syncSectorFocusCallbacks = false;
+  cheese.onSectorFocusBegin = function(cheesecake,callback){
+    if(cheese.highlightedSector.auxiliar){
+      $("#contacts_explorer").animate({width: 0},500,function(){        
+        $("#contacts_explorer").hide();
+      });
+      setTimeout(function(){
+        $("#sector_form").show();
+        $("#sector_form").animate({width: 300},500);
+      },100);     
+    }else{
+      $("#contacts_grid_available").fadeOut("fast", callback);      
+    }
+  };
+  cheese.onSectorFocusEnd = function(cheesecake){
+    if(cheese.highlightedSector.auxiliar){
+      
+    }else{
+      $("#contacts_grid_available").fadeIn("fast");      
+    }
+  };
+  cheese.onSectorUnfocusBegin = function(cheesecake,callback){
+    if(cheese.highlightedSector.auxiliar){
+      
+    }else{
+      $("#contacts_grid_available").fadeOut("fast", callback);      
+    }
+  };
+  cheese.onSectorUnfocusEnd = function(cheesecake){
+    if(cheese.highlightedSector.auxiliar){
+      $("#sector_form").animate({width: 0},500,function(){
+        $("#sector_form").hide();
+      });
+      setTimeout(function(){
+        $("#contacts_explorer").show();
+        $("#contacts_explorer").animate({width: 300},500);
+      },100);
+    }else{
+      $("#contacts_grid_available").fadeIn("fast");      
+    }
+  };
+  $("#contacts_filter_input").keyup(function(){
+    cheese.searchEngine.filter($("#contacts_filter_input").val());
+    //TODO: Make users unfiltered visible again
+  });
+  cheese.onChange = function(cheesecake){
+    var initial = cheesecake.getInitialState();
+    var changes = cheesecake.getChanges();
+    if((changes.actors)&&(changes.actors.length==0)&&(changes.sectors)&&(changes.sectors.length==0)&&(changes.subsectors)&&(changes.subsectors.length==0)){
+      $("#contacts_changes_button").hide();
+      $("#contacts_save").hide();
+    }else{
+      $("#contacts_changes_button").show();
+      $("#contacts_save").show();
+      var total = 0;
+      if(changes.actors)
+          total += changes.actors.length;
+      if(changes.sectors)
+          total += changes.sectors.length;
+      if(changes.subsectors)
+          total += changes.subsectors.length;
+      $("#contacts_changes_button_total").html(total);
+    }
+    var changes_html = "";
+    var actors = changes.actors;
+    $("#contacts_save_changes").val(JSON.stringify(changes));
+    for(var i in actors){
+      actor = actors[i];
+      if(actor.justAdded){
+        var new_subsectors = actor.subsectors;
+        var new_subsectors_string = "";
+        for(var i in new_subsectors){
+          if(i > 0) new_subsectors_string += ", ";
+          new_subsectors_string += cheesecake.getSubsectorById(new_subsectors[i]).label;
+        }
+        changes_html += "<div class=\"change_added\">" + actor.name + " has been removed from " + old_subsectors_string + "</div>";
+      }else if(actor.subsectors.length==0){
+        var old_subsectors = [];
+        var old_subsectors_string = "";
+        for(var i in initial.actors){
+          if(actor.id==initial.actors[i].id){
+            old_subsectors = initial.actors[i].subsectors;
+            break;
           }
-          changes_html += "<div class=\"change_deleted\">" + actor.name + " has been removed from " + old_subsectors_string + "</div>";
-        }else{
-          var old_subsectors = [];
-          var new_subsectors = actor.subsectors;
-          var left_subsectors = "";
-          var joined_subsectors = "";
-          for(var i in initial.actors){
-            if(actor.id==initial.actors[i].id){
-              old_subsectors = initial.actors[i].subsectors;
-              break;
-            }
+        }
+        for(var i in old_subsectors){
+          if(i > 0) old_subsectors_string += ", ";
+          old_subsectors_string += cheesecake.getSubsectorById(old_subsectors[i]).label;
+        }
+        changes_html += "<div class=\"change_deleted\">" + actor.name + " has been removed from " + old_subsectors_string + "</div>";
+      }else{
+        var old_subsectors = [];
+        var new_subsectors = actor.subsectors;
+        var left_subsectors = "";
+        var joined_subsectors = "";
+        for(var i in initial.actors){
+          if(actor.id==initial.actors[i].id){
+            old_subsectors = initial.actors[i].subsectors;
+            break;
           }
-          for(var i in old_subsectors){
-            if(new_subsectors.indexOf(old_subsectors[i])==-1){
-              if(left_subsectors.length!=0){
-                left_subsectors += ", ";
-              }
-              left_subsectors += cheesecake.getSubsectorById(old_subsectors[i]).label;
+        }
+        for(var i in old_subsectors){
+          if(new_subsectors.indexOf(old_subsectors[i])==-1){
+            if(left_subsectors.length!=0){
+              left_subsectors += ", ";
             }
+            left_subsectors += cheesecake.getSubsectorById(old_subsectors[i]).label;
           }
-          for(var i in new_subsectors){
-            if(old_subsectors.indexOf(new_subsectors[i])==-1){
-              if(joined_subsectors.length!=0){
-                joined_subsectors += ", ";
-              }
-              joined_subsectors += cheesecake.getSubsectorById(new_subsectors[i]).label;
+        }
+        for(var i in new_subsectors){
+          if(old_subsectors.indexOf(new_subsectors[i])==-1){
+            if(joined_subsectors.length!=0){
+              joined_subsectors += ", ";
             }
+            joined_subsectors += cheesecake.getSubsectorById(new_subsectors[i]).label;
           }
-          if((joined_subsectors.length!=0)&&(left_subsectors.length!=0)){
-            changes_html += "<div class=\"change_modified\">" + actor.name + " has been removed from " + left_subsectors + " and added to " + joined_subsectors + "</div>";
-          }else if(joined_subsectors.length!=0){
-            changes_html += "<div class=\"change_added\">" + actor.name + " has been added to " + joined_subsectors + "</div>";
-          }else{
-            changes_html += "<div class=\"change_deleted\">" + actor.name + " has been removed from " + left_subsectors + "</div>";  
-          }
+        }
+        if((joined_subsectors.length!=0)&&(left_subsectors.length!=0)){
+          changes_html += "<div class=\"change_modified\">" + actor.name + " has been removed from " + left_subsectors + " and added to " + joined_subsectors + "</div>";
+        }else if(joined_subsectors.length!=0){
+          changes_html += "<div class=\"change_added\">" + actor.name + " has been added to " + joined_subsectors + "</div>";
+        }else{
+          changes_html += "<div class=\"change_deleted\">" + actor.name + " has been removed from " + left_subsectors + "</div>";  
         }
       }
-      $("#contacts_changes_details").html(changes_html);
     }
-    $('#contacts_changes_button').tipsy({
-      delayIn: 0,
-      delayOut: 0,
-      gravity: 'se',
-      opacity: 1,
-      trigger: 'manual',
-      className: 'contacts_changes_tipsy_menu',
-      html: true,
-      hoverable: true,
-      title: function(){
-        return $('#contacts_changes').html();
-      }
-    });
-    $("#contacts_save_changes").val(JSON.stringify(cheese.getChanges()));
+    $("#contacts_changes_details").html(changes_html);
+  }
+  $('#contacts_changes_button').tipsy({
+    delayIn: 0,
+    delayOut: 0,
+    gravity: 'se',
+    opacity: 1,
+    trigger: 'manual',
+    className: 'contacts_changes_tipsy_menu',
+    html: true,
+    hoverable: true,
+    title: function(){
+      return $('#contacts_changes').html();
+    }
+  });
+  $("#contacts_save_changes").val(JSON.stringify(cheese.getChanges()));
+  $("#contacts_save_form").off("submit.disable");
+  $("#contacts_save_form").on("submit.disable",function(){
+    
+    if($(".contacts_changes_tipsy_menu").length != 0){
+      $("#contacts_changes_button").tipsy("hide");
+    }
+    $("#contacts_grid_saving").show();
+    cheese.disable();
+    $("#contacts_save_button").val("<%= t('cheesecake.changes.saving') %>").attr("disabled","true");
+  });
 });