social_stream 0.4.2 → 0.4.3

data/app/controllers/activities_controller.rb

@@ -1,5 +1,6 @@
 class ActivitiesController < InheritedResources::Base
   belongs_to_subjects
+  actions :index
 
   respond_to :js
 

data/app/controllers/avatars_controller.rb

@@ -8,22 +8,22 @@ class AvatarsController < InheritedResources::Base
       new_logo = Avatar.find(params[:id])
 
       if (new_logo.actor == current_subject.actor)
-        
+
         actual_logo = current_subject.avatars.active.first
         if !actual_logo.blank?
-          actual_logo.active = false
-          actual_logo.save
+        actual_logo.active = false
+        actual_logo.save
         end
-  
-        new_logo.active = true
-        new_logo.save
+
+      new_logo.active = true
+      new_logo.save
       end
     end
     redirect_to avatars_path
   end
 
   def create
-    @avatar = Avatar.create(params[:logo])
+    @avatar = Avatar.create(params[:avatar])
 
     if @avatar.new_record?
       render :new
@@ -32,13 +32,20 @@ class AvatarsController < InheritedResources::Base
       @avatar.actor_id = current_subject.actor.id
       if !current_subject.avatars.blank?
         actual_logo = current_subject.avatars.active.first
-        actual_logo.active = false
-        actual_logo.save
+      actual_logo.active = false
+      actual_logo.save
       end
       @avatar.active = true
       @avatar.save
-      redirect_to [current_subject, :profile]
+      redirect_to avatars_path
+    #redirect_to [current_subject, :profile]
     end
   end
 
+  protected
+
+  def begin_of_association_chain
+    current_subject
+  end
+
 end

data/app/controllers/comments_controller.rb

@@ -1,4 +1,6 @@
 class CommentsController < InheritedResources::Base
+  load_and_authorize_resource
+
   respond_to :html, :xml, :js
 
   def destroy

data/app/controllers/conversations_controller.rb

@@ -1,107 +1,102 @@
 class ConversationsController < ApplicationController
 
-	before_filter :get_mailbox, :get_box, :get_actor
-	def index
-		if @box.eql?"inbox"
-			@conversations = @mailbox.inbox.paginate(:per_page => 9, :page => params[:page])
-		elsif @box.eql?"sentbox"
-			@conversations = @mailbox.sentbox.paginate(:per_page => 9, :page => params[:page])
-		else
-			@conversations = @mailbox.trash.paginate(:per_page => 9, :page => params[:page])
-		end
-	end
-
-	def show
-		@conversation = Conversation.find_by_id(params[:id])
-		if @conversation.nil? or !@conversation.is_participant?(@actor)
-			redirect_to conversations_path(:box => @box)
-		return
-		end
-		if @box.eql? 'trash'
-		@receipts = @conversation.receipts(@actor).trash
-		else
-		@receipts = @conversation.receipts(@actor).not_trash
-		end
-		render :action => :show
-		@receipts.mark_as_read
-	end
-
-	def new
-
-	end
-
-	def edit
-
-	end
-
-	def create
-
-	end
-
-	def update
-		@conversation = Conversation.find_by_id(params[:id])
-		if @conversation.nil? or !@conversation.is_participant?(@actor)
-			redirect_to conversations_path(:box => @box)
-		return
-		end
-
-		if params[:untrash].present?
-		@conversation.untrash(@actor)
-		end
-
-		if params[:reply_all].present?
-			last_receipt = @conversation.receipts(@actor).last
-			@receipt = @actor.reply_to_all(last_receipt, params[:body])
-		end
-
-		if @box.eql? 'trash'
-		@receipts = @conversation.receipts(@actor).trash
-		else
-		@receipts = @conversation.receipts(@actor).not_trash
-		end
-		render :action => :show
-		@receipts.mark_as_read
-
-	end
-
-	def destroy
-		@conversation = Conversation.find_by_id(params[:id])
-		if @conversation.nil? or !@conversation.is_participant?(@actor)
-			redirect_to conversations_path(:box => @box)
-		return
-		end
-
-		@conversation.move_to_trash(@actor)
-
-		if params[:location].present?
-			case params[:location]
-			when 'conversation'
-				redirect_to conversations_path(:box => :trash)
-				return
-			else
-			redirect_to conversations_path(:box => @box,:page => params[:page])
-			return
-			end
-		end
-		redirect_to conversations_path(:box => @box,:page => params[:page])
-	end
-
-	private
-
-	def get_mailbox
-		@mailbox = current_subject.mailbox
-	end
-
-	def get_actor
-		@actor = Actor.normalize(current_subject)
-	end
-
-	def get_box
-		if params[:box].blank? or !["inbox","sentbox","trash"].include?params[:box]
-			@box = "inbox"
-		return
-		end
-		@box = params[:box]
-	end
+  before_filter :authenticate_user!
+  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 = @mailbox.inbox.paginate(:per_page => 9, :page => params[:page])
+    elsif @box.eql?"sentbox"
+      @conversations = @mailbox.sentbox.paginate(:per_page => 9, :page => params[:page])
+    else
+      @conversations = @mailbox.trash.paginate(:per_page => 9, :page => params[:page])
+    end
+  end
+
+  def show
+    if @box.eql? 'trash'
+      @receipts = @conversation.receipts(@actor).trash
+    else
+      @receipts = @conversation.receipts(@actor).not_trash
+    end
+    render :action => :show
+    @receipts.mark_as_read
+  end
+
+  def new
+
+  end
+
+  def edit
+
+  end
+
+  def create
+
+  end
+
+  def update
+    if params[:untrash].present?
+    @conversation.untrash(@actor)
+    end
+
+    if params[:reply_all].present?
+      last_receipt = @conversation.receipts(@actor).last
+      @receipt = @actor.reply_to_all(last_receipt, params[:body])
+    end
+
+    if @box.eql? 'trash'
+      @receipts = @conversation.receipts(@actor).trash
+    else
+      @receipts = @conversation.receipts(@actor).not_trash
+    end
+    render :action => :show
+    @receipts.mark_as_read
+
+  end
+
+  def destroy
+
+    @conversation.move_to_trash(@actor)
+
+    if params[:location].present?
+      case params[:location]
+      when 'conversation'
+        redirect_to conversations_path(:box => :trash)
+        return
+      else
+      redirect_to conversations_path(:box => @box,:page => params[:page])
+      return
+      end
+    end
+    redirect_to conversations_path(:box => @box,:page => params[:page])
+  end
+
+  private
+
+  def get_mailbox
+    @mailbox = current_subject.mailbox
+  end
+
+  def get_actor
+    @actor = Actor.normalize(current_subject)
+  end
+
+  def get_box
+    if params[:box].blank? or !["inbox","sentbox","trash"].include?params[:box]
+      @box = "inbox"
+    return
+    end
+    @box = params[:box]
+  end
+
+  def check_current_subject_in_conversation
+    @conversation = Conversation.find_by_id(params[:id])
+
+    if @conversation.nil? or !@conversation.is_participant?(@actor)
+      redirect_to conversations_path(:box => @box)
+    return
+    end
+  end
 
 end

data/app/controllers/groups_controller.rb

@@ -1,6 +1,8 @@
 class GroupsController < InheritedResources::Base
+  load_and_authorize_resource
+
   respond_to :html, :xml, :js
-  
+
   def index
     @groups = Group.alphabetic.
                     letter(params[:letter]).

data/app/controllers/likes_controller.rb

@@ -1,4 +1,6 @@
 class LikesController < ApplicationController
+  before_filter :authenticate_user!
+
   # POST /activities/1/like.js
   def create
     @like = Like.new(current_subject, params[:activity_id])

data/app/controllers/messages_controller.rb

@@ -1,6 +1,10 @@
 class MessagesController < ApplicationController
 
 	before_filter :get_mailbox, :get_box, :get_actor
+	
+	def index
+		redirect_to conversations_path(:box => @box)
+	end
 	# GET /messages/1
 	# GET /messages/1.xml
 	def show

data/app/controllers/posts_controller.rb

@@ -1,8 +1,8 @@
 class PostsController < InheritedResources::Base
-  respond_to :html, :xml, :js
-
   load_and_authorize_resource
 
+  respond_to :html, :xml, :js
+
   def destroy
     @post_activity = resource.post_activity
 

data/app/controllers/ties_controller.rb

@@ -9,6 +9,12 @@ class TiesController < InheritedResources::Base
     end
   end
 
+  def update
+    update do |format|
+      format.html { redirect_to resource.receiver_subject }
+    end
+  end
+
   def suggestion
     @tie = current_subject.suggestion
     render :layout  => false

data/app/helpers/subjects_helper.rb

@@ -11,6 +11,20 @@ module SubjectsHelper
   #
   # The menu option allows overwriting a menu slot with the content of the given block
   #
+  #
+  # Autoexpanding a menu section on your view:
+  #
+  # Toolbar allows you to autoexpand certain menu section that may be of interest for your view.
+  # For example, the messages menu when you are looking your inbox. This is done through :option element.
+  #
+  # To get it working, you should use the proper :option to be expanded, ":option => :messages" in the
+  # mentioned example. This will try, automatically, to expand the section of the menu where its root
+  # list link, the one expanding the section, has an id equal to "#messages_menu". If you use
+  # ":options => :contacts" it will try to expand "#contacts_menu".
+  #
+  # For now its working with :option => :messages, :contacts or :groups
+  #
+  #
   # Examples:
   #
   # Render the home toolbar:
@@ -29,6 +43,7 @@ module SubjectsHelper
   #
   #   <% toolbar :profile => @group, :option => :contacts %>
   #
+
   def toolbar(options = {}, &block)
     if options[:option] && block_given?
       menu_options[options[:option]] = capture(&block)
@@ -44,15 +59,25 @@ module SubjectsHelper
 
     case request.format
     when Mime::JS
-      <<-EOJ
-      $('#toolbar').html("#{ escape_javascript(content) }");
-      EOJ
+      response = <<-EOJ
+
+		      $('#toolbar').html("#{ escape_javascript(content) }");
+		      initMenu();
+		      expandSubMenu('#{ options[:option] }');
+		      EOJ
+
+      response.html_safe
     else
-      content_for(:toolbar) do
-        content
-      end
+    content_for(:toolbar) do
+    content
     end
-    
+    content_for(:javascript) do
+    <<-EOJ
+    expandSubMenu('#{ options[:option] }');
+    EOJ
+    end
+    end
+
   end
 
   # Cache menu options for toolbar

data/app/helpers/ties_helper.rb

@@ -22,11 +22,16 @@ module TiesHelper
             new_tie_path("tie[sender_id]" => tie.sender.id,
                          "tie[receiver_id]" => tie.receiver.id),
             :title => t("contact.new.title",
-                        :name => tie.receiver_subject.name),
-                        :remote => true
+                        :name => tie.receiver_subject.name)
   end
 
   def link_follow_state
       link_to("Unfollow", home_path)
   end
+  
+  
+  def get_permission_id(action,object,function)
+    return Permission.find_by_action_and_function_and_object(action,object,function).id
+  end
+  
 end

data/app/models/activity.rb

@@ -137,7 +137,7 @@ class Activity < ActiveRecord::Base
   def title view
     case verb
     when "follow", "make-friend"
-      I18n.t "activity.verb.#{ verb }.title",
+      I18n.t "activity.verb.#{ verb }.#{ tie.receiver.subject_type }.title",
              :subject => view.link_name(sender_subject),
              :contact => view.link_name(receiver_subject)
     when "post"

data/app/models/actor.rb

@@ -67,7 +67,7 @@ class Actor < ActiveRecord::Base
     joins(:received_ties).merge(Tie.sent_by(a))
   }
  
-  after_create :initialize_ties
+  after_create :create_initial_relations
   
   after_create :create_profile
   
@@ -229,7 +229,7 @@ class Actor < ActiveRecord::Base
   
   # Set of ties sent by this actor received by a
   def ties_to(a)
-    sent_ties.received_by(a)
+    sent_ties.received_by(a).original
   end
   
   def ties_to?(a)
@@ -301,11 +301,8 @@ class Actor < ActiveRecord::Base
   
   private
   
-  def initialize_ties
-    ::SocialStream::Relations.create(subject_type).each do |r|
-      sent_ties.create! :receiver => self,
-                        :relation => r
-    end
+  # After create callback
+  def create_initial_relations
+    Relation.defaults_for(self)
   end
-  
 end