postmark 1.21.1 → 1.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4059e97def9c50a4070433c6f2232431627c9c72f43aba77c5bb1844df107708
-  data.tar.gz: 29454f806e17cdf57885a091035faea0354049ae9da78b81d8f40549fe276e76
+  metadata.gz: 968a770c1ef1003b30c635a730caed027ed4579fae5a4c7ab8644996d2925440
+  data.tar.gz: 824ebb1f5ca038484a5077108df96cbbed072829c2dfd6fbc634f29d299e1675
 SHA512:
-  metadata.gz: d9576dc4ed16f2b2926fae5a1ff7db1f87ea511f7f9dd7eb8a52d7690b5af84ddd79bd2f6e452196961378e65d9ff2c3a061003d1579430d2731fa20bad40d7d
-  data.tar.gz: 8077ed204c8678179e6e2a1932342d76da52618acd8bdc9d8df5513ae973088b1820f9b6bd4ff5b2575b0736a0fb2600e02938cf490da06b05492634eef15b94
+  metadata.gz: a4a0bd9ac21b0a25fc377d70dd8d28c07dcb02886f51465d0879d2f1bb24bf8c5628cfc396b6cf6244f3a252fe5e17f7d7d4c10020764036884c1a9b99f3cf0b
+  data.tar.gz: 732d2a94875cfa132167aca0fcbd551279610a88d87fab34f23a116a568b0ba738e825e09b0b366ed8cb48e2c6bcd2d1b786d08ee8b1e93b35f3f172d911eee1

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = Changelog
 
+== 1.21.2
+
+* Ensure sending via message stream uses the correct message stream
+
 == 1.21.1
 
 * Fixed Postmark::ApiClient#get_message_streams

data/VERSION

@@ -1 +1 @@
-1.21.1
+1.21.2

data/lib/postmark/message_extensions/mail.rb

@@ -72,10 +72,13 @@ module Mail
       @template_model = model
     end
 
-    attr_writer :message_stream
     def message_stream(val = nil)
       self.message_stream = val unless val.nil?
-      @message_stream
+      header['MESSAGE-STREAM'].to_s
+    end
+
+    def message_stream=(val)
+      header['MESSAGE-STREAM'] = val
     end
 
     def templated?
@@ -188,6 +191,7 @@ module Mail
         attachment   to
         track-opens  track-links
         postmark-template-alias
+        message-stream
       ]
     end
 

data/lib/postmark/version.rb

@@ -1,3 +1,3 @@
 module Postmark
-  VERSION = '1.21.1'
+  VERSION = '1.21.2'
 end

data/spec/unit/postmark/api_client_spec.rb

@@ -1086,10 +1086,10 @@ describe Postmark::ApiClient do
     specify do
       expect(http_client).to receive(:post).
         with('message-streams',
-             match_json({
-               :Name => 'My Stream',
-               :Id => 'my-stream',
-               :MessageStreamType => 'Broadcasts'
+             json_representation_of({
+               'Name' => 'My Stream',
+               'Id' => 'my-stream',
+               'MessageStreamType' => 'Broadcasts'
              }))
       subject
     end

data/spec/unit/postmark/mail_message_converter_spec.rb

@@ -173,7 +173,7 @@ describe Postmark::MailMessageConverter do
   end
 
   it 'converts plain text messages correctly' do
-    expect(subject.new(mail_message).run).to eq ({
+    expect(subject.new(mail_message).run).to eq({
         "From" => "sheldon@bigbangtheory.com",
         "Subject" => "Hello!",
         "TextBody" => "Hello Sheldon!",
@@ -181,7 +181,7 @@ describe Postmark::MailMessageConverter do
   end
 
   it 'converts tagged text messages correctly' do
-    expect(subject.new(tagged_mail_message).run).to eq ({
+    expect(subject.new(tagged_mail_message).run).to eq({
         "From" => "sheldon@bigbangtheory.com",
         "Subject" => "Hello!",
         "TextBody" => "Hello Sheldon!",
@@ -190,14 +190,14 @@ describe Postmark::MailMessageConverter do
   end
 
   it 'converts plain text messages without body correctly' do
-    expect(subject.new(mail_message_without_body).run).to eq ({
+    expect(subject.new(mail_message_without_body).run).to eq({
         "From" => "sheldon@bigbangtheory.com",
         "Subject" => "Hello!",
         "To" => "lenard@bigbangtheory.com"})
   end
 
   it 'converts html messages correctly' do
-    expect(subject.new(mail_html_message).run).to eq ({
+    expect(subject.new(mail_html_message).run).to eq({
         "From" => "sheldon@bigbangtheory.com",
         "Subject" => "Hello!",
         "HtmlBody" => "<b>Hello Sheldon!</b>",
@@ -205,7 +205,7 @@ describe Postmark::MailMessageConverter do
   end
 
   it 'converts multipart messages correctly' do
-    expect(subject.new(mail_multipart_message).run).to eq ({
+    expect(subject.new(mail_multipart_message).run).to eq({
         "From" => "sheldon@bigbangtheory.com",
         "Subject" => "Hello!",
         "HtmlBody" => "<b>Hello Sheldon!</b>",
@@ -214,7 +214,7 @@ describe Postmark::MailMessageConverter do
   end
 
   it 'converts messages with attachments correctly' do
-    expect(subject.new(mail_message_with_attachment).run).to eq ({
+    expect(subject.new(mail_message_with_attachment).run).to eq({
         "From" => "sheldon@bigbangtheory.com",
         "Subject" => "Hello!",
         "Attachments" => [{"Name" => "empty.gif",
@@ -225,7 +225,7 @@ describe Postmark::MailMessageConverter do
   end
 
   it 'converts messages with named addresses correctly' do
-    expect(subject.new(mail_message_with_named_addresses).run).to eq ({
+    expect(subject.new(mail_message_with_named_addresses).run).to eq({
         "From" => "Sheldon <sheldon@bigbangtheory.com>",
         "Subject" => "Hello!",
         "TextBody" => "Hello Sheldon!",
@@ -244,7 +244,7 @@ describe Postmark::MailMessageConverter do
   context 'open tracking' do
     context 'setup inside of mail' do
       it 'converts open tracking enabled messages correctly' do
-        expect(subject.new(mail_message_with_open_tracking).run).to eq ({
+        expect(subject.new(mail_message_with_open_tracking).run).to eq({
             "From" => "sheldon@bigbangtheory.com",
             "Subject" => "Hello!",
             "HtmlBody" => "<b>Hello Sheldon!</b>",
@@ -253,7 +253,7 @@ describe Postmark::MailMessageConverter do
       end
 
       it 'converts open tracking disabled messages correctly' do
-        expect(subject.new(mail_message_with_open_tracking_disabled).run).to eq ({
+        expect(subject.new(mail_message_with_open_tracking_disabled).run).to eq({
             "From" => "sheldon@bigbangtheory.com",
             "Subject" => "Hello!",
             "HtmlBody" => "<b>Hello Sheldon!</b>",
@@ -264,7 +264,7 @@ describe Postmark::MailMessageConverter do
 
     context 'setup with tracking variable' do
       it 'converts open tracking enabled messages correctly' do
-        expect(subject.new(mail_message_with_open_tracking_set_variable).run).to eq ({
+        expect(subject.new(mail_message_with_open_tracking_set_variable).run).to eq({
             "From" => "sheldon@bigbangtheory.com",
             "Subject" => "Hello!",
             "HtmlBody" => "<b>Hello Sheldon!</b>",
@@ -273,7 +273,7 @@ describe Postmark::MailMessageConverter do
       end
 
       it 'converts open tracking disabled messages correctly' do
-        expect(subject.new(mail_message_with_open_tracking_disabled_set_variable).run).to eq ({
+        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>",
@@ -285,7 +285,7 @@ describe Postmark::MailMessageConverter do
 
   context 'link tracking' do
     it 'converts html and text link tracking enabled messages correctly' do
-      expect(subject.new(mail_message_with_link_tracking_all).run).to eq ({
+      expect(subject.new(mail_message_with_link_tracking_all).run).to eq({
           "From" => "sheldon@bigbangtheory.com",
           "Subject" => "Hello!",
           "HtmlBody" => "<b>Hello Sheldon!</b>",
@@ -294,7 +294,7 @@ describe Postmark::MailMessageConverter do
     end
 
     it 'converts html only link tracking enabled messages correctly' do
-      expect(subject.new(mail_message_with_link_tracking_html).run).to eq ({
+      expect(subject.new(mail_message_with_link_tracking_html).run).to eq({
           "From" => "sheldon@bigbangtheory.com",
           "Subject" => "Hello!",
           "HtmlBody" => "<b>Hello Sheldon!</b>",
@@ -303,7 +303,7 @@ describe Postmark::MailMessageConverter do
     end
 
     it 'converts text only link tracking enabled messages correctly' do
-      expect(subject.new(mail_message_with_link_tracking_text).run).to eq ({
+      expect(subject.new(mail_message_with_link_tracking_text).run).to eq({
           "From" => "sheldon@bigbangtheory.com",
           "Subject" => "Hello!",
           "HtmlBody" => "<b>Hello Sheldon!</b>",
@@ -377,13 +377,17 @@ describe Postmark::MailMessageConverter do
 
   describe 'passing message stream' do
     context 'when not set' do
-      specify { expect(mail_message.to_postmark_hash.keys).not_to include('MessageStream') }
+      specify { expect(subject.new(mail_message).run).not_to include('MessageStream') }
     end
 
     context 'when set' do
-      before { mail_message.message_stream = 'weekly-newsletter' }
+      before do
+        mail_message.message_stream = 'weekly-newsletter'
+      end
 
-      specify { expect(mail_message.to_postmark_hash).to include('MessageStream' => 'weekly-newsletter') }
+      it 'passes message stream to the API call' do
+        expect(subject.new(mail_message).run).to include('MessageStream' => 'weekly-newsletter')
+      end
     end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: postmark
 version: !ruby/object:Gem::Version
-  version: 1.21.1
+  version: 1.21.2
 platform: ruby
 authors:
 - Petyo Ivanov
 - Ilya Sabanin
 - Artem Chistyakov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -146,8 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Official Postmark API wrapper.
 test_files: