postmark 1.9.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76623008dfbb09504295182472b645b013700da6
-  data.tar.gz: 8648dba9d5ed435d630493777d8b42552369df54
+  metadata.gz: 0783a6fc070a9e3aa81200e4e37df4b4ac7cc615
+  data.tar.gz: 945107372cad40489c8ceb05537429114d1e9e1a
 SHA512:
-  metadata.gz: f6b5c6789fa0d38c1d4ba35a426febce12b11c3bd09a9450e388d9cf1c17d2c5312ae67611e33d9d2cc750173e2020c86920b4100ea9f46b7a847e18cfe88fd6
-  data.tar.gz: e3324835f12c6a203fdc78147a400c039714d5a0045917823b95d4bdd2890f7afbad80ab7a816aaea12785ba2c6cee62132016ec25eb3ad027ce86b481ee0782
+  metadata.gz: 69edcd10b9a8b14ea2d211150992af00387438870424a5d3adf015e409f11fe67baa924cf10963a524dadbd258ef0df244cb5086f1106c3f1a0662a3e9f29bbb
+  data.tar.gz: a5818e954ca24d7098166a5a8c63e445b0e58b763766c901ead97fe835176433ae1924d4ecb9b5b933b1c53547583a2af1d5c5577069c6d9285866633c35e691

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = Changelog
 
+== 1.10.0
+
+* Fix a bug when open tracking flag is set to false by default, when open tracking flag is not set by a user.
+* Added support for link tracking
+
 == 1.9.1
 
 * Fix a bug when port setting is not respected.

data/README.md

@@ -66,7 +66,7 @@ client.deliver(from: 'sheldon@bigbangtheory.com',
 # => {:to=>"Leonard Hofstadter <leonard@bigbangtheory.com>", :submitted_at=>"2013-05-09T02:45:16.2059023-04:00", :message_id=>"b2b268e3-6a70-xxxx-b897-49c9eb8b1d2e", :error_code=>0, :message=>"OK"}
 ```
 
-## Sending an HTML message (with open tracking!)
+## Sending an HTML message with open tracking
 
 Simply pass an HTML document as html_body parameter to `#deliver`. You can also enable open tracking by setting `track_opens` to `true`.
 
@@ -80,6 +80,22 @@ client.deliver(from: 'sheldon@bigbangtheory.com',
                track_opens: true)
 # => {:to=>"Leonard Hofstadter <leonard@bigbangtheory.com>", :submitted_at=>"2013-05-09T02:51:08.8789433-04:00", :message_id=>"75c28987-564e-xxxx-b6eb-e8071873ac06", :error_code=>0, :message=>"OK"}
 ```
+## Sending a message with link tracking
+
+To track visited links for emails you send, make sure to have links in html_body, text_body or both when passing them to `#deliver`. You need to enable link tracking by setting `track_links` parameter to one of the following options: `:html_only`, `:text_only`, `:html_and_text` or `:none`.
+Depending on parameter you set, link tracking will be enabled on plain text body, html body, both or none. Optionally you can also use string values as parameters 'HtmlOnly', 'TextOnly', 'HtmlAndText' or 'None'.
+
+``` ruby
+client.deliver(from: 'sheldon@bigbangtheory.com',
+               to: 'Leonard Hofstadter <leonard@bigbangtheory.com>',
+               subject: 'Re: What, to you, is a large crowd?',
+               html_body: '<p>Any group big enough to trample me to death. ' \
+                          'General <a href="http://www.example.com">rule of thumb</a> is 36 adults or 70 ' \
+                          'children.</p>',
+               text_body: 'Any group big enough to trample me to death. General rule of thumb is 36 adults or 70 children - http://www.example.com.',
+               track_links: :html_and_text)
+# => {:to=>"Leonard Hofstadter <leonard@bigbangtheory.com>", :submitted_at=>"2013-05-09T02:51:08.8789433-04:00", :message_id=>"75c28987-564e-xxxx-b6eb-e8071873ac06", :error_code=>0, :message=>"OK"}
+```
 
 ## Sending a message with attachments
 
@@ -391,7 +407,7 @@ message = Mail.new do
   body            '<p>Any group big enough to trample me to death. General ' \
                   'rule of thumb is 36 adults or 70 children.</p>'
 
-  track_opens     "true" # Feel free to use boolean values on mail >= 2.3.0
+  track_opens     true 
 
   delivery_method Mail::Postmark, :api_token => 'your-postmark-api-token'
 end
@@ -400,6 +416,41 @@ message.deliver
 # => #<Mail::Message:70355902117460, Multipart: false, Headers: <From: sheldon@bigbangtheory.com>, <To: leonard@bigbangtheory.com>, <Message-ID: 3a9370a2-6c24-4304-a03c-320a54cc59f7>, <Subject: Re: What, to you, is a large crowd?>, <Content-Type: text/html; charset=UTF-8>>
 ```
 
+## Multipart message (with link tracking)
+
+Notice that we set `track_links` field to `:html_and_text`, to enable link tracking for both plain text and html parts for this message.
+
+``` ruby
+require 'rubygems'
+require 'postmark'
+require 'mail'
+require 'json'
+
+message = Mail.new do
+  from            'sheldon@bigbangtheory.com'
+  to              'Leonard Hofstadter <leonard@bigbangtheory.com>'
+  subject         'Re: What, to you, is a large crowd?'
+
+  text_part do
+    body          'Any group big enough to trample me to death. General rule of thumb is 36 adults or 70 children - http://www.example.com.'
+  end
+
+  html_part do
+    content_type  'text/html; charset=UTF-8'
+    body          '<p>Any group big enough to trample me to death. ' \
+                  'General <a href="http://www.example.com">rule of thumb</a> is 36 adults or 70 ' \
+                  'children.</p>'
+  end
+
+  track_links     :html_and_text
+
+  delivery_method Mail::Postmark, :api_token => 'your-postmark-api-token'
+end
+
+message.deliver
+# => #<Mail::Message:70355902117460, Multipart: true, Headers: <From: sheldon@bigbangtheory.com>, <To: leonard@bigbangtheory.com>, <Message-ID: 1a1370a1-6c21-4304-a03c-320a54cc59f7>, <Subject: Re: What, to you, is a large crowd?>, <Content-Type: multipart/alternative; boundary=--==_mimepart_58380d6029b17_20543fd48543fa14977a>, <TRACK-LINKS: HtmlAndText>>
+```
+
 ## Message with attachments
 
 ``` ruby
@@ -629,10 +680,13 @@ Postmark.response_parser_class = :Json # :ActiveSupport or :Yajl are also suppor
 
 * Fork the project.
 * Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-* Send me a pull request. Bonus points for topic branches.
+* Add tests for it. This is important to prevent future regressions.
+* Do not mess with rakefile, version, or history
+* Update the CHANGELOG, list your changes under Unreleased.
+* Update the README if necessary.
+* Write short, descriptive commit messages, following the format used in the repo.
+* Send a pull request. Bonus points for topic branches.
 
 ## Copyright
 
-Copyright © 2014 Wildbit LLC. See LICENSE for details.
+Copyright © 2016 Wildbit LLC. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-1.9.1
+1.10.0

data/lib/postmark/helpers/message_helper.rb

@@ -18,6 +18,10 @@ module Postmark
         message[:attachments] = attachments_to_postmark(message[:attachments])
       end
 
+      if message[:track_links]
+        message[:track_links] = ::Postmark::Inflector.to_postmark(message[:track_links])
+      end
+
       HashHelper.to_postmark(message)
     end
 

data/lib/postmark/mail_message_converter.rb

@@ -30,7 +30,8 @@ module Postmark
         'Subject' => @message.subject,
         'Headers' => @message.export_headers,
         'Tag' => @message.tag.to_s,
-        'TrackOpens' => cast_to_bool(@message.track_opens)
+        'TrackOpens' => (cast_to_bool(@message.track_opens) unless @message.track_opens.empty?),
+        'TrackLinks' => (@message.track_links unless @message.track_links.empty?)
       }
     end
 

data/lib/postmark/message_extensions/mail.rb

@@ -15,12 +15,22 @@ module Mail
       header['TAG'] = val
     end
 
+    def track_links(val = nil)
+      self.track_links=(val) unless val.nil?
+      header['TRACK-LINKS'].to_s
+    end
+
+    def track_links=(val)
+      header['TRACK-LINKS'] = ::Postmark::Inflector.to_postmark(val)
+    end
+
     def track_opens(val = nil)
-      default 'TRACK-OPENS', !!val
+      self.track_opens=(val) unless val.nil?
+      header['TRACK-OPENS'].to_s
     end
 
     def track_opens=(val)
-      header['TRACK-OPENS'] = !!val
+      header['TRACK-OPENS'] = (!!val).to_s
     end
 
     def postmark_attachments=(value)
@@ -116,7 +126,7 @@ module Mail
         cc           bcc
         subject      tag
         attachment   to
-        track-opens
+        track-opens  track-links
       ]
     end
 

data/lib/postmark/version.rb

@@ -1,3 +1,3 @@
 module Postmark
-  VERSION = '1.9.1'
+  VERSION = '1.10.0'
 end

data/spec/unit/postmark/helpers/message_helper_spec.rb

@@ -80,46 +80,92 @@ describe Postmark::MessageHelper do
       message.merge(:track_opens => true)
     }
 
+    let(:message_with_open_tracking_false) {
+      message.merge(:track_opens => false)
+    }
+
     let(:postmark_message_with_open_tracking) {
       postmark_message.merge("TrackOpens" => true)
     }
 
+    let(:postmark_message_with_open_tracking_false) {
+      postmark_message.merge("TrackOpens" => false)
+    }
+
     it 'converts messages without custom headers and attachments correctly' do
-      subject.to_postmark(message).should == postmark_message
+      expect(subject.to_postmark(message)).to eq postmark_message
     end
 
     it 'converts messages with custom headers and without attachments correctly' do
-      subject.to_postmark(message_with_headers).should == postmark_message_with_headers
+      expect(subject.to_postmark(message_with_headers)).to eq postmark_message_with_headers
     end
 
     it 'converts messages with custom headers and attachments correctly' do
-      subject.to_postmark(message_with_headers_and_attachments).should == postmark_message_with_headers_and_attachments
+      expect(subject.to_postmark(message_with_headers_and_attachments)).to eq postmark_message_with_headers_and_attachments
+    end
+
+    context 'open tracking flag set' do
+
+      it 'true' do
+        expect(subject.to_postmark(message_with_open_tracking)).to eq(postmark_message_with_open_tracking)
+      end
+
+      it 'false' do
+        expect(subject.to_postmark(message_with_open_tracking_false)).to eq(postmark_message_with_open_tracking_false)
+      end
+
     end
 
-    it 'includes open tracking flag when specified' do
-      expect(subject.to_postmark(message_with_open_tracking)).to eq(postmark_message_with_open_tracking)
+    context 'link tracking flag set' do
+
+      let(:message_with_link_tracking_html) { message.merge(:track_links => :html_only) }
+      let(:message_with_link_tracking_text) { message.merge(:track_links => :text_only) }
+      let(:message_with_link_tracking_all) { message.merge(:track_links => :html_and_text) }
+      let(:message_with_link_tracking_none) { message.merge(:track_links => :none) }
+
+      let(:postmark_message_with_link_tracking_html) { postmark_message.merge("TrackLinks" => 'HtmlOnly') }
+      let(:postmark_message_with_link_tracking_text) { postmark_message.merge("TrackLinks" => 'TextOnly') }
+      let(:postmark_message_with_link_tracking_all) { postmark_message.merge("TrackLinks" => 'HtmlAndText') }
+      let(:postmark_message_with_link_tracking_none) { postmark_message.merge("TrackLinks" => 'None') }
+
+      it 'html' do
+        expect(subject.to_postmark(message_with_link_tracking_html)).to eq(postmark_message_with_link_tracking_html)
+      end
+
+      it 'text' do
+        expect(subject.to_postmark(message_with_link_tracking_text)).to eq(postmark_message_with_link_tracking_text)
+      end
+
+      it 'html and text' do
+        expect(subject.to_postmark(message_with_link_tracking_all)).to eq(postmark_message_with_link_tracking_all)
+      end
+
+      it 'none' do
+        expect(subject.to_postmark(message_with_link_tracking_none)).to eq(postmark_message_with_link_tracking_none)
+      end
+
     end
 
   end
 
   describe ".headers_to_postmark" do
     it 'converts headers to Postmark format' do
-      subject.headers_to_postmark(headers).should == postmark_headers
+      expect(subject.headers_to_postmark(headers)).to eq postmark_headers
     end
 
     it 'accepts single header as a non-array' do
-      subject.headers_to_postmark(headers.first).should == [postmark_headers.first]
+      expect(subject.headers_to_postmark(headers.first)).to eq [postmark_headers.first]
     end
   end
 
   describe ".attachments_to_postmark" do
 
     it 'converts attachments to Postmark format' do
-      subject.attachments_to_postmark(attachments).should == postmark_attachments
+      expect(subject.attachments_to_postmark(attachments)).to eq postmark_attachments
     end
 
     it 'accepts single attachment as a non-array' do
-      subject.attachments_to_postmark(attachments.first).should == [postmark_attachments.first]
+      expect(subject.attachments_to_postmark(attachments.first)).to eq [postmark_attachments.first]
     end
 
   end

data/spec/unit/postmark/mail_message_converter_spec.rb

@@ -15,7 +15,7 @@ describe Postmark::MailMessageConverter do
   end
 
   let(:mail_html_message) do
-    mail = Mail.new do
+    Mail.new do
       from          "sheldon@bigbangtheory.com"
       to            "lenard@bigbangtheory.com"
       subject       "Hello!"
@@ -24,8 +24,8 @@ describe Postmark::MailMessageConverter do
     end
   end
 
-  let(:mail_message_with_tracking) do
-    mail = Mail.new do
+  let(:mail_message_with_open_tracking) do
+    Mail.new do
       from          "sheldon@bigbangtheory.com"
       to            "lenard@bigbangtheory.com"
       subject       "Hello!"
@@ -35,6 +35,52 @@ describe Postmark::MailMessageConverter do
     end
   end
 
+  let(:mail_message_with_open_tracking_disabled) do
+    Mail.new do
+      from          "sheldon@bigbangtheory.com"
+      to            "lenard@bigbangtheory.com"
+      subject       "Hello!"
+      content_type  'text/html; charset=UTF-8'
+      body          "<b>Hello Sheldon!</b>"
+      track_opens   false
+    end
+  end
+
+  let(:mail_message_with_open_tracking_set_variable) do
+    mail = mail_html_message
+    mail.track_opens=true
+    mail
+  end
+
+  let(:mail_message_with_open_tracking_disabled_set_variable) do
+    mail = mail_html_message
+    mail.track_opens=false
+    mail
+  end
+
+  let(:mail_message_with_link_tracking_all) do
+    mail = mail_html_message
+    mail.track_links   :html_and_text
+    mail
+  end
+
+  let(:mail_message_with_link_tracking_html) do
+    mail = mail_html_message
+    mail.track_links = :html_only
+    mail
+  end
+
+  let(:mail_message_with_link_tracking_text) do
+    mail = mail_html_message
+    mail.track_links = :text_only
+    mail
+  end
+
+  let(:mail_message_with_link_tracking_none) do
+    mail = mail_html_message
+    mail.track_links = :none
+    mail
+  end
 
   let(:tagged_mail_message) do
     Mail.new do
@@ -55,7 +101,7 @@ describe Postmark::MailMessageConverter do
   end
 
   let(:mail_multipart_message) do
-    mail = Mail.new do
+    Mail.new do
       from          "sheldon@bigbangtheory.com"
       to            "lenard@bigbangtheory.com"
       subject       "Hello!"
@@ -123,8 +169,7 @@ describe Postmark::MailMessageConverter do
         "From" => "sheldon@bigbangtheory.com",
         "Subject" => "Hello!",
         "TextBody" => "Hello Sheldon!",
-        "To" => "lenard@bigbangtheory.com",
-        'TrackOpens' => false}
+        "To" => "lenard@bigbangtheory.com"}
   end
 
   it 'converts tagged text messages correctly' do
@@ -133,16 +178,14 @@ describe Postmark::MailMessageConverter do
         "Subject" => "Hello!",
         "TextBody" => "Hello Sheldon!",
         "Tag" => "sheldon",
-        "To"=>"lenard@bigbangtheory.com",
-        'TrackOpens' => false}
+        "To"=>"lenard@bigbangtheory.com"}
   end
 
   it 'converts plain text messages without body correctly' do
     subject.new(mail_message_without_body).run.should == {
         "From" => "sheldon@bigbangtheory.com",
         "Subject" => "Hello!",
-        "To" => "lenard@bigbangtheory.com",
-        'TrackOpens' => false}
+        "To" => "lenard@bigbangtheory.com"}
   end
 
   it 'converts html messages correctly' do
@@ -150,8 +193,7 @@ describe Postmark::MailMessageConverter do
         "From" => "sheldon@bigbangtheory.com",
         "Subject" => "Hello!",
         "HtmlBody" => "<b>Hello Sheldon!</b>",
-        "To" => "lenard@bigbangtheory.com",
-        'TrackOpens' => false}
+        "To" => "lenard@bigbangtheory.com"}
   end
 
   it 'converts multipart messages correctly' do
@@ -160,8 +202,7 @@ describe Postmark::MailMessageConverter do
         "Subject" => "Hello!",
         "HtmlBody" => "<b>Hello Sheldon!</b>",
         "TextBody" => "Hello Sheldon!",
-        "To" => "lenard@bigbangtheory.com",
-        'TrackOpens' => false}
+        "To" => "lenard@bigbangtheory.com"}
   end
 
   it 'converts messages with attachments correctly' do
@@ -172,8 +213,7 @@ describe Postmark::MailMessageConverter do
                            "Content"=>encoded_empty_gif_data,
                            "ContentType"=>"image/gif"}],
         "TextBody"=>"Hello Sheldon!",
-        "To"=>"lenard@bigbangtheory.com",
-        'TrackOpens' => false}
+        "To"=>"lenard@bigbangtheory.com"}
   end
 
   it 'converts messages with named addresses correctly' do
@@ -182,18 +222,95 @@ describe Postmark::MailMessageConverter do
         "Subject" => "Hello!",
         "TextBody" => "Hello Sheldon!",
         "To" => "Leonard Hofstadter <leonard@bigbangtheory.com>",
-        "ReplyTo" => 'Penny The Neighbor <penny@bigbangtheory.com>',
-        'TrackOpens' => false
-    }
+        "ReplyTo" => 'Penny The Neighbor <penny@bigbangtheory.com>'}
   end
 
-  it 'recognizes when open tracking is enabled' do
-    subject.new(mail_message_with_tracking).run.should == {
-        "From" => "sheldon@bigbangtheory.com",
-        "Subject" => "Hello!",
-        "HtmlBody" => "<b>Hello Sheldon!</b>",
-        "To" => "lenard@bigbangtheory.com",
-        "TrackOpens" => true}
+  context 'recognizes open tracking' do
+
+    context 'setup inside of mail' do
+
+      it 'enabled' do
+        expect(subject.new(mail_message_with_open_tracking).run).to eq ({
+            "From" => "sheldon@bigbangtheory.com",
+            "Subject" => "Hello!",
+            "HtmlBody" => "<b>Hello Sheldon!</b>",
+            "To" => "lenard@bigbangtheory.com",
+            "TrackOpens" => true})
+      end
+
+      it 'disabled' do
+        expect(subject.new(mail_message_with_open_tracking_disabled).run).to eq ({
+            "From" => "sheldon@bigbangtheory.com",
+            "Subject" => "Hello!",
+            "HtmlBody" => "<b>Hello Sheldon!</b>",
+            "To" => "lenard@bigbangtheory.com",
+            "TrackOpens" => false})
+      end
+
+    end
+
+    context 'setup with tracking variable' do
+
+      it 'enabled' do
+        expect(subject.new(mail_message_with_open_tracking_set_variable).run).to eq ({
+            "From" => "sheldon@bigbangtheory.com",
+            "Subject" => "Hello!",
+            "HtmlBody" => "<b>Hello Sheldon!</b>",
+            "To" => "lenard@bigbangtheory.com",
+            "TrackOpens" => true})
+      end
+
+      it 'disabled' do
+        expect(subject.new(mail_message_with_open_tracking_disabled_set_variable).run).to eq ({
+            "From" => "sheldon@bigbangtheory.com",
+            "Subject" => "Hello!",
+            "HtmlBody" => "<b>Hello Sheldon!</b>",
+            "To" => "lenard@bigbangtheory.com",
+            "TrackOpens" => false})
+      end
+
+    end
+
+  end
+
+  context 'link tracking' do
+
+    it 'html and text' do
+      expect(subject.new(mail_message_with_link_tracking_all).run).to eq ({
+          "From" => "sheldon@bigbangtheory.com",
+          "Subject" => "Hello!",
+          "HtmlBody" => "<b>Hello Sheldon!</b>",
+          "To" => "lenard@bigbangtheory.com",
+          "TrackLinks" => 'HtmlAndText'})
+    end
+
+    it 'html only' do
+      expect(subject.new(mail_message_with_link_tracking_html).run).to eq ({
+          "From" => "sheldon@bigbangtheory.com",
+          "Subject" => "Hello!",
+          "HtmlBody" => "<b>Hello Sheldon!</b>",
+          "To" => "lenard@bigbangtheory.com",
+          "TrackLinks" => 'HtmlOnly'})
+    end
+
+    it 'text only' do
+      expect(subject.new(mail_message_with_link_tracking_text).run).to eq ({
+          "From" => "sheldon@bigbangtheory.com",
+          "Subject" => "Hello!",
+          "HtmlBody" => "<b>Hello Sheldon!</b>",
+          "To" => "lenard@bigbangtheory.com",
+          "TrackLinks" => 'TextOnly'})
+    end
+
+    it 'none' do
+      expect(subject.new(mail_message_with_link_tracking_none).run).to eq ({
+          "From" => "sheldon@bigbangtheory.com",
+          "Subject" => "Hello!",
+          "HtmlBody" => "<b>Hello Sheldon!</b>",
+          "To" => "lenard@bigbangtheory.com",
+          "TrackLinks" => 'None'})
+    end
+
   end
 
   it 'correctly decodes unicode in messages transfered as quoted-printable' do

data/spec/unit/postmark/message_extensions/mail_spec.rb

@@ -15,7 +15,7 @@ describe Mail::Message do
   end
 
   let(:mail_html_message) do
-    mail = Mail.new do
+    Mail.new do
       from          "sheldon@bigbangtheory.com"
       to            "lenard@bigbangtheory.com"
       subject       "Hello!"
@@ -38,24 +38,102 @@ describe Mail::Message do
     mail_message.header['Tag'] = 'bogus-tag'
     mail_message.header['Attachment'] = 'anydatahere'
     mail_message.header['Allowed-Header'] = 'value'
+    mail_message.header['TRACK-OPENS'] = 'true'
+    mail_message.header['TRACK-LINKS'] = 'HtmlOnly'
     mail_message
   end
 
+  describe '#tag' do
+
+    it 'value set on tag=' do
+      mail_message.tag='value'
+      expect(mail_message.tag).to eq 'value'
+    end
+
+    it 'value set on tag()' do
+      mail_message.tag('value')
+      expect(mail_message.tag).to eq 'value'
+    end
+
+  end
+
+  describe '#track_opens' do
+
+    context 'flag set on track_opens=' do
+
+      it 'true' do
+        mail_message.track_opens = true
+        expect(mail_message.track_opens).to eq 'true'
+      end
+
+      it 'false' do
+        mail_message.track_opens = false
+        expect(mail_message.track_opens).to eq 'false'
+      end
+
+      it 'not set' do
+        expect(mail_message.track_opens).to eq ''
+      end
+
+    end
+
+    context 'flag set on track_opens()' do
+
+      it 'true' do
+        mail_message.track_opens(true)
+        expect(mail_message.track_opens).to eq 'true'
+      end
+
+      it 'false' do
+        mail_message.track_opens(false)
+        expect(mail_message.track_opens).to eq 'false'
+      end
+
+    end
+
+  end
+
+  describe '#track_links' do
+
+    context 'flag set on track_links=' do
+
+      it 'set' do
+        mail_message.track_links=:html_only
+        expect(mail_message.track_links).to eq 'HtmlOnly'
+      end
+
+      it 'not set' do
+        expect(mail_message.track_links).to eq ''
+      end
+
+    end
+
+    context 'flag set on track_links()' do
+
+      it 'set' do
+        mail_message.track_links(:html_only)
+        expect(mail_message.track_links).to eq 'HtmlOnly'
+      end
+
+    end
+
+  end
+
   describe "#html?" do
     it 'is true for html only email' do
-      mail_html_message.should be_html
+      expect(mail_html_message).to be_html
     end
   end
 
   describe "#body_html" do
     it 'returns html body if present' do
-      mail_html_message.body_html.should == "<b>Hello Sheldon!</b>"
+      expect(mail_html_message.body_html).to eq "<b>Hello Sheldon!</b>"
     end
   end
 
   describe "#body_text" do
     it 'returns text body if present' do
-      mail_message.body_text.should == "Hello Sheldon!"
+      expect(mail_message.body_text).to eq "Hello Sheldon!"
     end
   end
 
@@ -65,7 +143,7 @@ describe Mail::Message do
 
     it "stores attachments as an array" do
       mail_message.postmark_attachments = attached_hash
-      mail_message.instance_variable_get(:@_attachments).should include(attached_hash)
+      expect(mail_message.instance_variable_get(:@_attachments)).to include(attached_hash)
     end
 
     it "is deprecated" do
@@ -93,8 +171,8 @@ describe Mail::Message do
       mail_message.postmark_attachments = [attached_hash, attached_file]
       attachments = mail_message.export_attachments
 
-      attachments.should include(attached_hash)
-      attachments.should include(exported_file)
+      expect(attachments).to include(attached_hash)
+      expect(attachments).to include(exported_file)
     end
 
     it "is deprecated" do
@@ -116,13 +194,13 @@ describe Mail::Message do
 
       it "exports native attachments" do
         mail_message.attachments["face.jpeg"] = file_data
-        mail_message.export_attachments.should include(exported_data)
+        expect(mail_message.export_attachments).to include(exported_data)
       end
 
       it "still supports the deprecated attachments API" do
         mail_message.attachments["face.jpeg"] = file_data
         mail_message.postmark_attachments = exported_data
-        mail_message.export_attachments.should == [exported_data, exported_data]
+        expect(mail_message.export_attachments).to eq [exported_data, exported_data]
       end
 
     end
@@ -132,10 +210,11 @@ describe Mail::Message do
       it "exports the attachment with related content id" do
         mail_message.attachments.inline["face.jpeg"] = file_data
         attachments = mail_message.export_attachments
-        attachments.count.should_not be_zero
-        attachments.first.should include(exported_data)
-        attachments.first.should have_key('ContentID')
-        attachments.first['ContentID'].should start_with('cid:')
+
+        expect(attachments.count).to_not be_zero
+        expect(attachments.first).to include(exported_data)
+        expect(attachments.first).to have_key('ContentID')
+        expect(attachments.first['ContentID']).to start_with('cid:')
       end
 
     end
@@ -146,8 +225,8 @@ describe Mail::Message do
     let(:headers) { mail_message_with_bogus_headers.export_headers }
     let(:header_names) { headers.map { |h| h['Name'] } }
 
-    specify { header_names.should include('Allowed-Header') }
-    specify { header_names.count.should == 1 }
+    specify { expect(header_names).to include('Allowed-Header') }
+    specify { expect(header_names.count).to eq 1 }
   end
 
   describe "#to_postmark_hash" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postmark
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Petyo Ivanov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake