social_stream-base 0.12.1 → 0.13.0

data/app/assets/javascripts/toolbar.js

@@ -1 +1,22 @@
-//= require menu
+function initMenu() {
+	$('.toolbar_menu ul li ul').hide();
+	$('.toolbar_menu li a').click( function() {
+		$(this).next().slideToggle('normal');
+	}
+	);
+	//Logo menu for current subject
+  //Full Caption Sliding (Hidden to Visible)
+  $('.logo_grid.logo_full').hover( function() {
+    $(".logo_menu", this).stop().animate({top:'101px'},{queue:false,duration:160});
+  }, function() {
+    $(".logo_menu", this).stop().animate({top:'1119px'},{queue:false,duration:160});
+  });
+}
+
+function expandSubMenu(id) {
+	$('#' + id + '_menu').next().show();
+}
+
+$(document).ready(function() {
+	initMenu();
+});

data/app/assets/stylesheets/activities.css.scss

@@ -33,7 +33,7 @@
 .super_activity{width: 95%;}
 .activity {	text-align:left;	display: block;	vertical-align: top;	padding: 10px 0px 5px 0px;
 	display: inline-block;	color: $sentence-color; font-size: 13px;  color: $main-color;border-bottom:1px solid #E9E9E9;}
-.actor_logo {	width: 38px;	padding: 8px 0px 5px 5px;	display: inline-block;	vertical-align: top;}
+.actor_logo {	width: 38px;	padding: 0px 0px 5px 5px;	display: inline-block;	vertical-align: top;}
 .activity_content {	padding: 0px;	display: inline-block;	color: $sentence-color;	width: 89%; word-wrap: break-word; }
 .actor_name {font-size: 13px;}
 .actor_name a{font-weight: bold;}

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

@@ -3,11 +3,13 @@
 #cheesecake {
   position: relative;
   padding: 20px;
+  padding-top: 0px;
 }
 #contacts_cheesecake {
   width: 440px;
   height: 440px;
-  padding: 0px;  
+  padding: 0px;
+  margin-top: 45px;  
   float: left;
 }
 #contacts_filter {
@@ -39,19 +41,59 @@
 }
 #contacts_grid_extra {
   width: 270px;
-  padding: 5px;
-  height: 10px;
-  border: solid 1px $input-border-color;
   text-align: center;
   float: right;
   margin-right: 20px;
   cursor: pointer;
+  vertical-align: middle;
+  padding-top: 6px;
+  background: #DEEFF8;
+  padding-left: 10px;
+  display: block;
+  height: 20px;
+  font-weight: bold;
+}
+#contacts_save {
+  width: 270px;
+  padding-right: 5px;
+  height: 25px;
+  text-align: right;
+  float: right;
+  margin-right: 20px;
+}
+#contacts_save_form {
+  overflow: visible; 
+}
+#contacts_changes {
+  width: 705px;
+  margin-left: 20px;
+}
+#contacts_changes_title {
+  vertical-align: middle;
+  padding-top: 6px;
+  background: $secondary-color;
+  padding-left: 10px;
+  display: block;
+  height: 20px;
+  font-weight: bold;
+  cursor: pointer;
+}
+#contacts_changes_details {
+  border: solid 1px $secondary-color;
+  border-top: 0px;
+  padding: 5px;
+  display: none;
+  max-height: 200px;
+}
+#contacts_changes_details ul{
+  padding-left: 20px;
 }
 #contacts_grid .actor {
   width: 48px;
   height: 48px;
   float: left;
   margin: 4px;
+  display: none;
 }
 #contacts_grid .actor.focused {
   border: 2px solid $main-color;

data/app/assets/stylesheets/settings.css

@@ -3,6 +3,17 @@
     display:block;
     padding-left:10px;
 }
+select#language {
+    background: #fff;
+}
+select#language option {
+    padding: 3px 0 3px 30px;
+    background-repeat: no-repeat;
+    background-position: 3px center;
+}
+select#language option[value=browser] { padding-left: 0; }
+select#language option[value=en] { background-image: url(flags/en.png); }
+select#language option[value=es] { background-image: url(flags/es.png); }
 #api_token {
     font-weight: bold;
     font-style: italic;

data/app/controllers/cheesecake_controller.rb

@@ -1,9 +1,21 @@
 class CheesecakeController < ApplicationController
-  
+
   before_filter :authenticate_user!
-  
   def index
     @actors = current_subject.contact_actors(:direction => :sent)
   end
-  
+
+  def update
+    changes = JSON.parse params[:contacts_save_changes] if params[:contacts_save_changes].is_a? String
+
+    if (actors = changes["actors"]).present? and actors.is_a? Array
+      actors.each do |actor|
+        next if (contact = Contact.find_by_id(actor["extraInfo"].to_i)).nil?
+        contact.relation_ids = actor["subsectors"]
+      end
+    end
+
+    @actors = current_subject.contact_actors(:direction => :sent)
+  end
+
 end

data/app/controllers/contacts_controller.rb

@@ -24,6 +24,8 @@ class ContactsController < ApplicationController
     params[:contact][:relation_ids].present? &&
      params[:contact][:relation_ids].delete("0")
 
+    params[:contact][:user_author] = current_user
+
     if @contact.update_attributes(params[:contact])
       redirect_to @contact.receiver_subject
     else

data/app/controllers/conversations_controller.rb

@@ -4,12 +4,12 @@ class ConversationsController < ApplicationController
   before_filter :get_mailbox, :get_box, :get_actor
   before_filter :check_current_subject_in_conversation, :only => [:show, :update, :destroy]
   def index
-    if @box.eql?"inbox"
-      @conversations = Kaminari.paginate_array(@mailbox.inbox).page(params[:page]).per(9)
-    elsif @box.eql?"sentbox"
-      @conversations = Kaminari.paginate_array(@mailbox.sentbox).page(params[:page]).per(9)
+    if @box.eql? "inbox"
+      @conversations = @mailbox.inbox.page(params[:page]).per(9)
+    elsif @box.eql? "sentbox"
+      @conversations = @mailbox.sentbox.page(params[:page]).per(9)
     else
-      @conversations = Kaminari.paginate_array(@mailbox.trash).page(params[:page]).per(9)
+      @conversations = @mailbox.trash.page(params[:page]).per(9)
     end
   end
 

data/app/controllers/likes_controller.rb

@@ -3,7 +3,7 @@ class LikesController < ApplicationController
 
   # POST /activities/1/like.js
   def create
-    @like = Like.build(current_subject, @indirect_id)
+    @like = Like.build(current_subject, current_user, @indirect_id)
     
     respond_to do |format|
       if @like.save

data/app/helpers/notifications_helper.rb

@@ -0,0 +1,10 @@
+module NotificationsHelper
+
+  # Set locale as per subject preference
+  def locale_as(subject)
+    if subject.respond_to? :language
+      I18n.locale = subject.language || I18n.default_locale
+    end
+  end
+
+end

data/app/models/activity.rb

@@ -1,10 +1,10 @@
 # Activities follow the {Activity Streams}[http://activitystrea.ms/] standard.
 #
-# == Activities, Contacts and Audiences
-# Every activity is attached to a {Contact}, which defines the sender and the receiver of the {Activity}
+# == {Activity Activities}, {Channel Channels} and Audiences
+# Every activity is attached to a {Channel}, which defines the sender and the receiver of the {Activity}
 #
-# Besides, the activity is attached to one or more relations, which define the audicence of the activity,
-# the {actors Actor} that can reach it and their {permissions Permission}
+# Besides, the activity is attached to one or more relations, which define the audience of the activity,
+# in other words, the {actors Actor} that can reach it and their {permissions Permission}
 #
 # == Wall
 # The Activity.wall(args) scope provides all the activities appearing in a wall
@@ -12,16 +12,15 @@
 # There are two types of wall, :home and :profile. Check {Actor#wall} for more information
 #
 class Activity < ActiveRecord::Base
+  # See {SocialStream::Models::Channeled}
+  channeled
+
   has_ancestry
 
   paginates_per 10
 
   belongs_to :activity_verb
 
-  belongs_to :contact
-  has_one :sender,   :through => :contact
-  has_one :receiver, :through => :contact
-
   has_many :audiences, :dependent => :destroy
   has_many :relations, :through => :audiences
 
@@ -33,7 +32,7 @@ class Activity < ActiveRecord::Base
   scope :wall, lambda { |args|
     q =
       select("DISTINCT activities.*").
-      joins(:contact).
+      joins(:channel).
       joins(:audiences).
       joins(:relations).
       roots
@@ -43,13 +42,14 @@ class Activity < ActiveRecord::Base
             where('activity_objects.object_type' => args[:object_type])
     end
 
-    contacts   = Contact.arel_table
+    channels   = Channel.arel_table
     audiences  = Audience.arel_table
     relations  = Relation.arel_table
 
     owner_conditions =
-      contacts[:sender_id].eq(Actor.normalize_id(args[:owner])).
-        or(contacts[:receiver_id].eq(Actor.normalize_id(args[:owner])))
+      channels[:author_id].eq(Actor.normalize_id(args[:owner])).
+        or(channels[:user_author_id].eq(Actor.normalize_id(args[:owner]))).
+        or(channels[:owner_id].eq(Actor.normalize_id(args[:owner])))
 
     audience_conditions =
       audiences[:relation_id].in(args[:relation_ids]).
@@ -59,16 +59,16 @@ class Activity < ActiveRecord::Base
       case args[:type]
       when :home
         followed_conditions =
-          contacts[:sender_id].in(args[:followed]).
-            or(contacts[:receiver_id].in(args[:followed]))
+          channels[:author_id].in(args[:followed]).
+            or(channels[:owner_id].in(args[:followed]))
 
         owner_conditions.
           or(followed_conditions.and(audience_conditions))
       when :profile
         if args[:for].present?
           visitor_conditions =
-            contacts[:sender_id].eq(Actor.normalize_id(args[:for])).
-              or(contacts[:receiver_id].eq(Actor.normalize_id(args[:for])))
+            channels[:author_id].eq(Actor.normalize_id(args[:for])).
+              or(channels[:owner_id].eq(Actor.normalize_id(args[:for])))
 
           owner_conditions.
             and(visitor_conditions.or(audience_conditions))
@@ -110,7 +110,7 @@ class Activity < ActiveRecord::Base
   # This method provides the {Actor}. Use {#sender_subject} for the {SocialStream::Models::Subject Subject}
   # ({User}, {Group}, etc..)
   def sender
-    contact.sender
+    channel.author
   end
 
   # The {SocialStream::Models::Subject Subject} author of this activity
@@ -118,7 +118,7 @@ class Activity < ActiveRecord::Base
   # This method provides the {SocialStream::Models::Subject Subject} ({User}, {Group}, etc...).
   # Use {#sender} for the {Actor}.
   def sender_subject
-    contact.sender_subject
+    channel.author_subject
   end
 
   # The wall where the activity is shown belongs to receiver
@@ -126,7 +126,7 @@ class Activity < ActiveRecord::Base
   # This method provides the {Actor}. Use {#receiver_subject} for the {SocialStream::Models::Subject Subject}
   # ({User}, {Group}, etc..)
   def receiver
-    contact.receiver
+    channel.owner
   end
 
   # The wall where the activity is shown belongs to the receiver
@@ -134,7 +134,7 @@ class Activity < ActiveRecord::Base
   # This method provides the {SocialStream::Models::Subject Subject} ({User}, {Group}, etc...).
   # Use {#receiver} for the {Actor}.
   def receiver_subject
-    contact.receiver_subject
+    channel.owner_subject
   end
 
   # The comments about this activity
@@ -148,7 +148,7 @@ class Activity < ActiveRecord::Base
   end
 
   def liked_by(user) #:nodoc:
-    likes.joins(:contact).merge(Contact.sent_by(user))
+    likes.joins(:channel).merge(Channel.subject_authored_by(user))
   end
 
   # Does user like this activity?
@@ -157,9 +157,12 @@ class Activity < ActiveRecord::Base
   end
 
   # Build a new children activity where subject like this
-  def new_like(subject)
+  def new_like(subject, user)
+    channel = Channel.new :author      => Actor.normalize(subject),
+                          :user_author => Actor.normalize(user),
+                          :owner       => owner
     a = children.new :verb => "like",
-                     :contact => subject.contact_to!(receiver),
+                     :channel => channel,
                      :relation_ids => self.relation_ids
 
     if direct_activity_object.present?
@@ -207,7 +210,7 @@ class Activity < ActiveRecord::Base
     return true if !notificable?
     #Avaible verbs: follow, like, make-friend, post, update
 
-    if ['like','follow','make-friend','post','update'].include? verb and !contact.reflexive?
+    if ['like','follow','make-friend','post','update'].include? verb and !channel.reflexive?
       receiver.notify(notification_subject, "Youre not supposed to see this", self)
     end
     true
@@ -215,15 +218,15 @@ class Activity < ActiveRecord::Base
 
   # Is subject allowed to perform action on this {Activity}?
   def allow?(subject, action)
-    return false if contact.blank?
+    return false if channel.blank?
 
     case action
     when 'create'
-      return false if contact.sender_id != Actor.normalize_id(subject)
+      return false if subject.blank? || channel.author_id != Actor.normalize_id(subject)
 
       rels = Relation.normalize(relation_ids)
 
-      own_rels     = rels.select{ |r| r.actor_id == contact.sender_id }
+      own_rels     = rels.select{ |r| r.actor_id == channel.author_id }
       foreign_rels = rels - own_rels
 
       # Only posting to own relations or allowed to post to foreign relations
@@ -239,12 +242,12 @@ class Activity < ActiveRecord::Base
 
       return false if subject.blank?
 
-      return true if [contact.sender_id, contact.receiver_id].include?(Actor.normalize_id(subject))
+      return true if [channel.author_id, channel.owner_id].include?(Actor.normalize_id(subject))
     when 'update'
-      return true if contact.sender_id == Actor.normalize_id(subject)
+      return true if [channel.author_id, channel.owner_id].include?(Actor.normalize_id(subject))
     when 'destroy'
       # We only allow destroying to sender and receiver by now
-      return [contact.sender_id, contact.receiver_id].include?(Actor.normalize_id(subject))
+      return [channel.author_id, channel.owner_id].include?(Actor.normalize_id(subject))
     end
 
     Relation.
@@ -302,10 +305,10 @@ class Activity < ActiveRecord::Base
 
     # FIXME: repeated in SocialStream::Models::Object#_relation_ids
     self.relation_ids =
-      if contact.reflexive?
+      if channel.reflexive?
         receiver.relation_customs.map(&:id)
       else
-        receiver.relation_customs.allow(contact.sender, 'create', 'activity').map(&:id)
+        receiver.relation_customs.allow(channel.author, 'create', 'activity').map(&:id)
       end
   end
 
@@ -340,11 +343,27 @@ class Activity < ActiveRecord::Base
               :who => I18n.t('notification.who.'+ receiver.subject.class.to_s.underscore,
                               :name => receiver_name))
       when 'post'
-        I18n.t('notification.post.'+ receiver.subject.class.to_s.underscore, 
+        if direct_object.is_a? Comment
+          I18n.t('notification.post.'+ receiver.subject.class.to_s.underscore, 
               :sender => sender_name,
-              :whose => I18n.t('notification.whose.'+ receiver.subject.class.to_s.underscore,
-                               :receiver => receiver_name),
-              :thing => I18n.t(direct_object.class.to_s.underscore+'.one'))
+	      :whose => I18n.t('notification.whose.'+ receiver.subject.class.to_s.underscore,
+	                       :receiver => receiver_name),
+	      :title => 'Re: ' + direct_object.parent_post.text.truncate(30, :separator => ' '))
+	elsif direct_object.is_a? Post
+          I18n.t('notification.post.'+ receiver.subject.class.to_s.underscore, 
+              :sender => sender_name,
+	      :whose => I18n.t('notification.whose.'+ receiver.subject.class.to_s.underscore,
+	                       :receiver => receiver_name),
+	      :title => direct_object.text.truncate(30, :separator => ' '))
+	elsif direct_object.respond_to? :title
+          I18n.t('notification.post.'+ receiver.subject.class.to_s.underscore, 
+              :sender => sender_name,
+	      :whose => I18n.t('notification.whose.'+ receiver.subject.class.to_s.underscore,
+	                       :receiver => receiver_name),
+	      :title => direct_object.title.truncate(30, :separator => ' '))
+	else
+	  I18n.t('notification.default')
+	end
       when 'update'
         I18n.t('notification.update.'+ receiver.subject.class.to_s.underscore, 
               :sender => sender_name,

data/app/models/activity_object.rb

@@ -9,10 +9,9 @@
 # Objects are added to +config/initializers/social_stream.rb+
 #
 class ActivityObject < ActiveRecord::Base
-  # ActivityObject is a subtype of Channel
-  # Author, owner and user_author of this ActivityObject are defined in its channel
-  subtype_of :channel,
-             :belongs => { :dependent => nil }
+  # See {SocialStream::Models::Channeled}
+  channeled
+
   # ActivityObject is a supertype of SocialStream.objects
   supertype_of :object
 
@@ -27,8 +26,6 @@ class ActivityObject < ActiveRecord::Base
     joins(:channel).merge(Channel.authored_by(subject))
   }
 
-  before_validation :check_existing_channel
-
   # The object of this activity object
   def object
     subtype_instance.is_a?(Actor) ?
@@ -45,21 +42,4 @@ class ActivityObject < ActiveRecord::Base
   def acts_as_actor?
     object_type == "Actor"
   end
-
-  protected
-
-  def check_existing_channel
-    return unless channel!.new_record?
-
-    existing_channel =
-      Channel.
-        where(:author_id      => author_id,
-              :owner_id       => owner_id,
-              :user_author_id => user_author_id).
-        first
-
-    return if existing_channel.blank?
-
-    self.channel = existing_channel
-  end
 end