mailboxer 0.12.5 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d3dc85202d707157141672e526db6f126cd6969
-  data.tar.gz: dcfd20e099d3355a6c3f0ccc8cc7817ff05262b4
+  metadata.gz: 76560ca95f622b27cb610d4e333f5f07da0145f0
+  data.tar.gz: 5865f0a7a71a57403bc459cae32aba44b2a3ca4e
 SHA512:
-  metadata.gz: 339eb28db3520ce5fd59ba8898358aecd98afbd98d644dfeb1f09e4f9f0a7052e6168e5cf492e79c7ffb1bd9849daaaec68faf3a35cbcdfa36ff6f3b15862d8d
-  data.tar.gz: d8dabb5d52bc1a7f108e96d00e7eb4ee2f62b1d93b630660f8461d733ec384591fa853277d0810efccd3763e5466533377fc1c3d1bb5bd21d33bf501f1a68ed7
+  metadata.gz: 39519d696f2bc2240d62c3e79738d195148d817cf105cf47a75a74d717c70c58823787bd3c9e0fe6f16977ab731ee858524535b22a5f5755ad5b033d3ad53dd8
+  data.tar.gz: 87c71b2d1e53a05dc3d27842b7dd25577610d28e1016dc3b61e2d190f653e0fcb5bd25cb613e83c6a71df92eb20a66a78759ecb89251db76378ed81d6620f187

data/README.md

@@ -25,7 +25,7 @@ Mailboxer was born from the great, but outdated, code from [lpsergi /
 acts*as*messageable](https://github.com/psergi/acts_as_messageable).
 
 We are now working to make exhaustive documentation and some wiki
-pages in order to make it even easier to use the gem to its full potencial.
+pages in order to make it even easier to use the gem to its full potential.
 Please, give us some time if you find something missing or [ask for
 it](https://github.com/ging/mailboxer/issues).  You can also find us on the [Gitter room for this repo](https://gitter.im/mailboxer/mailboxer).  Join us there to talk.
 
@@ -82,7 +82,7 @@ $ rake db:migrate
 
 ### Emails
 
-We are now adding support for sending emails when a Notification or a Message is sent to one or more recipients. You should modify the mailboxer initializer (/config/initializer/mailboxer.rb) to edit these settings.
+We are now adding support for sending emails when a Notification or a Message is sent to one or more recipients. You should modify the mailboxer initializer (/config/initializer/mailboxer.rb) to edit these settings:
 
 ```ruby
 Mailboxer.setup do |config|
@@ -94,7 +94,7 @@ Mailboxer.setup do |config|
 end
 ```
 
-You can change the way in which emails are delivered by specifying a custom implementation of notification and message mailers
+You can change the way in which emails are delivered by specifying a custom implementation of notification and message mailers:
 
 ```ruby
 Mailboxer.setup do |config|
@@ -142,7 +142,7 @@ end
 You may change whatever you want or need. For example:
 
 ```ruby
-config.email_method = :notifications_email
+config.email_method = :notification_email
 config.name_method = :display_name
 ```
 
@@ -160,7 +160,7 @@ class User < ActiveRecord::Base
 end
 ```
 
-You are not limited to the User model. You can use Mailboxer in any other model and use it in serveral different models. If you have ducks and cylons in your application and you want to exchange messages as if they were the same, just add `acts_as_messageable` to each one and you will be able to send duck-duck, duck-cylon, cylon-duck and cylon-cylon messages. Of course, you can extend it for as many classes as you need.
+You are not limited to the User model. You can use Mailboxer in any other model and use it in several different models. If you have ducks and cylons in your application and you want to exchange messages as if they were the same, just add `acts_as_messageable` to each one and you will be able to send duck-duck, duck-cylon, cylon-duck and cylon-cylon messages. Of course, you can extend it for as many classes as you need.
 
 Example:
 
@@ -314,4 +314,4 @@ If you need a GUI you should take a look a these links:
 * [fabianoalmeida](https://github.com/ging/mailboxer/commits/master?author=fabianoalmeida) (Fabiano Almeida)
 * [supremebeing7](https://github.com/ging/mailboxer/commits/master?author=supremebeing7) (Mark J. Lehman)
 * [searsaw](https://github.com/mailboxer/mailboxer/commits/master?author=searsaw) (Alex Sears)
-* [joshblour](https://github.com/mailboxer/mailboxer/commits/master?author=joshblour) (Yonah Forst)
+* [joshblour](https://github.com/mailboxer/mailboxer/commits/master?author=joshblour) (Yonah Forst)

data/app/models/mailboxer/notification.rb

@@ -33,13 +33,14 @@ 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)
+    def notify_all(recipients, subject, body, obj = nil, sanitize_text = true, notification_code=nil, send_mail=true, sender=nil)
       notification = Mailboxer::NotificationBuilder.new({
         :recipients        => recipients,
         :subject           => subject,
         :body              => body,
         :notified_object   => obj,
-        :notification_code => notification_code
+        :notification_code => notification_code,
+        :sender            => sender
       }).build
 
       notification.deliver sanitize_text, send_mail

data/lib/mailboxer/engine.rb

@@ -1,5 +1,5 @@
 # Database foreign keys
-require 'foreigner'
+require 'foreigner' if Rails.version < "4.2.0"
 require 'carrierwave'
 begin
   require 'sunspot_rails'

data/lib/mailboxer/models/messageable.rb

@@ -56,8 +56,8 @@ module Mailboxer
       end
 
       #Sends a notification to the messageable
-      def notify(subject,body,obj = nil,sanitize_text=true,notification_code=nil,send_mail=true)
-        Mailboxer::Notification.notify_all([self],subject,body,obj,sanitize_text,notification_code,send_mail)
+      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

data/lib/mailboxer/version.rb

@@ -1,3 +1,3 @@
 module Mailboxer
-  VERSION = "0.12.5"
+  VERSION = "0.13.0"
 end

data/spec/models/notification_spec.rb

@@ -46,6 +46,13 @@ describe Mailboxer::Notification do
     expect(notification).to be_is_read(@entity1)
   end
 
+  it "should be able to specify a sender for a notification" do
+    @entity1.notify("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)
+  end
+
   it "should notify several users" do
     recipients = [@entity1,@entity2,@entity3]
     Mailboxer::Notification.notify_all(recipients,"Subject","Body")
@@ -99,6 +106,25 @@ describe Mailboxer::Notification do
     expect(notification.body).to eq "Body"
   end
 
+  it "should be able to specify a sender for a notification" do
+    Mailboxer::Notification.notify_all(@entity1,"Subject","Body", nil, true, nil, false, @entity3)
+
+    #Check getting ALL receipts
+    expect(@entity1.mailbox.receipts.size).to eq 1
+    receipt      = @entity1.mailbox.receipts.first
+    notification = receipt.notification
+    expect(notification.subject).to eq "Subject"
+    expect(notification.body).to eq "Body"
+    expect(notification.sender).to eq @entity3
+
+    #Check getting NOTIFICATION receipts only
+    expect(@entity1.mailbox.notifications.size).to eq 1
+    notification = @entity1.mailbox.notifications.first
+    expect(notification.subject).to eq "Subject"
+    expect(notification.body).to eq "Body"
+    expect(notification.sender).to eq @entity3
+  end
+
   describe "scopes" do
     let(:scope_user) { FactoryGirl.create(:user) }
     let!(:notification) { scope_user.notify("Body", "Subject").notification }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailboxer
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.13.0
 platform: ruby
 authors:
 - Eduardo Casanova Cuesta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreigner
@@ -320,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Messaging system for rails apps.