social_stream 0.4.1 → 0.4.2

data/Rakefile

@@ -25,16 +25,4 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb', 'app/**/*.rb')
 end
 
-class Bundler::GemHelper
-  def install_gem
-    built_gem_path = build_gem
-    out, err, code = sh_with_code("sudo gem install #{built_gem_path} --no-rdoc --no-ri")
-    if err[/ERROR/]
-      Bundler.ui.error err
-    else
-      Bundler.ui.confirm "#{name} (#{version}) installed"
-    end
-  end
-end
-
 Bundler::GemHelper.install_tasks

data/app/controllers/activities_controller.rb

@@ -1,2 +1,18 @@
-class ActivitiesController < ApplicationController
+class ActivitiesController < InheritedResources::Base
+  belongs_to_subjects
+
+  respond_to :js
+
+  protected
+
+  def collection
+    rel = params[:section].to_i if params[:section].present?
+
+    # should be activities.paginate(:page => params[:page], :count => { :select => 'activity.id', :distinct => true }) but it is not working in Rails 3.0.3 
+    @activities ||= association_chain[-1].
+                      wall(:profile,
+                           :for => current_subject,
+                           :relation => rel).
+                      paginate(:page => params[:page])
+  end
 end

data/app/controllers/api_controller.rb

@@ -1,6 +1,6 @@
 class ApiController < ApplicationController
   
-  before_filter :authenticate_user!, :only => [:create_key, :users, :activity_atom_feed]
+  before_filter :authenticate_user!, :only => [:create_key, :users]#, :activity_atom_feed]
   
   def create_key
     current_user.reset_authentication_token!
@@ -26,7 +26,7 @@ class ApiController < ApplicationController
     end
     
     @page = params[:page]
-    @activities = current_user.home_wall.paginate(:page => params[:page], :per_page => 10)
+    @activities = @user.wall(:home).paginate(:page => params[:page], :per_page => 10)
     respond_to do |format|
       format.atom
     end

data/app/controllers/avatars_controller.rb

@@ -0,0 +1,44 @@
+class AvatarsController < InheritedResources::Base
+
+  before_filter :authenticate_user!
+  def update
+
+    if !current_subject.avatars.blank?
+
+      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
+        end
+  
+        new_logo.active = true
+        new_logo.save
+      end
+    end
+    redirect_to avatars_path
+  end
+
+  def create
+    @avatar = Avatar.create(params[:logo])
+
+    if @avatar.new_record?
+      render :new
+    else
+      @avatar.updating_logo = true
+      @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
+      end
+      @avatar.active = true
+      @avatar.save
+      redirect_to [current_subject, :profile]
+    end
+  end
+
+end

data/app/controllers/contacts_controller.rb

@@ -1,28 +1,20 @@
 class ContactsController < ApplicationController
+  before_filter :authenticate_user!
   
   def index
-    
-    
-    return if current_subject.blank?
-    
-    myContacts = Array.new
-    mySubjects = current_subject.subjects(:direction => :receivers)
-    
-    return if mySubjects.blank?
-    
-    #Fill the array with actor name/actorId of all the actors which has a tie with current_subject
-    mySubjects.each do |aSubject|
-      aSubjectD = {}
-      aSubjectD['key'] = aSubject.name
-      aSubjectD['value'] = aSubject.actor_id.to_s
-      myContacts << aSubjectD
-    end
-    
+    @contacts =
+      current_subject.
+        contacts(:direction => :sent){ |q|
+          q.alphabetic.
+            letter(params[:letter]).
+            search(params[:search]).
+            merge(Tie.original.related_by(current_subject.relations.find_by_id(params[:relation])))
+        }
+
     respond_to do |format|
-      format.html #index.html.erb
-      format.json { render :text => myContacts.to_json }
+      format.html { @contacts = @contacts.paginate(:page => params[:page], :per_page => 10) }
+      format.js { @contacts = @contacts.paginate(:page => params[:page], :per_page => 10) }
+      format.json { render :text => @contacts.map{ |c| { 'key' => c.name, 'value' => c.actor_id.to_s } }.to_json }
     end
-    
   end
-
 end

data/app/controllers/conversations_controller.rb

@@ -0,0 +1,107 @@
+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
+
+end

data/app/controllers/groups_controller.rb

@@ -1,21 +1,17 @@
 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])
-    else
-      if params[:letter] && params[:letter]!="undefined"
-        @groups = Group.search(params[:letter]+"%").paginate(:per_page => 10, :page => params[:page])
-      else
-        @groups = Group.alphabetic.paginate(:per_page => 10, :page => params[:page])
-      end
+    @groups = Group.alphabetic.
+                    letter(params[:letter]).
+                    search(params[:search]).
+                    paginate(:per_page => 10, :page => params[:page])
+
+    index! do |format|
+      format.html { render :layout => (user_signed_in? ? 'application' : 'frontpage') }
     end
   end
 
-
-  
   protected
 
   # Overwrite resource method to support slug

data/app/controllers/messages_controller.rb

@@ -1,32 +1,15 @@
 class MessagesController < ApplicationController
 
-	before_filter :get_mailbox, :get_box
-	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
-
+	before_filter :get_mailbox, :get_box, :get_actor
 	# GET /messages/1
 	# GET /messages/1.xml
 	def show
-		@actor = Actor.normalize(current_subject)
-		@conversation = Conversation.find_by_id(params[:id])
-		if @conversation.nil? or !@conversation.is_participant?(@actor)
-			redirect_to mailbox_index_path
-		return
-		end
-		if @box.eql? 'trash'
-		@receipts = @conversation.receipts(@actor).trash
-		else
-		@conversation.mark_as_read(@actor)
-		@receipts = @conversation.receipts(@actor).not_trash
+		if @message = Message.find_by_id(params[:id]) and @conversation = @message.conversation
+			if @conversation.is_participant?(@actor)
+				redirect_to conversation_path(@conversation, :box => @box, :anchor => "message_" + @message.id.to_s)
+			return
+			end
 		end
-
 	end
 
 	# GET /messages/new
@@ -34,6 +17,7 @@ class MessagesController < ApplicationController
 	def new
 		if params[:receiver].present?
 			@recipient = Actor.find_by_slug(params[:receiver])
+			return if @recipient.nil?
 			@recipient = nil if Actor.normalize(@recipient)==Actor.normalize(current_subject)
 		end
 	end
@@ -46,31 +30,19 @@ class MessagesController < ApplicationController
 	# POST /messages
 	# POST /messages.xml
 	def create
-		@conversation = Conversation.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
+		if params[:_recipients].present?
+			params[:_recipients].each do |recp_id|
+				recp = Actor.find_by_id(recp_id)
+				next if recp.nil?
+				@recipients << recp
+			end
 		end
-
-		if (mail = @actor.send_message(@recipients, params[:body], params[:subject]))
-			@conversation = mail.conversation
-			redirect_to message_path(@conversation, :box => :sentbox)
+		@receipt = @actor.send_message(@recipients, params[:body], params[:subject])
+		if (@receipt.errors.blank?)
+			@conversation = @receipt.conversation
+			redirect_to conversation_path(@conversation, :box => :sentbox)
 		else
 			render :action => :new
 		end
@@ -79,56 +51,13 @@ class MessagesController < ApplicationController
 	# PUT /messages/1
 	# PUT /messages/1.xml
 	def update
-		@actor = Actor.normalize(current_subject)
-		@conversation = Conversation.find_by_id(params[:id])
-		if @conversation.nil? or !@conversation.is_participant?(@actor)
-			redirect_to messages_path(:box => @box)
-		return
-		end
-
-		if params[:untrash].present?
-		@conversation.untrash(@actor)
-		end
-
-		if params[:reply_all].present?
-			if params[:body].present?
-				last_receipt = @conversation.receipts(@actor).last
-				@actor.reply_to_all(last_receipt, params[:body])
-			end
-		end
 
-		if @box.eql? 'trash'
-		@receipts = @conversation.receipts(@actor).trash
-		else
-		@conversation.mark_as_read(@actor)
-		@receipts = @conversation.receipts(@actor).not_trash
-		end
-		render :action => :show
 	end
 
 	# DELETE /messages/1
 	# DELETE /messages/1.xml
 	def destroy
-		@actor = Actor.normalize(current_subject)
-		@conversation = Conversation.find_by_id(params[:id])
-		if @conversation.nil? or !@conversation.is_participant?(@actor)
-			redirect_to messages_path(:box => @box)
-		return
-		end
-
-		@conversation.move_to_trash(@actor)
 
-		if params[:location].present?
-			case params[:location]
-			when 'conversation'
-				redirect_to messages_path(:box => :trash)
-				return
-			else
-			redirect_to messages_path(:box => @box)
-			return
-			end
-		end
-		redirect_to messages_path(:box => @box)
 	end
 
 	private
@@ -137,6 +66,10 @@ class MessagesController < ApplicationController
 		@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"

data/app/controllers/profiles_controller.rb

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

data/app/controllers/pshb_controller.rb

@@ -15,5 +15,41 @@ class PshbController < ApplicationController
       # requested unsubscription by someone in this node
       # and delete permissions/remote actor if necessary
     end  
+
+    logger.debug request.body.read
   end
-end
+  
+  require "net/http"
+  require "uri"
+  
+  def pshb_subscription_request#(topic,hub,mode)
+    t = Thread.new do
+      #test
+      hub = 'http://138.4.7.113:4567/' # last '/' is mandatory!
+      topic = 'http://138.4.7.69:3000/api/user/demo/home.atom'
+      mode = 'subscribe'
+      #
+      uri = URI.parse(hub)   
+      response = Net::HTTP::post_form(uri,{ 'hub.callback' => pshb_callback_url, 
+                                            'hub.mode'     => mode,
+                                            'hub.topic'    => topic,
+                                            'hub.verify'   => 'sync'})                                            
+	puts response.body
+      #TO-DO: process 4XX response.status                                      
+    end                                                                                
+  end
+  
+  def pshb_publish#(topic,hub)
+    t = Thread.new do
+      #test params
+      hub = 'http://138.4.7.113:4567/' # last '/' is mandatory!
+      topic = 'http://138.4.7.69:3000/api/user/demo/home.atom'
+      #
+      uri = URI.parse(hub)
+      response = Net::HTTP::post_form(uri,{ 'hub.mode' => 'publish',
+                                            'hub.url'  => topic})
+      #TO-DO: process 4XX response.status                                      
+    end
+  end  
+  
+end