postageapp 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: eee8e5a9e9b96751117b5069f54aa8ecb833fdf1
-  data.tar.gz: 27f7144b8dddb20b7002e83020397b20c2f0bd26
+SHA256:
+  metadata.gz: b142c061512b3ef0ff5d1d18d436de9796b772793e6ed10d1267d506c0577d54
+  data.tar.gz: 1f028542353d6cb55ca037f431a68ee1f2820833cc7bce8b5b5fd72f46345365
 SHA512:
-  metadata.gz: b4595cceffe1fc5f6343757db1aef22fbe8529656bf7f30c5c3c7ed53042228d4174e5d26fd2d88bed85e8f7b63976e272faf0265fbb903183876f4d87e27aac
-  data.tar.gz: a2491f2ca1da5d85d2a75c2ecf321190449ae1d9f2b6d4faca827c940910cbff06b7cc2f46714af205684f4bec11d7c04114eb016044208c7810822536f7db8c
+  metadata.gz: 615475381e51dfbdb59e6966381e9c09f95c76e2d625c3983c5fbe7955765f42e85ecd76e3e4a2249bd55638ab70a3bd5153e7715fcf6ed2b0607e108ead503e
+  data.tar.gz: 295a8585e182f43e92447188eed75af8f447083d7c0186076a2f425eed22f86a36d7788974095f49ab0a4807191c4d743113d6c25eaa5efe1b65f70cf1aefa28

data/.gitignore

@@ -1,3 +1,5 @@
+/.bundle
+
 .DS_Store
 coverage
 rdoc
@@ -8,3 +10,7 @@ test/gemfiles/*.lock
 Gemfile.lock
 .ruby-version
 *.gem
+
+.env
+
+.vscode

data/.travis.yml

@@ -3,46 +3,15 @@ before_install: "WITH_VERBOSE=1 script/with current bootstrap"
 install: "WITH_VERBOSE=1 script/with current bundle install"
 script: "WITH_VERBOSE=1 script/with current bundle exec rake test"
 rvm:
-  - 1.9.3-p551
-  - 2.0.0-p648
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
-  - 2.4.1
-  - jruby-9.1.2.0
+  - 2.5.9
+  - 2.6.7
+  - 2.7.3
+  - 3.0.1
+  - jruby-9.1.17.0
+  - jruby-9.2.17.0
 gemfile:
   - test/gemfiles/Gemfile.ruby
-  - test/gemfiles/Gemfile.rails-2.3.x
-  - test/gemfiles/Gemfile.rails-3.0.x
-  - test/gemfiles/Gemfile.rails-3.1.x
-  - test/gemfiles/Gemfile.rails-3.2.x
-  - test/gemfiles/Gemfile.rails-4.0.x
-  - test/gemfiles/Gemfile.rails-4.1.x
-  - test/gemfiles/Gemfile.rails-4.2.x
   - test/gemfiles/Gemfile.rails-5.0.x
-matrix:
-  exclude:
-    - rvm: 1.9.3-p551
-      gemfile: test/gemfiles/Gemfile.rails-2.3.x
-    - rvm: 2.0.0-p648
-      gemfile: test/gemfiles/Gemfile.rails-2.3.x
-    - rvm: 2.1.10
-      gemfile: test/gemfiles/Gemfile.rails-2.3.x
-    - rvm: 2.2.5
-      gemfile: test/gemfiles/Gemfile.rails-2.3.x
-    - rvm: 2.3.1
-      gemfile: test/gemfiles/Gemfile.rails-2.3.x
-    - rvm: jruby-9.1.2.0
-      gemfile: test/gemfiles/Gemfile.rails-2.3.x
-    - rvm: 1.9.3-p551
-      gemfile: test/gemfiles/Gemfile.rails-4.0.x
-    - rvm: 1.9.3-p551
-      gemfile: test/gemfiles/Gemfile.rails-4.1.x
-    - rvm: 1.9.3-p551
-      gemfile: test/gemfiles/Gemfile.rails-4.2.x
-    - rvm: 1.9.3-p551
-      gemfile: test/gemfiles/Gemfile.rails-5.0.x
-    - rvm: 2.0.0-p648
-      gemfile: test/gemfiles/Gemfile.rails-5.0.x
-    - rvm: 2.1.10
-      gemfile: test/gemfiles/Gemfile.rails-5.0.x
+  - test/gemfiles/Gemfile.rails-5.2.x
+  - test/gemfiles/Gemfile.rails-6.0.x
+  - test/gemfiles/Gemfile.rails-6.1.x

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2016 Scott Tadman, Oleg Khabarov, PostageApp
+Copyright (c) 2011-2019 Scott Tadman, Oleg Khabarov, PostageApp Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,13 +1,35 @@
-# [PostageApp](http://postageapp.com) Ruby Gem [![Build Status](https://secure.travis-ci.org/postageapp/postageapp-ruby.png)](http://travis-ci.org/postageapp/postageapp-ruby)
+# [PostageApp](https://postageapp.com/) Ruby Gem [![Build Status](https://secure.travis-ci.org/postageapp/postageapp-ruby.png)](http://travis-ci.org/postageapp/postageapp-ruby)
 
-This gem is used to integrate Ruby apps with [PostageApp](http://postageapp.com/)
+This gem is used to integrate Ruby apps with [PostageApp](https://postageapp.com/)
 service. Personalized high-volume email sending can be offloaded to PostageApp
-via a simple [JSON-based API](http://dev.postageapp.com/api.html).
+via a simple [JSON-based API](https://dev.postageapp.com/api).
 
-### [API Documentation](http://help.postageapp.com/kb/api/api-overview) • [Knowledge Base](http://help.postageapp.com/kb) • [Help Portal](http://help.postageapp.com/)
+### [API Documentation](https://dev.postageapp.com/api/)
 
 # Installation
 
+## Rails 5.2 and newer
+
+Add the `postageapp` gem to your Gemfile:
+
+    gem 'postageapp'
+
+Then from the Rails project's root run:
+
+    bundle install
+
+For authentication, add your project's PostageApp credentials to the
+Rails Encrypted Credentials:
+
+    rails credentials:edit
+
+The format of this entry should be:
+
+    postageapp:
+      api_key: __PROJECT_API_KEY__
+
+Where that will be picked up by the plugin when Rails starts.
+
 ## Rails 4.x and newer
 
 Add the `postageapp` gem to your Gemfile:
@@ -26,9 +48,13 @@ Then from the Rails project's root run:
 
 ## Sinatra / Rack / Others
 
-You'll need to install the gem first:
+Add the `postageapp` gem to your Gemfile:
+
+    gem 'postageapp'
+
+Then from the project's root run:
 
-    $ sudo gem install postageapp
+    bundle install
 
 The configuration will need to be loaded before executing any API calls:
 
@@ -46,7 +72,7 @@ with the appropriate API key will also work.
 # Usage
 
 Here's an example of sending a message using the
-[`send_message`](http://help.postageapp.com/faqs/api/send_message) API call:
+[`send_message`](https://dev.postageapp.com/api/send_message) API call:
 
 ```ruby
 request = PostageApp::Request.new(
@@ -63,7 +89,7 @@ request = PostageApp::Request.new(
     },
     attachments: {
       'document.pdf' => {
-        content_type: application/pdf',
+        content_type: 'application/pdf',
         content: Base64.encode64(File.open('/path/to/document.pdf', 'rb').read)
       }
     }
@@ -121,7 +147,7 @@ require 'postageapp/mailer'
 There are custom methods that allow setting of `template` and `variables` parts
 of the API call. They are `postageapp_template` and `postageapp_variables`.
 Examples how they are used are below. For details what they do please see
-[documentation](http://help.postageapp.com/faqs)
+[documentation](https://dev.postageapp.com/api/)
 
 Please note that `deliver` method will return `PostageApp::Response` object.
 This way you can immediately check the status of the delivery. For example:
@@ -213,11 +239,89 @@ For projects other than Rails you'll need to tell where the `project_root` is:
 
 ```ruby
 PostageApp.configure do |config|
-  config.api_key      = 'PROJECT_API_KEY'
+  config.api_key = 'PROJECT_API_KEY'
   config.project_root = "/path/to/your/project"
 end
 ```
 
-# Copyright
-
-(C) 2011-2017 Scott Tadman, Oleg Khabarov, [PostageApp](http://www.postageapp.com/)
+# Configuration Details
+
+Configuration can be done either via Ruby code directly, by environment
+variables, or by a combination of both. Where both are supplied, the
+Ruby setting will take precedence.
+
+## Configuration Arguments
+
+These can all be set with `PostageApp.config`:
+
+* `api_key`: Project API key to use (required for project API functions)
+* `account_api_key`: Account API key to use (required for account API functions)
+* `postback_secret`: Secret to use for validating ActionMailbox requests (optional)
+* `project_root`: Project root for logging purposes (default: current working directory)
+* `recipient_override`: Override sender on `send_message` calls (optional)
+* `logger`: Logger instance to use (optional)
+* `secure`: Enable verifying TLS connections (default: `true`)
+* `verify_tls`: Enable TLS certificate verification (default: `true`)
+* `verify_certificate`: Alias for `verify_tls`
+* `host`: API host to contact (default: `api.postageapp.com`)
+* `port`: API port to contact (default: `443`)
+* `scheme`: HTTP scheme to use (default: `https`)
+* `protocol`: Alias for `scheme`
+* `proxy_username`: SOCKS5 proxy username (optional)
+* `proxy_user`: Alias for `proxy_username`
+* `proxy_password`: SOCKS5 proxy password (optional)
+* `proxy_pass`: Alias for `proxy_password`
+* `proxy_host`: SOCKS5 proxy host (optional)
+* `proxy_port`: SOCKS5 proxy port (default: `1080`)
+* `open_timeout`: Timeout in seconds when initiating requests (default: `5`)
+* `http_open_timeout`: Alias for `open_timeout`
+* `read_timeout`: Timeout in seconds when awaiting responses (default: `10`)
+* `http_read_timeout`: Alias for `read_timeout`
+* `retry_methods`: Which API calls to retry, comma and/or space separated (default: `send_message`)
+* `requests_to_resend`: Alias for `retry_methods`
+* `framework`: Framework used (default: `Ruby`)
+* `environment`: Environment to use (default: `production`)
+
+A typical configuration involves setting the project API key:
+
+    PostageApp.config do |config|
+      config.api_key = 'PROJECT_API_KEY'
+    end
+
+Where additional settings can be applied as necessary.
+
+## Environment Variables
+
+Most configuration parameters can be set via the environment:
+
+* `POSTAGEAPP_API_KEY`: Project API key to use (required for project API functions)
+* `POSTAGEAPP_ACCOUNT_API_KEY`: Account API key to use (required for account API functions)
+* `POSTAGEAPP_POSTBACK_SECRET`: Secret to use for validating ActionMailbox requests (optional)
+* `POSTAGEAPP_PROJECT_ROOT`: Project root for logging purposes (default: current working directory)
+* `POSTAGEAPP_RECIPIENT_OVERRIDE`: Override sender on `send_message` calls (optional)
+* `POSTAGEAPP_VERIFY_TLS`:  (default: `true`)
+* `POSTAGEAPP_VERIFY_CERTIFICATE`: Alias for `POSTAGEAPP_VERIFY_TLS`
+* `POSTAGEAPP_HOST`: API host to contact (default: `api.postageapp.com`)
+* `POSTAGEAPP_PORT`: API port to contact (default: `443`)
+* `POSTAGEAPP_SCHEME`: HTTP scheme to use (default: `https`)
+* `POSTAGEAPP_PROTOCOL`: Alias for `POSTAGEAPP_SCHEME`
+* `POSTAGEAPP_PROXY_USERNAME`: SOCKS5 proxy username (optional)
+* `POSTAGEAPP_PROXY_USER`: Alias for `POSTAGEAPP_PROXY_USERNAME`
+* `POSTAGEAPP_PROXY_PASSWORD`: SOCKS5 proxy password (optional)
+* `POSTAGEAPP_PROXY_PASS`: Alias for `POSTAGEAPP_PROXY_PASSWORD`
+* `POSTAGEAPP_PROXY_HOST`: SOCKS5 proxy host (optional)
+* `POSTAGEAPP_PROXY_PORT`: SOCKS5 proxy port (default: `1080`)
+* `POSTAGEAPP_OPEN_TIMEOUT`: Timeout in seconds when initiating requests (default: `5`)
+* `POSTAGEAPP_HTTP_OPEN_TIMEOUT`: Alias for `POSTAGEAPP_OPEN_TIMEOUT`
+* `POSTAGEAPP_READ_TIMEOUT`: Timeout in seconds when awaiting responses (default: `10`)
+* `POSTAGEAPP_HTTP_READ_TIMEOUT`: Alias for `POSTAGEAPP_READ_TIMEOUT`
+* `POSTAGEAPP_RETRY_METHODS`: Which API calls to retry, comma and/or space separated (default: `send_message`)
+* `POSTAGEAPP_REQUESTS_TO_RESEND`: Alias for `POSTAGEAPP_RETRY_METHODS`
+* `POSTAGEAPP_FRAMEWORK`: Framework used (default: `Ruby`)
+* `POSTAGEAPP_ENVIRONMENT`: Environment to use (default: `production`)
+
+# Copyright and Licensing
+
+(C) 2011-2019 Scott Tadman, Oleg Khabarov, [PostageApp](https://postageapp.com/)
+
+This is released under the [MIT License](LICENSE.md).

data/Rakefile

@@ -1,4 +1,5 @@
-require 'bundler/setup'
+# Avoid contaminating ENV with lots of BUNDLER_ variables
+# require 'bundler/setup'
 
 require 'rake/testtask'
 
@@ -11,17 +12,27 @@ end
 namespace :travis do
   desc "Run tests across different environments, simulating Travis"
   task :test do
-    require File.expand_path('test/travis_test', File.dirname(__FILE__))
+    require_relative './test/travis_test'
 
     TravisTest.run!
   end
 
   desc "Report on which versions of Ruby are installed"
   task :versions do
-    require File.expand_path('test/travis_test', File.dirname(__FILE__))
+    require_relative './test/travis_test'
 
     TravisTest.validate_ruby_versions!
   end
 end
 
-task :default => :test
+task default: :test
+
+namespace :test do
+  task :rails do
+    ENV['BUNDLE_GEMFILE'] = File.expand_path('./test/gemfiles/Gemfile.rails-6.1.x', __dir__)
+
+    require 'bundler/setup'
+
+    p Rails
+  end
+end

data/VERSION

@@ -0,0 +1 @@
+1.4.0

data/app/ingresses/action_mailbox/ingresses/postage_app.rb

@@ -0,0 +1,2 @@
+module ActionMailbox::Ingresses::PostageApp
+end

data/app/ingresses/action_mailbox/ingresses/postage_app/inbound_emails_controller.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+class ActionMailbox::Ingresses::PostageApp::InboundEmailsController < ActionMailbox::BaseController
+  before_action :hmac_authenticate
+
+  def create
+    ActionMailbox::InboundEmail.create_and_extract_message_id!(message_param)
+
+    head(:ok)
+
+  rescue JSON::ParserError => e
+    logger.error(e.message)
+
+    head(:unprocessable_entity)
+  end
+
+private
+  def message_param
+    params.require(:inbound_email).require(:message)
+  end
+
+  def hmac_authenticate
+    return if (hmac_authenticated?)
+
+    head(:unauthorized)
+  end
+
+  def hmac_authenticated?
+    if (PostageApp.config.postback_secret.present?)
+      ActiveSupport::SecurityUtils.secure_compare(
+        request.headers["X-PostageApp-Signature"],
+        hmac_signature(message_param, PostageApp.config.postback_secret)
+      )
+    else
+      raise ArgumentError, <<~END.squish
+        Missing required PostageApp "postback secret" which can be set as
+        in the Rails Encypted Credentials, as POSTAGEAPP_API_POSTBACK_SECRET
+        in the environment, or via a config/initializer script using the
+        PostageApp.config method.
+      END
+    end
+  end
+
+private
+  def hmac_signature(*content)
+    Base64.strict_encode64(
+      OpenSSL::HMAC.digest(OpenSSL::Digest::SHA1.new, *content)
+    )
+  end
+end

data/config/routes.rb

@@ -0,0 +1,6 @@
+PostageApp::Engine.routes.draw do
+  scope "/rails/action_mailbox", module: "action_mailbox/ingresses" do
+    post "/postageapp/inbound_emails" => "postage_app/inbound_emails#create",
+      as: :rails_postageapp_inbound_emails
+  end
+end

data/exe/postageapp

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH << File.expand_path('../lib', __dir__)
+
+require 'postageapp'
+require 'postageapp/cli'
+
+exit_code = -1
+
+begin
+  if (ARGV.length > 0)
+    PostageApp::CLI.parse!(*ARGV)
+
+    exit(0)
+  end
+
+rescue PostageApp::CLI::Command::MissingArguments
+  exit(-20)
+rescue PostageApp::CLI::Command::APICallError
+  exit(-30)
+rescue PostageApp::CLI::UnknownCommand => e
+  $stderr.puts("Error: #{e}")
+  exit_code = -11
+end
+
+puts "usage: postageapp command [options]"
+puts
+puts "commands:"
+
+PostageApp::CLI::Command.defined.each do |command, _|
+  puts "  #{command}"
+end
+
+puts
+puts "* Documentation: https://dev.postageapp.com/api/"
+
+exit(exit_code)

data/lib/generators/postageapp/postageapp_generator.rb

@@ -10,18 +10,21 @@ class PostageappGenerator < Rails::Generators::Base
   def self.source_root
     @__source_root ||= File.expand_path(
       '../../../generators/postageapp/templates',
-      File.dirname(__FILE__)
+      __dir__
     )
   end
   
   def install
-    unless (options[:api_key])
-      puts 'Must pass --api-key with API key of your PostageApp.com project'
+    unless (PostageApp::Env.rails_with_encrypted_credentials?)
+      unless (options[:api_key])
+        puts 'Must pass --api-key with API key of your PostageApp.com project'
 
-      exit(-1)
+        exit(-1)
+      end
+      
+      template('initializer.rb', 'config/initializers/postageapp.rb')
     end
-    
-    template('initializer.rb', 'config/initializers/postageapp.rb')
+
     copy_file('postageapp_tasks.rake', 'lib/tasks/postageapp_tasks.rake')
 
     puts run('rake postageapp:test')

data/lib/postageapp.rb

@@ -9,70 +9,88 @@ require 'base64'
 
 module PostageApp
   class Error < StandardError ; end
-  
+
   # Call this method to modify your configuration
   # Example:
   #   PostageApp.configure do |config|
-  #     config.api_key             = '1234567890abcdef'
-  #     config.recipient_override  = 'test@test.test' if Rails.env.staging?
+  #     config.api_key = '1234567890abcdef'
+  #
+  #     if Rails.env.staging?
+  #       config.recipient_override = 'test@test.test'
+  #     end
   #   end
-  # 
+  #
   # If you do not want/need to initialize the gem in this way, you can use the environment
   # variable POSTAGEAPP_API_KEY to set up your key.
-  
-  def self.configure(reset = false)
+
+  VERSION = File.read(File.expand_path('../VERSION', __dir__)).gsub(/\s/, '')
+
+  def self.version
+    VERSION
+  end
+
+  def self.configure(reset: false)
     if (reset)
-      self.configuration_reset!
+      self.config_reset!
     end
 
-    yield(self.configuration)
+    yield(self.config)
   end
-  
+
   # Accessor for the PostageApp::Configuration object
   # Example use:
   #   PostageApp.configuration.api_key = '1234567890abcdef'
-  def self.configuration
-    @configuration ||= Configuration.new
+  def self.config
+    @config ||= Configuration.new
   end
 
-  def self.configuration_reset!
-    @configuration = nil
+  def self.config_reset!
+    @config = nil
   end
 
   class << self
-    alias :config :configuration
+    alias_method :configuration_reset!, :config_reset!
+    alias_method :configuration, :config
   end
-  
+
   # Logger for the plugin
   def self.logger
     @logger ||= begin
-      configuration.logger || PostageApp::Logger.new(
-        if (configuration.project_root)
-          FileUtils.mkdir_p(File.join(File.expand_path(configuration.project_root), 'log'))
-          File.join(configuration.project_root, "log/postageapp_#{configuration.environment}.log")
+      config.logger || PostageApp::Logger.new(
+        if (config.project_root)
+          FileUtils.mkdir_p(File.join(File.expand_path(config.project_root), 'log'))
+          File.join(config.project_root, "log/postageapp_#{config.environment}.log")
         else
-          STDOUT
+          $stdout
         end
       )
     end
   end
 end
 
-require 'postageapp/configuration'
-require 'postageapp/diagnostics'
-require 'postageapp/failed_request'
-require 'postageapp/http'
-require 'postageapp/logger'
-require 'postageapp/request'
-require 'postageapp/response'
-require 'postageapp/mail'
-require 'postageapp/mail/delivery_method'
-require 'postageapp/utils'
-require 'postageapp/version'
-
-require 'postageapp/rails/railtie' if (defined?(Rails::Railtie))
-
-require 'postageapp/mail/extensions'
+require_relative './postageapp/env'
+
+if (PostageApp::Env.rails?)
+  require_relative './postageapp/engine'
+  # require 'postageapp/ingresses/postage_app'
+end
+
+require_relative './postageapp/configuration'
+require_relative './postageapp/diagnostics'
+require_relative './postageapp/failed_request'
+require_relative './postageapp/http'
+require_relative './postageapp/logger'
+require_relative './postageapp/request'
+require_relative './postageapp/response'
+require_relative './postageapp/mail'
+require_relative './postageapp/mail/delivery_method'
+require_relative './postageapp/utils'
+
+if (defined?(Rails::Railtie))
+  require_relative './postageapp/rails/railtie'
+end
+
+require_relative './postageapp/mail/extensions'
 
 if (defined?(::Mail))
   PostageApp::Mail::Extensions.install!