mailboxer 0.12.0.rc1 → 0.12.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e699bff86b951b515780d88e719ae2b02eca59e7
-  data.tar.gz: 7024930841d1c7b675ecca3eab46767896fcc67c
+  metadata.gz: 38f9237485be3b51d9455f038fa12dcd5a8d0ed6
+  data.tar.gz: 001a61d76bf5735eb93070b6f0e9b02c7c33a507
 SHA512:
-  metadata.gz: 81b0a14bd89091e70042fc95e215482bb3c64c2d352821f40c0da348b51eb0fa1d07c2d802bc73f933758f767e1b65c3f314e7741da3b8035c91607f10321848
-  data.tar.gz: d9e30049e35052c5253f3587239ce9dfb6568c9350056d82fb261ed9a9d20096aef578c1252c3f48353aa4f88688782e019ba187c37e448a73c8f5092224634e
+  metadata.gz: 33d87aed32e8303d19ba5cf31164d6517f48c7b360a2fbcbe691ef6ddad138f48258b6185e559492c7b0366f3c0aba3b52bfaeae98a4f687fb8b404db7ccfb9b
+  data.tar.gz: 4d8e2e8e858855700a61a160874bd87ac66d9cc0c4575c1bbbe10aa137a402ba69e460047f65329a29544df84f6cc404993df5c5afa8fa56c86e13729271645a

data/README.md

@@ -56,6 +56,21 @@ And don't forget to migrate your database:
 $ rake db:migrate
 ```
 
+Upgrading
+---------
+
+If upgrading from 0.11.0 to 0.12.0, run the following generator:
+
+```sh
+$ rails generate mailboxer:namespacing_compatibility
+```
+
+Then, migrate your database:
+
+```sh
+$ rake db:migrate
+```
+
 ## Requirements & Settings
 
 ### Emails

data/app/builders/mailboxer/base_builder.rb

@@ -0,0 +1,26 @@
+class Mailboxer::BaseBuilder
+
+  attr_reader :params
+
+  def initialize(params)
+    @params = params.with_indifferent_access
+  end
+
+  def build
+    klass.new.tap do |object|
+      params.keys.each do |field|
+        object.send("#{field}=", get(field)) unless get(field).nil?
+      end
+    end
+  end
+
+  protected
+
+  def get(key)
+    respond_to?(key) ? send(key) : params[key]
+  end
+
+  def recipients
+    Array(params[:recipients]).uniq
+  end
+end

data/app/builders/mailboxer/conversation_builder.rb

@@ -0,0 +1,8 @@
+class Mailboxer::ConversationBuilder < Mailboxer::BaseBuilder
+
+  protected
+
+  def klass
+    Mailboxer::Conversation
+  end
+end

data/app/builders/mailboxer/message_builder.rb

@@ -0,0 +1,16 @@
+class Mailboxer::MessageBuilder < Mailboxer::BaseBuilder
+
+  protected
+
+  def klass
+    Mailboxer::Message
+  end
+
+  def subject
+    params[:subject] || default_subject
+  end
+
+  def default_subject
+    "#{params[:conversation].subject}"
+  end
+end

data/app/builders/mailboxer/notification_builder.rb

@@ -0,0 +1,8 @@
+class Mailboxer::NotificationBuilder < Mailboxer::BaseBuilder
+
+  protected
+
+  def klass
+    Mailboxer::Notification
+  end
+end

data/app/builders/mailboxer/receipt_builder.rb

@@ -0,0 +1,13 @@
+class Mailboxer::ReceiptBuilder < Mailboxer::BaseBuilder
+
+  protected
+
+  def klass
+    Mailboxer::Receipt
+  end
+
+  def mailbox_type
+    params.fetch(:mailbox_type, 'inbox')
+  end
+
+end

data/app/models/mailboxer/conversation.rb

@@ -81,22 +81,22 @@ class Mailboxer::Conversation < ActiveRecord::Base
 
   #Originator of the conversation.
   def originator
-    @originator ||= self.original_message.sender
+    @originator ||= original_message.sender
   end
 
   #First message of the conversation.
   def original_message
-    @original_message ||= self.messages.order('created_at').first
+    @original_message ||= messages.order('created_at').first
   end
 
   #Sender of the last message.
   def last_sender
-    @last_sender ||= self.last_message.sender
+    @last_sender ||= last_message.sender
   end
 
   #Last message in the conversation.
   def last_message
-    @last_message ||= self.messages.order('created_at DESC').first
+    @last_message ||= messages.order('created_at DESC').first
   end
 
   #Returns the receipts of the conversation for one participants
@@ -117,29 +117,26 @@ class Mailboxer::Conversation < ActiveRecord::Base
 
 	#Adds a new participant to the conversation
 	def add_participant(participant)
-		messages = self.messages
 		messages.each do |message|
-		  receipt = Mailboxer::Receipt.new
-		  receipt.notification = message
-		  receipt.is_read = false
-		  receipt.receiver = participant
-		  receipt.mailbox_type = 'inbox'
-		  receipt.updated_at = message.updated_at
-		  receipt.created_at = message.created_at
-		  receipt.save
+      Mailboxer::ReceiptBuilder.new({
+        :notification => message,
+        :receiver     => participant,
+        :updated_at   => message.updated_at,
+        :created_at   => message.created_at
+      }).build.save
 		end
 	end
 
   #Returns true if the participant has at least one trashed message of the conversation
   def is_trashed?(participant)
     return false unless participant
-    self.receipts_for(participant).trash.count != 0
+    receipts_for(participant).trash.count != 0
   end
 
   #Returns true if the participant has deleted the conversation
   def is_deleted?(participant)
     return false unless participant
-    return self.receipts_for(participant).deleted.count == self.receipts_for(participant).count
+    return receipts_for(participant).deleted.count == receipts_for(participant).count
   end
 
   #Returns true if both participants have deleted the conversation

data/app/models/mailboxer/mailbox.rb

@@ -1,5 +1,4 @@
 class Mailboxer::Mailbox
-  attr_accessor :type
   attr_reader :messageable
 
   #Initializer method
@@ -10,8 +9,8 @@ class Mailboxer::Mailbox
   #Returns the notifications for the messageable
   def notifications(options = {})
     #:type => nil is a hack not to give Messages as Notifications
-    notifs = Mailboxer::Notification.recipient(@messageable).where(:type => nil).order("mailboxer_notifications.created_at DESC")
-    if (options[:read].present? and options[:read]==false) or (options[:unread].present? and options[:unread]==true)
+    notifs = Mailboxer::Notification.recipient(messageable).where(:type => nil).order("mailboxer_notifications.created_at DESC")
+    if options[:read] == false || options[:unread]
       notifs = notifs.unread
     end
 
@@ -31,23 +30,10 @@ class Mailboxer::Mailbox
   #* :unread=true
   #
   def conversations(options = {})
-    conv = Mailboxer::Conversation.participant(@messageable)
-
-    if options[:mailbox_type].present?
-      case options[:mailbox_type]
-      when 'inbox'
-        conv = Mailboxer::Conversation.inbox(@messageable)
-      when 'sentbox'
-        conv = Mailboxer::Conversation.sentbox(@messageable)
-      when 'trash'
-        conv = Mailboxer::Conversation.trash(@messageable)
-      when  'not_trash'
-        conv = Mailboxer::Conversation.not_trash(@messageable)
-      end
-    end
+    conv = get_conversations(options[:mailbox_type])
 
-    if (options.has_key?(:read) && options[:read]==false) || (options.has_key?(:unread) && options[:unread]==true)
-      conv = conv.unread(@messageable)
+    if options[:read] == false || options[:unread]
+      conv = conv.unread(messageable)
     end
 
     conv
@@ -58,7 +44,7 @@ class Mailboxer::Mailbox
   #Same as conversations({:mailbox_type => 'inbox'})
   def inbox(options={})
     options = options.merge(:mailbox_type => 'inbox')
-    self.conversations(options)
+    conversations(options)
   end
 
   #Returns the conversations in the sentbox of messageable
@@ -66,7 +52,7 @@ class Mailboxer::Mailbox
   #Same as conversations({:mailbox_type => 'sentbox'})
   def sentbox(options={})
     options = options.merge(:mailbox_type => 'sentbox')
-    self.conversations(options)
+    conversations(options)
   end
 
   #Returns the conversations in the trash of messageable
@@ -74,12 +60,12 @@ class Mailboxer::Mailbox
   #Same as conversations({:mailbox_type => 'trash'})
   def trash(options={})
     options = options.merge(:mailbox_type => 'trash')
-    self.conversations(options)
+    conversations(options)
   end
 
   #Returns all the receipts of messageable, from Messages and Notifications
   def receipts(options = {})
-    Mailboxer::Receipt.where(options).recipient(@messageable)
+    Mailboxer::Receipt.where(options).recipient(messageable)
   end
 
   #Deletes all the messages in the trash of messageable. NOT IMPLEMENTED.
@@ -90,17 +76,17 @@ class Mailboxer::Mailbox
 
   #Returns if messageable is a participant of conversation
   def has_conversation?(conversation)
-    conversation.is_participant?(@messageable)
+    conversation.is_participant?(messageable)
   end
 
   #Returns true if messageable has at least one trashed message of the conversation
   def is_trashed?(conversation)
-    conversation.is_trashed?(@messageable)
+    conversation.is_trashed?(messageable)
   end
 
   #Returns true if messageable has trashed all the messages of the conversation
   def is_completely_trashed?(conversation)
-    conversation.is_completely_trashed?(@messageable)
+    conversation.is_completely_trashed?(messageable)
   end
 
   #Returns the receipts of object for messageable as a ActiveRecord::Relation
@@ -114,9 +100,26 @@ class Mailboxer::Mailbox
   def receipts_for(object)
     case object
     when Mailboxer::Message, Mailboxer::Notification
-      object.receipt_for(@messageable)
+      object.receipt_for(messageable)
     when Mailboxer::Conversation
-      object.receipts_for(@messageable)
+      object.receipts_for(messageable)
+    end
+  end
+
+  private
+
+  def get_conversations(mailbox)
+    case mailbox
+    when 'inbox'
+      Mailboxer::Conversation.inbox(messageable)
+    when 'sentbox'
+      Mailboxer::Conversation.sentbox(messageable)
+    when 'trash'
+      Mailboxer::Conversation.trash(messageable)
+    when  'not_trash'
+      Mailboxer::Conversation.not_trash(messageable)
+    else
+      Mailboxer::Conversation.participant(messageable)
     end
   end
 end

data/app/models/mailboxer/message.rb

@@ -33,8 +33,7 @@ class Mailboxer::Message < Mailboxer::Notification
 
     temp_receipts << sender_receipt
 
-    if temp_receipts.all?(&:valid?)
-      temp_receipts.each(&:save!) 	#Save receipts
+    if temp_receipts.all?(&:save!)
 
       Mailboxer::MailDispatcher.new(self, recipients).call
 

data/app/models/mailboxer/notification.rb

@@ -33,11 +33,15 @@ class Mailboxer::Notification < ActiveRecord::Base
 
   class << self
     #Sends a Notification to all the recipients
-    def notify_all(recipients,subject,body,obj = nil,sanitize_text = true,notification_code=nil,send_mail=true)
-      notification = Mailboxer::Notification.new({:body => body, :subject => subject})
-      notification.recipients        = Array(recipients).uniq
-      notification.notified_object   = obj               if obj.present?
-      notification.notification_code = notification_code if notification_code.present?
+    def notify_all(recipients, subject, body, obj = nil, sanitize_text = true, notification_code=nil, send_mail=true)
+      notification = Mailboxer::NotificationBuilder.new({
+        :recipients        => recipients,
+        :subject           => subject,
+        :body              => body,
+        :notified_object   => obj,
+        :notification_code => notification_code
+      }).build
+
       notification.deliver sanitize_text, send_mail
     end
 
@@ -47,10 +51,8 @@ class Mailboxer::Notification < ActiveRecord::Base
       case receipts
       when Mailboxer::Receipt
         receipts.valid?
-        receipts.errors.empty?
       when Array
-        receipts.each(&:valid?)
-        receipts.all? { |t| t.errors.empty? }
+        receipts.all?(&:valid?)
       else
         false
       end
@@ -58,18 +60,18 @@ class Mailboxer::Notification < ActiveRecord::Base
   end
 
   def expired?
-    self.expires.present? && (self.expires < Time.now)
+    expires.present? && (expires < Time.now)
   end
 
   def expire!
-    unless self.expired?
-      self.expire
-      self.save
+    unless expired?
+      expire
+      save
     end
   end
 
   def expire
-    unless self.expired?
+    unless expired?
       self.expires = Time.now - 1.second
     end
   end
@@ -78,12 +80,7 @@ class Mailboxer::Notification < ActiveRecord::Base
   #Use Mailboxer::Models::Message.notify and Notification.notify_all instead.
   def deliver(should_clean = true, send_mail = true)
     clean if should_clean
-    temp_receipts = Array.new
-
-    #Receiver receipts
-    self.recipients.each do |r|
-      temp_receipts << build_receipt(r, nil, false)
-    end
+    temp_receipts = recipients.map { |r| build_receipt(r, nil, false) }
 
     if temp_receipts.all?(&:valid?)
       temp_receipts.each(&:save!)   #Save receipts
@@ -97,16 +94,8 @@ class Mailboxer::Notification < ActiveRecord::Base
 
   #Returns the recipients of the Notification
   def recipients
-    if @recipients.blank?
-      recipients_array = Array.new
-      self.receipts.each do |receipt|
-        recipients_array << receipt.receiver
-      end
-
-      recipients_array
-    else
-      @recipients
-    end
+    return Array.wrap(@recipients) unless @recipients.blank?
+    @recipients = receipts.map { |receipt| receipt.receiver }
   end
 
   #Returns the receipt for the participant
@@ -122,53 +111,53 @@ class Mailboxer::Notification < ActiveRecord::Base
   #Returns if the participant have read the Notification
   def is_unread?(participant)
     return false if participant.nil?
-    !self.receipt_for(participant).first.is_read
+    !receipt_for(participant).first.is_read
   end
 
   def is_read?(participant)
-    !self.is_unread?(participant)
+    !is_unread?(participant)
   end
 
   #Returns if the participant have trashed the Notification
   def is_trashed?(participant)
     return false if participant.nil?
-    self.receipt_for(participant).first.trashed
+    receipt_for(participant).first.trashed
   end
 
   #Returns if the participant have deleted the Notification
   def is_deleted?(participant)
     return false if participant.nil?
-    return self.receipt_for(participant).first.deleted
+    return receipt_for(participant).first.deleted
   end
 
   #Mark the notification as read
   def mark_as_read(participant)
     return if participant.nil?
-    self.receipt_for(participant).mark_as_read
+    receipt_for(participant).mark_as_read
   end
 
   #Mark the notification as unread
   def mark_as_unread(participant)
     return if participant.nil?
-    self.receipt_for(participant).mark_as_unread
+    receipt_for(participant).mark_as_unread
   end
 
   #Move the notification to the trash
   def move_to_trash(participant)
     return if participant.nil?
-    self.receipt_for(participant).move_to_trash
+    receipt_for(participant).move_to_trash
   end
 
   #Takes the notification out of the trash
   def untrash(participant)
     return if participant.nil?
-    self.receipt_for(participant).untrash
+    receipt_for(participant).untrash
   end
 
   #Mark the notification as deleted for one of the participant
   def mark_as_deleted(participant)
     return if participant.nil?
-    return self.receipt_for(participant).mark_as_deleted
+    return receipt_for(participant).mark_as_deleted
   end
 
   #Sanitizes the body and subject
@@ -190,12 +179,12 @@ class Mailboxer::Notification < ActiveRecord::Base
   private
 
   def build_receipt(receiver, mailbox_type, is_read = false)
-    Mailboxer::Receipt.new.tap do |receipt|
-      receipt.notification = self
-      receipt.is_read = is_read
-      receipt.receiver = receiver
-      receipt.mailbox_type = mailbox_type
-    end
+    Mailboxer::ReceiptBuilder.new({
+      :notification => self,
+      :mailbox_type => mailbox_type,
+      :receiver     => receiver,
+      :is_read      => is_read
+    }).build
   end
 
 end

data/app/models/mailboxer/receipt.rb

@@ -73,13 +73,10 @@ class Mailboxer::Receipt < ActiveRecord::Base
     end
 
     #This methods helps to do a update_all with table joins, not currently supported by rails.
-    #Acording to the github ticket https://github.com/rails/rails/issues/522 it should be
+    #According to the github ticket https://github.com/rails/rails/issues/522 it should be
     #supported with 3.2.
     def update_receipts(updates,options={})
-      ids = Array.new
-      where(options).each do |rcp|
-        ids << rcp.id
-      end
+      ids = where(options).map { |rcp| rcp.id }
       unless ids.empty?
         conditions = [""].concat(ids)
         condition = "id = ? "
@@ -140,12 +137,12 @@ class Mailboxer::Receipt < ActiveRecord::Base
 
   #Returns if the participant have read the Notification
   def is_unread?
-    !self.is_read
+    !is_read
   end
 
   #Returns if the participant have trashed the Notification
   def is_trashed?
-    self.trashed
+    trashed
   end
 
   protected
@@ -153,9 +150,9 @@ class Mailboxer::Receipt < ActiveRecord::Base
   #Removes the duplicate error about not present subject from Conversation if it has been already
   #raised by Message
   def remove_duplicate_errors
-    if self.errors["mailboxer_notification.conversation.subject"].present? and self.errors["mailboxer_notification.subject"].present?
-      self.errors["mailboxer_notification.conversation.subject"].each do |msg|
-        self.errors["mailboxer_notification.conversation.subject"].delete(msg)
+    if errors["mailboxer_notification.conversation.subject"].present? and errors["mailboxer_notification.subject"].present?
+      errors["mailboxer_notification.conversation.subject"].each do |msg|
+        errors["mailboxer_notification.conversation.subject"].delete(msg)
       end
     end
   end

data/app/uploaders/mailboxer/attachment_uploader.rb

@@ -0,0 +1,3 @@
+class Mailboxer::AttachmentUploader < CarrierWave::Uploader::Base
+  storage :file
+end

data/lib/mailboxer/models/messageable.rb

@@ -47,9 +47,7 @@ module Mailboxer
 
       #Gets the mailbox of the messageable
       def mailbox
-        @mailbox = Mailboxer::Mailbox.new(self) if @mailbox.nil?
-        @mailbox.type = :all
-        @mailbox
+        @mailbox ||= Mailboxer::Mailbox.new(self)
       end
 
       #Sends a notification to the messageable
@@ -60,26 +58,39 @@ module Mailboxer
       #Sends a messages, starting a new conversation, with the messageable
       #as originator
       def send_message(recipients, msg_body, subject, sanitize_text=true, attachment=nil, message_timestamp = Time.now)
-        convo = Mailboxer::Conversation.new({:subject => subject})
-        convo.created_at = message_timestamp
-        convo.updated_at = message_timestamp
-        message = messages.new({:body => msg_body, :subject => subject, :attachment => attachment})
-        message.created_at = message_timestamp
-        message.updated_at = message_timestamp
-        message.conversation = convo
-        message.recipients = recipients.is_a?(Array) ? recipients : [recipients]
-        message.recipients = message.recipients.uniq
+        convo = Mailboxer::ConversationBuilder.new({
+          :subject    => subject,
+          :created_at => message_timestamp,
+          :updated_at => message_timestamp
+        }).build
+
+        message = Mailboxer::MessageBuilder.new({
+          :sender       => self,
+          :conversation => convo,
+          :recipients   => recipients,
+          :body         => msg_body,
+          :subject      => subject,
+          :attachment   => attachment,
+          :created_at   => message_timestamp,
+          :updated_at   => message_timestamp
+        }).build
+
         message.deliver false, sanitize_text
       end
 
       #Basic reply method. USE NOT RECOMENDED.
       #Use reply_to_sender, reply_to_all and reply_to_conversation instead.
       def reply(conversation, recipients, reply_body, subject=nil, sanitize_text=true, attachment=nil)
-        subject = subject || "RE: #{conversation.subject}"
-        response = messages.new({:body => reply_body, :subject => subject, :attachment => attachment})
-        response.conversation = conversation
-        response.recipients = recipients.is_a?(Array) ? recipients : [recipients]
-        response.recipients = response.recipients.uniq
+        subject = subject || "#{conversation.subject}"
+        response = Mailboxer::MessageBuilder.new({
+          :sender       => self,
+          :conversation => conversation,
+          :recipients   => recipients,
+          :body         => reply_body,
+          :subject      => subject,
+          :attachment   => attachment
+        }).build
+
         response.recipients.delete(self)
         response.deliver true, sanitize_text
       end

data/lib/mailboxer/version.rb

@@ -1,3 +1,3 @@
 module Mailboxer
-  VERSION = "0.12.0.rc1"
+  VERSION = "0.12.0.rc2"
 end

data/spec/dummy/Gemfile

@@ -9,25 +9,3 @@ gem 'factory_girl'
 
 gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
 gem "jdbc-sqlite3", :platform => :jruby
-
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'ruby-debug'
-
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
-
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-# group :development, :test do
-#   gem 'webrat'
-# end

data/spec/integration/message_and_receipt_spec.rb

@@ -61,8 +61,8 @@ describe "Messages And Mailboxer::Receipts" do
       it "should create proper message" do
         @message2.sender.id.should == @entity2.id
         @message2.sender.class.should == @entity2.class
-        assert @message2.body.eql?"Reply body"
-        assert @message2.subject.eql?"RE: Subject"
+        @message2.body.should eq "Reply body"
+        @message2.subject.should eq "Subject"
       end
 
       it "should create proper mails" do
@@ -108,7 +108,7 @@ describe "Messages And Mailboxer::Receipts" do
         @message2.sender.id.should == @entity2.id
         @message2.sender.class.should == @entity2.class
         assert @message2.body.eql?"Reply body"
-        assert @message2.subject.eql?"RE: Subject"
+        assert @message2.subject.eql?"Subject"
       end
 
       it "should create proper mails" do
@@ -153,7 +153,7 @@ describe "Messages And Mailboxer::Receipts" do
         @message2.sender.id.should == @entity2.id
         @message2.sender.class.should == @entity2.class
         assert @message2.body.eql?"Reply body"
-        assert @message2.subject.eql?"RE: Subject"
+        assert @message2.subject.eql?"Subject"
       end
 
       it "should create proper mails" do
@@ -248,7 +248,7 @@ describe "Messages And Mailboxer::Receipts" do
         @message2.sender.id.should == @entity2.id
         @message2.sender.class.should == @entity2.class
         assert @message2.body.eql?"Reply body"
-        assert @message2.subject.eql?"RE: Subject"
+        assert @message2.subject.eql?"Subject"
       end
 
       it "should create proper mails" do
@@ -294,7 +294,7 @@ describe "Messages And Mailboxer::Receipts" do
         @message2.sender.id.should == @entity2.id
         @message2.sender.class.should == @entity2.class
         assert @message2.body.eql?"Reply body"
-        assert @message2.subject.eql?"RE: Subject"
+        assert @message2.subject.eql?"Subject"
       end
 
       it "should create proper mails" do
@@ -417,7 +417,7 @@ describe "Messages And Mailboxer::Receipts" do
         @message2.sender.id.should == @entity2.id
         @message2.sender.class.should == @entity2.class
         assert @message2.body.eql?"Reply body"
-        assert @message2.subject.eql?"RE: Subject"
+        assert @message2.subject.eql?"Subject"
       end
 
       it "should create proper mails" do
@@ -473,7 +473,7 @@ describe "Messages And Mailboxer::Receipts" do
         @message2.sender.id.should == @entity2.id
         @message2.sender.class.should == @entity2.class
         assert @message2.body.eql?"Reply body"
-        assert @message2.subject.eql?"RE: Subject"
+        assert @message2.subject.eql?"Subject"
       end
 
       it "should create proper mails" do
@@ -599,7 +599,7 @@ describe "Messages And Mailboxer::Receipts" do
         @message2.sender.id.should == @entity2.id
         @message2.sender.class.should == @entity2.class
         assert @message2.body.eql?"Reply body"
-        assert @message2.subject.eql?"RE: Subject"
+        assert @message2.subject.eql?"Subject"
       end
 
       it "should create proper mails" do
@@ -655,7 +655,7 @@ describe "Messages And Mailboxer::Receipts" do
         @message2.sender.id.should == @entity2.id
         @message2.sender.class.should == @entity2.class
         assert @message2.body.eql?"Reply body"
-        assert @message2.subject.eql?"RE: Subject"
+        assert @message2.subject.eql?"Subject"
       end
 
       it "should create proper mails" do
@@ -775,7 +775,7 @@ describe "Messages And Mailboxer::Receipts" do
         @message2.sender.id.should == @entity2.id
         @message2.sender.class.should == @entity2.class
         assert @message2.body.eql?"Reply body"
-        assert @message2.subject.eql?"RE: Subject"
+        assert @message2.subject.eql?"Subject"
       end
 
       it "should create proper mails" do
@@ -821,7 +821,7 @@ describe "Messages And Mailboxer::Receipts" do
         @message2.sender.id.should == @entity2.id
         @message2.sender.class.should == @entity2.class
         assert @message2.body.eql?"Reply body"
-        assert @message2.subject.eql?"RE: Subject"
+        assert @message2.subject.eql?"Subject"
       end
 
       it "should create proper mails" do
@@ -866,7 +866,7 @@ describe "Messages And Mailboxer::Receipts" do
         @message2.sender.id.should == @entity2.id
         @message2.sender.class.should == @entity2.class
         assert @message2.body.eql?"Reply body"
-        assert @message2.subject.eql?"RE: Subject"
+        assert @message2.subject.eql?"Subject"
       end
 
       it "should create proper mails" do

data/spec/models/notification_spec.rb

@@ -47,7 +47,7 @@ describe Mailboxer::Notification do
   end
 
   it "should notify several users" do
-    recipients = Set.new [@entity1,@entity2,@entity3]
+    recipients = [@entity1,@entity2,@entity3]
     Mailboxer::Notification.notify_all(recipients,"Subject","Body")
     #Check getting ALL receipts
     @entity1.mailbox.receipts.size.should==1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailboxer
 version: !ruby/object:Gem::Version
-  version: 0.12.0.rc1
+  version: 0.12.0.rc2
 platform: ruby
 authors:
 - Eduardo Casanova Cuesta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreigner
@@ -170,6 +170,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/builders/mailboxer/base_builder.rb
+- app/builders/mailboxer/conversation_builder.rb
+- app/builders/mailboxer/message_builder.rb
+- app/builders/mailboxer/notification_builder.rb
+- app/builders/mailboxer/receipt_builder.rb
 - app/mailers/mailboxer/base_mailer.rb
 - app/mailers/mailboxer/message_mailer.rb
 - app/mailers/mailboxer/notification_mailer.rb
@@ -179,7 +184,7 @@ files:
 - app/models/mailboxer/message.rb
 - app/models/mailboxer/notification.rb
 - app/models/mailboxer/receipt.rb
-- app/uploaders/attachment_uploader.rb
+- app/uploaders/mailboxer/attachment_uploader.rb
 - app/views/mailboxer/message_mailer/new_message_email.html.erb
 - app/views/mailboxer/message_mailer/new_message_email.text.erb
 - app/views/mailboxer/message_mailer/reply_message_email.html.erb

data/app/uploaders/attachment_uploader.rb

@@ -1,3 +0,0 @@
-class AttachmentUploader < CarrierWave::Uploader::Base
-  storage :file
-end