mailboxer 0.0.13 → 0.0.14

data/app/models/conversation.rb

@@ -1,13 +1,11 @@
 class Conversation < ActiveRecord::Base
 	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
+	validates_presence_of :subject
 
-	before_create :clean
-	after_create :clear_recipients
+	before_validation :clean
 
 	#  before_create :clean
 	scope :participant, lambda {|participant|
@@ -52,12 +50,12 @@ class Conversation < ActiveRecord::Base
 	end
 
 	def recipients
-		if @recipients.blank? and self.last_message
+		if self.last_message
 			recps = self.last_message.recipients
 			recps = recps.is_a?(Array) ? recps : [recps]
-			return recps
+		return recps
 		end
-		return @recipients
+		return []
 	end
 
 	#originator of the conversation.
@@ -129,8 +127,4 @@ class Conversation < ActiveRecord::Base
 		self.subject = sanitize self.subject
 	end
 
-	def clear_recipients
-		self.recipients=nil
-	end
-
 end

data/app/models/mailbox.rb

@@ -1,88 +1,64 @@
 class Mailbox
-  attr_accessor :type
-  attr_reader :messageable
-  
-  def initialize(recipient, box = :all)
-    @messageable = recipient
-    @type = box
-  end
-  #sets the mailbox type to the symbol corresponding to the given val.
-  def type=(val)
-    @type = val.to_sym
-  end
-  
-  def conversations(options = {})
-    conv = Conversation.participant(@messageable)
-    
-    if options[:mailbox_type].present?
-      case options[:mailbox_type]
-        when 'inbox'
-        conv = Conversation.inbox(@messageable)
-        when 'sentbox'
-        conv = Conversation.sentbox(@messageable)
-        when 'trash'
-        conv = Conversation.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={})
-    options = options.merge(:mailbox_type => 'inbox')
-    return self.conversations(options)   
-  end
-  
-  def sentbox(options={})
-    options = options.merge(:mailbox_type => 'sentbox')
-    return self.conversations(options)   
-  end
-  
-  def trash(options={})
-    options = options.merge(:mailbox_type => 'trash')
-    return self.conversations(options)     
-  end
-  
-  def receipts(options = {})
-    return Receipt.where(options).receiver(@messageable)
-  end
-  
-  def [](mailbox_type)
-    self.type = mailbox_type
-    return self
-  end
-  
-  def <<(msg)
-    return self.add(msg)
-  end
-  
-  def add(msg)
-    msg_receipt = Receipt.new
-    msg_receipt.message = msg
-    msg_receipt.read = (msg.sender.id == @messageable.id && msg.sender.class == @messageable.class)
-    msg_receipt.receiver = @messageable
-    msg_receipt.mailbox_type = @type.to_s unless @type == :all
-    @messageable.receipts << msg_receipt
-    return msg_receipt
-  end
-  
-  def empty_trash(options = {})
-    return false
-  end
-  
-  def has_conversation?(conversation)
-    return conversation.is_participant?(@messageable)
-  end
-  
-  def is_trashed?(conversation)
-    return conversation.is_trashed?(@messageable)
-  end
-  def is_completely_trashed?(conversation)
-    return conversation.is_completely_trashed?(@messageable)
-  end
-  
+	attr_accessor :type
+	attr_reader :messageable
+	def initialize(recipient, box = :all)
+		@messageable = recipient
+	end
+
+	def conversations(options = {})
+		conv = Conversation.participant(@messageable)
+
+		if options[:mailbox_type].present?
+			case options[:mailbox_type]
+			when 'inbox'
+				conv = Conversation.inbox(@messageable)
+			when 'sentbox'
+				conv = Conversation.sentbox(@messageable)
+			when 'trash'
+				conv = Conversation.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={})
+		options = options.merge(:mailbox_type => 'inbox')
+		return self.conversations(options)
+	end
+
+	def sentbox(options={})
+		options = options.merge(:mailbox_type => 'sentbox')
+		return self.conversations(options)
+	end
+
+	def trash(options={})
+		options = options.merge(:mailbox_type => 'trash')
+		return self.conversations(options)
+	end
+
+	def receipts(options = {})
+		return Receipt.where(options).receiver(@messageable)
+	end
+
+	def empty_trash(options = {})
+		return false
+	end
+
+	def has_conversation?(conversation)
+		return conversation.is_participant?(@messageable)
+	end
+
+	def is_trashed?(conversation)
+		return conversation.is_trashed?(@messageable)
+	end
+
+	def is_completely_trashed?(conversation)
+		return conversation.is_completely_trashed?(@messageable)
+	end
+
 end

data/app/models/message.rb

@@ -1,13 +1,12 @@
 class Message < ActiveRecord::Base
-  #any additional info that needs to be sent in a message (ex. I use these to determine request types)
-  serialize :headers
-  
+  #  
   attr_accessor :recipients
+  belongs_to :sender, :polymorphic => :true
+  belongs_to :conversation, :validate => true, :autosave => true
+  validates_presence_of :subject, :body, :sender  
   
   class_inheritable_accessor :on_deliver_callback
   protected :on_deliver_callback  
-  belongs_to :sender, :polymorphic => :true
-  belongs_to :conversation
   has_many :receipts
   scope :conversation, lambda { |conversation|    
     where(:conversation_id => conversation.id)
@@ -19,14 +18,36 @@ class Message < ActiveRecord::Base
     end
   end  
   
-  def deliver(mailbox_type, should_clean = true)
+  def deliver(reply = false, should_clean = true)
     self.clean if should_clean
-    self.save
+    temp_receipts = Array.new
+    #Receiver receipts
     self.recipients.each do |r|
-      r.mailbox[mailbox_type] << self
+      msg_receipt = Receipt.new
+	  msg_receipt.message = self
+	  msg_receipt.read = false
+	  msg_receipt.receiver = r
+	  msg_receipt.mailbox_type = "inbox"
+   	  temp_receipts << msg_receipt
     end
-    self.recipients=nil
-    self.on_deliver_callback.call(self, mailbox_type) unless self.on_deliver_callback.nil?
+    #Sender receipt
+    sender_receipt = Receipt.new
+	sender_receipt.message = self
+	sender_receipt.read = true
+	sender_receipt.receiver = self.sender
+	sender_receipt.mailbox_type = "sentbox"
+   	temp_receipts << sender_receipt
+    
+ 	temp_receipts.each(&:valid?)
+ 	if temp_receipts.all? { |t| t.errors.empty? }
+		temp_receipts.each(&:save!) 	#Save receipts
+		if reply
+			self.conversation.update_attribute(:updated_at, Time.now)
+		end
+		self.recipients=nil
+		self.on_deliver_callback.call(self) unless self.on_deliver_callback.nil?
+	end
+    return sender_receipt	
   end
    
   def recipients

data/app/models/receipt.rb

@@ -1,71 +1,85 @@
 class Receipt < ActiveRecord::Base
-  belongs_to :message
-  has_one :conversation, :through => :message
-  belongs_to :receiver, :polymorphic => :true
-  scope :receiver, lambda { |receiver|
+	belongs_to :message, :validate => true, :autosave => true
+	has_one :conversation, :through => :message
+	belongs_to :receiver, :polymorphic => :true
+
+	validates_presence_of :receiver
+
+	scope :receiver, lambda { |receiver|
     where(:receiver_id => receiver.id,:receiver_type => receiver.class.to_s)
   }
-  scope :message, lambda { |message|
+	scope :message, lambda { |message|
     where(:message_id => message.id)
   }
-  scope :conversation, lambda { |conversation|    
+	scope :conversation, lambda { |conversation|
     joins(:message).where('messages.conversation_id' => conversation.id)
   }
-  scope :sentbox, where(:mailbox_type => "sentbox")
-  scope :inbox, where(:mailbox_type => "inbox")
-  scope :trash, where(:trashed => true)
-  scope :not_trash, where(:trashed => false)
-  scope :read, where(:read => true)
-  scope :unread, where(:read => false)
-  
-  class << self 
-    def mark_as_read(options={})    
-      where(options).update_all(:read => true)
-    end
-    
-    def mark_as_unread(options={}) 
-      where(options).update_all(:read => false)
-    end
-    
-    def move_to_trash(options={})     
-      where(options).update_all(:trashed => true)
-    end
-    
-    def untrash(options={})     
-      where(options).update_all(:trashed => false)
-    end
-    
-    def move_to_inbox(options={})     
-      where(options).update_all(:mailbox_type => :inbox, :trashed => false)
-    end
-    
-    def move_to_sentbox(options={})     
-      where(options).update_all(:mailbox_type => :sentbox, :trashed => false)
-    end
-  end 
-  
-  def mark_as_read 
-    update_attributes(:read => true)
-  end
-
-  def mark_as_unread
-    update_attributes(:read => false)
-  end
-  
-  def move_to_trash
-    update_attributes(:trashed => true)
-  end
-  
-  def untrash
-    update_attributes(:trashed => false)
-  end
-  
-  def move_to_inbox
-    update_attributes(:mailbox_type => :inbox, :trashed => false)
-  end
-  
-  def move_to_sentbox
-    update_attributes(:mailbox_type => :sentbox, :trashed => false)
-  end
+	scope :sentbox, where(:mailbox_type => "sentbox")
+	scope :inbox, where(:mailbox_type => "inbox")
+	scope :trash, where(:trashed => true)
+	scope :not_trash, where(:trashed => false)
+	scope :read, where(:read => true)
+	scope :unread, where(:read => false)
+
+	after_validation :remove_duplicate_errors
+	class << self
+		def mark_as_read(options={})
+			where(options).update_all(:read => true)
+		end
+
+		def mark_as_unread(options={})
+			where(options).update_all(:read => false)
+		end
+
+		def move_to_trash(options={})
+			where(options).update_all(:trashed => true)
+		end
+
+		def untrash(options={})
+			where(options).update_all(:trashed => false)
+		end
+
+		def move_to_inbox(options={})
+			where(options).update_all(:mailbox_type => :inbox, :trashed => false)
+		end
+
+		def move_to_sentbox(options={})
+			where(options).update_all(:mailbox_type => :sentbox, :trashed => false)
+		end
+	end
+
+	def mark_as_read
+		update_attributes(:read => true)
+	end
+
+	def mark_as_unread
+		update_attributes(:read => false)
+	end
+
+	def move_to_trash
+		update_attributes(:trashed => true)
+	end
+
+	def untrash
+		update_attributes(:trashed => false)
+	end
+
+	def move_to_inbox
+		update_attributes(:mailbox_type => :inbox, :trashed => false)
+	end
+
+	def move_to_sentbox
+		update_attributes(:mailbox_type => :sentbox, :trashed => false)
+	end
+
+	protected
+
+	def remove_duplicate_errors
+		if self.errors["message.conversation.subject"].present? and self.errors["message.subject"].present?
+			self.errors["message.conversation.subject"].each do |msg|
+				self.errors["message.conversation.subject"].delete(msg)
+			end
+		end
+	end
 
 end

data/lib/generators/mailboxer/templates/migration.rb

@@ -1,10 +1,13 @@
 class CreateMailboxer < ActiveRecord::Migration
   def self.up    
+  #Tables
+  	#Conversations
     create_table :conversations do |t|
       t.column :subject, :string, :default => ""
       t.column :created_at, :datetime, :null => false
       t.column :updated_at, :datetime, :null => false
     end    
+  	#Receipts
     create_table :receipts do |t|
       t.references :receiver, :polymorphic => true
       t.column :message_id, :integer, :null => false
@@ -15,21 +18,39 @@ class CreateMailboxer < ActiveRecord::Migration
       t.column :created_at, :datetime, :null => false
       t.column :updated_at, :datetime, :null => false
     end    
+  	#Messages
     create_table :messages do |t|
       t.column :body, :text
       t.column :subject, :string, :default => ""
-      t.column :headers, :text
       t.references :sender, :polymorphic => true
       t.column :conversation_id, :integer
-      t.column :sent, :boolean, :default => false
       t.column :draft, :boolean, :default => false
-      t.column :system, :boolean, :default => false
       t.column :updated_at, :datetime, :null => false
       t.column :created_at, :datetime, :null => false
     end    
+    
+    
+  #Indexes
+  	#Conversations
+  	#Receipts
+  	add_index "receipts","message_id"
+  	#Messages  
+  	add_index "messages","conversation_id"
+  
+  #Foreign keys    
+  	#Conversations
+  	#Receipts
+  	add_foreign_key "receipts", "messages", :name => "receipts_on_message_id"
+  	#Messages  
+  	add_foreign_key "messages", "conversations", :name => "messages_on_conversation_id"
   end
   
   def self.down
+  #Tables  	
+  	remove_foreign_key "receipts", :name => "receipts_on_message_id"
+  	remove_foreign_key "messages", :name => "messages_on_conversation_id"
+  	
+  #Indexes
     drop_table :receipts
     drop_table :conversations
     drop_table :messages

data/lib/mailboxer/models/messageable.rb

@@ -22,24 +22,20 @@ module Mailboxer
 				end
 
 				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})
+					convo = Conversation.new({:subject => subject})
+					message = Message.new({: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
+					return message.deliver
 				end
 
 				def reply(conversation, recipients, reply_body, subject = nil)
-					return nil if(reply_body.blank?)
-					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 = Message.new({:sender => self, :conversation => conversation, :body => reply_body, :subject => subject})
 					response.recipients = recipients.is_a?(Array) ? recipients : [recipients]					
 					response.recipients = response.recipients.uniq
 					response.recipients.delete(self)
-					response.deliver(:inbox)
-					return mailbox[:sentbox] << response
+					return response.deliver(true)
 				end
 
 				def reply_to_sender(receipt, reply_body, subject = nil)

data/mailboxer.gemspec

@@ -1,35 +1,35 @@
-
 Gem::Specification.new do |s|
-  s.name = "mailboxer"
-  s.version = "0.0.13"
+	s.name = "mailboxer"
+	s.version = "0.0.14"
+	s.authors = ["Eduardo Casanova Cuesta"]
+	s.summary = "Messaging system for rails apps."
+	s.description = "A Rails engine that allows any model to act as messageable, permitting it interchange messages with any other messageable model."
+	s.email = "ecasanovac@gmail.com"
+	s.homepage = "http://github.com/ging/mailboxer"
+	s.files = `git ls-files`.split("\n")
+
+	# Gem dependencies
+	#
+	# SQL foreign keys
+	s.add_runtime_dependency('foreigner', '~> 0.9.1')
+
+	# Development Gem dependencies
+	#
+	s.add_development_dependency('rails', '~> 3.0.5')
+	# Testing database
+	s.add_development_dependency('sqlite3-ruby')
+	# Debugging
+	if RUBY_VERSION < '1.9'
+		s.add_development_dependency('ruby-debug', '~> 0.10.3')
+	end
+	# Specs
+	s.add_development_dependency('rspec-rails', '~> 2.5.0')
+	# Fixtures
+	s.add_development_dependency('factory_girl', '~> 1.3.2')
+	# Population
+	s.add_development_dependency('forgery', '~> 0.3.6')
+	# Integration testing
+	s.add_development_dependency('capybara', '~> 0.3.9')
 
-  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-26}
-  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 = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.homepage = %q{http://github.com/ging/mailboxer}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Messaging system for rails apps.}
-  s.files = `git ls-files`.split("\n")
-  
-  s.add_development_dependency('rails', '~> 3.0.5')
-  s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
-  if RUBY_VERSION < '1.9'
-    s.add_development_dependency('ruby-debug', '~> 0.10.3')
-  end
-  s.add_development_dependency(%q<rspec-rails>, [">= 2.0.0.beta"])
-  s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-  s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre3"])
-  s.add_development_dependency(%q<rcov>, [">= 0"])
-  s.add_development_dependency('factory_girl', '~> 1.3.2')
-  s.add_development_dependency('forgery', '~> 0.3.6')
-  s.add_development_dependency('capybara', '~> 0.3.9')
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mailboxer
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Eduardo Casanova Cuesta
@@ -15,13 +15,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 +01:00
+date: 2011-03-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: foreigner
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 9
+        - 1
+        version: 0.9.1
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,11 +49,11 @@ dependencies:
         - 5
         version: 3.0.5
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,11 +63,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,75 +79,27 @@ dependencies:
         - 3
         version: 0.10.3
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31098209
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        version: 2.0.0.beta
-  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rspec-rails
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 27
         segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 270495430
-        segments: 
-        - 1
+        - 2
         - 5
         - 0
-        - pre3
-        version: 1.5.0.pre3
+        version: 2.5.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id007
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -143,11 +111,11 @@ dependencies:
         - 2
         version: 1.3.2
   type: :development
-  version_requirements: *id008
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: forgery
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -159,11 +127,11 @@ dependencies:
         - 6
         version: 0.3.6
   type: :development
-  version_requirements: *id009
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: capybara
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -175,16 +143,15 @@ dependencies:
         - 9
         version: 0.3.9
   type: :development
-  version_requirements: *id010
-description: "A Rails engine that allows any model to act as messageable, permitting it interchange messages with any other messageable model. "
+  version_requirements: *id008
+description: A Rails engine that allows any model to act as messageable, permitting it interchange messages with any other messageable model.
 email: ecasanovac@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .gitignore
 - .yardopts
@@ -260,8 +227,8 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/ging/mailboxer
-licenses: 
-- MIT
+licenses: []
+
 post_install_message: 
 rdoc_options: []