mailboxer 0.0.12 → 0.0.13

data/app/models/conversation.rb

@@ -1,9 +1,13 @@
 class Conversation < ActiveRecord::Base
-	attr_reader :originator, :original_message, :last_sender, :last_message, :users
+	attr_reader :originator, :original_message, :last_sender, :last_message
+	attr_accessor :recipients, :body
 	has_many :messages
 	has_many :receipts, :through => :messages
 
+	validates_presence_of :recipients, :subject, :body
+
 	before_create :clean
+	after_create :clear_recipients
 
 	#  before_create :clean
 	scope :participant, lambda {|participant|
@@ -47,6 +51,15 @@ class Conversation < ActiveRecord::Base
 		return self.receipts(participant).untrash
 	end
 
+	def recipients
+		if @recipients.blank? and self.last_message
+			recps = self.last_message.recipients
+			recps = recps.is_a?(Array) ? recps : [recps]
+			return recps
+		end
+		return @recipients
+	end
+
 	#originator of the conversation.
 	def originator
 		@orignator = self.original_message.sender if @originator.nil?
@@ -76,15 +89,6 @@ class Conversation < ActiveRecord::Base
 		return Receipt.conversation(self)
 	end
 
-	#all users involved in the conversation.
-	def recipients
-		return last_message.get_recipients
-	end
-
-	def get_recipients
-		return self.recipients
-	end
-
 	def count_messages
 		return Message.conversation(self).count
 	end
@@ -93,20 +97,20 @@ class Conversation < ActiveRecord::Base
 		return false if participant.nil?
 		return self.receipts(participant).count != 0
 	end
-	
+
 	def is_trashed?(participant)
 		return false if participant.nil?
-    	return self.receipts(participant).trash.count!=0
+		return self.receipts(participant).trash.count!=0
 	end
-	
+
 	def is_completely_trashed?(participant)
 		return false if participant.nil?
-	    return self.receipts(participant).trash.count==self.receipts(participant).count
+		return self.receipts(participant).trash.count==self.receipts(participant).count
 	end
-	
+
 	def is_unread?(participant)
 		return false if participant.nil?
-    	return self.receipts(participant).unread.count!=0
+		return self.receipts(participant).unread.count!=0
 	end
 	#  protected
 	#  #[empty method]
@@ -117,9 +121,16 @@ class Conversation < ActiveRecord::Base
 	#    #strip all illegal content here. (scripts, shit that will break layout, etc.)
 	#  end
 
+	protected
+
 	include ActionView::Helpers::SanitizeHelper
 
 	def clean
 		self.subject = sanitize self.subject
 	end
+
+	def clear_recipients
+		self.recipients=nil
+	end
+
 end

data/app/models/message.rb

@@ -25,16 +25,20 @@ class Message < ActiveRecord::Base
     self.recipients.each do |r|
       r.mailbox[mailbox_type] << self
     end
+    self.recipients=nil
     self.on_deliver_callback.call(self, mailbox_type) unless self.on_deliver_callback.nil?
   end
-  
-  def get_recipients
-    recipients_array = Array.new 
-    self.receipts.each do |receipt|      
-      recipients_array << receipt.receiver
-    end
-    return recipients_array.uniq
-  end  
+   
+  def recipients
+		if @recipients.blank?
+			recipients_array = Array.new
+			self.receipts.each do |receipt|
+				recipients_array << receipt.receiver
+			end
+		return recipients_array
+		end
+		return @recipients
+	end
 
 	def receipts(participant=nil)
 		return Receipt.message(self).receiver(participant) if participant

data/lib/mailboxer/models/messageable.rb

@@ -21,10 +21,11 @@ module Mailboxer
 					return @mailbox
 				end
 
-				def send_message(recipients, msg_body, subject = '')
-					convo = Conversation.create({:subject => subject})
+				def send_message(recipients, msg_body, subject)
+					convo = Conversation.create!({:recipients => recipients, :body => msg_body, :subject => subject})
 					message = Message.create({:sender => self, :conversation => convo,  :body => msg_body, :subject => subject})
 					message.recipients = recipients.is_a?(Array) ? recipients : [recipients]
+					message.recipients = message.recipients.uniq
 					message.deliver(:inbox)
 					return mailbox[:sentbox] << message
 				end
@@ -34,7 +35,8 @@ module Mailboxer
 					conversation.update_attribute(:updated_at, Time.now)
 					subject = subject || "RE: #{conversation.subject}"
 					response = Message.create({:sender => self, :conversation => conversation, :body => reply_body, :subject => subject})
-					response.recipients = recipients.is_a?(Array) ? recipients : [recipients]
+					response.recipients = recipients.is_a?(Array) ? recipients : [recipients]					
+					response.recipients = response.recipients.uniq
 					response.recipients.delete(self)
 					response.deliver(:inbox)
 					return mailbox[:sentbox] << response
@@ -45,9 +47,7 @@ module Mailboxer
 				end
 
 				def reply_to_all(receipt, reply_body, subject = nil)
-					msg = receipt.message
-					recipients = msg.get_recipients
-					return reply(receipt.conversation, recipients, reply_body, subject)
+					return reply(receipt.conversation, receipt.message.recipients, reply_body, subject)
 				end
 
 				def reply_to_conversation(conversation, reply_body, subject = nil)
@@ -56,7 +56,7 @@ module Mailboxer
 						mailbox.receipts.conversation(conversation).untrash
 					end
 					#remove self from recipients unless you are the originator of the convo
-					recipients = conversation.get_recipients
+					recipients = conversation.last_message.recipients
 					if(conversation.originator != self)
 						recipients.delete(self)
 						if(!recipients.include?(conversation.originator))

data/mailboxer.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |s|
   s.name = "mailboxer"
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eduardo Casanova Cuesta"]

data/spec/integration/message_and_receipt_spec.rb

@@ -42,7 +42,7 @@ describe "Messages And Receipts" do
       end
       
       it "should have the correct recipients" do
-        recipients = @message1.get_recipients
+        recipients = @message1.recipients
         recipients.count.should==2
         recipients.count(@entity1).should==1
         recipients.count(@entity2).should==1
@@ -85,7 +85,7 @@ describe "Messages And Receipts" do
       end
       
       it "should have the correct recipients" do
-        recipients = @message2.get_recipients
+        recipients = @message2.recipients
         recipients.count.should==2
         recipients.count(@entity1).should==1
         recipients.count(@entity2).should==1
@@ -131,7 +131,7 @@ describe "Messages And Receipts" do
       end
       
       it "should have the correct recipients" do
-        recipients = @message2.get_recipients
+        recipients = @message2.recipients
         recipients.count.should==2
         recipients.count(@entity1).should==1
         recipients.count(@entity2).should==1
@@ -176,7 +176,7 @@ describe "Messages And Receipts" do
       end
       
       it "should have the correct recipients" do
-        recipients = @message2.get_recipients
+        recipients = @message2.recipients
         recipients.count.should==2
         recipients.count(@entity1).should==1
         recipients.count(@entity2).should==1
@@ -228,7 +228,7 @@ describe "Messages And Receipts" do
       end
       
       it "should have the correct recipients" do
-        recipients = @message1.get_recipients
+        recipients = @message1.recipients
         recipients.count.should==2
         recipients.count(@entity1).should==1
         recipients.count(@entity2).should==1
@@ -271,7 +271,7 @@ describe "Messages And Receipts" do
       end
       
       it "should have the correct recipients" do
-        recipients = @message2.get_recipients
+        recipients = @message2.recipients
         recipients.count.should==2
         recipients.count(@entity1).should==1
         recipients.count(@entity2).should==1
@@ -317,7 +317,7 @@ describe "Messages And Receipts" do
       end
       
       it "should have the correct recipients" do
-        recipients = @message2.get_recipients
+        recipients = @message2.recipients
         recipients.count.should==2
         recipients.count(@entity1).should==1
         recipients.count(@entity2).should==1
@@ -396,7 +396,7 @@ describe "Messages And Receipts" do
       end
       
       it "should have the correct recipients" do
-        recipients = @message1.get_recipients
+        recipients = @message1.recipients
         recipients.count.should==3
         recipients.count(@entity1).should==1
         recipients.count(@entity2).should==1
@@ -445,7 +445,7 @@ describe "Messages And Receipts" do
       end
       
       it "should have the correct recipients" do
-        recipients = @message2.get_recipients
+        recipients = @message2.recipients
         recipients.count.should==2
         recipients.count(@entity1).should==1
         recipients.count(@entity2).should==1
@@ -498,7 +498,7 @@ describe "Messages And Receipts" do
       end
       
       it "should have the correct recipients" do
-        recipients = @message2.get_recipients
+        recipients = @message2.recipients
         recipients.count.should==3
         recipients.count(@entity1).should==1
         recipients.count(@entity2).should==1
@@ -578,7 +578,7 @@ describe "Messages And Receipts" do
       end
       
       it "should have the correct recipients" do
-        recipients = @message1.get_recipients
+        recipients = @message1.recipients
         recipients.count.should==3
         recipients.count(@entity1).should==1
         recipients.count(@entity2).should==1
@@ -627,7 +627,7 @@ describe "Messages And Receipts" do
       end
       
       it "should have the correct recipients" do
-        recipients = @message2.get_recipients
+        recipients = @message2.recipients
         recipients.count.should==2
         recipients.count(@entity1).should==1
         recipients.count(@entity2).should==1
@@ -680,7 +680,7 @@ describe "Messages And Receipts" do
       end
       
       it "should have the correct recipients" do
-        recipients = @message2.get_recipients
+        recipients = @message2.recipients
         recipients.count.should==3
         recipients.count(@entity1).should==1
         recipients.count(@entity2).should==1

data/spec/models/conversation_spec.rb

@@ -31,9 +31,10 @@ describe Conversation do
   end
   
   it "should have all conversation users" do   
-    @conversation.get_recipients.count.should==2
-    @conversation.get_recipients.count(@entity1).should==1
-    @conversation.get_recipients.count(@entity2).should==1
+    @conversation.recipients.count.should==2
+    @conversation.recipients.count.should==2
+    @conversation.recipients.count(@entity1).should==1
+    @conversation.recipients.count(@entity2).should==1
   end
   
 end

data/spec/models/message_spec.rb

@@ -0,0 +1,24 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Message do
+  
+  before do
+    @entity1 = Factory(:user)
+    @entity2 = Factory(:user)
+    @receipt1 = @entity1.send_message(@entity2,"Body","Subject")
+    @receipt2 = @entity2.reply_to_all(@receipt1,"Reply body 1")
+    @receipt3 = @entity1.reply_to_all(@receipt2,"Reply body 2")
+    @receipt4 = @entity2.reply_to_all(@receipt3,"Reply body 3")
+    @message1 = @receipt1.message
+    @message4 = @receipt4.message
+    @conversation = @message1.conversation
+  end  
+  
+  it "should have right recipients" do
+  	@receipt1.message.recipients.count.should==2
+  	@receipt2.message.recipients.count.should==2
+  	@receipt3.message.recipients.count.should==2
+  	@receipt4.message.recipients.count.should==2      
+  end
+    
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mailboxer
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Eduardo Casanova Cuesta
@@ -255,6 +255,7 @@ files:
 - spec/models/conversation_spec.rb
 - spec/models/mailbox_spec.rb
 - spec/models/mailboxer_models_messageable_spec.rb
+- spec/models/message_spec.rb
 - spec/models/receipt_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true