social_stream-base 0.6.8 → 0.7.0

data/.travis.yml

@@ -1,3 +1,4 @@
 rvm:
   - 1.8.7
   - 1.9.2
+  - ree

data/app/{views/activities/_jquery.html.erb → assets/javascripts/activities.js.erb}

@@ -1,10 +1,15 @@
+//= require jquery.livequery
+//
 //initial state
-$('#wrapper_activities_header form').hide();
-$('#new_post').show();
+$(function() {
+  $('#wrapper_activities_header form').hide();
+  $('#new_<%= SocialStream.activity_forms.first %>').show();
+  $('#select_<%= SocialStream.activity_forms.first %>').addClass('selected');
+});
 
 //clicks on headers
-$('.activities_title_header').live('click',function(){
-	$('.activities_title_header').removeClass('selected');
+$('.activity_form_selector').live('click',function(){
+	$('.activity_form_selector').removeClass('selected');
 	$(this).addClass('selected');
 	$('#wrapper_activities_header form').hide();
 	$('#new_'+this.id.split("_")[1]).show();
@@ -24,22 +29,26 @@ $('#masterSubmitButton').live('click',function(){
 });
 
 //javascript for main activities input
-title = "<%= t('activity.input') %>";
-$("#input_activities").click(function(){
-  if(this.value == title){
-    this.value="";
-    $("#masterSubmitButton").show();
-  }
+$(function() {
+  activity_input = "<%= I18n.t('activity.input') %>";
+  $("#input_activities").click(function(){
+    if(this.value == activity_input){
+      this.value = "";
+      $("#masterSubmitButton").show();
+    }
+  });
 });
 
 
 //javascript for comments
-$(".input_new_comments").val("<%= t('comment.input') %>");
-$(".activities_comment_btn").hide();
+$(function() {
+  $(".input_new_comments").val("<%= I18n.t('comment.input') %>");
+  $(".activities_comment_btn").hide();
+});
 
 //usa livequery para usar el javascript luego de una accion con  AJAX
 $(".input_new_comments").livequery("click",function(){
-	if(this.value == "<%= t('comment.input') %>"){
+	if(this.value == "<%= I18n.t('comment.input') %>"){
 		$(this).val("");
 	}
 	$(".activities_comment_btn").hide();
@@ -48,12 +57,12 @@ $(".input_new_comments").livequery("click",function(){
 $(".input_new_comments").livequery("blur",function(){
 	if(this.value == ""){
 		$(".activities_comment_btn").hide();
-    $(this).val("<%= t('comment.input') %>");
+    $(this).val("<%= I18n.t('comment.input') %>");
 	}
 });
 
 $(".input_new_comments").click(function(){
-	if(this.value == "<%= t('comment.input') %>"){
+	if(this.value == "<%= I18n.t('comment.input') %>"){
 		$(this).val("");
 	}
 	$(".activities_comment_btn").hide();

data/app/assets/javascripts/ckeditor.rails.js.erb

@@ -0,0 +1,4 @@
+//= require ckeditor/ckeditor
+//= require ckeditor/adapters/jquery
+
+CKEDITOR.basePath = "<%= asset_path "ckeditor/" %>";

data/app/assets/javascripts/contacts.js

@@ -0,0 +1,10 @@
+// index
+//= require jquery.ba-url
+//= require ajax.paginate
+//
+// edit
+//= require ui.checkbox
+
+$(function() {
+	$('input[id^="relation_custom"]').checkBox();
+});

data/app/assets/javascripts/conversations.js

@@ -0,0 +1,3 @@
+//= require jquery.scrollTo.min
+//= require jquery.validate
+//= require ckeditor.rails

data/app/assets/javascripts/groups.js

@@ -0,0 +1,5 @@
+//= require jqcloud-0.1.3
+//= require jquery.fcbkcomplete
+//= require jquery.validate
+//= require jquery.ba-url
+//= require ajax.paginate

data/app/assets/javascripts/invitations.js

@@ -0,0 +1 @@
+//= require jquery.validate

data/app/assets/javascripts/{main.js → layouts.js}

@@ -1,7 +1,7 @@
-// initialise plugins
-jQuery(function(){
-  
-   
+//= require hoverIntent
+//= require superfish
+//
+$(function() {
     jQuery('ul.sf-menu').superfish({
         delay: 2000, // one second delay on mouseout
         animation: {
@@ -11,13 +11,7 @@ jQuery(function(){
         autoArrows: false,
         dropShadows: false // disable drop shadows
     });
-    
-    
-});
-
 
-
-$(document).ready(function(){
     $('#tabright> ul').tabs({
         fx: {
              height: 'toggle',
@@ -25,4 +19,3 @@ $(document).ready(function(){
         }
     });
 });
-

data/app/assets/javascripts/messages.js

@@ -0,0 +1,3 @@
+//= require jquery.fcbkcomplete
+//= require jquery.validate
+//= require ckeditor.rails

data/app/assets/javascripts/profiles.js

@@ -0,0 +1,6 @@
+//= require jquery.validate
+//= require jquery.fcbkcomplete
+
+$(function() {
+	$(".edit_profile").validate();
+});

data/app/{views/relation/customs/_jquery.erb → assets/javascripts/relation_customs.js}

@@ -1,3 +1,5 @@
+//= require ui.checkbox
+
 var relations;
 
 function checkBoxId(id) {
@@ -27,10 +29,14 @@ function checkBoxEnable(id) {
         switch (checkBoxType(id)) {
 
 	case "relation_custom":
+		if ($('#' + id).parents().hasClass('edit_contact')) {
+			break;
+		};
+
 		$(':checkbox[id^="relation_custom"]:checked:not(#' + id + ')').checkBox('changeCheckStatus', false);
 
 		$.ajax({
-			url: "<%= permissions_path %>",
+			url: "../permissions",
 			context: document.body,
 			data: { relation_id: checkBoxId(id) },
                         dataType: "script"
@@ -55,7 +61,11 @@ function checkBoxDisable(id) {
         switch (checkBoxType(id)) {
 
 	case "relation_custom":
-                $("#permissions").html("");
+       		if ($('#' + id).parents().hasClass('edit_contact')) {
+			break;
+		};
+
+	        $("#permissions").html("");
 		$("#permissions").hide();
 
                 break;

data/app/assets/javascripts/settings.js

@@ -32,4 +32,4 @@ showApiKeySettings = function() {
         $("#api_key_settings_briefing").hide("slow");
         api_key_open = true;
     }
-}
+}

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

@@ -0,0 +1,6 @@
+//= require jquery
+//= require jquery_ujs
+//= require jquery-ui
+//= require modernizr
+//
+//= require_tree .

data/app/assets/javascripts/toolbar.js

@@ -0,0 +1 @@
+//= require menu

data/app/assets/javascripts/users.js

@@ -0,0 +1,2 @@
+//= require jquery.ba-url
+//= require ajax.paginate

data/app/assets/stylesheets/base.css

@@ -199,12 +199,28 @@ textarea.new_contact_text_area{ width:100%; height: 100px; color: #2A3890;}
 	padding: 2px;
 	margin-right: 10px;
 	margin-bottom: 5px;
-	cursor: pointer;
+	border: 2px solid transparent;
+	color: #000000;
+}
+
+.activities_title_header img{
+	margin-bottom: -4px;
+	margin-right: 4px;
+}
+
+#activity_form_select {
+	margin-left: 10px;
+}
+
+.activity_form_selector{
+	padding: 2px;
+	margin-bottom: 5px;
 	float: left;
 	border: 2px solid transparent;
+	cursor: pointer; 
 }
 
-.activities_title_header.selected{
+.activity_form_selector.selected{
 	border: 2px solid #46B9E8;
 }
 

data/app/controllers/contacts_controller.rb

@@ -2,21 +2,18 @@ class ContactsController < ApplicationController
   before_filter :authenticate_user!
   
   def index
+    if params[:pending].present?
+      pending
+      return  
+    end
     @contacts =
       Contact.sent_by(current_subject).
               joins(:receiver).merge(Actor.alphabetic).
               merge(Actor.letter(params[:letter])).
-              merge(Actor.search(params[:search]))
-    
-    if params[:pending].present?
-      @contacts = 
-        Contact.received_by(current_subject).
-              joins(:sender).merge(Actor.alphabetic).
-              merge(Actor.letter(params[:letter])).
               merge(Actor.search(params[:search])).
-              pending.
-              not_reflexive
-    end
+              active
+    
+
 
     respond_to do |format|
       format.html { @contacts = @contacts.page(params[:page]).per(10) }
@@ -53,4 +50,15 @@ class ContactsController < ApplicationController
       format.js
     end
   end
+  
+  def pending
+
+      @contacts = current_subject.pending_contacts
+
+    respond_to do |format|
+      format.html { @contacts = Kaminari.paginate_array(@contacts).page(params[:page]).per(10) }
+      format.js { Kaminari.paginate_array(@contacts).page(params[:page]).per(10) }
+      format.json { render :text => @contacts.map{ |c| { 'key' => c.actor_id.to_s, 'value' => self.class.helpers.truncate_name(c.name) } }.to_json }
+    end
+  end
 end

data/app/helpers/notifications_helper.rb

@@ -3,17 +3,25 @@ module NotificationsHelper
   
   def decode_notification notification_text, activity
     return if activity.nil?
-    notification_text = notification_text.gsub(/\%\{sender\}/, link_to(truncate_name(activity.sender.name), activity.sender.subject))   
-    notification_text = notification_text.gsub(/\%\{confirm\}/,link_to(t('notification.confirm'),edit_contact_path(activity.receiver.contact_to!(activity.sender))))
-    notification_text = notification_text.gsub(/\%\{look\}/,link_to(t('notification.look'),activity.sender.subject))
+    notification_text = notification_text.gsub(/\%\{sender\}/, link_to(truncate_name(activity.sender.name), 
+                                                                      url_for(:controller=> activity.sender.subject.class.to_s.downcase.pluralize, 
+                                                                              :action=> :show, :id=> activity.sender.subject.slug, :only_path => false)))   
+    notification_text = notification_text.gsub(/\%\{confirm\}/,link_to(t('notification.confirm'),edit_contact_url(activity.receiver.contact_to!(activity.sender))))
+    notification_text = notification_text.gsub(/\%\{look\}/,link_to(t('notification.look'),
+                                                                      url_for(:controller=> activity.sender.subject.class.to_s.downcase.pluralize, 
+                                                                              :action=> :show, :id=> activity.sender.subject.slug, :only_path => false)))
     notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
     
     if activity.direct_object.present?
       object = activity.direct_object
       object = object.subject if object.is_a? Actor
-      notification_text=notification_text.gsub(/\%\{object\}/,link_to(object.class.to_s.downcase,object))
+      notification_text=notification_text.gsub(/\%\{object\}/,link_to(object.class.to_s.downcase,
+                                                                      url_for(:controller=> object.class.to_s.downcase.pluralize, :action=> :show, 
+                                                                              :id=> object.id, :only_path => false)))
       notification_text=notification_text.gsub(/\%\{object.name\}/,object.class.to_s.downcase)
-      notification_text=notification_text.gsub(/\%\{object.text\}/,link_to(object.text.truncate(100, :separator =>' '), object)) if object.respond_to? :text 
+      notification_text=notification_text.gsub(/\%\{object.text\}/,link_to(object.text.truncate(100, :separator =>' '), 
+                                                                          url_for(:controller=> object.class.to_s.downcase.pluralize, :action=> :show, 
+                                                                                  :id=> object.id, :only_path => false))) if object.respond_to? :text 
       #notification_text=notification_text.gsub(/\%\{object.image\}/,thumb_for(object)) if SocialStream.activity_forms.include? :document and object.is_a? Document
       
     else

data/app/models/activity.rb

@@ -211,25 +211,24 @@ class Activity < ActiveRecord::Base
     when 'create'
       return false if contact.sender_id != Actor.normalize_id(subject)
 
-      if relation_ids.present?
-        rels = Relation.normalize(relation_ids)
+      val = 
+        if relation_ids.present?
+          rels = Relation.normalize(relation_ids)
 
-        foreign_rels = rels.select{ |r| r.actor_id != contact.sender_id }
+          foreign_rels = rels.select{ |r| r.actor_id != contact.sender_id }
 
-        # Only posting to own relations
-        return true if foreign_rels.blank?
-
-        return Relation.
-                 allow(subject, action, 'activity', :in => foreign_rels).all.size == foreign_rels.size
-      else
-        if contact.reflexive?
-          return true
+          # Only posting to own relations
+          foreign_rels.blank? ||
+            Relation.
+              allow(subject, action, 'activity', :in => foreign_rels).all.size == foreign_rels.size
         else
-          receiver.
-            relation_customs.allow(sender, 'create', 'activity').
-            present?
+          contact.reflexive? ||
+            receiver.
+              relation_customs.allow(sender, 'create', 'activity').
+              present?
         end
-      end
+
+      return val
 
     when 'read'
       return true if [contact.sender_id, contact.receiver_id].include?(Actor.normalize_id(subject)) || relations.select{ |r| r.is_a?(Relation::Public) }.any?

data/app/models/actor.rb

@@ -225,9 +225,15 @@ class Actor < ActiveRecord::Base
     as.map(&:subject)
   end
 
+  # Return a contact to subject.
+  def contact_to(subject)
+    sent_contacts.received_by(subject).first
+  end
+
   # Return a contact to subject. Create it if it does not exist
   def contact_to!(subject)
-    Contact.find_or_create_by_sender_id_and_receiver_id id, Actor.normalize_id(subject)
+    contact_to(subject) ||
+      sent_contacts.create!(:receiver_id => Actor.normalize_id(subject))
   end
   
   # This is an scaffold for a recomendations engine

data/app/models/relation.rb

@@ -93,7 +93,7 @@ class Relation < ActiveRecord::Base
       end
 
       # Add in condition
-      if options[:in].present?
+      if ! options[:in].nil?
         conds = conds.and(Relation.arel_table[:id].in(Relation.normalize_id(Array(options[:in]))))
       end
 

data/app/models/tie.rb

@@ -88,7 +88,7 @@ class Tie < ActiveRecord::Base
   #
   # Create contact activity if this is the first tie
   def create_activity
-    return if contact.reload.ties_count != 1
+    return if contact.reload.ties_count != 1 || relation.is_a?(Relation::Public)
 
     Activity.create! :contact => contact,
                      :relation_ids => contact.relation_ids,

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

@@ -3,18 +3,12 @@
   <%= stylesheet_link_tag "jquery-ui", :media => "screen, projection" %>
 <% end %>
 
-<% content_for :javascript do %>
-  <%= render :partial => 'activities/jquery' %>
-<% end -%>
-
 <div id="wrapper_activities">
   <div id="wrapper_activities_header">
     <div id="activities_title" class="content_size">
-		<% SocialStream.activity_forms.each do |element| %>
-			<div id="header_<%= element %>" class="activities_title_header">
-				<%= render :partial => element.to_s.pluralize+'/header' %>			    
-			</div>
-		<% end %> 	
+      <div class="activities_title_header">
+        <%= image_tag("btn/activity.png") %><%= t 'activity.title' %>
+      </div>
     </div>
     <%= render :partial => 'activities/new', :locals => { :receiver => owner } %>
   </div>

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

@@ -18,6 +18,14 @@
   <% end %>
 </div>
 
+<div id="activity_form_select">
+  <% SocialStream.activity_forms.each do |element| %>
+    <div id="select_<%= element %>" class="activity_form_selector">
+      <%= image_tag "btn/#{ element }.png", :title => t("#{ element }.form.title") %>
+    </div>
+  <% end %> 	
+</div>
+
 <div id="activities_share_btn">
 <% if current_subject == receiver %>
   <div id="securities"><%= select_tag :_relation_ids, options_for_select(current_subject.activity_relations(receiver).sort.map{ |r| [ r.name, r.id ] }), :id => 'security', :multiple => nil %></div>