mailboxer 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20ef2352a667a4efe2b58ba03e9e0ec71be8c6f5
-  data.tar.gz: 62b56eef4d08c04fffea2050d547ea65331cd8d9
+  metadata.gz: 46c49273efc5f0fe22a30a35bbc7a0e0cd50a88f
+  data.tar.gz: 4683361def08b32438d693116f1cf53864ef76c7
 SHA512:
-  metadata.gz: 1aa5bbfb3de37857cbccfee7e010f73d9bc92b03e6b221e5bbf4210af8e5fa599b9227bd4f922752d6f19342f846f328e5a3cb08b319bf818f07ba773b615ce8
-  data.tar.gz: 5d6dc14ece4e486dce7ff21afb63ee2d562092e29792cad1dc74fb91135f69c564853b8e939efb9702a305d5f49c168eb57e615830678bb173f45983bb86be74
+  metadata.gz: 00c8d3afb30b6449c1748e511bb9c14310f46117a018cc81326ea20ca799ec464f11f57336e396500d1780f700b700681a71e096db41670d4b1f0e24e437c0a4
+  data.tar.gz: dcb7b75dbb2f24e8cfeaecc49268b0f1953179992dc0340647190eb66527ab072c0a9c6709c2bbf4cdc59a9d61108b5046203afc03344dbd0c810ecdbbb5b5ad

data/.travis.yml

@@ -3,18 +3,14 @@ cache: bundler
 sudo: false
 
 rvm:
-  - 2.1.10
   - 2.2.5
   - 2.3.1
+  - 2.4.1
+
 
 gemfile:
-  - gemfiles/rails4.2.gemfile
   - gemfiles/rails5.0.gemfile
-
-matrix:
-  exclude:
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails5.0.gemfile
+  - gemfiles/rails5.1.gemfile
 
 env:
   global:

data/Appraisals

@@ -1,3 +1,3 @@
-appraise "rails4.2" do
-  gem "rails", "~> 4.2.6"
+appraise "rails5.1" do
+  gem "rails", "~> 5.1.1"
 end

data/CHANGELOG.md

@@ -0,0 +1,66 @@
+# CHANGELOG
+
+## Master (Unreleased)
+
+## 0.15.0 - 2017-05-17
+
+### Changed
+
+* Update for Rails 5.1
+
+* When sorting entries by `created_at`, also sort by `id` descending. This
+is to ensure proper sorting of items for databases that do not store
+nanoseconds for timestamp columns.
+
+### Fixed
+
+* When trying to delete a Mailboxer object, a `NameError` may be thrown due
+to a missing namespace
+
+## 0.14.0 - 2016-07-29
+
+### Added
+
+* Rails 5 compatibility.
+
+### Fixed
+
+* `Mailboxer::Message` object no longer requires to have a subject.
+* Objects are now saved before mails are sent, you you can use them in the
+mailer templates (to build URLs, for example).
+
+### Changed
+
+* Errors are now stored in the parent message/notification instead of being
+stored in the sender receipt. That means you need handle mailboxer related
+controller and views differently, and study the upgrade case by case (propably
+by having a look at mailboxer's source code). As an example, if you were
+previously doing something like this in your controller:
+
+```
+@receipt = @actor.send_message(@recipients, params[:body], params[:subject])
+if (@receipt.errors.blank?)
+  @conversation = @receipt.conversation
+  redirect_to conversation_path(@conversation)
+else
+  render :action => :new
+end
+```
+
+you now need to do something like
+
+```
+@receipt = @actor.send_message(@recipients, params[:body], params[:subject])
+@message = @receipt.message
+if (@message.errors.blank?)
+  @conversation = @message.conversation
+  redirect_to conversation_path(@conversation)
+else
+  render :action => :new
+end
+```
+
+This might look more complicated at first but allows you to build more RESTful
+resources since you can build forms on messages and/or conversations and
+directly show errors on them. Less specially handling is now required to
+propagate errors around models.

data/README.md

@@ -104,6 +104,24 @@ Mailboxer.setup do |config|
 end
 ```
 
+If you have subclassed the Mailboxer::Notification class, you can specify the mailers using a member method:
+
+```ruby
+class NewDocumentNotification < Mailboxer::Notification
+  def mailer_class
+    NewDocumentNotificationMailer
+  end
+end
+
+class NewCommentNotification < Mailboxer::Notification
+  def mailer_class
+    NewDocumentNotificationMailer
+  end
+end
+```
+
+Otherwise, the mailer class will be determined by appending 'Mailer' to the mailable class name.
+
 ### User identities
 
 Users must have an identity defined by a `name` and an `email`. We must ensure that Messageable models have some specific methods. These methods are:
@@ -135,6 +153,7 @@ Mailboxer.setup do |config|
   #Configures the methods needed by mailboxer
   config.email_method = :mailboxer_email
   config.name_method = :name
+  config.notify_method = :notify
   # ...
 end
 ```
@@ -144,9 +163,10 @@ You may change whatever you want or need. For example:
 ```ruby
 config.email_method = :notification_email
 config.name_method = :display_name
+config.notify_method = :notify_mailboxer
 ```
 
-Will use the method `notification_email(object)` instead of `mailboxer_email(object)` and `display_name` for `name`.
+Will use the method `notification_email(object)` instead of `mailboxer_email(object)`, `display_name` for `name` and `notify_mailboxer` for `notify`.
 
 Using default or custom method names, if your model doesn't implement them, Mailboxer will use dummy methods so as to notify you of missing methods rather than crashing.
 

data/app/models/mailboxer/conversation.rb

@@ -32,6 +32,9 @@ class Mailboxer::Conversation < ActiveRecord::Base
   scope :not_trash,  lambda {|participant|
     participant(participant).merge(Mailboxer::Receipt.not_trash)
   }
+  scope :not_deleted,  lambda {|participant|
+    participant(participant).merge(Mailboxer::Receipt.not_deleted)
+  }
   scope :between, lambda {|participant_one, participant_two|
     joins("INNER JOIN (#{Mailboxer::Notification.recipient(participant_two).to_sql}) participant_two_notifications " \
           "ON participant_two_notifications.conversation_id = #{table_name}.id AND participant_two_notifications.type IN ('Mailboxer::Message')").
@@ -93,7 +96,7 @@ class Mailboxer::Conversation < ActiveRecord::Base
 
   #First message of the conversation.
   def original_message
-    @original_message ||= messages.order('created_at').first
+    @original_message ||= messages.order(:created_at).first
   end
 
   #Sender of the last message.
@@ -103,7 +106,7 @@ class Mailboxer::Conversation < ActiveRecord::Base
 
   #Last message in the conversation.
   def last_message
-    @last_message ||= messages.order('created_at DESC').first
+    @last_message ||= messages.order(:created_at => :desc, :id => :desc).first
   end
 
   #Returns the receipts of the conversation for one participants

data/app/models/mailboxer/mailbox.rb

@@ -9,7 +9,7 @@ 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")
+    notifs = Mailboxer::Notification.recipient(messageable).where(:type => nil).order(:created_at => :desc, :id => :desc)
     if options[:read] == false || options[:unread]
       notifs = notifs.unread
     end

data/app/models/mailboxer/notification.rb

@@ -13,21 +13,21 @@ class Mailboxer::Notification < ActiveRecord::Base
                       :length => { :maximum => Mailboxer.body_max_length }
 
   scope :recipient, lambda { |recipient|
-    joins(:receipts).where('mailboxer_receipts.receiver_id' => recipient.id,'mailboxer_receipts.receiver_type' => recipient.class.base_class.to_s)
+    joins(:receipts).where(:mailboxer_receipts => { :receiver_id  => recipient.id, :receiver_type => recipient.class.base_class.to_s })
   }
   scope :with_object, lambda { |obj|
-    where('notified_object_id' => obj.id,'notified_object_type' => obj.class.to_s)
+    where(:notified_object_id => obj.id, :notified_object_type => obj.class.to_s)
   }
   scope :not_trashed, lambda {
-    joins(:receipts).where('mailboxer_receipts.trashed' => false)
+    joins(:receipts).where(:mailboxer_receipts => { :trashed => false })
   }
   scope :unread,  lambda {
-    joins(:receipts).where('mailboxer_receipts.is_read' => false)
+    joins(:receipts).where(:mailboxer_receipts => { :is_read => false })
   }
   scope :global, lambda { where(:global => true) }
-  scope :expired, lambda { where("mailboxer_notifications.expires < ?", Time.now) }
+  scope :expired, lambda { where("#{Mailboxer::Notification.quoted_table_name}.expires < ?", Time.now) }
   scope :unexpired, lambda {
-    where("mailboxer_notifications.expires is NULL OR mailboxer_notifications.expires > ?", Time.now)
+    where("#{Mailboxer::Notification.quoted_table_name}.expires is NULL OR #{Mailboxer::Notification.quoted_table_name}.expires > ?", Time.now)
   }
 
   class << self

data/app/models/mailboxer/receipt.rb

@@ -13,13 +13,13 @@ class Mailboxer::Receipt < ActiveRecord::Base
   }
   #Notifications Scope checks type to be nil, not Notification because of STI behaviour
   #with the primary class (no type is saved)
-  scope :notifications_receipts, lambda { joins(:notification).where('mailboxer_notifications.type' => nil) }
-  scope :messages_receipts, lambda { joins(:notification).where('mailboxer_notifications.type' => Mailboxer::Message.to_s) }
+  scope :notifications_receipts, lambda { joins(:notification).where(:mailboxer_notifications => { :type => nil }) }
+  scope :messages_receipts, lambda { joins(:notification).where(:mailboxer_notifications => { :type => Mailboxer::Message.to_s }) }
   scope :notification, lambda { |notification|
     where(:notification_id => notification.id)
   }
   scope :conversation, lambda { |conversation|
-    joins(:message).where('mailboxer_notifications.conversation_id' => conversation.id)
+    joins(:message).where(:mailboxer_notifications => { :conversation_id => conversation.id })
   }
   scope :sentbox, lambda { where(:mailbox_type => "sentbox") }
   scope :inbox, lambda { where(:mailbox_type => "inbox") }
@@ -72,12 +72,8 @@ class Mailboxer::Receipt < ActiveRecord::Base
     end
 
     def update_receipts(updates, options={})
-      ids = where(options).map { |rcp| rcp.id }
-      unless ids.empty?
-        sql = ids.map { "#{table_name}.id = ? " }.join(' OR ')
-        conditions = [sql].concat(ids)
-        Mailboxer::Receipt.where(conditions).update_all(updates)
-      end
+      ids = where(options).pluck(:id)
+      Mailboxer::Receipt.where(:id => ids).update_all(updates) unless ids.empty?
     end
   end
 
@@ -140,14 +136,19 @@ class Mailboxer::Receipt < ActiveRecord::Base
   protected
 
   if Mailboxer.search_enabled
-    searchable do
-      text :subject, :boost => 5 do
-        message.subject if message
-      end
-      text :body do
-        message.body if message
+    if Mailboxer.search_engine == :pg_search
+      include PgSearch
+      pg_search_scope :search, associated_against: { message: { subject: 'A', body: 'B' } }, using: :tsearch
+    else
+      searchable do
+        text :subject, :boost => 5 do
+          message.subject if message
+        end
+        text :body do
+          message.body if message
+        end
+        integer :receiver_id
       end
-      integer :receiver_id
     end
   end
 end

data/db/migrate/20110511145103_create_mailboxer.rb

@@ -1,4 +1,4 @@
-class CreateMailboxer < ActiveRecord::Migration
+class CreateMailboxer < ActiveRecord::Migration[4.2]
   def self.up
   #Tables
     #Conversations
@@ -27,7 +27,8 @@ class CreateMailboxer < ActiveRecord::Migration
       t.column :conversation_id, :integer
       t.column :draft, :boolean, :default => false
       t.string :notification_code, :default => nil
-      t.references :notified_object, :polymorphic => true
+      t.references :notified_object, :polymorphic => true, index: { name: 'mailboxer_notifications_notified_object' }
+  end
       t.column :attachment, :string
       t.column :updated_at, :datetime, :null => false
       t.column :created_at, :datetime, :null => false

data/db/migrate/20131206080416_add_conversation_optout.rb

@@ -1,4 +1,4 @@
-class AddConversationOptout < ActiveRecord::Migration
+class AddConversationOptout < ActiveRecord::Migration[4.2]
   def self.up
     create_table :mailboxer_conversation_opt_outs do |t|
       t.references :unsubscriber, :polymorphic => true

data/db/migrate/20131206080417_add_missing_indices.rb

@@ -1,4 +1,4 @@
-class AddMissingIndices < ActiveRecord::Migration
+class AddMissingIndices < ActiveRecord::Migration[4.2]
   def change
     # We'll explicitly specify its name, as the auto-generated name is too long and exceeds 63
     # characters limitation.

data/db/migrate/20151103080417_add_delivery_tracking_info_to_mailboxer_receipts.rb

@@ -1,4 +1,4 @@
-class AddDeliveryTrackingInfoToMailboxerReceipts < ActiveRecord::Migration
+class AddDeliveryTrackingInfoToMailboxerReceipts < ActiveRecord::Migration[4.2]
   def change
     add_column :mailboxer_receipts, :is_delivered, :boolean, default: false
     add_column :mailboxer_receipts, :delivery_method, :string

data/gemfiles/rails5.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 5.1.1"
+
+gemspec :path => "../"

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

@@ -9,9 +9,10 @@ Mailboxer.setup do |config|
   #Configures the methods needed by mailboxer
   config.email_method = :mailboxer_email
   config.name_method = :name
+  config.notify_method = :notify
 
   #Configures if you use or not a search engine and which one you are using
-  #Supported engines: [:solr,:sphinx]
+  #Supported engines: [:solr,:sphinx,:pg_search]
   config.search_enabled = false
   config.search_engine = :solr
 

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

@@ -13,6 +13,7 @@ class MailboxerNamespacingCompatibility < ActiveRecord::Migration
     rename_table :mailboxer_notifications, :notifications
     rename_table :mailboxer_receipts,      :receipts
 
+    Mailboxer::Notification.table_name = "notifications"
     Mailboxer::Notification.where(type: 'Mailboxer::Message').update_all(type: 'Message')
   end
 end

data/lib/mailboxer.rb

@@ -15,6 +15,8 @@ module Mailboxer
   @@email_method = :mailboxer_email
   mattr_accessor :name_method
   @@name_method = :name
+  mattr_accessor :notify_method
+  @@notify_method = :notify
   mattr_accessor :subject_max_length
   @@subject_max_length = 255
   mattr_accessor :body_max_length

data/lib/mailboxer/mail_dispatcher.rb

@@ -18,9 +18,21 @@ module Mailboxer
     private
 
     def mailer
+      mailer_config_method || mailer_from_mailable || mailer_constant
+    end
+
+    def mailer_from_mailable
+      mailable.mailer_class if mailable.respond_to? :mailer_class
+    end
+
+    def mailer_config_method
       klass = mailable.class.name.demodulize
       method = "#{klass.downcase}_mailer".to_sym
-      Mailboxer.send(method) || "#{mailable.class}Mailer".constantize
+      Mailboxer.send(method) if Mailboxer.respond_to? method
+    end
+
+    def mailer_constant
+      "#{mailable.class.name}Mailer".constantize
     end
 
     def send_email(receipt)

data/lib/mailboxer/models/messageable.rb

@@ -14,7 +14,7 @@ module Mailboxer
 
       included do
         has_many :messages, :class_name => "Mailboxer::Message", :as => :sender
-        has_many :receipts, -> { order 'created_at DESC' }, :class_name => "Mailboxer::Receipt", dependent: :destroy, as: :receiver
+        has_many :receipts, -> { order(:created_at => :desc, :id => :desc) }, :class_name => "Mailboxer::Receipt", dependent: :destroy, as: :receiver
       end
 
       unless defined?(Mailboxer.name_method)
@@ -40,6 +40,11 @@ module Mailboxer
         end
       end
 
+      #Sends a notification to the messageable
+      define_method Mailboxer.notify_method do |subject, body, obj=nil, sanitize_text=true, notification_code=nil, send_mail=true, sender=nil|
+        Mailboxer::Notification.notify_all([self],subject,body,obj,sanitize_text,notification_code,send_mail,sender)
+      end
+
       #Gets the mailbox of the messageable
       def mailbox
         @mailbox ||= Mailboxer::Mailbox.new(self)
@@ -50,11 +55,6 @@ module Mailboxer
         mailbox.inbox(unread: true).count
       end
 
-      #Sends a notification to the messageable
-      def notify(subject,body,obj = nil,sanitize_text=true,notification_code=nil,send_mail=true,sender=nil)
-        Mailboxer::Notification.notify_all([self],subject,body,obj,sanitize_text,notification_code,send_mail,sender)
-      end
-
       #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)
@@ -169,11 +169,11 @@ module Mailboxer
       #* An array with any of them
       def mark_as_deleted(obj)
         case obj
-          when Receipt
+          when Mailboxer::Receipt
             return obj.mark_as_deleted if obj.receiver == self
-          when Message, Notification
+          when Mailboxer::Message, Mailboxer::Notification
             obj.mark_as_deleted(self)
-          when Conversation
+          when Mailboxer::Conversation
             obj.mark_as_deleted(self)
           when Array
             obj.map{ |sub_obj| mark_as_deleted(sub_obj) }
@@ -225,12 +225,15 @@ module Mailboxer
       end
 
       def search_messages(query)
-        @search = Mailboxer::Receipt.search do
-          fulltext query
-          with :receiver_id, self.id
+        if Mailboxer.search_engine == :pg_search
+          Mailboxer::Receipt.search(query).where(receiver_id: self.id).map(&:conversation).uniq
+        else
+          @search = Mailboxer::Receipt.search do
+            fulltext query
+            with :receiver_id, self.id
+          end
+          @search.results.map { |r| r.conversation }.uniq
         end
-
-        @search.results.map { |r| r.conversation }.uniq
       end
     end
   end

data/lib/mailboxer/version.rb

@@ -1,3 +1,3 @@
 module Mailboxer
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

data/mailboxer.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   #
 
   # Development Gem dependencies
-  s.add_runtime_dependency('rails', '>= 4.2.0')
+  s.add_runtime_dependency('rails', '>= 5.0.0')
   s.add_runtime_dependency('carrierwave', '>= 0.5.8')
 
   if RUBY_ENGINE == "rbx" && RUBY_VERSION >= "2.1.0"

data/spec/dummy/config/initializers/mailboxer.rb

@@ -1,17 +1,18 @@
 Mailboxer.setup do |config|
-  
+
   #Configures if you applications uses or no the email sending for Notifications and Messages
   config.uses_emails = true
-  
+
   #Configures the default from for the email sent for Messages and Notifications of Mailboxer
   config.default_from = "no-reply@mailboxer.com"
-  
+
   #Configures the methods needed by mailboxer
   config.email_method = :mailboxer_email
   config.name_method = :name
+  config.notify_method = :notify
 
   #Configures if you use or not a search engine and wich one are you using
-  #Supported enignes: [:solr,:sphinx] 
+  #Supported enignes: [:solr,:sphinx]
   config.search_enabled = false
   config.search_engine = :solr
 

data/spec/dummy/db/migrate/20110228120600_create_users.rb

@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[4.2]
   def self.up
     create_table :users do |t|
       t.string :name

data/spec/dummy/db/migrate/20110306002940_create_ducks.rb

@@ -1,4 +1,4 @@
-class CreateDucks < ActiveRecord::Migration
+class CreateDucks < ActiveRecord::Migration[4.2]
   def self.up
     create_table :ducks do |t|
       t.string :name

data/spec/dummy/db/migrate/20110306015107_create_cylons.rb

@@ -1,4 +1,4 @@
-class CreateCylons < ActiveRecord::Migration
+class CreateCylons < ActiveRecord::Migration[4.2]
   def self.up
     create_table :cylons do |t|
       t.string :name

data/spec/dummy/db/migrate/20120305103200_create_mailboxer.rb

@@ -1,13 +1,13 @@
-class CreateMailboxer < ActiveRecord::Migration
-  def self.up    
+class CreateMailboxer < ActiveRecord::Migration[4.2]
+  def self.up
   #Tables
-  	#Conversations
+    #Conversations
     create_table :mailboxer_conversations do |t|
       t.column :subject, :string, :default => ""
       t.column :created_at, :datetime, :null => false
       t.column :updated_at, :datetime, :null => false
-    end    
-  	#Receipts
+    end
+    #Receipts
     create_table :mailboxer_receipts do |t|
       t.references :receiver, :polymorphic => true
       t.column :notification_id, :integer, :null => false
@@ -17,46 +17,45 @@ class CreateMailboxer < ActiveRecord::Migration
       t.column :mailbox_type, :string, :limit => 25
       t.column :created_at, :datetime, :null => false
       t.column :updated_at, :datetime, :null => false
-    end    
-  	#Notifications and Messages
+    end
+    #Notifications and Messages
     create_table :mailboxer_notifications do |t|
       t.column :type, :string
       t.column :body, :text
       t.column :subject, :string, :default => ""
       t.references :sender, :polymorphic => true
-      t.references :notified_object, :polymorphic => true
-      t.string :notification_code, :default => nil
       t.column :conversation_id, :integer
       t.column :draft, :boolean, :default => false
+      t.string :notification_code, :default => nil
+      t.references :notified_object, :polymorphic => true, index: { name: 'mailboxer_notifications_notified_object' }
       t.column :attachment, :string
       t.column :updated_at, :datetime, :null => false
       t.column :created_at, :datetime, :null => false
-      t.boolean :global, :default => false
+      t.boolean :global, default: false
       t.datetime :expires
-    end    
-    
-    
+    end
+
   #Indexes
-  	#Conversations
-  	#Receipts
-  	add_index "mailboxer_receipts","notification_id"
+    #Conversations
+    #Receipts
+    add_index "mailboxer_receipts","notification_id"
+
+    #Messages
+    add_index "mailboxer_notifications","conversation_id"
 
-  	#Messages  
-  	add_index "mailboxer_notifications","conversation_id"
-  
-  #Foreign keys    
-  	#Conversations
-  	#Receipts
-  	add_foreign_key "mailboxer_receipts", "mailboxer_notifications", :name => "receipts_on_notification_id", :column => "notification_id"
-  	#Messages  
-  	add_foreign_key "mailboxer_notifications", "mailboxer_conversations", :name => "notifications_on_conversation_id", :column => "conversation_id"
+  #Foreign keys
+    #Conversations
+    #Receipts
+    add_foreign_key "mailboxer_receipts", "mailboxer_notifications", :name => "receipts_on_notification_id", :column => "notification_id"
+    #Messages
+    add_foreign_key "mailboxer_notifications", "mailboxer_conversations", :name => "notifications_on_conversation_id", :column => "conversation_id"
   end
-  
+
   def self.down
-  #Tables  	
-  	remove_foreign_key "mailboxer_receipts", :name => "receipts_on_notification_id"
-  	remove_foreign_key "mailboxer_notifications", :name => "notifications_on_conversation_id"
-  	
+  #Tables
+    remove_foreign_key "mailboxer_receipts", :name => "receipts_on_notification_id"
+    remove_foreign_key "mailboxer_notifications", :name => "notifications_on_conversation_id"
+
   #Indexes
     drop_table :mailboxer_receipts
     drop_table :mailboxer_conversations

data/spec/dummy/db/migrate/20131206080416_add_conversation_optout.rb

@@ -1,4 +1,4 @@
-class AddConversationOptout < ActiveRecord::Migration
+class AddConversationOptout < ActiveRecord::Migration[4.2]
   def self.up
     create_table :mailboxer_conversation_opt_outs do |t|
       t.references :unsubscriber, :polymorphic => true

data/spec/dummy/db/migrate/20151103202534_add_missing_indices.mailboxer_engine.rb

@@ -1,5 +1,4 @@
-# This migration comes from mailboxer_engine (originally 20131206080417)
-class AddMissingIndices < ActiveRecord::Migration
+class AddMissingIndices < ActiveRecord::Migration[4.2]
   def change
     # We'll explicitly specify its name, as the auto-generated name is too long and exceeds 63
     # characters limitation.

data/spec/dummy/db/migrate/20151103202535_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb

@@ -1,5 +1,4 @@
-# This migration comes from mailboxer_engine (originally 20151103080417)
-class AddDeliveryTrackingInfoToMailboxerReceipts < ActiveRecord::Migration
+class AddDeliveryTrackingInfoToMailboxerReceipts < ActiveRecord::Migration[4.2]
   def change
     add_column :mailboxer_receipts, :is_delivered, :boolean, default: false
     add_column :mailboxer_receipts, :delivery_method, :string

data/spec/mailboxer/mail_dispatcher_spec.rb

@@ -63,7 +63,7 @@ describe Mailboxer::MailDispatcher do
   describe "mailer" do
     let(:receipts) { [] }
 
-    context "mailable is a Message" do
+    context "mailable is a Notification" do
       let(:mailable) { Mailboxer::Notification.new }
 
       its(:mailer) { should be Mailboxer::NotificationMailer }
@@ -76,16 +76,27 @@ describe Mailboxer::MailDispatcher do
       end
     end
 
-    context "mailable is a Notification" do
+    context "mailable is a Message" do
       let(:mailable) { Mailboxer::Message.new }
       its(:mailer) { should be Mailboxer::MessageMailer }
 
-      context "with custom mailer" do
+      context 'mailer class is selected using global Mailboxer method' do
         before { Mailboxer.message_mailer = 'foo' }
         after  { Mailboxer.message_mailer = nil   }
 
         its(:mailer) { should eq 'foo' }
       end
+
+      context 'mailer class is selected using Mailable#mailer_class' do
+        let(:mailable) { double(mailer_class: :foo) }
+        its(:mailer) { should eq :foo }
+      end
+
+      context 'mailer class is selected by searching for the constant' do
+        before { stub_const 'StringMailer', 1 }
+        let(:mailable) { String.new('I am a string') }
+        its(:mailer) { should eq Object.const_get('StringMailer') }
+      end
     end
   end
 end

data/spec/models/mailboxer_models_messageable_spec.rb

@@ -170,7 +170,7 @@ describe "Mailboxer::Models::Messageable through User" do
 
 
   it "should be able to unread an owned Notification (mark as unread)" do
-    @receipt = @entity1.notify("Subject","Body")
+    @receipt = @entity1.send(Mailboxer.notify_method, "Subject", "Body")
     @notification = @receipt.notification
     expect(@receipt.is_read).to eq false
     @entity1.mark_as_read(@notification)
@@ -179,7 +179,7 @@ describe "Mailboxer::Models::Messageable through User" do
   end
 
   it "should be able to read an owned Notification (mark as read)" do
-    @receipt = @entity1.notify("Subject","Body")
+    @receipt = @entity1.send(Mailboxer.notify_method, "Subject", "Body")
     @notification = @receipt.notification
     expect(@receipt.is_read).to eq false
     @entity1.mark_as_read(@notification)
@@ -187,7 +187,7 @@ describe "Mailboxer::Models::Messageable through User" do
   end
 
   it "should not be able to unread a not owned Notification (mark as unread)" do
-    @receipt = @entity1.notify("Subject","Body")
+    @receipt = @entity1.send(Mailboxer.notify_method, "Subject", "Body")
     @notification = @receipt.notification
     expect(@receipt.is_read).to eq false
     @entity1.mark_as_read(@notification)
@@ -196,7 +196,7 @@ describe "Mailboxer::Models::Messageable through User" do
   end
 
   it "should not be able to read a not owned Notification (mark as read)" do
-    @receipt = @entity1.notify("Subject","Body")
+    @receipt = @entity1.send(Mailboxer.notify_method, "Subject", "Body")
     @notification = @receipt.notification
     expect(@receipt.is_read).to eq false
     @entity2.mark_as_read(@notification)
@@ -204,7 +204,7 @@ describe "Mailboxer::Models::Messageable through User" do
   end
 
   it "should be able to trash an owned Notification" do
-    @receipt = @entity1.notify("Subject","Body")
+    @receipt = @entity1.send(Mailboxer.notify_method, "Subject", "Body")
     @notification = @receipt.notification
     expect(@receipt.trashed).to eq false
     @entity1.trash(@notification)
@@ -212,7 +212,7 @@ describe "Mailboxer::Models::Messageable through User" do
   end
 
   it "should be able to untrash an owned Notification" do
-    @receipt = @entity1.notify("Subject","Body")
+    @receipt = @entity1.send(Mailboxer.notify_method, "Subject", "Body")
     @notification = @receipt.notification
     expect(@receipt.trashed).to eq false
     @entity1.trash(@notification)
@@ -221,7 +221,7 @@ describe "Mailboxer::Models::Messageable through User" do
   end
 
   it "should not be able to trash a not owned Notification" do
-    @receipt = @entity1.notify("Subject","Body")
+    @receipt = @entity1.send(Mailboxer.notify_method, "Subject", "Body")
     @notification = @receipt.notification
     expect(@receipt.trashed).to eq false
     @entity2.trash(@notification)
@@ -229,7 +229,7 @@ describe "Mailboxer::Models::Messageable through User" do
   end
 
   it "should not be able to untrash a not owned Notification" do
-    @receipt = @entity1.notify("Subject","Body")
+    @receipt = @entity1.send(Mailboxer.notify_method, "Subject", "Body")
     @notification = @receipt.notification
     expect(@receipt.trashed).to eq false
     @entity1.trash(@notification)

data/spec/models/notification_spec.rb

@@ -14,7 +14,7 @@ describe Mailboxer::Notification do
   it { should validate_length_of(:body).is_at_most(Mailboxer.body_max_length) }
 
   it "should notify one user" do
-    @entity1.notify("Subject", "Body")
+    @entity1.send(Mailboxer.notify_method, "Subject", "Body")
 
     #Check getting ALL receipts
     expect(@entity1.mailbox.receipts.size).to eq 1
@@ -31,14 +31,14 @@ describe Mailboxer::Notification do
   end
 
   it "should be unread by default" do
-    @entity1.notify("Subject", "Body")
+    @entity1.send(Mailboxer.notify_method, "Subject", "Body")
     expect(@entity1.mailbox.receipts.size).to eq 1
     notification = @entity1.mailbox.receipts.first.notification
     expect(notification).to be_is_unread(@entity1)
   end
 
   it "should be able to marked as read" do
-    @entity1.notify("Subject", "Body")
+    @entity1.send(Mailboxer.notify_method, "Subject", "Body")
     expect(@entity1.mailbox.receipts.size).to eq 1
     notification = @entity1.mailbox.receipts.first.notification
     notification.mark_as_read(@entity1)
@@ -46,7 +46,7 @@ describe Mailboxer::Notification do
   end
 
   it "should be able to specify a sender for a notification" do
-    @entity1.notify("Subject", "Body", nil, true, nil, true, @entity3)
+    @entity1.send(Mailboxer.notify_method, "Subject", "Body", nil, true, nil, true, @entity3)
     expect(@entity1.mailbox.receipts.size).to eq 1
     notification = @entity1.mailbox.receipts.first.notification
     expect(notification.sender).to eq(@entity3)
@@ -126,11 +126,11 @@ describe Mailboxer::Notification do
 
   describe "scopes" do
     let(:scope_user) { FactoryGirl.create(:user) }
-    let!(:notification) { scope_user.notify("Body", "Subject").notification }
+    let!(:notification) { scope_user.send(Mailboxer.notify_method, "Body", "Subject").notification }
 
     describe ".unread" do
       it "finds unread notifications" do
-        unread_notification = scope_user.notify("Body", "Subject").notification
+        unread_notification = scope_user.send(Mailboxer.notify_method, "Body", "Subject").notification
         notification.mark_as_read(scope_user)
         expect(Mailboxer::Notification.unread.last).to eq unread_notification
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailboxer
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Eduardo Casanova Cuesta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +180,7 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -210,8 +211,8 @@ files:
 - db/migrate/20131206080416_add_conversation_optout.rb
 - db/migrate/20131206080417_add_missing_indices.rb
 - db/migrate/20151103080417_add_delivery_tracking_info_to_mailboxer_receipts.rb
-- gemfiles/rails4.2.gemfile
 - gemfiles/rails5.0.gemfile
+- gemfiles/rails5.1.gemfile
 - lib/generators/mailboxer/install_generator.rb
 - lib/generators/mailboxer/namespacing_compatibility_generator.rb
 - lib/generators/mailboxer/templates/initializer.rb
@@ -309,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Messaging system for rails apps.

data/gemfiles/rails4.2.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.2.0"
-
-gemspec path: "../"