mailboxer 0.0.5 → 0.0.6

data/.yardopts

@@ -0,0 +1,2 @@
+lib/**/*.rb
+app/**/*.rb

data/app/models/mailboxer_conversation.rb

@@ -2,30 +2,34 @@ class MailboxerConversation < ActiveRecord::Base
   attr_reader :originator, :original_message, :last_sender, :last_message, :users
   has_many :mailboxer_messages
   has_many :mailboxer_mails, :through => :mailboxer_messages
-#  before_create :clean
+  #  before_create :clean
   scope :participant, lambda {|participant|
     joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s)    
   }
   scope :inbox, lambda {|participant|
-    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s, 'mailboxer_mails.mailbox_type' => 'inbox') 
+    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s, 'mailboxer_mails.mailbox_type' => 'inbox','mailboxer_mails.trashed' => false) 
   }
   scope :sentbox, lambda {|participant|
-    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s, 'mailboxer_mails.mailbox_type' => 'sentbox')    
+    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s, 'mailboxer_mails.mailbox_type' => 'sentbox','mailboxer_mails.trashed' => false)    
+  }
+  scope :trash, lambda {|participant|
+    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s,'mailboxer_mails.trashed' => true)
+  }
+  scope :unread,  lambda {|participant|
+    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s,'mailboxer_mails.read' => false)
   }
-  scope :trash, joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.trashed' => true)    
-  scope :unread, joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.read' => false)    
   
   class << self
     def total
       count('DISTINCT mailboxer_conversations.id')
     end
   end
- 
+  
   def mark_as_read(participant)
     return if participant.nil?
     return MailboxerMail.conversation(self).receiver(participant).mark_as_read
   end
-
+  
   def mark_as_unread(participant)
     return if participant.nil?
     return MailboxerMail.conversation(self).receiver(participant).mark_as_unread
@@ -87,12 +91,12 @@ class MailboxerConversation < ActiveRecord::Base
     return MailboxerMessage.conversation(self).count
   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
+  #  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
 end

data/app/models/mailboxer_mailbox.rb

@@ -4,7 +4,7 @@ class MailboxerMailbox
   #the user/owner of this mailbox, set when initialized.
   attr_reader :messageable
   #creates a new Mailbox instance with the given user and optional type.
-    
+  
   def initialize(recipient, box = :all)
     @messageable = recipient
     @type = box
@@ -13,23 +13,43 @@ class MailboxerMailbox
   def type=(val)
     @type = val.to_sym
   end
-
+  
   def conversations(options = {})
-    return MailboxerConversation.where(options).participant(@messageable).uniq
+    conv = MailboxerConversation.participant(@messageable)
+    
+    if options[:mailbox_type].present?
+      case options[:mailbox_type]
+        when 'inbox'
+        conv = MailboxerConversation.inbox(@messageable)
+        when 'sentbox'
+        conv = MailboxerConversation.sentbox(@messageable)
+        when 'trash'
+        conv = MailboxerConversation.trash(@messageable)
+      end      
+    end
+    
+    if (options[:read].present? and options[:read]==false) or (options[:unread].present? and options[:unread]==true)
+      conv = conv.unread(@messageable)
+    end    
+    
+    return conv.uniq
   end
   
   def inbox(options={})
-    return MailboxerConversation.where(options).inbox(@messageable).uniq    
+    options = options.merge(:mailbox_type => 'inbox')
+    return self.conversations(options)   
   end
   
   def sentbox(options={})
-    return MailboxerConversation.where(options).sentbox(@messageable).uniq
+    options = options.merge(:mailbox_type => 'sentbox')
+    return self.conversations(options)   
   end
   
   def trash(options={})
-    return MailboxerConversation.where(options).participant(@messageable).trash.uniq    
+    options = options.merge(:mailbox_type => 'trash')
+    return self.conversations(options)     
   end
-
+  
   def mail(options = {})
     return MailboxerMail.where(options).receiver(@messageable)
   end
@@ -38,11 +58,11 @@ class MailboxerMailbox
     self.type = mailbox_type
     return self
   end
-
+  
   def <<(msg)
     return self.add(msg)
   end
-
+  
   def add(msg)
     mail_msg = MailboxerMail.new
     mail_msg.mailboxer_message = msg
@@ -52,20 +72,20 @@ class MailboxerMailbox
     @messageable.mailboxer_mails << mail_msg
     return mail_msg
   end
-
+  
   def empty_trash(options = {})
     return self.mail.trash(options).delete_all
   end
-
+  
   def has_conversation?(conversation)
     return self.mail.conversation(converstaion).count!=0
   end
-
+  
   def is_trashed?(conversation)
     return self.mail.trash.conversation(conversation).count!=0
   end
   def is_completely_trashed?(conversation)
     return self.mail.trash.conversation(conversation).count==self.mail.conversation(conversation).count
   end
-
+  
 end

data/mailboxer.gemspec

@@ -1,11 +1,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mailboxer"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eduardo Casanova Cuesta"]
-  s.date = %q{2011-03-14}
+  s.date = %q{2011-03-17}
   s.description = %q{A Rails engine that allows any model to act as messageable, permitting it interchange messages with any other messageable model. }
   s.email = %q{ecasanovac@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mailboxer
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Eduardo Casanova Cuesta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 +01:00
+date: 2011-03-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -187,6 +187,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- .yardopts
 - Gemfile
 - LICENSE.txt
 - README.rdoc