quo_vadis 1.2.2 → 1.2.3

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # CHANGELOG
 
 
+## 1.2.3 (21 March 2013)
+
+* Ability to override the activation email's from and subject.
+
+
 ## 1.2.2 (20 March 2013)
 
 * Enable form validation errors in activation form.

data/README.md

@@ -161,9 +161,9 @@ Write the mailer view, i.e. the email which will be sent to your new users ([exa
 * be at `app/views/quo_vadis/notifier/invite.text.erb`
 * render `@url` somewhere (this is the link the user clicks to go to the invitation page)
 
-You can also refer to `@user` in the email view, as well as any other data you pass to `invite_to_activate`.
+You can also refer to `@user` in the email view, as well as any other data you pass to `invite_to_activate`.  Note that passing `:from` and/or `:subject` in the hash to `invite_to_activate` overrides the default `QuoVadis.from` and/or `QuoVadis.subject_invitation` respectively.
 
-Configure the email's from address in `config/initializers/quo_vadis.rb`.
+Configure the email's from address in `config/initializers/quo_vadis.rb` (or pass in the data hash to `invite_to_activate`).
 
 Configure the default host so ActionMailer can generate the URL.  In `config/environments/<env>.rb`:
 

data/app/mailers/quo_vadis/notifier.rb

@@ -13,12 +13,17 @@ module QuoVadis
     # can choose their username and password.
     #
     # `data` - hash of data to pass to view via instance variables.  A key of `:foo`
-    #          will be available via `@foo`.
+    #          will be available via `@foo`.  `:from` and `:subject` are deleted from
+    #          the hash and used to override `QuoVadis#from` and `#subject_invitation`.
     def invite(user, data = {})
       @user = user
       @url = invitation_url user.token
+      
+      from    = data.delete(:from)    || QuoVadis.from
+      subject = data.delete(:subject) || QuoVadis.subject_invitation
+      
       data.each { |k,v| instance_variable_set :"@#{k}", v }
-      mail :to => user.email, :from => QuoVadis.from, :subject => QuoVadis.subject_invitation
+      mail :to => user.email, :from => from, :subject => subject
     end
 
   end

data/lib/quo_vadis/version.rb

@@ -1,3 +1,3 @@
 module QuoVadis
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/test/integration/activation_test.rb

@@ -95,4 +95,14 @@ class ActivationTest < ActiveSupport::IntegrationCase
     email = ActionMailer::Base.deliveries.last
     assert_match Regexp.new('Barbaz'), email.encoded
   end
+
+  test 'data can be passed to invitation email to override :from and :subject' do
+    user = User.new_for_activation :name => 'Bob', :email => 'bob@example.com'
+    assert user.save
+    assert QuoVadis::SessionsController.new.invite_to_activate user,
+      :subject => 'Foo', :from => 'Bar <bar@example.com>'
+    email = ActionMailer::Base.deliveries.last
+    assert_equal ['bar@example.com'], email.from
+    assert_equal 'Foo', email.subject
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quo_vadis
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -237,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1859986741885625298
+      hash: 2281906662398485868
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1859986741885625298
+      hash: 2281906662398485868
 requirements: []
 rubyforge_project: quo_vadis
 rubygems_version: 1.8.23