postmark 1.21.7 → 1.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2bd2c9a288c0f4baa7f2f076d91151a0835b8b168c76e6b1938d5aee972d118
-  data.tar.gz: 5f8ef5865ba91468d5d413f111af5f195adaf0c44983749605e7e015d9b79eb3
+  metadata.gz: dd4bf518075f6e5a7eafaa982c34b95cb3cd5eebee2cf059ad5743b182a6a533
+  data.tar.gz: f34c3ddc69336854ca6a964b66eb4c393a4e630756b4e2a8dc637121e5c43a3e
 SHA512:
-  metadata.gz: ba8d2597f8502259ef996c647d08f5264e6c677aa4d3e0e697156442b35fe6a1503b914f156b83a627dadaf4cdb64e3e159049d2031e52c675ff721b960abc16
-  data.tar.gz: 538224ea9fa9c537f9671a5f9de5bfb1a7dc9078f531b6ef8fc8f1c02aa64fda4e82e8031ad5da37abcaeb793b65fd4b5b541e6329181e8e0e21af8d05d0fc93
+  metadata.gz: 6020d8ad751fd18f3e706d42c3c16938f04e517de4653121e1efb83ce9e1db9d33578cef954edd615c3f56c0151e9c4ee154a7cb7e8f2e738cb57cd6ffa227dc
+  data.tar.gz: c0ccc572d15ab61da1647c7c4abcbd4a0d180d0aa21cda7a580a798880f03f1ede1759a40db2bb269b15d9cf3dc39bbe2a641d6c12211cec2901db9e2034a925

data/.ruby-gemset

@@ -0,0 +1 @@
+postmark-gem

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.6

data/CHANGELOG.rdoc

@@ -1,5 +1,16 @@
 = Changelog
 
+== 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.
+
+== 1.21.8
+
+* Fixed passing and receiving SubscriptionManagementConfiguration when creating/updating message streams (#94).
+
 == 1.21.7
 
 * Improved parsing recipients with Postmark::InactiveRecipientError.parse_recipients method

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](http://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,14 @@ 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.
 
 ## Copyright
 
-Copyright © 2021 Wildbit LLC.
+Copyright © 2022 ActiveCampaign LLC.

data/RELEASE.md

@@ -1,12 +1,13 @@
 New versions of the gem are cut by the Postmark team, this is a quick guide to ensuring a smooth release.
 
+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.21.4
+1.22.1

data/lib/postmark/api_client.rb

@@ -38,7 +38,7 @@ module Postmark
         response, error = take_response_of { http_client.post("email", data) }
         update_message(message, response)
         raise error if error
-        format_response(response, true)
+        format_response(response, :compatible => true)
       end
     end
 
@@ -51,7 +51,7 @@ module Postmark
         response, error = take_response_of { http_client.post("email/withTemplate", data) }
         update_message(message, response)
         raise error if error
-        format_response(response, true)
+        format_response(response, :compatible => true)
       end
     end
 
@@ -95,7 +95,7 @@ module Postmark
     end
 
     def delivery_stats
-      response = format_response(http_client.get("deliverystats"), true)
+      response = format_response(http_client.get("deliverystats"), :compatible => true)
 
       if response[:bounces]
         response[:bounces] = format_response(response[:bounces])
@@ -343,13 +343,13 @@ module Postmark
     end
 
     def create_message_stream(attributes = {})
-      data = serialize(HashHelper.to_postmark(attributes))
-      format_response(http_client.post('message-streams', data))
+      data = serialize(HashHelper.to_postmark(attributes, :deep => true))
+      format_response(http_client.post('message-streams', data), :deep => true)
     end
 
     def update_message_stream(id, attributes)
-      data = serialize(HashHelper.to_postmark(attributes))
-      format_response(http_client.patch("message-streams/#{id}", data))
+      data = serialize(HashHelper.to_postmark(attributes, :deep => true))
+      format_response(http_client.patch("message-streams/#{id}", data), :deep => true)
     end
 
     def archive_message_stream(id)

data/lib/postmark/client.rb

@@ -6,7 +6,7 @@ module Postmark
 
     def initialize(api_token, options = {})
       options = options.dup
-      @max_retries = options.delete(:max_retries) || 3
+      @max_retries = options.delete(:max_retries) || 0
       @http_client = HttpClient.new(api_token, options)
     end
 
@@ -60,13 +60,16 @@ module Postmark
       [e.full_response || {}, e]
     end
 
-    def format_response(response, compatible = false)
+    def format_response(response, options = {})
       return {} unless response
 
+      compatible = options.fetch(:compatible, false)
+      deep = options.fetch(:deep, false)
+
       if response.kind_of? Array
-        response.map { |entry| Postmark::HashHelper.to_ruby(entry, compatible) }
+        response.map { |entry| Postmark::HashHelper.to_ruby(entry, :compatible => compatible, :deep => deep) }
       else
-        Postmark::HashHelper.to_ruby(response, compatible)
+        Postmark::HashHelper.to_ruby(response, :compatible => compatible, :deep => deep)
       end
     end
 

data/lib/postmark/helpers/hash_helper.rb

@@ -3,22 +3,47 @@ module Postmark
 
     extend self
 
-    def to_postmark(hash)
-      hash.inject({}) { |m, (k,v)| m[Inflector.to_postmark(k)] = v; m }
+    def to_postmark(object, options = {})
+      deep = options.fetch(:deep, false)
+
+      case object
+      when Hash
+        object.reduce({}) do |m, (k, v)|
+          m.tap do |h|
+            h[Inflector.to_postmark(k)] = deep ? to_postmark(v, options) : v
+          end
+        end
+      when Array
+        deep ? object.map { |v| to_postmark(v, options) } : object
+      else
+        object
+      end
     end
 
-    def to_ruby(hash, compatible = false)
-      formatted = hash.inject({}) { |m, (k,v)| m[Inflector.to_ruby(k)] = v; m }
-
-      if compatible
-        formatted.merge!(hash)
-        enhance_with_compatibility_warning(formatted)
+    def to_ruby(object, options = {})
+      compatible = options.fetch(:compatible, false)
+      deep = options.fetch(:deep, false)
+
+      case object
+      when Hash
+        object.reduce({}) do |m, (k, v)|
+          m.tap do |h|
+            h[Inflector.to_ruby(k)] = deep ? to_ruby(v, options) : v
+          end
+        end.tap do |result|
+          if compatible
+            result.merge!(object)
+            enhance_with_compatibility_warning(result)
+          end
+        end
+      when Array
+        deep ? object.map { |v| to_ruby(v, options) } : object
+      else
+        object
       end
-
-      formatted
     end
 
-    protected
+    private
 
     def enhance_with_compatibility_warning(hash)
       def hash.[](key)

data/lib/postmark/version.rb

@@ -1,3 +1,3 @@
 module Postmark
-  VERSION = '1.21.7'
+  VERSION = '1.22.1'
 end

data/postmark.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |s|
   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"]