mandrill_mailer 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cec71a64a8a20cffa3174b760b1196f3e72846f
-  data.tar.gz: 72ad5d28b0e812b0513fd9bbd3c0c3f19d47e864
+  metadata.gz: 1f1b23face89c57dcf4a9d63594a1d316adb67e5
+  data.tar.gz: 5311702dc42f69d2c6718177d6f790da846c56fa
 SHA512:
-  metadata.gz: 179f7ed1f504bcfc472d8db839dac2fd9bd4eef419e4304101de9ef7477ac6f3f50f513781c97395f1e3e5c9c6fc901a3e10565058b23406b055199a8fc9315d
-  data.tar.gz: 2914a62ac2d55f9e17f500e512b7949e6961ec033bdaad995357368033b01de642313e6ae58e33c9971820315d0e820f8c583939544baa40310dbe143dc77633
+  metadata.gz: eda62b4c59aa3d60a60f15f851e5483cc1af155a3304c15ed28ee58ae1bccd59ff804e3af1913d018f451e11fac36ab14a95ebdde2ec6b44af30835060edb5fb
+  data.tar.gz: 094eed9cb7c1e02c72b9fd040ad2a7a03bb9ae46999601d0e654998d72e984e041383053094cf943e796c75875cd542319f9ec4db68f6d54fab9cb2d6c402990

data/CHANGELOG.md

@@ -2,24 +2,28 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.0.4 - 2015-09-24
+### Added
+- Allow default `view_content_link` on Mailer class.
+
 ## 1.0.3
-- Fix a bug where defaults in merge vars were receiving the correct defaults - Credit @kennethkalmer
+- Fix a bug where defaults in merge vars were receiving the correct defaults (credit @kennethkalmer).
 
 ## 1.0.1
-- Correct regression caused in 1.0.0 that broke defaults in mailers - Credit: @etipton
+- Correct regression caused in 1.0.0 that broke defaults in mailers (credit: @etipton).
 
 ## 1.0.0
 ### Changed
-- Update manrill_api gem to 1.0.X
-- Change how interceptors work to be more flexible and not overwrite data if needed
-- Make both the template and message mailers compatible with all available attributes in the messages api
+- Update manrill_api gem to 1.0.X.
+- Change how interceptors work to be more flexible and not overwrite data if needed.
+- Make both the template and message mailers compatible with all available attributes in the messages API.
 
 ### Removed
 - Deprecated `data` method on Mailer objects, replaced with `message`.
 
 ## 0.6.1
 ### Fixed
-- Correct a regression introduced in 0.6.0 that caused a TypeError exception
+- Correct a regression introduced in 0.6.0 that caused a TypeError exception.
 when no `merge_vars` were provided as arguments to `mandrill_mail`.
 
 ## 0.6.0

data/README.md

@@ -100,6 +100,7 @@ end
   * `:from` - set the default from email address for the mailer
   * `:from_name` - set the default from name for the mailer. If not set, defaults to from email address. Setting :from_name in the .mandrill_mail overrides the default.
   * `:merge_vars` - set some default `merge_vars` that will be sent with every mailer method (in `global_merge_vars` so there's no risk of collision with method-specific `merge_vars`.
+  * `:view_content_link` - set a default to be able to access individual mailer messages in the Mandrill dashboard
 
 * `.mandrill_mail`
    * `:template`(required) - Template slug from within Mandrill (for backwards-compatibility, the template name may also be used but the immutable slug is preferred)
@@ -184,7 +185,8 @@ class InvitationMailer < MandrillMailer::MessageMailer
                   # to: { email: invitation.email, name: 'Honored Guest' },
                   text: "Example text content",
                   html: "<p>Example HTML content</p>",
-                  view_content_link: "http://www.nba.com",
+                  # when you need to see the content of individual emails sent to users
+                  view_content_link: true,
                   vars: {
                     'OWNER_NAME' => invitation.owner_name,
                     'PROJECT_NAME' => invitation.project_name

data/lib/mandrill_mailer/arg_formatter.rb

@@ -92,7 +92,7 @@ module MandrillMailer
         "inline_css" => boolean(args[:inline_css]),
         "url_strip_qs" => boolean(args.fetch(:url_strip_qs, true)),
         "preserve_recipients" => boolean(args[:preserve_recipients]),
-        "view_content_link" => boolean(args[:view_content_link]),
+        "view_content_link" => boolean(args[:view_content_link] || defaults[:view_content_link]),
         "bcc_address" => args[:bcc],
         "tracking_domain" => args[:tracking_domain],
         "signing_domain" => args[:signing_domain],

data/lib/mandrill_mailer/core_mailer.rb

@@ -7,6 +7,7 @@
 #   default from: 'support@codeschool.com',
 #           from_name: 'Code School',
 #           merge_vars: { 'FOO' => 'Bar' }
+#           view_content_link: false
 
 #   def invite(invitation)
 #     invitees = invitation.invitees.map { |invitee| { email: invitee.email, name: invitee.name } }
@@ -36,9 +37,10 @@
 # end
 
 # #default:
-#   :from       - set the default from email address for the mailer
-#   :from_name  - set the default from name for the mailer
-#   :merge_vars - set the default merge vars for the mailer
+#   :from               - set the default from email address for the mailer
+#   :from_name          - set the default from name for the mailer
+#   :merge_vars         - set the default merge vars for the mailer
+#   :view_content_link  - set a default view_content_link option for the mailer
 
 # .mandrill_mail
 #   :template(required) - Template name from within Mandrill

data/lib/mandrill_mailer/template_mailer.rb

@@ -6,7 +6,8 @@
 # class InvitationMailer < MandrillMailer::TemplateMailer
 #   default from: 'support@codeschool.com',
 #           from_name: 'Code School',
-#           merge_vars: { 'FOO' => 'Bar' }
+#           merge_vars: { 'FOO' => 'Bar' },
+#           view_content_link: true
 
 #   def invite(invitation)
 #     invitees = invitation.invitees.map { |invitee| { email: invitee.email, name: invitee.name } }
@@ -36,7 +37,10 @@
 # end
 
 # #default:
-#   :from - set the default from email address for the mailer
+#   :from               - set the default from email address for the mailer
+#   :from_name          - set the default from name for the mailer
+#   :merge_vars         - set the default merge vars for the mailer
+#   :view_content_link  - set a default view_content_link option for the mailer
 
 # .mandrill_mail
 #   :template(required) - Template name from within Mandrill

data/lib/mandrill_mailer/version.rb

@@ -1,3 +1,3 @@
 module MandrillMailer
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/spec/core_mailer_spec.rb

@@ -99,11 +99,13 @@ describe MandrillMailer::CoreMailer do
       default_from = "default name"
       default_from_email = "default@email.com"
       default_merge_vars = { foo: "bar" }
+      default_view_content_link = true
 
       unique_mailer = Class.new(core_mailer) do
         default from_name: default_from,
                 from: default_from_email,
-                merge_vars: default_merge_vars
+                merge_vars: default_merge_vars,
+                view_content_link: default_view_content_link
       end
 
       # Create a second mailer to make sure we don't get class var pollution
@@ -117,6 +119,7 @@ describe MandrillMailer::CoreMailer do
 
       expect(new_unique_mailer.message['from_name']).to eq default_from
       expect(new_unique_mailer.message['from_email']).to eq default_from_email
+      expect(new_unique_mailer.message['view_content_link']).to eq default_view_content_link
 
       global_merge_vars = [{ "name" => :foo, "content" => "bar" }]
       expect(new_unique_mailer.message['global_merge_vars']).to eq global_merge_vars
@@ -215,7 +218,7 @@ describe MandrillMailer::CoreMailer do
   end
 
   describe 'defaults' do
-    it 'should not share between different subclasses' do
+    it "doesn't share between different subclasses" do
       klassA = Class.new(core_mailer) do
         default from_name: 'ClassA'
       end
@@ -227,7 +230,7 @@ describe MandrillMailer::CoreMailer do
       expect(klassB.defaults[:from_name]).to eq 'ClassB'
     end
 
-    it 'should use defaults from the parent class' do
+    it 'uses defaults from the parent class' do
       klassA = Class.new(core_mailer) do
         default from_name: 'ClassA'
       end
@@ -237,7 +240,7 @@ describe MandrillMailer::CoreMailer do
       expect(klassB.defaults[:from_name]).to eq 'ClassA'
     end
 
-    it 'should allow overriding defaults from the parent' do
+    it 'allows overriding defaults from the parent' do
       klassA = Class.new(core_mailer) do
         default from_name: 'ClassA'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_mailer
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Adam Rensel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Transactional Mailer for Mandrill