mailboxer 0.0.10 → 0.0.11

data/app/models/conversation.rb

@@ -1,102 +1,110 @@
 class Conversation < ActiveRecord::Base
-  attr_reader :originator, :original_message, :last_sender, :last_message, :users
-  has_many :messages
-  has_many :receipts, :through => :messages
-  #  before_create :clean
-  scope :participant, lambda {|participant|
+	attr_reader :originator, :original_message, :last_sender, :last_message, :users
+	has_many :messages
+	has_many :receipts, :through => :messages
+
+	before_create :clean
+
+	#  before_create :clean
+	scope :participant, lambda {|participant|
     joins(:receipts).select('DISTINCT conversations.*').where('receipts.receiver_id' => participant.id,'receipts.receiver_type' => participant.class.to_s).order("conversations.updated_at DESC")
   }
-  scope :inbox, lambda {|participant|
+	scope :inbox, lambda {|participant|
     joins(:receipts).select('DISTINCT conversations.*').where('receipts.receiver_id' => participant.id,'receipts.receiver_type' => participant.class.to_s, 'receipts.mailbox_type' => 'inbox','receipts.trashed' => false).order("conversations.updated_at DESC")
   }
-  scope :sentbox, lambda {|participant|
-    joins(:receipts).select('DISTINCT conversations.*').where('receipts.receiver_id' => participant.id,'receipts.receiver_type' => participant.class.to_s, 'receipts.mailbox_type' => 'sentbox','receipts.trashed' => false).order("conversations.updated_at DESC")    
+	scope :sentbox, lambda {|participant|
+    joins(:receipts).select('DISTINCT conversations.*').where('receipts.receiver_id' => participant.id,'receipts.receiver_type' => participant.class.to_s, 'receipts.mailbox_type' => 'sentbox','receipts.trashed' => false).order("conversations.updated_at DESC")
   }
-  scope :trash, lambda {|participant|
+	scope :trash, lambda {|participant|
     joins(:receipts).select('DISTINCT conversations.*').where('receipts.receiver_id' => participant.id,'receipts.receiver_type' => participant.class.to_s,'receipts.trashed' => true).order("conversations.updated_at DESC")
   }
-  scope :unread,  lambda {|participant|
+	scope :unread,  lambda {|participant|
     joins(:receipts).select('DISTINCT conversations.*').where('receipts.receiver_id' => participant.id,'receipts.receiver_type' => participant.class.to_s,'receipts.read' => false).order("conversations.updated_at DESC")
   }
-  
-  class << self
-    def total
-      count('DISTINCT conversations.id')
-    end
-  end
-  
-  def mark_as_read(participant)
-    return if participant.nil?
-    return self.receipts(participant).mark_as_read
-  end
-  
-  def mark_as_unread(participant)
-    return if participant.nil?
-    return self.receipts(participant).mark_as_unread
-  end
-  
-  def move_to_trash(participant)
-    return if participant.nil?
-    return self.receipts(participant).move_to_trash
-  end
-  
-  def untrash(participant)
-    return if participant.nil?
-    return self.receipts(participant).untrash
-  end
-  
-  #originator of the conversation.
-  def originator
-    @orignator = self.original_message.sender if @originator.nil?
-    return @orignator
-  end
-  
-  #first message of the conversation.
-  def original_message
-    @original_message = self.messages.find(:first, :order => 'created_at') if @original_message.nil?
-    return @original_message
-  end
-  
-  #sender of the last message.
-  def last_sender
-    @last_sender = self.last_message.sender if @last_sender.nil?
-    return @last_sender
-  end
-  
-  #last message in the conversation.
-  def last_message
-    @last_message = self.messages.find(:first, :order => 'created_at DESC') if @last_message.nil?
-    return @last_message
-  end
-  
-  def receipts(participant=nil)
-    return Receipt.conversation(self).receiver(participant) if participant
-    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
-  
-  def is_participant?(participant)
-    return false if participant.nil?
-    return self.receipts(participant).count != 0
-  end
-  #  protected
-  #  #[empty method]
-  #  #
-  #  #this gets called before_create. Implement this if you wish to clean out illegal content such as scripts or anything that will break layout. This is left empty because what is considered illegal content varies.
-  #  def clean
-  #    return if subject.nil?
-  #    #strip all illegal content here. (scripts, shit that will break layout, etc.)
-  #  end
+	class << self
+		def total
+			count('DISTINCT conversations.id')
+		end
+	end
+
+	def mark_as_read(participant)
+		return if participant.nil?
+		return self.receipts(participant).mark_as_read
+	end
+
+	def mark_as_unread(participant)
+		return if participant.nil?
+		return self.receipts(participant).mark_as_unread
+	end
+
+	def move_to_trash(participant)
+		return if participant.nil?
+		return self.receipts(participant).move_to_trash
+	end
+
+	def untrash(participant)
+		return if participant.nil?
+		return self.receipts(participant).untrash
+	end
+
+	#originator of the conversation.
+	def originator
+		@orignator = self.original_message.sender if @originator.nil?
+		return @orignator
+	end
+
+	#first message of the conversation.
+	def original_message
+		@original_message = self.messages.find(:first, :order => 'created_at') if @original_message.nil?
+		return @original_message
+	end
+
+	#sender of the last message.
+	def last_sender
+		@last_sender = self.last_message.sender if @last_sender.nil?
+		return @last_sender
+	end
+
+	#last message in the conversation.
+	def last_message
+		@last_message = self.messages.find(:first, :order => 'created_at DESC') if @last_message.nil?
+		return @last_message
+	end
+
+	def receipts(participant=nil)
+		return Receipt.conversation(self).receiver(participant) if participant
+		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
+
+	def is_participant?(participant)
+		return false if participant.nil?
+		return self.receipts(participant).count != 0
+	end
+	#  protected
+	#  #[empty method]
+	#  #
+	#  #this gets called before_create. Implement this if you wish to clean out illegal content such as scripts or anything that will break layout. This is left empty because what is considered illegal content varies.
+	#  def clean
+	#    return if subject.nil?
+	#    #strip all illegal content here. (scripts, shit that will break layout, etc.)
+	#  end
+
+	include ActionView::Helpers::SanitizeHelper
+
+	def clean
+		self.subject = sanitize self.subject
+	end
 end

data/app/models/message.rb

@@ -6,8 +6,6 @@ class Message < ActiveRecord::Base
   
   class_inheritable_accessor :on_deliver_callback
   protected :on_deliver_callback  
-  class_inheritable_accessor :on_deliver_clean
-  protected :on_deliver_clean
   belongs_to :sender, :polymorphic => :true
   belongs_to :conversation
   has_many :receipts
@@ -16,14 +14,13 @@ class Message < ActiveRecord::Base
   }
     
   class << self
-    def on_deliver(clean_method, callback_method)
-      self.on_deliver_clean = clean_method
+    def on_deliver(callback_method)
       self.on_deliver_callback = callback_method
     end
   end  
   
   def deliver(mailbox_type, should_clean = true)
-    self.on_deliver_clean.call(self) unless self.on_deliver_clean.nil? or !should_clean
+    self.clean if should_clean
     self.save
     self.recipients.each do |r|
       r.mailbox[mailbox_type] << self
@@ -39,4 +36,12 @@ class Message < ActiveRecord::Base
     return recipients_array.uniq
   end
   
+  include ActionView::Helpers::SanitizeHelper
+  def clean 
+  	unless self.subject.nil?
+  		self.subject = sanitize self.subject
+  	end
+  	self.body = sanitize self.body
+  end
+  
 end

data/mailboxer.gemspec

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mailboxer
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Eduardo Casanova Cuesta