social_stream 0.4.0 → 0.4.1

data/app/controllers/api_controller.rb

@@ -20,10 +20,6 @@ class ApiController < ApplicationController
   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])

data/app/controllers/frontpage_controller.rb

@@ -6,6 +6,11 @@ class FrontpageController < ApplicationController
       format.html # index.html.erb
     end
   end
+
+  # Webfinger protocol
+  # http://code.google.com/p/webfinger/
+  def host_meta
+  end
   
 
   private

data/app/controllers/logos_controller.rb

@@ -14,8 +14,24 @@ class LogosController < InheritedResources::Base
  
   end
 =end
-  
+begin  
+def create
+    @logo = Logo.create(params[:logo])
+    #debugger
+    #{:original=>#<File:/var/folders/EZ/EZmst6HwE0ipKa3hozX2Zk+++TI/-Tmp-/stream20110322-5217-ft6j6l-0.jpg>}
 
-  
+    
+    if @logo.new_record?
+      render :new
+    else
+      #redirect_to @logo
+      redirect_to logos_path
+    end
+    
+    
+    
+    
+  end
+end  
   
 end

data/app/controllers/messages_controller.rb

@@ -0,0 +1,148 @@
+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
+
+	# 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
+		end
+
+	end
+
+	# GET /messages/new
+	# GET /messages/new.xml
+	def new
+		if params[:receiver].present?
+			@recipient = Actor.find_by_slug(params[:receiver])
+			@recipient = nil if Actor.normalize(@recipient)==Actor.normalize(current_subject)
+		end
+	end
+
+	# GET /messages/1/edit
+	def edit
+
+	end
+
+	# 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
+		end
+
+		if (mail = @actor.send_message(@recipients, params[:body], params[:subject]))
+			@conversation = mail.conversation
+			redirect_to message_path(@conversation, :box => :sentbox)
+		else
+			render :action => :new
+		end
+	end
+
+	# 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
+
+	def get_mailbox
+		@mailbox = current_subject.mailbox
+	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/pshb_controller.rb

@@ -0,0 +1,19 @@
+class PshbController < ApplicationController
+  
+  def callback
+    #sync subscription verification
+    if params['hub.mode']=='subscribe'   
+      render :text => params['hub.challenge'], :status => 200
+      # TO-DO: confirm that params['hub.topic'] is a real 
+      # requested subscription by someone in this node
+    end
+    
+    #sync unsubscription verification
+    if params['hub.mode']=='unsubscribe'
+      render :text => params['hub.challenge'], :status => 200
+      # TO-DO: confirm that params['hub.topic'] is a real 
+      # requested unsubscription by someone in this node
+      # and delete permissions/remote actor if necessary
+    end  
+  end
+end

data/app/controllers/subjects_controller.rb

@@ -0,0 +1,7 @@
+class SubjectsController < ApplicationController
+  def lrdd
+    actor = Actor.find_by_webfinger!(params[:id])
+
+    redirect_to polymorphic_path(actor.subject, :format => :xrd)
+  end
+end

data/app/controllers/ties_controller.rb

@@ -8,13 +8,10 @@ class TiesController < InheritedResources::Base
     render :layout  => false
   end
   
-  def create 
+  def create
       super do |format|
         format.html { redirect_to resource.receiver_subject }
       end
   end
-
-  
-  
   
 end

data/app/helpers/subjects_helper.rb

@@ -1,11 +1,47 @@
 module SubjectsHelper
-  def toolbar_menu(option = nil, &block)
-    if option
-      content_for("menu_#{ option }".to_sym, &block)
+  # Define the toolbar content for your view. There are two typical cases, depending on the value of
+  # options[:profile]
+  # * If present, render the profile menu for the {SocialStream::Models::Subject subject}
+  # * If blank, render the home menu
+  #
+  # The menu option allows overwriting a menu slot with the content of the given block
+  #
+  # Examples:
+  #
+  # Render the home toolbar:
+  #
+  #   <% toolbar %>
+  #
+  # Render the profile toolbar for a user:
+  #
+  #   <% toolbar :profile => @user %>
+  #
+  # Render the home toolbar changing the messages menu option:
+  #
+  #   <% toolbar :option => :messages %>
+  #
+  # Render the profile toolbar for group changing the contacts menu option:
+  #
+  #   <% toolbar :profile => @group, :option => :contacts %>
+  #
+  def toolbar(options = {}, &block)
+    if options[:option] && block_given?
+      menu_options[options[:option]] = capture(&block)
     end
 
     content_for(:toolbar) do
-      render :partial => 'subjects/toolbar'
+      if options[:profile]
+        render :partial => 'subjects/toolbar_profile', :locals => { :subject => options[:profile] }
+      else
+        render :partial => 'subjects/toolbar_home'
+      end
     end
   end
+
+  # Cache menu options for toolbar
+  #
+  # @api private
+  def menu_options #:nodoc:
+    @menu_options ||= {}
+  end
 end

data/app/models/activity_verb.rb

@@ -1,6 +1,6 @@
 class ActivityVerb < ActiveRecord::Base
   # Activity Strems verbs
-  Available = %w( post update like )
+  Available = %w( post update like make_friend)
 
   validates_uniqueness_of :name
 

data/app/models/actor.rb

@@ -53,7 +53,9 @@ class Actor < ActiveRecord::Base
     # Get actor's id from an object, if possible
     def normalize_id(a)
       case a
-        when Array
+      when Integer
+        a
+      when Array
         a.map{ |e| normalize_id(e) }
       else
         Actor.normalize(a).id
@@ -62,11 +64,11 @@ class Actor < ActiveRecord::Base
     # Get actor from object, if possible
     def normalize(a)
       case a
-        when Actor
+      when Actor
         a
-        when Integer
+      when Integer
         Actor.find a
-        when Array
+      when Array
         a.map{ |e| Actor.normalize(e) }
       else
         begin
@@ -76,6 +78,12 @@ class Actor < ActiveRecord::Base
         end
       end
     end
+
+    def find_by_webfinger!(link)
+      link =~ /(acct:)?(.*)@/
+
+      find_by_slug! $2
+    end
   end
   
   

data/app/models/logo.rb

@@ -1,22 +1,59 @@
 require 'RMagick'
 
 class Logo < ActiveRecord::Base
- has_attached_file :logo,
-                        :styles => { :tie => "30x30>",
-                                     :actor => '35x35>',
-                                     :profile => '94x94' },
-                        :default_url => "/images/:attachment/:style/:subtype_class.png"
+ 	has_attached_file :logo,
+                      :styles => { :tie => "30x30>",
+                                   :actor => '35x35>',
+                                   :profile => '94x94' },
+                      :default_url => "/images/:attachment/:style/:subtype_class.png"
+	
 	before_post_process :process_precrop
-	attr_accessor :crop_x, :crop_y, :crop_w, :crop_h
-	validates_attachment_presence :logo
+#	before_post_process :copy_temp_file
+	attr_accessor :crop_x, :crop_y, :crop_w, :crop_h, :name
+	validates_attachment_presence :logo, :if => :uploading_file?
+		
+	after_validation :precrop_done
+#	after_validation :mylog
+	
+	
+  	def uploading_file?
+    	return @name.blank?
+  	end
+	
+	def precrop_done
+		return if @name.blank?
+		
+		images_path = File.join(RAILS_ROOT, "public", "images")
+    	tmp_path = FileUtils.mkdir_p(File.join(images_path, "tmp"))
+    	precrop_path = File.join(tmp_path,@name)
+    	
+    	make_precrop(precrop_path,@crop_x.to_i,@crop_y.to_i,@crop_w.to_i,@crop_h.to_i)
+		@logo = Logo.new :logo => File.open(precrop_path), :name => @name
+		
+		self.logo = @logo.logo
+		
+		FileUtils.remove_file(precrop_path)
+	end
+	
+	def copy_temp_file
+	  images_path = File.join(RAILS_ROOT, "public", "images")
+      tmp_path = FileUtils.mkdir_p(File.join(images_path, "tmp"))
+	end
 
    def process_precrop
+   	
+  	if @name.blank? && (  logo.content_type.present? && !logo.content_type.start_with?("image/"))
+		logo.errors['invalidType'] = "The file you uploaded isn't valid"
+		return false
+	end
+   	
+	return if !@name.blank?
       logo.errors['precrop'] = "You have to make precrop"
 	
       images_path = File.join(RAILS_ROOT, "public", "images")
       tmp_path = FileUtils.mkdir_p(File.join(images_path, "tmp"))
-      
-      resize_image(logo.queued_for_write[:original].path,600,600)
+            
+      resize_image(logo.queued_for_write[:original].path,500,500)
  
       my_file_name = File.basename(logo.queued_for_write[:original].path)
       FileUtils.cp(logo.queued_for_write[:original].path,tmp_path)

data/app/models/tie.rb

@@ -101,6 +101,7 @@ class Tie < ActiveRecord::Base
 
   after_create :complete_weak_set
   after_create :create_activity_after_add_contact
+  after_create :send_message
 
   def relation_name
     @relation_name || relation.try(:name)
@@ -253,7 +254,26 @@ class Tie < ActiveRecord::Base
   
   
   def create_activity_after_add_contact
-    
+    if self.original
+      p = Post.create :text =>
+                      (I18n.t "tie.activity.add_contact", :active=>self.sender.name , :pasive=>self.receiver.name),
+                       :_activity_tie_id => self.id
+    end   
+  end
+  
+  
+  # Values of "receiver.subject_type": "User", "Group"
+  def send_message
+    if self.original
+      if((message!=nil)&&(message!="")&&(receiver.subject_type=="User"))
+        sender.send_message(receiver, get_private_message(message))
+      end 
+    end
+  end
+  
+  
+  def get_private_message(message)
+    return (I18n.t "tie.private_messages.add_contact", :name=>sender.name) + ".\n" + message
   end