social_stream 0.3.6 → 0.4.0

data/.gitignore

@@ -8,3 +8,4 @@ nbproject
 .project
 .DS_Store
 .yardoc/*
+lib/generators/social_stream/templates/public/images/tmp/

data/Gemfile

@@ -1,4 +1,10 @@
 source "http://rubygems.org"
 
 gemspec
+#Uncomment the following two lines if you are planing to
+#use a local code of mailboxer gem
+#@dependencies.delete_if {|d| d.name == 'mailboxer' }
+#gem 'mailboxer', :path => '../mailboxer'
+
+
 

data/app/controllers/api_controller.rb

@@ -0,0 +1,39 @@
+class ApiController < ApplicationController
+  
+  before_filter :authenticate_user!, :only => [:create_key, :users, :activity_atom_feed]
+  
+  def create_key
+    current_user.reset_authentication_token!
+    redirect_to :controller => :users, :action => :show, :id => current_user.to_param, :auth_token => params[:auth_token]
+  end
+  
+  def users
+    if !params[:id]
+      params[:id]=current_user.to_param
+    end
+    
+    if !params[:format]
+      params[:format]='xml'
+    end
+        
+    redirect_to :controller => :users, :action => :show, :format => params[:format], :id => params[:id], :auth_token => params[:auth_token]
+  end
+  
+  def activity_atom_feed
+    if !params[:page]
+      params[:page] = 1
+    end
+    
+    @user = current_user
+    if params[:id] != nil
+      @user = User.find_by_slug!(params[:id])
+    end
+    
+    @page = params[:page]
+    @activities = current_user.home_wall.paginate(:page => params[:page], :per_page => 10)
+    respond_to do |format|
+      format.atom
+    end
+  end
+  
+end

data/app/controllers/frontpage_controller.rb

@@ -13,4 +13,6 @@ class FrontpageController < ApplicationController
   def redirect_user_to_home
     redirect_to(home_path) if user_signed_in?
   end
+
 end
+

data/app/controllers/groups_controller.rb

@@ -1,4 +1,7 @@
 class GroupsController < InheritedResources::Base
+  
+  respond_to :html, :xml, :js
+  
   def index
     if params[:search]
       @groups = Group.search("%"+params[:search]+"%").paginate(:per_page => 10, :page => params[:page])
@@ -10,11 +13,14 @@ class GroupsController < InheritedResources::Base
       end
     end
   end
+
+
+  
   protected
 
-  # Overwrite resource method to support permalink
+  # Overwrite resource method to support slug
   # See InheritedResources::BaseHelpers#resource
   def resource
-    @group ||= end_of_association_chain.find_by_permalink!(params[:id])
+    @group ||= end_of_association_chain.find_by_slug!(params[:id])
   end
 end

data/app/controllers/likes_controller.rb

@@ -1,12 +1,8 @@
 class LikesController < ApplicationController
-  # Ensure the suitable tie exists
-  before_filter :tie!, :only => :create
-
   # POST /activities/1/like.js
   def create
-    @like = activity!.children.new :verb => "like",
-                                   :_tie => tie!
-		
+    @like = Like.new(current_subject, params[:activity_id])
+
     respond_to do |format|
       if @like.save
         format.js
@@ -16,32 +12,16 @@ class LikesController < ApplicationController
     end
   end
 
+  # DELETE /activities/1/like.js
   def destroy
-    if (@like = activity!.liked_by(current_subject).first)
-      @like.destroy
-    end
+    @like = Like.find!(current_subject, params[:activity_id])
 
     respond_to do |format|
-      format.js
+      if @like.destroy
+        format.js
+      else
+        format.js
+      end
     end
   end
-
-  private
-
-  def activity
-    @activity ||= Activity.find(params[:activity_id])
-  end
-
-  def activity!
-    activity || raise(ActiveRecord::RecordNotFound)
-  end
-
-  def tie
-    @tie ||= current_subject.sent_ties(:receiver => activity!.receiver,
-                                    :relation => activity!.relation).first
-  end
-
-  def tie!
-    tie || raise(ActiveRecord::RecordNotFound)
-  end
 end

data/app/controllers/logos_controller.rb

@@ -0,0 +1,21 @@
+class LogosController < InheritedResources::Base
+=begin  
+  def new
+#    if params[:logo_logo].present?
+ #    render :template => "logos/_precrop", :layout => false
+  #  end
+    debugger
+    if params[:logo_logo]
+      
+    end
+     respond_to do |format|
+      format.html #new.html.erb
+     end
+ 
+  end
+=end
+  
+
+  
+  
+end

data/app/controllers/mailbox/conversation_controller.rb

@@ -0,0 +1,110 @@
+class Mailbox::ConversationController < ApplicationController
+  
+  before_filter :get_mailbox
+  
+  
+  def show
+    @actor = Actor.normalize(current_subject)
+    @conversation = MailboxerConversation.find_by_id(params[:id])
+    if @conversation.nil? or !@conversation.is_participant?(@actor)
+      redirect_to mailbox_index_path
+      return
+    end    
+    @mails = @conversation.mails(@actor)
+    #    messages = Array.new
+    #    @mails.each do |mail|
+    #      messages << mail.message
+    #    end
+    #    @messages = messages.uniq
+  end
+  
+  def new
+  end
+  
+  def edit
+  end
+  
+  def create
+  	@conversation = MailboxerConversation.new
+  	if params[:subject].blank?
+  		@conversation.errors.add("subject", "can't be empty")
+  	end
+  	if params[:body].blank?
+  		@conversation.errors.add("body", "can't be empty")  		
+  	end
+  	if params[:_recipients].nil? or params[:_recipients]==[]
+  		@conversation.errors.add("recipients", "can't be empty")  		
+  	end
+  	if @conversation.errors.any? 
+  		render :action => :new
+  		return  		
+  	end
+  	@actor = current_subject
+  	@recipients = Array.new
+  	params[:_recipients].each do |recp_id|
+  		recp = Actor.find_by_id(recp_id)
+  		next if recp.nil?
+  		@recipients << recp
+  	end
+  	
+  	if (mail = @actor.send_message(@recipients, params[:body], params[:subject]))  	
+	  	@conversation = mail.conversation  	
+	  	redirect_to mailbox_conversation_path(@conversation)
+  	else
+  		render :action => :new
+  	end
+  	
+  end
+  
+  def update    
+    @actor = Actor.normalize(current_subject)
+    @conversation = MailboxerConversation.find_by_id(params[:id])
+    if @conversation.nil? or !@conversation.is_participant?(@actor)
+      redirect_to mailbox_index_path
+      return
+    end 
+    
+    if params[:untrash].present?
+    	@conversation.untrash(@actor)
+    end
+    
+    if params[:reply_all].present?
+      if params[:body].present?
+        last_mail = @conversation.mails(@actor).last
+        @actor.reply_to_all(last_mail, params[:body])
+      end
+    end
+    
+    @mails = @conversation.mails(@actor)
+    render :action => :show
+  end
+  
+  def destroy
+  	@actor = Actor.normalize(current_subject)
+    @conversation = MailboxerConversation.find_by_id(params[:id])
+    if @conversation.nil? or !@conversation.is_participant?(@actor)
+      redirect_to mailbox_index_path
+      return
+    end 
+    
+    @conversation.move_to_trash(@actor)
+    
+    if params[:location].present?
+    	case params[:location]
+    	when 'conversation'
+    		redirect_to mailbox_path(:id => :trash)    		
+    	else
+    		redirect_to mailbox_path(:id => params[:location])
+    	end   	
+    	
+  	return
+    end
+    redirect_to mailbox_index_path
+  end
+  
+  private
+  
+  def get_mailbox    
+    @mailbox = current_subject.mailbox
+  end
+end

data/app/controllers/mailbox_controller.rb

@@ -0,0 +1,35 @@
+class MailboxController < ApplicationController
+  
+  before_filter :get_mailbox
+  
+  def index
+  end
+  
+  def new
+  end
+  
+  def create
+  end
+
+  def show
+    if params[:id].blank? or !["inbox","sentbox","trash"].include?params[:id]
+      redirect_to :action => :index
+      return
+    end
+    
+    if params[:id].eql?"inbox"
+      @conversations = @mailbox.inbox.paginate(:per_page => 8, :page => params[:page])      
+    elsif params[:id].eql?"sentbox"
+      @conversations = @mailbox.sentbox.paginate(:per_page => 8, :page => params[:page])      
+    else
+      @conversations = @mailbox.trash.paginate(:per_page => 8, :page => params[:page])      
+    end
+  end
+  
+  private
+  
+  def get_mailbox    
+    @mailbox = current_subject.mailbox
+  end
+  
+end

data/app/controllers/posts_controller.rb

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

data/app/controllers/profiles_controller.rb

@@ -0,0 +1,3 @@
+class ProfilesController < InheritedResources::Base
+  belongs_to *(SocialStream.subjects + [{ :polymorphic => true, :finder => :find_by_slug!, :singleton => true }])
+end

data/app/controllers/ties_controller.rb

@@ -7,4 +7,14 @@ class TiesController < InheritedResources::Base
     @tie = current_subject.suggestion
     render :layout  => false
   end
+  
+  def create 
+      super do |format|
+        format.html { redirect_to resource.receiver_subject }
+      end
+  end
+
+  
+  
+  
 end

data/app/controllers/users_controller.rb

@@ -12,16 +12,16 @@ class UsersController < ApplicationController
   end
 
   def show
-    @user = User.find_by_permalink!(params[:id])
-
+    @user = User.find_by_slug!(params[:id])
+    
     respond_to do |format|
       format.html # show.html.erb
-      format.xml  { render :xml => @user }
+      format.xml  # { render :xml => @user }
     end
 	end
 
   def edit
-    @user = User.find_by_permalink!(params[:id])
+    @user = User.find_by_slug!(params[:id])
 
     respond_to do |format|
       format.html # edit.html.erb
@@ -31,7 +31,7 @@ class UsersController < ApplicationController
   
   def update
     
-    @user = User.find_by_permalink!(params[:id])
+    @user = User.find_by_slug!(params[:id])
 
     respond_to do |format|
       if @user.update_attributes(params[:user])

data/app/helpers/groups_helper.rb

@@ -1,5 +1,3 @@
 module GroupsHelper
 
-
-
 end

data/app/helpers/subjects_helper.rb

@@ -0,0 +1,11 @@
+module SubjectsHelper
+  def toolbar_menu(option = nil, &block)
+    if option
+      content_for("menu_#{ option }".to_sym, &block)
+    end
+
+    content_for(:toolbar) do
+      render :partial => 'subjects/toolbar'
+    end
+  end
+end

data/app/helpers/ties_helper.rb

@@ -23,7 +23,7 @@ module TiesHelper
                          "tie[receiver_id]" => tie.receiver.id),
             :title => t("contact.new.title",
                         :name => tie.receiver_subject.name),
-            :remote => true
+                        :remote => true
   end
 
   def link_follow_state

data/app/models/activity.rb

@@ -26,6 +26,8 @@ class Activity < ActiveRecord::Base
   has_many :activity_objects,
            :through => :activity_object_activities
 
+  after_create :like_direct_object
+
   scope :home_wall, lambda { |ties|
     select("DISTINCT activities.*").
       roots.
@@ -104,9 +106,21 @@ class Activity < ActiveRecord::Base
     liked_by(user).present?
   end
 
+  # Build a new children activity where subject like this
+  def new_like(subject)
+    children.new :verb => "like",
+                 :_tie => subject.sent_ties(:receiver => receiver,
+                                            :relation => relation).first
+  end
+
+  # The first activity object of this activity
+  def direct_activity_object
+    activity_objects.first
+  end
+
   # The first object of this activity
   def direct_object
-    activity_objects.first.try(:object)
+    direct_activity_object.try(:object)
   end
 
   private
@@ -124,4 +138,13 @@ class Activity < ActiveRecord::Base
       end
     end
   end
+
+  # Link like activities with parent direct object
+  def like_direct_object
+    return unless verb == "like"
+
+    return if parent.direct_object.blank?
+
+    activity_objects << parent.direct_activity_object
+  end
 end