mail-ses 0.1.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6828265477b50de02b28a33e6d7e6c2454489e1874a9ef4a877d5c9da2798c19
-  data.tar.gz: b170ccac0a3decfc335bade3929bbabea31553b11f21f26abbf9af3d953bc083
+  metadata.gz: 85feb11fd75e0a0af6ccc3c6a2d9711a48e9444db1fb2bec25f407a7388da165
+  data.tar.gz: d32dd2fe4aa147b3d1a08b1d65aa4cf92ce4001fd6318e23b9d05f0a7c97433a
 SHA512:
-  metadata.gz: 4501f1de2cacc24c08c3a2f398ef1865c38661f6878f694db809e6cba04621f8e379a76e8c5d66770a10566f2ce5549571016fafe11681836bd70696a2519134
-  data.tar.gz: f7c0310010dcdab52f961441b7c1c7f957bbaa815abe280e0bf90e36e2c42e3399d374d29f675e0af3507f8946ef5cdcef283c4085c0b847f409b1f03cc63de8
+  metadata.gz: 66f8925d0f8f0cc657b0fcb26868d1ee57010360747e5782f8126f28a5054004a6a20a5d3358608617eb900d5429adebbe16e0eaa9b98567f3ad048b806743c9
+  data.tar.gz: 339a15c00b6664a1266a3ea7dbe390ad684a434785fcc4670cb1f0a8c5b9409d3a7cc26892cf4c5d88a639c32c64671b1c56d224ec7ef9cc66188c9326b30506

data/CHANGELOG.md

@@ -1,8 +1,26 @@
-# 0.1.1
-
-- Fix: Remove Base64 encoding from message body.
-
-# 0.1.0
-
-- Initial release of gem.
-- Support for sending ActionMailer mails via AWS SDK v3.
+# Changelog
+
+### 1.0.1
+
+- Add compatibility with Mail gem 2.8.0.
+
+### 1.0.0
+
+- BREAKING CHANGE: Upgrade to AWS Ruby SDK v3 - SESv2 API ([@khrvi](https://github.com/khrvi))
+- Drop support for Ruby 2.5 and earlier.
+- Switch CI from Travis to Github Actions.
+- Add Rubocop to CI.
+- Refactor code.
+
+### 0.1.2
+
+- Fix: Add #settings method for conformity with other Mail delivery methods.
+
+### 0.1.1
+
+- Fix: Remove Base64 encoding from message body.
+
+### 0.1.0
+
+- Initial release of gem.
+- Support for sending ActionMailer mails via AWS SDK v3.

data/README.md

@@ -1,121 +1,125 @@
-[![Gem Version](https://badge.fury.io/rb/mail-ses.svg)](http://badge.fury.io/rb/mail-ses)
-[![Travis Status](https://travis-ci.org/tablecheck/mail-ses.svg?branch=master)](https://travis-ci.org/tablecheck/mail-ses)
-
-# Mail::SES
-
-Mail::SES is a mail delivery method handler for Amazon SES (Simple Email Service) which can be used with Rails' [Action Mailer](https://guides.rubyonrails.org/action_mailer_basics.html).
-
-This gem is inspired by [Drew Blas' AWS::SES gem](https://github.com/drewblas/aws-ses),
-but uses the official [AWS SDK v3 for SES](https://docs.aws.amazon.com/ses/latest/DeveloperGuide/send-using-sdk-ruby.html) under-the-hood.
-By passing parameters through to the SDK, this gem supports greater flexibility with less code (including IAM instance profiles, retry parameters, etc.)
-
-### Compatibility
-
-* TBD
-
-### Shameless Plug
-
-ActionMailer::SES is sponsored by [TableCheck](http://corp.tablecheck.com/), Japan's leading restaurant management app. If **you** are a ninja-level Javascript/Ruby coder, designer, project manager, etc. and are eager to work in Tokyo with other ninjas, Japan in a dynamic environment, please get in touch at [careers@tablecheck.com](mailto:careers@tablecheck.com).
-
-## Getting Started
-
-In your `Gemfile`:
-
-```ruby
-gem 'mail-ses'
-```
-
-Next, make a new initializer at `config/initializers/mail_ses.rb`:
-
-```ruby
-ActionMailer::Base.add_delivery_method :ses, Mail::SES,
-    region: 'us-east-1',
-    access_key_id: 'abc',
-    secret_access_key: '123'
-```
-
-Finally, in the appropriate `config/environments/*.rb`:
-
-```ruby
-config.action_mailer.delivery_method = :ses
-```
-
-## Advanced Usage
-
-### AWS SES Client Options
-
-Any options supported by the `Aws::SES::Client` class can be passed into the initializer, for example:
-
-```ruby
-ActionMailer::Base.add_delivery_method :ses, Mail::SES,
-    region: 'us-east-1',
-    session_token: 'foobar',
-    retry_limit: 5,
-    retry_max_delay: 10
-```
-
-In addition, the shortcut option `:use_iam_profile (Boolean)` which activates the IAM instance profile.
-
-```ruby
-ActionMailer::Base.add_delivery_method :ses, Mail::SES,
-    region: 'us-east-1',
-    use_iam_profile: true
-```
-
-### Default Mail Options
-
-In the initializer you can set `:mail_options (Hash)` which are default options to pass-through to each mail sent:
-
-```ruby
-ActionMailer::Base.add_delivery_method :ses, Mail::SES,
-    # ...
-    mail_options: {
-      source_arn: 'arn:aws:ses:us-east-1:123456789012:identity/example.com',
-      tags: [
-        { name: 'MessageTagName', value: 'MessageTagValue' },
-      ],
-    }
-```
-
-### AWS Error Handling
-
-To handle errors from AWS API, in the initializer you can set `:error_handler (Proc)` which takes two args:
-the error which was raised, and the raw_email options hash. This is useful for notifying your bug tracking service.
-Setting `:error_handler` causes the error to be swallowed unless it is raised again in the handler itself.
-
-```ruby
-ActionMailer::Base.add_delivery_method :ses, Mail::SES,
-    # ...
-    error_handler: ->(error, raw_email) do
-      Bugsnag.notify(error){|r| r.add_tab('email', { email: raw_email })}
-      raise error    
-    end
-```
-
-### Send Email as a Standalone
-
-You can send one-off mails using the `Mail::SES` object and `#deliver` method.
-
-```ruby
-mail = Mail.new(args)
-
-ses  = Mail::SES.new(region: 'us-east-1',
-                     access_key_id: 'abc',
-                     secret_access_key: '123')
-
-options = { source_arn: 'arn:aws:ses:us-east-1:123456789012:identity/example.com' }
-
-ses.deliver!(mail, options) #=> returns AWS API response
-
-mail.message_id #=> "00000138111222aa-33322211-cccc-cccc-cccc-ddddaaaa0680-000000@email.amazonses.com"
-```
-
-Please also see the [AWS SDK v3 for SES](https://docs.aws.amazon.com/ses/latest/DeveloperGuide/send-using-sdk-ruby.html) for alternate approaches.
-
-## Statistics, Verified Addresses, Bounce Rate, etc.
-
-Please use the official [AWS SDK v3 for SES](https://docs.aws.amazon.com/ses/latest/DeveloperGuide/send-using-sdk-ruby.html).
-
-## Copyright
-
-Copyright (c) 2018 TableCheck Inc. See LICENSE for further details.
+[![Gem Version](https://badge.fury.io/rb/mail-ses.svg)](http://badge.fury.io/rb/mail-ses)
+[![Github Actions](https://github.com/tablecheck/mail-ses/actions/workflows/test.yml/badge.svg)](https://github.com/tablecheck/mail-ses/actions/workflows/test.yml)
+
+# Mail::SES
+
+Mail::SES is a mail delivery method handler for Amazon SES (Simple Email Service) which can be used with Rails' [Action Mailer](https://guides.rubyonrails.org/action_mailer_basics.html).
+
+This gem is inspired by [Drew Blas' AWS::SES gem](https://github.com/drewblas/aws-ses),
+but uses the official [AWS SDK for Ruby v3 - SESv2](https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/SESV2.html) under-the-hood.
+By passing parameters through to the SDK, this gem supports greater flexibility with less code (including IAM instance profiles, retry parameters, etc.)
+
+### Compatibility
+
+* Ruby 2.6+
+* Ruby on Rails 3.2+
+* AWS SDK for Ruby v3 - SESv2
+
+Please use version 0.1.x of this gem for legacy Ruby and AWS SDK support.
+
+## Getting Started
+
+In your `Gemfile`:
+
+```ruby
+gem 'mail-ses'
+```
+
+Next, make a new initializer at `config/initializers/mail_ses.rb`:
+
+```ruby
+ActionMailer::Base.add_delivery_method :ses, Mail::SES,
+    region: 'us-east-1',
+    access_key_id: 'abc',
+    secret_access_key: '123'
+```
+
+Finally, in the appropriate `config/environments/*.rb`:
+
+```ruby
+config.action_mailer.delivery_method = :ses
+```
+
+## Advanced Usage
+
+### AWS SES Client Options
+
+Any options supported by the `Aws::SESV2::Client` class can be passed into the initializer, for example:
+
+```ruby
+ActionMailer::Base.add_delivery_method :ses, Mail::SES,
+    region: 'us-east-1',
+    session_token: 'foobar',
+    retry_limit: 5,
+    retry_max_delay: 10
+```
+
+In addition, the shortcut option `:use_iam_profile (Boolean)` which activates the IAM instance profile.
+
+```ruby
+ActionMailer::Base.add_delivery_method :ses, Mail::SES,
+    region: 'us-east-1',
+    use_iam_profile: true
+```
+
+### Default Mail Options
+
+In the initializer you can set `:mail_options (Hash)` which are default options to pass-through to each mail sent:
+
+```ruby
+ActionMailer::Base.add_delivery_method :ses, Mail::SES,
+    # ...
+    mail_options: {
+      from_email_address_identity_arn: 'arn:aws:ses:us-east-1:123456789012:identity/example.com',
+      email_tags: [
+        { name: 'MessageTagName', value: 'MessageTagValue' },
+      ],
+    }
+```
+
+### AWS Error Handling
+
+To handle errors from AWS API, in the initializer you can set `:error_handler (Proc)` which takes two args:
+the error which was raised, and the raw_email options hash. This is useful for notifying your bug tracking service.
+Setting `:error_handler` causes the error to be swallowed unless it is raised again in the handler itself.
+
+```ruby
+ActionMailer::Base.add_delivery_method :ses, Mail::SES,
+    # ...
+    error_handler: ->(error, raw_email) do
+      Bugsnag.notify(error){|r| r.add_tab('email', { email: raw_email })}
+      raise error    
+    end
+```
+
+### Send Email as a Standalone
+
+You can send one-off mails using the `Mail::SES` object and `#deliver` method.
+
+```ruby
+mail = Mail.new(args)
+
+ses  = Mail::SES.new(region: 'us-east-1',
+                     access_key_id: 'abc',
+                     secret_access_key: '123')
+
+options = { from_email_address_identity_arn: 'arn:aws:ses:us-east-1:123456789012:identity/example.com' }
+
+ses.deliver!(mail, options) #=> returns AWS API response
+
+mail.message_id #=> "00000138111222aa-33322211-cccc-cccc-cccc-ddddaaaa0680-000000@email.amazonses.com"
+```
+
+Please also see the [AWS SDK v3 for SES](https://docs.aws.amazon.com/ses/latest/DeveloperGuide/send-using-sdk-ruby.html) for alternate approaches.
+
+### Statistics, Verified Addresses, Bounce Rate, etc.
+
+Please use the official [AWS SDK v3 for SES](https://docs.aws.amazon.com/ses/latest/DeveloperGuide/send-using-sdk-ruby.html).
+
+## Shameless Plug
+
+Mail::SES is sponsored by [TableCheck](http://www.tablecheck.com/en/company/), Japan's leading restaurant management app. If **you** are a ninja-level Javascript/Ruby coder, designer, project manager, etc. and are eager to work in Tokyo with other ninjas, Japan in a dynamic environment, please get in touch at [careers@tablecheck.com](mailto:careers@tablecheck.com).
+
+## Copyright
+
+Copyright (c) 2018 [TableCheck Inc.](http://www.tablecheck.com/en/company/) See LICENSE for further details.

data/lib/mail/ses/message_validator.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Mail
+  class SES
+    # Validates a Mail::Message object before sending
+    class MessageValidator
+      # message - The Mail::Message object to be validated.
+      def initialize(message)
+        @message = message
+      end
+
+      # Validate the message.
+      def validate
+        validate_class
+        validate_delivery_params
+        validate_attachments
+      end
+
+      private
+
+      def validate_class
+        return if @message.is_a?(Mail::Message)
+
+        raise ArgumentError.new('mail must be an instance of Mail::Message class')
+      end
+
+      def validate_delivery_params
+        if defined?(Mail::CheckDeliveryParams) # mail gem < 2.7.0
+          Mail::CheckDeliveryParams.check(@message)
+        elsif defined?(Mail::SmtpEnvelope) # mail gem >= 2.8.0
+          Mail::SmtpEnvelope.new(@message)
+        end
+      end
+
+      def validate_attachments
+        return unless @message.has_attachments? && @message.text_part.nil? && @message.html_part.nil?
+
+        raise ArgumentError.new('Attachment provided without message body')
+      end
+    end
+  end
+end

data/lib/mail/ses/options_builder.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Mail
+  class SES
+    # Builds options for Aws::SESV2::Client#send_email
+    class OptionsBuilder
+      # message - The Mail::Message object to be sent.
+      # options - The Hash options which override any defaults
+      #           from the message.
+      def initialize(message, options = {})
+        @message = message
+        @options = options
+      end
+
+      # Returns the options for Aws::SESV2::Client#send_email.
+      def build
+        message_options.merge(ses_options)
+      end
+
+      private
+
+      def ses_options
+        slice_hash(@options, *RAW_EMAIL_ATTRS)
+      end
+
+      def message_options
+        {
+          from_email_address: @message.from&.first,
+          destination: {
+            to_addresses: Array(@message.to).compact,
+            cc_addresses: Array(@message.cc).compact,
+            bcc_addresses: Array(@message.bcc).compact
+          },
+          content: { raw: { data: @message.to_s } }
+        }.compact
+      end
+
+      def slice_hash(hash, *keys)
+        keys.each_with_object({}) { |k, h| h[k] = hash[k] if hash.key?(k) }
+      end
+    end
+  end
+end

data/lib/mail/ses/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Mail
+  class SES
+    VERSION = '1.0.1'
+  end
+end

data/lib/mail/ses.rb

@@ -1,87 +1,68 @@
-# frozen_string_literal: true
-module Mail
-  # Mail delivery method handler for AWS SES
-  class SES
-    VERSION = File.read(File.join(File.dirname(__FILE__), '../../VERSION')).strip.freeze
-
-    RAW_EMAIL_ATTRS = %i[ source
-                          source_arn
-                          from_arn
-                          return_path_arn
-                          tags
-                          configuration_set_name ].freeze
-
-    attr_reader :client
-
-    # Initializes the Mail::SES object.
-    #
-    # options - The Hash options (optional, default: {}):
-    #   :mail_options    - (Hash) Default AWS options to set on each mail object.
-    #   :error_handler   - (Proc<Error, Hash>) Handler for AWS API errors.
-    #   :use_iam_profile - Shortcut to use AWS IAM instance profile.
-    #   All other options are passed-thru to Aws::SES::Client.
-    def initialize(options = {})
-      @mail_options = options.delete(:mail_options) || {}
-      @error_handler = options.delete(:error_handler)
-      self.class.validate_error_handler(@error_handler)
-      options = self.class.build_client_options(options)
-      @client = Aws::SES::Client.new(options)
-    end
-
-    # Delivers a Mail object via SES.
-    #
-    # mail    - The Mail object to deliver (required).
-    # options - The Hash options which override any defaults set in :mail_options
-    #           in the initializer (optional, default: {}). Refer to
-    #           Aws::SES::Client#send_raw_email
-    def deliver!(mail, options = {})
-      self.class.validate_mail(mail)
-      options = @mail_options.merge(options || {})
-      raw_email_options = self.class.build_raw_email_options(mail, options)
-      begin
-        response = client.send_raw_email(raw_email_options)
-        mail.message_id = "#{response.to_h[:message_id]}@email.amazonses.com"
-        response
-      rescue StandardError => e
-        @error_handler ? @error_handler.call(e, raw_email_options.dup) : raise(e)
-      end
-    end
-
-    class << self
-      def validate_error_handler(error_handler)
-        raise ArgumentError.new(':error_handler must be a Proc') if error_handler && !error_handler.is_a?(Proc)
-      end
-
-      def validate_mail(mail)
-        unless mail.is_a?(Mail::Message)
-          raise ArgumentError.new('mail must be an instance of Mail::Message class')
-        end
-
-        Mail::CheckDeliveryParams.check(mail)
-
-        if mail.has_attachments? && mail.text_part.nil? && mail.html_part.nil?
-          raise ArgumentError.new('Attachment provided without message body')
-        end
-      end
-
-      def build_client_options(options)
-        options[:credentials] = Aws::InstanceProfileCredentials.new if options.delete(:use_iam_profile)
-        options
-      end
-
-      def build_raw_email_options(message, options = {})
-        output = slice_hash(options, *RAW_EMAIL_ATTRS)
-        output[:source] ||= message.from.first
-        output[:destinations] = [message.to, message.cc, message.bcc].flatten.compact
-        output[:raw_message] = { data: message.to_s }
-        output
-      end
-
-      protected
-
-      def slice_hash(hash, *keys)
-        keys.each_with_object({}) { |k, h| h[k] = hash[k] if hash.key?(k) }
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'mail/ses/version'
+require 'mail/ses/message_validator'
+require 'mail/ses/options_builder'
+
+module Mail
+  # Mail delivery method handler for AWS SES
+  class SES
+    RAW_EMAIL_ATTRS = %i[ from_email_address
+                          from_email_address_identity_arn
+                          feedback_forwarding_email_address
+                          feedback_forwarding_email_address_identity_arn
+                          email_tags
+                          configuration_set_name ].freeze
+
+    attr_accessor :settings
+    attr_reader :client
+
+    # Initializes the Mail::SES object.
+    #
+    # options - The Hash options (optional, default: {}):
+    #   :mail_options    - (Hash) Default AWS options to set on each mail object.
+    #   :error_handler   - (Proc<Error, Hash>) Handler for AWS API errors.
+    #   :use_iam_profile - Shortcut to use AWS IAM instance profile.
+    #   All other options are passed-thru to Aws::SESV2::Client.
+    def initialize(options = {})
+      @mail_options = options.delete(:mail_options) || {}
+
+      @error_handler = options.delete(:error_handler)
+      raise ArgumentError.new(':error_handler must be a Proc') if @error_handler && !@error_handler.is_a?(Proc)
+
+      @settings = { return_response: options.delete(:return_response) }
+
+      options[:credentials] = Aws::InstanceProfileCredentials.new if options.delete(:use_iam_profile)
+      @client = Aws::SESV2::Client.new(options)
+    end
+
+    # Delivers a Mail::Message object via SES.
+    #
+    # message - The Mail::Message object to deliver (required).
+    # options - The Hash options which override any defaults set in :mail_options
+    #           in the initializer (optional, default: {}). Refer to
+    #           Aws::SESV2::Client#send_email
+    def deliver!(message, options = {})
+      MessageValidator.new(message).validate
+
+      options = @mail_options.merge(options || {})
+      send_options = OptionsBuilder.new(message, options).build
+
+      begin
+        response = client.send_email(send_options)
+        message.message_id = "#{response.to_h[:message_id]}@email.amazonses.com"
+        settings[:return_response] ? response : self
+      rescue StandardError => e
+        handle_error(e, send_options)
+      end
+    end
+
+    private
+
+    def handle_error(error, send_options)
+      raise(error) unless @error_handler
+
+      @error_handler.call(error, send_options.dup)
+    end
+  end
+end

data/lib/mail-ses.rb

@@ -1,4 +1,5 @@
-# frozen_string_literal: true
-require 'aws-sdk-ses'
-require 'mail'
-require 'mail/ses'
+# frozen_string_literal: true
+
+require 'aws-sdk-sesv2'
+require 'mail'
+require 'mail/ses'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mail-ses
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.1
 platform: ruby
 authors:
 - Johnny Shields
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-18 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-ses
+  name: aws-sdk-sesv2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.27'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.5
+- !ruby/object:Gem::Dependency
+  name: net-smtp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.0
+        version: 1.30.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.0
+        version: 1.30.1
 description: Ruby Mail delivery method handler for Amazon SES
 email: info@tablecheck.com
 executables: []
@@ -89,16 +117,17 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-- VERSION
 - lib/mail-ses.rb
 - lib/mail/ses.rb
-- spec/mail_ses_spec.rb
-- spec/spec_helper.rb
+- lib/mail/ses/message_validator.rb
+- lib/mail/ses/options_builder.rb
+- lib/mail/ses/version.rb
 homepage: https://github.com/tablecheck/mail-ses
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,18 +135,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.3.13
+signing_key:
 specification_version: 4
 summary: Ruby Mail delivery method handler for Amazon SES
-test_files:
-- spec/mail_ses_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/VERSION

@@ -1 +0,0 @@
-0.1.1

data/spec/mail_ses_spec.rb

@@ -1,167 +0,0 @@
-# frozen_string_literal: true
-require 'spec_helper'
-
-RSpec.describe Mail::SES do
-  let(:ses_options) { { stub_responses: true } }
-
-  let(:ses) do
-    described_class.new(ses_options)
-  end
-
-  let(:mail) do
-    Mail.new do
-      from 'from@abc.com'
-      to %w[to1@def.com to2@xyz.com]
-      cc %w[cc1@xyz.com cc2@def.com]
-      bcc %w[bcc1@abc.com bcc2@def.com]
-      body 'This is the body'
-    end
-  end
-
-  describe '::VERSION' do
-    it { expect(described_class::VERSION).to match(/\A\d+\.\d+\.\d+/) }
-  end
-
-  describe '#initialize' do
-    it 'accepts valid :error_handler' do
-      expect(described_class.new(ses_options)).to be_a(Mail::SES)
-    end
-
-    it 'accepts valid :error_handler' do
-      expect(described_class.new(ses_options.merge(error_handler: ->(a, b) {}))).to be_a(Mail::SES)
-    end
-
-    it 'rejects invalid :error_handler' do
-      expect { described_class.new(ses_options.merge(error_handler: 'foobar')) }.to raise_error(ArgumentError, ':error_handler must be a Proc')
-    end
-
-    it 'handles :use_iam_profile option' do
-      allow_any_instance_of(Aws::InstanceProfileCredentials).to receive(:get_credentials).and_return('{}')
-      ses = described_class.new(ses_options.merge(use_iam_profile: true))
-      expect(ses.client.config.credentials).to be_a(Aws::InstanceProfileCredentials)
-    end
-
-    it 'passes through options to AWS' do
-      ses = described_class.new(ses_options.merge(log_level: :debug, retry_limit: 5))
-      expect(ses.client.config.log_level).to eq :debug
-      expect(ses.client.config.retry_limit).to eq 5
-    end
-  end
-
-  describe '#deliver!' do
-    it 'validates that mail is a Mail' do
-      expect { ses.deliver!(foo: :bar) }.to raise_error(ArgumentError, 'mail must be an instance of Mail::Message class')
-    end
-
-    it 'validates integrity of Mail' do
-      expect { ses.deliver!(Mail.new) }.to raise_error(ArgumentError, 'SMTP From address may not be blank: nil')
-      expect { ses.deliver!(Mail.new { from 'foo@bar.com' }) }.to raise_error(ArgumentError, 'SMTP To address may not be blank: []')
-    end
-
-    it 'validates attachment without body' do
-      mail.body = nil
-      mail.add_file __FILE__
-      expect { ses.deliver!(mail) }.to raise_error(ArgumentError, 'Attachment provided without message body')
-    end
-
-    context 'when options set' do
-      before { allow(mail).to receive(:to_s).and_return('Fixed message body') }
-      let(:ses_options) { { stub_responses: true, mail_options: { source: 'foo@bar.com', source_arn: 'sa1' } } }
-
-      let(:exp) do
-        {
-          source: 'foo@bar.com',
-          source_arn: 'sa2',
-          destinations: %w[to1@def.com to2@xyz.com cc1@xyz.com cc2@def.com bcc1@abc.com bcc2@def.com],
-          raw_message: {
-            data: 'Fixed message body'
-          }
-        }
-      end
-
-      it 'allows pass-thru and override of default options' do
-        expect(ses.client).to receive(:send_raw_email).with(exp)
-        ses.deliver!(mail, source_arn: 'sa2')
-      end
-    end
-
-    it 'sets mail.message_id' do
-      ses.deliver!(mail)
-      expect(mail.message_id).to eq('MessageId@email.amazonses.com')
-    end
-
-    it 'returns the AWS response' do
-      expect(ses.deliver!(mail)).to be_a(Seahorse::Client::Response)
-    end
-
-    context 'error handling' do
-      before { allow_any_instance_of(Aws::SES::Client).to receive(:send_raw_email).and_raise(RuntimeError.new('test')) }
-
-      context 'when :error_handler not set' do
-        it 'raises the error' do
-          expect { ses.deliver!(mail) }.to raise_error(RuntimeError, 'test')
-        end
-      end
-
-      context 'when :error_handler set' do
-        let(:ses_options) { { stub_responses: true, error_handler: ->(a, b) {} } }
-
-        it 'calls the error handler' do
-          expect(ses_options[:error_handler]).to receive(:call).and_call_original
-          ses.deliver!(mail)
-        end
-      end
-    end
-  end
-
-  describe '::build_raw_email_options' do
-    let(:options) { {} }
-    subject { described_class.build_raw_email_options(mail, options) }
-    before { allow(mail).to receive(:to_s).and_return('Fixed message body') }
-
-    context 'without options' do
-      let(:exp) do
-        {
-          source: 'from@abc.com',
-          destinations: %w[to1@def.com to2@xyz.com cc1@xyz.com cc2@def.com bcc1@abc.com bcc2@def.com],
-          raw_message: {
-            data: 'Fixed message body'
-          }
-        }
-      end
-
-      it { expect(subject).to eq(exp) }
-    end
-
-    context 'with options' do
-      let(:options) do
-        { source: 'source@source.com',
-          source_arn: 'source_arn',
-          from_arn: 'from_arn',
-          return_path_arn: 'return_path_arn',
-          tags: [{ name: 'Name', value: 'Value' }],
-          configuration_set_name: 'configuration_set_name',
-          other: 'other' }
-      end
-
-      let(:exp) do
-        {
-          source: 'source@source.com',
-          source_arn: 'source_arn',
-          from_arn: 'from_arn',
-          return_path_arn: 'return_path_arn',
-          tags: [
-            { name: 'Name', value: 'Value' }
-          ],
-          configuration_set_name: 'configuration_set_name',
-          destinations: %w[to1@def.com to2@xyz.com cc1@xyz.com cc2@def.com bcc1@abc.com bcc2@def.com],
-          raw_message: {
-            data: 'Fixed message body'
-          }
-        }
-      end
-
-      it { expect(subject).to eq(exp) }
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-require 'rubygems'
-require 'bundler/setup'
-require 'rspec'
-
-Bundler.setup
-
-require 'mail-ses'
-
-RSpec.configure do |config|
-  config.disable_monkey_patching!
-
-  config.default_formatter = 'doc' if config.files_to_run.one?
-
-  config.order = :random
-
-  Kernel.srand config.seed
-end