postmark 1.22.0 → 1.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b214577bda32a36ea3de8910d8ef1bf7929e090e513a30d32ae891219134234b
-  data.tar.gz: 7379520e17f6e9afda7e7157e4e118ccd1b171298e211555e112e5963433880c
+  metadata.gz: 65048304ac65a25c53918528a483e99f0c74ea5474c11348c978d8fb732dc032
+  data.tar.gz: 3e90058072e9e549846850fb3c352e963cc7c32468792e10d37662a63b036f03
 SHA512:
-  metadata.gz: 9bf13b2db7d0818a8f69286b4ece4ad1675b8e546a9677f23f9827915c80795b5118a16a9a32860dfab3b35b5b694791ef3e48bc8d2eca13dd05228fe634f3a2
-  data.tar.gz: a4ce846c304fea9a62ffd3bcc4802675a435009b6536741ad3b32c9dd98780925f57d0e32fa1c40c1d45c0b8ca5096d626140c4fd78268a072231a7fc4dc4fdc
+  metadata.gz: b25f7ea69f5b3db0260ad29c70b464cf757ed2f3f3b9abb45383aa8c4239516cbc9132bc67200f56faa08563e5cfcf391be086d845bf5baf03223106dd3e7cae
+  data.tar.gz: 7fefb6ced2722b022b27ed06bd5cde4c388e373cfc75995dfb549534618a48e7106281514f9c06d6aba280d472c8211b39a4bffcaff9e61f43aa5017b0a260f7

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6
+ruby-2.7.5

data/CHANGELOG.rdoc

@@ -1,5 +1,12 @@
 = Changelog
 
+== 1.22.2
+* Updated Postmark::InactiveRecipientError.parse_recipients method to handle current error message
+* Update post install message to use https URL
+
+== 1.22.1
+* Migrated to ActiveCampaign
+
 == 1.22.0
 
 * Disabled automatic retries of failed requests by default. You can enabled it by passing `max_retries` option to the client constructor.

data/CONTRIBUTING.md

@@ -14,5 +14,5 @@ If you’d like to submit a pull request:
 * 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 therepo.
+* Write short, descriptive commit messages, following the format used in the repo.
 * Send a pull request. Bonus points for topic branches.

data/Gemfile

@@ -11,5 +11,8 @@ group :test do
   gem 'mime-types'
   gem 'activesupport'
   gem 'i18n', '~> 0.6.0'
-  gem 'yajl-ruby', '~> 1.0', :platforms => [:mingw, :mswin, :ruby]
+
+  # To support Ruby version <= 2.6
+  gem 'minitest', '<= 5.15.0'
+  gem 'yajl-ruby', '<= 1.4.1', :platforms => [:mingw, :mswin, :ruby]
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018 Wildbit LLC.
+Copyright (c) 2022 ActiveCampaign LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -3,31 +3,32 @@
 </a>
 
 # Postmark Ruby Gem
-[![Build Status](https://circleci.com/gh/wildbit/postmark-gem.svg?style=shield)](https://circleci.com/gh/wildbit/postmark-gem)
-[![Code Climate](https://codeclimate.com/github/wildbit/postmark-gem/badges/gpa.svg)](https://codeclimate.com/github/wildbit/postmark-gem)
+
+[![Build Status](https://circleci.com/gh/ActiveCampaign/postmark-gem.svg?style=shield)](https://circleci.com/gh/ActiveCampaign/postmark-gem)
+[![Code Climate](https://codeclimate.com/github/ActiveCampaign/postmark-gem/badges/gpa.svg)](https://codeclimate.com/github/ActiveCampaign/postmark-gem)
 [![License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](http://www.opensource.org/licenses/MIT)
 [![Gem Version](https://badge.fury.io/rb/postmark.svg)](https://badge.fury.io/rb/postmark)
 
 Postmark allows you to send your emails with high delivery rates. It also includes detailed statistics. In addition, Postmark can parse incoming emails which are forwarded back to your application.
 
-This gem is the official wrapper for the [Postmark HTTP API](http://postmarkapp.com). 
+This gem is the official wrapper for the [Postmark HTTP API](https://postmarkapp.com).
 
 ## Usage
 
-Please see the [wiki](https://github.com/wildbit/postmark-gem/wiki) for detailed instructions about sending email, using the bounce api and other Postmark API features.
+Please see the [wiki](https://github.com/ActiveCampaign/postmark-gem/wiki) for detailed instructions about sending email, using the bounce api and other Postmark API features.
 For details about Postmark API in general, please check out [Postmark developer docs](https://postmarkapp.com/developer).
 
 ## Requirements
 
-You will need a Postmark account, server and sender signature (or verified domain) set up to use it. For details about setup, check out [wiki pages](https://github.com/wildbit/postmark-gem/wiki/Getting-Started).
+You will need a Postmark account, server and sender signature (or verified domain) set up to use it. For details about setup, check out [wiki pages](https://github.com/ActiveCampaign/postmark-gem/wiki/Getting-Started).
 
-If you plan using the library in a Rails project, check out the [postmark-rails](https://github.com/wildbit/postmark-rails/) gem, which
+If you plan using the library in a Rails project, check out the [postmark-rails](https://github.com/ActiveCampaign/postmark-rails/) gem, which
 is meant to integrate with ActionMailer. The plugin will try to use ActiveSupport JSon if it is already included. If not,
 it will attempt to use the built-in Ruby JSon library.
 
 You can also explicitly specify which one to be used, using following code:
 
-``` ruby
+```ruby
 Postmark.response_parser_class = :Json # :ActiveSupport or :Yajl are also supported.
 ```
 
@@ -37,13 +38,13 @@ You can use the library with or without a Bundler.
 
 With Bundler:
 
-``` ruby
+```ruby
 gem 'postmark'
 ```
 
 Without Bundler:
 
-``` bash
+```bash
 gem install postmark
 ```
 
@@ -53,14 +54,18 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) file for details.
 
 ## Issues & Comments
 
-Feel free to contact us if you encounter any issues with the library or Postmark API. 
-Please leave all comments, bugs, requests and issues on the Issues page.  
+Feel free to contact us if you encounter any issues with the library or Postmark API.
+Please leave all comments, bugs, requests and issues on the Issues page.
 
 ## License
 
-The Postmark Ruby library is licensed under the [MIT](http://www.opensource.org/licenses/mit-license.php) license. 
-Refer to the [LICENSE](https://github.com/wildbit/postmark-gem/blob/master/LICENSE) file for more information.
+The Postmark Ruby library is licensed under the [MIT](http://www.opensource.org/licenses/mit-license.php) license.
+Refer to the [LICENSE](https://github.com/ActiveCampaign/postmark-gem/blob/main/LICENSE) file for more information.
+
+## Tests
+
+The [integration tests](https://github.com/ActiveCampaign/postmark-gem/tree/main/spec/integration) currently use a real  test email address, configured via `POSTMARK_CI_RECIPIENT`. The credentials for it can be found in the internal 1password vault under `Postmark - Ruby - Client Library - Account`.
 
 ## Copyright
 
-Copyright © 2021 Wildbit LLC.
+Copyright © 2022 ActiveCampaign LLC.

data/RELEASE.md

@@ -2,12 +2,12 @@ New versions of the gem are cut by the Postmark team, this is a quick guide to e
 
 1. Determine the next version of the gem by following the [SemVer](https://semver.org/) guidelines.
 1. Verify all builds are passing on CircleCI for your branch.
-1. Merge in your branch to master.
+1. Merge in your branch to main.
 1. Update VERSION and lib/postmark/version.rb with the new version.
 1. Update CHANGELOG.rdoc with a brief description of the changes.
 1. Commit to git with a comment of "Bump version to x.y.z".
 1. run `rake release` - This will push to github(with the version tag) and rubygems with the version in lib/postmark/version.rb.
   *Note that if you're on Bundler 1.17 there's a bug that hides the prompt for your OTP. If it hangs after adding the tag then it's asking for your OTP, enter your OTP and press Enter. Bundler 2.x and beyond resolved this issue. *
-1. Verify the new version is on [github](https://github.com/wildbit/postmark-gem) and [rubygems](https://rubygems.org/gems/postmark).
-1. Create a new release for the version on [Github releases](https://github.com/wildbit/postmark-gem/releases).
-1. Add or update any related content to the [wiki](https://github.com/wildbit/postmark-gem/wiki).
+1. Verify the new version is on [github](https://github.com/ActiveCampaign/postmark-gem) and [rubygems](https://rubygems.org/gems/postmark).
+1. Create a new release for the version on [Github releases](https://github.com/ActiveCampaign/postmark-gem/releases).
+1. Add or update any related content to the [wiki](https://github.com/ActiveCampaign/postmark-gem/wiki).

data/VERSION

@@ -1 +1 @@
-1.22.0
+1.22.2

data/lib/postmark/error.rb

@@ -75,9 +75,10 @@ module Postmark
   class InactiveRecipientError < ApiInputError
     attr_reader :recipients
 
-    PATTERNS = [/^Found inactive addresses: (.+?)\.$/.freeze,
-                /these inactive addresses: (.+?)\. Inactive/.freeze,
-                /these inactive addresses: (.+?)\.?$/].freeze
+    PATTERNS = [
+      /Found inactive addresses: (.+?)\. Inactive/,
+      /these inactive addresses: (.+?)\.?$/
+    ].freeze
 
     def self.parse_recipients(message)
       PATTERNS.each do |p|

data/lib/postmark/version.rb

@@ -1,3 +1,3 @@
 module Postmark
-  VERSION = '1.22.0'
+  VERSION = '1.22.2'
 end

data/postmark.gemspec

@@ -5,12 +5,11 @@ require "postmark/version"
 Gem::Specification.new do |s|
   s.name             = "postmark"
   s.version          = Postmark::VERSION
-  s.homepage         = "http://postmarkapp.com"
+  s.homepage         = "https://postmarkapp.com"
   s.platform         = Gem::Platform::RUBY
   s.license          = 'MIT'
 
   s.authors          = ["Tomek Maszkowski", "Igor Balos", "Artem Chistyakov", "Nick Hammond", "Petyo Ivanov", "Ilya Sabanin"]
-  s.email            = "tomek@wildbit.com"
   s.extra_rdoc_files = ["LICENSE", "README.md"]
   s.rdoc_options     = ["--charset=UTF-8"]
 
@@ -25,7 +24,7 @@ Gem::Specification.new do |s|
   s.post_install_message = %q{
     ==================
     Thanks for installing the postmark gem. If you don't have an account, please
-    sign up at http://postmarkapp.com/.
+    sign up at https://postmarkapp.com/.
 
     Review the README.md for implementation details and examples.
     ==================

data/spec/unit/postmark/error_spec.rb

@@ -179,33 +179,22 @@ end
 describe(Postmark::InactiveRecipientError) do
   describe '.parse_recipients' do
     let(:recipients) do
-      %w(nothing@wildbit.com noth.ing+2@wildbit.com noth.ing+2-1@wildbit.com)
+      %w(nothing@postmarkapp.com noth.ing+2@postmarkapp.com noth.ing+2-1@postmarkapp.com)
     end
 
     subject {Postmark::InactiveRecipientError.parse_recipients(message)}
 
     context '1/1 inactive' do
       let(:message) do
-        'You tried to send to a recipient that has been marked as ' \
-        "inactive.\nFound inactive addresses: #{recipients[0]}.\n" \
-        'Inactive recipients are ones that have generated a hard ' \
-        'bounce or a spam complaint.'
+        all_recipients_inactive_message(recipients[0])
       end
 
       it {is_expected.to eq(recipients.take(1))}
     end
 
-    context 'i/n inactive, n > 1, i < n - new message format' do
-      let(:message) { "Message OK, but will not deliver to these inactive addresses: #{recipients[0...2].join(', ')}" }
-
-      it {is_expected.to eq(recipients.take(2))}
-    end
-
     context 'i/n inactive, n > 1, i < n' do
       let(:message) do
-        'Message OK, but will not deliver to these inactive addresses: ' \
-        "#{recipients[0...2].join(', ')}. Inactive recipients are ones that " \
-        'have generated a hard bounce or a spam complaint.'
+        some_recipients_inactive_message(recipients[0...2].join(', '))
       end
 
       it {is_expected.to eq(recipients.take(2))}
@@ -213,9 +202,7 @@ describe(Postmark::InactiveRecipientError) do
 
     context 'n/n inactive, n > 1' do
       let(:message) do
-        'You tried to send to recipients that have all been marked as ' \
-        "inactive.\nFound inactive addresses: #{recipients.join(', ')}.\n" \
-        'Inactive recipients are ones that have generated a hard bounce or a spam complaint.'
+        all_recipients_inactive_message(recipients.join(', '))
       end
 
       it {is_expected.to eq(recipients)}
@@ -240,10 +227,7 @@ describe(Postmark::InactiveRecipientError) do
     end
 
     let(:message) do
-      'You tried to send to a recipient that has been marked as ' \
-      "inactive.\nFound inactive addresses: #{address}.\n" \
-      'Inactive recipients are ones that have generated a hard ' \
-      'bounce or a spam complaint.'
+      all_recipients_inactive_message(address)
     end
 
     it 'parses recipients from json payload' do
@@ -262,6 +246,15 @@ describe(Postmark::InactiveRecipientError) do
       expect(subject.error_code).to eq(Postmark::ApiInputError::INACTIVE_RECIPIENT)
     end
   end
+
+  def some_recipients_inactive_message(addresses)
+   "Message OK, but will not deliver to these inactive addresses: #{addresses}."
+  end
+
+  def all_recipients_inactive_message(addresses)
+    "You tried to send to recipient(s) that have been marked as inactive. Found inactive addresses: #{addresses}. " \
+    "Inactive recipients are ones that have generated a hard bounce, a spam complaint, or a manual suppression."
+  end
 end
 
 describe(Postmark::DeliveryError) do

data/spec/unit/postmark/inbound_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Postmark::Inbound do
   # http://developer.postmarkapp.com/developer-inbound-parse.html#example-hook
-  let(:example_inbound) { '{"From":"myUser@theirDomain.com","FromFull":{"Email":"myUser@theirDomain.com","Name":"John Doe"},"To":"451d9b70cf9364d23ff6f9d51d870251569e+ahoy@inbound.postmarkapp.com","ToFull":[{"Email":"451d9b70cf9364d23ff6f9d51d870251569e+ahoy@inbound.postmarkapp.com","Name":""}],"Cc":"\"Full name\" <sample.cc@emailDomain.com>, \"Another Cc\" <another.cc@emailDomain.com>","CcFull":[{"Email":"sample.cc@emailDomain.com","Name":"Full name"},{"Email":"another.cc@emailDomain.com","Name":"Another Cc"}],"ReplyTo":"myUsersReplyAddress@theirDomain.com","Subject":"This is an inbound message","MessageID":"22c74902-a0c1-4511-804f2-341342852c90","Date":"Thu, 5 Apr 2012 16:59:01 +0200","MailboxHash":"ahoy","TextBody":"[ASCII]","HtmlBody":"[HTML(encoded)]","Tag":"","Headers":[{"Name":"X-Spam-Checker-Version","Value":"SpamAssassin 3.3.1 (2010-03-16) onrs-ord-pm-inbound1.wildbit.com"},{"Name":"X-Spam-Status","Value":"No"},{"Name":"X-Spam-Score","Value":"-0.1"},{"Name":"X-Spam-Tests","Value":"DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_PASS"},{"Name":"Received-SPF","Value":"Pass (sender SPF authorized) identity=mailfrom; client-ip=209.85.160.180; helo=mail-gy0-f180.google.com; envelope-from=myUser@theirDomain.com; receiver=451d9b70cf9364d23ff6f9d51d870251569e+ahoy@inbound.postmarkapp.com"},{"Name":"DKIM-Signature","Value":"v=1; a=rsa-sha256; c=relaxed\/relaxed;        d=wildbit.com; s=google;        h=mime-version:reply-to:date:message-id:subject:from:to:cc         :content-type;        bh=cYr\/+oQiklaYbBJOQU3CdAnyhCTuvemrU36WT7cPNt0=;        b=QsegXXbTbC4CMirl7A3VjDHyXbEsbCUTPL5vEHa7hNkkUTxXOK+dQA0JwgBHq5C+1u         iuAJMz+SNBoTqEDqte2ckDvG2SeFR+Edip10p80TFGLp5RucaYvkwJTyuwsA7xd78NKT         Q9ou6L1hgy\/MbKChnp2kxHOtYNOrrszY3JfQM="},{"Name":"MIME-Version","Value":"1.0"},{"Name":"Message-ID","Value":"<CAGXpo2WKfxHWZ5UFYCR3H_J9SNMG+5AXUovfEFL6DjWBJSyZaA@mail.gmail.com>"}],"Attachments":[{"Name":"myimage.png","Content":"[BASE64-ENCODED CONTENT]","ContentType":"image/png","ContentLength":4096},{"Name":"mypaper.doc","Content":"[BASE64-ENCODED CONTENT]","ContentType":"application/msword","ContentLength":16384}]}' }
+  let(:example_inbound) { '{"From":"myUser@theirDomain.com","FromFull":{"Email":"myUser@theirDomain.com","Name":"John Doe"},"To":"451d9b70cf9364d23ff6f9d51d870251569e+ahoy@inbound.postmarkapp.com","ToFull":[{"Email":"451d9b70cf9364d23ff6f9d51d870251569e+ahoy@inbound.postmarkapp.com","Name":""}],"Cc":"\"Full name\" <sample.cc@emailDomain.com>, \"Another Cc\" <another.cc@emailDomain.com>","CcFull":[{"Email":"sample.cc@emailDomain.com","Name":"Full name"},{"Email":"another.cc@emailDomain.com","Name":"Another Cc"}],"ReplyTo":"myUsersReplyAddress@theirDomain.com","Subject":"This is an inbound message","MessageID":"22c74902-a0c1-4511-804f2-341342852c90","Date":"Thu, 5 Apr 2012 16:59:01 +0200","MailboxHash":"ahoy","TextBody":"[ASCII]","HtmlBody":"[HTML(encoded)]","Tag":"","Headers":[{"Name":"X-Spam-Checker-Version","Value":"SpamAssassin 3.3.1 (2010-03-16) onrs-ord-pm-inbound1.postmarkapp.com"},{"Name":"X-Spam-Status","Value":"No"},{"Name":"X-Spam-Score","Value":"-0.1"},{"Name":"X-Spam-Tests","Value":"DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_PASS"},{"Name":"Received-SPF","Value":"Pass (sender SPF authorized) identity=mailfrom; client-ip=209.85.160.180; helo=mail-gy0-f180.google.com; envelope-from=myUser@theirDomain.com; receiver=451d9b70cf9364d23ff6f9d51d870251569e+ahoy@inbound.postmarkapp.com"},{"Name":"DKIM-Signature","Value":"v=1; a=rsa-sha256; c=relaxed\/relaxed;        d=postmarkapp.com; s=google;        h=mime-version:reply-to:date:message-id:subject:from:to:cc         :content-type;        bh=cYr\/+oQiklaYbBJOQU3CdAnyhCTuvemrU36WT7cPNt0=;        b=QsegXXbTbC4CMirl7A3VjDHyXbEsbCUTPL5vEHa7hNkkUTxXOK+dQA0JwgBHq5C+1u         iuAJMz+SNBoTqEDqte2ckDvG2SeFR+Edip10p80TFGLp5RucaYvkwJTyuwsA7xd78NKT         Q9ou6L1hgy\/MbKChnp2kxHOtYNOrrszY3JfQM="},{"Name":"MIME-Version","Value":"1.0"},{"Name":"Message-ID","Value":"<CAGXpo2WKfxHWZ5UFYCR3H_J9SNMG+5AXUovfEFL6DjWBJSyZaA@mail.gmail.com>"}],"Attachments":[{"Name":"myimage.png","Content":"[BASE64-ENCODED CONTENT]","ContentType":"image/png","ContentLength":4096},{"Name":"mypaper.doc","Content":"[BASE64-ENCODED CONTENT]","ContentType":"application/msword","ContentLength":16384}]}' }
 
   context "given a serialized inbound document" do
     subject { Postmark::Inbound.to_ruby_hash(example_inbound) }

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

@@ -219,9 +219,9 @@ describe Mail::Message do
 
   describe "#export_headers" do
     let(:mail_message_with_reserved_headers) do
-      mail_message.header['Return-Path'] = 'bounce@wildbit.com'
-      mail_message.header['From'] = 'info@wildbit.com'
-      mail_message.header['Sender'] = 'info@wildbit.com'
+      mail_message.header['Return-Path'] = 'bounce@postmarkapp.com'
+      mail_message.header['From'] = 'info@postmarkapp.com'
+      mail_message.header['Sender'] = 'info@postmarkapp.com'
       mail_message.header['Received'] = 'from mta.pstmrk.it ([72.14.252.155]:54907)'
       mail_message.header['Date'] = 'January 25, 2013 3:30:58 PM PDT'
       mail_message.header['Content-Type'] = 'application/json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postmark
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.22.2
 platform: ruby
 authors:
 - Tomek Maszkowski
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-25 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -59,7 +59,7 @@ dependencies:
         version: '0'
 description: Use this gem to send emails through Postmark HTTP API and retrieve info
   about bounces.
-email: tomek@wildbit.com
+email:
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -129,12 +129,12 @@ files:
 - spec/unit/postmark/mail_message_converter_spec.rb
 - spec/unit/postmark/message_extensions/mail_spec.rb
 - spec/unit/postmark_spec.rb
-homepage: http://postmarkapp.com
+homepage: https://postmarkapp.com
 licenses:
 - MIT
 metadata: {}
 post_install_message: "\n    ==================\n    Thanks for installing the postmark
-  gem. If you don't have an account, please\n    sign up at http://postmarkapp.com/.\n\n
+  gem. If you don't have an account, please\n    sign up at https://postmarkapp.com/.\n\n
   \   Review the README.md for implementation details and examples.\n    ==================\n
   \ "
 rdoc_options:
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Official Postmark API wrapper.