mailtrap 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd604b5702f48dbaa0cf3fb294c3d000af11891ca3e0d6453af0763c1aa0abd4
-  data.tar.gz: 66baa71b1a5cb26cbd4012f6b6a4ab10fd585850f93792ffc9b2776bde9019ae
+  metadata.gz: e4f1415f049fa2132b1716a70d48c1e6fd5650d4fa263b15fe2339c024053abd
+  data.tar.gz: e6a299b5d04aeeb2ed80c0b47bf3f1177d5934ef214d0499a9c8d4c8f17a5f7c
 SHA512:
-  metadata.gz: 853e6421d2d5d3c02bd0b090b4810383b5b30e6b8bfc178379ea602e56eb44ba1b298a2bb8e87575abfd0a37bc110a5bb8c8d14ca78d3c75729974cf389b2fd6
-  data.tar.gz: b9ca3ed482f8077a35151237a6078ef88ce2cdc58f1f097f72730f6fe71eb7367235559ebbbeba24b1622a06af10f31c728deb93ee6ef4207d6091543e5944bb
+  metadata.gz: b594f448ac1fee0581ebac86107572e69c7f77ec8acc558671977e1301b762bedb3e962514485cfba87089c5587c63475dd57e5744c2c6225da58a36525f3bad
+  data.tar.gz: 94692a8b8a05646ddf49f92a13cfb630ed5e79176bed7f7b48f2f914b092becfd422ba21c38c5dddb6e802261d235c6e8ac2f2cdb190a0e3bc4c1d6339156b72

data/.rubocop.yml

@@ -3,6 +3,8 @@ require: rubocop-rspec
 AllCops:
   TargetRubyVersion: 2.7
   NewCops: enable
+  Exclude:
+    - 'gemfiles/**/*'
 
 Layout/LineLength:
   Max: 120

data/Appraisals

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+appraise 'mail-2.7' do
+  gem 'mail', '~> 2.7.0'
+end
+
+appraise 'mail-2.8' do
+  gem 'mail', '~> 2.8.0'
+end

data/CHANGELOG.md

@@ -10,3 +10,15 @@
 ## [1.1.0] - 2022-07-22
 
 - Add ActionMailer support
+
+## [1.1.1] - 2022-10-14
+
+- Fix custom port and host usage
+
+## [1.2.0] - 2023-01-27
+
+- Breaking changes:
+  - move `Mailtrap::Sending::Mail` class to `Mailtrap::Mail::Base`
+  - move `Mailtrap::Sending::Convert` to `Mailtrap::Mail`
+- Add mail gem 2.8 support
+- Add email template support

data/Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'appraisal'
 gem 'mail'
 gem 'net-smtp'
 gem 'rake', '~> 13.0'

data/Gemfile.lock

@@ -1,13 +1,17 @@
 PATH
   remote: .
   specs:
-    mailtrap (1.1.0)
+    mailtrap (1.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
     ast (2.4.2)
     crack (0.4.5)
       rexml
@@ -55,6 +59,7 @@ GEM
     rubocop-rspec (2.11.1)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
+    thor (1.2.1)
     unicode-display_width (2.1.0)
     vcr (6.1.0)
     webmock (3.14.0)
@@ -66,6 +71,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  appraisal
   mail
   mailtrap!
   net-smtp

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Railsware Products Studio, Inc.
+Copyright (c) 2022 Railsware Products Studio LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -30,7 +30,7 @@ Or install it yourself as:
 require 'mailtrap'
 
 # create mail object
-mail = Mailtrap::Sending::Mail.new(
+mail = Mailtrap::Mail::Base.new(
   from: { email: 'mailtrap@example.com', name: 'Mailtrap Test' },
   to: [
     { email: 'your@email.com' }
@@ -50,7 +50,7 @@ client.send(mail)
 require 'mailtrap'
 require 'base64'
 
-mail = Mailtrap::Sending::Mail.new(
+mail = Mailtrap::Mail::Base.new(
   from: { email: 'mailtrap@example.com', name: 'Mailtrap Test' },
   to: [
     { email: 'your@email.com', name: 'Your name' }
@@ -87,6 +87,28 @@ client = Mailtrap::Sending::Client.new(api_key: 'your-api-key')
 client.send(mail)
 ```
 
+### Using email template
+
+```ruby
+require 'mailtrap'
+
+# create mail object
+mail = Mailtrap::Mail::FromTemplate.new(
+  from: { email: 'mailtrap@example.com', name: 'Mailtrap Test' },
+  to: [
+    { email: 'your@email.com' }
+  ],
+  template_uuid: '2f45b0aa-bbed-432f-95e4-e145e1965ba2',
+  template_variables: {
+    'user_name' => 'John Doe'
+  }
+)
+
+# create client and send
+client = Mailtrap::Sending::Client.new(api_key: 'your-api-key')
+client.send(mail)
+```
+
 ### ActionMailer
 
 This gem also adds ActionMailer delivery method. To configure it, add following to your ActionMailer configuration (in Rails projects located in `config/$ENVIRONMENT.rb`):

data/lib/mailtrap/action_mailer/delivery_method.rb

@@ -10,7 +10,7 @@ module Mailtrap
       end
 
       def deliver!(message)
-        mail = Mailtrap::Sending::Convert.from_message(message)
+        mail = Mailtrap::Mail.from_message(message)
 
         client.send(mail)
       end

data/lib/mailtrap/{sending/mail.rb → mail/base.rb}

@@ -3,9 +3,9 @@
 require 'json'
 
 module Mailtrap
-  module Sending
-    class Mail
-      attr_accessor :from, :to, :cc, :bcc, :subject, :text, :html, :headers, :category, :custom_variables
+  module Mail
+    class Base
+      attr_accessor :from, :to, :cc, :bcc, :headers, :custom_variables, :subject, :text, :html, :category
       attr_reader :attachments
 
       def initialize( # rubocop:disable Metrics/ParameterLists, Metrics/MethodLength
@@ -18,8 +18,8 @@ module Mailtrap
         html: nil,
         attachments: [],
         headers: {},
-        category: nil,
-        custom_variables: {}
+        custom_variables: {},
+        category: nil
       )
         @from = from
         @to = to
@@ -30,24 +30,24 @@ module Mailtrap
         @html = html
         self.attachments = attachments
         @headers = headers
-        @category = category
         @custom_variables = custom_variables
+        @category = category
       end
 
       def as_json # rubocop:disable Metrics/MethodLength
         {
-          'to' => to,
           'from' => from,
+          'to' => to,
           'cc' => cc,
           'bcc' => bcc,
           'subject' => subject,
-          'html' => html,
           'text' => text,
+          'html' => html,
           'attachments' => attachments.map(&:as_json),
           # TODO: update headers and custom_variables with as_json method
           'headers' => headers,
-          'category' => category,
-          'custom_variables' => custom_variables
+          'custom_variables' => custom_variables,
+          'category' => category
         }.compact
       end
 

data/lib/mailtrap/mail/from_template.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Mailtrap
+  module Mail
+    class FromTemplate < Base
+      attr_accessor :template_uuid, :template_variables
+
+      def initialize( # rubocop:disable Metrics/ParameterLists, Metrics/MethodLength
+        from: nil,
+        to: [],
+        cc: [],
+        bcc: [],
+        attachments: [],
+        headers: {},
+        custom_variables: {},
+        template_uuid: nil,
+        template_variables: {}
+      )
+        super(
+          from: from,
+          to: to,
+          cc: cc,
+          bcc: bcc,
+          attachments: attachments,
+          headers: headers,
+          custom_variables: custom_variables
+        )
+        @template_uuid = template_uuid
+        @template_variables = template_variables
+      end
+
+      def as_json
+        super.merge(
+          {
+            'template_uuid' => template_uuid,
+            'template_variables' => template_variables
+          }
+        ).compact
+      end
+    end
+  end
+end

data/lib/mailtrap/mail.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'base64'
+
+require_relative 'mail/base'
+require_relative 'mail/from_template'
+
+module Mailtrap
+  module Mail
+    class << self
+      def from_message(message) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
+        Mailtrap::Mail::Base.new(
+          from: prepare_address(address_list(message['from'])&.addresses&.first),
+          to: prepare_addresses(address_list(message['to'])&.addresses),
+          cc: prepare_addresses(address_list(message['cc'])&.addresses),
+          bcc: prepare_addresses(address_list(message['bcc'])&.addresses),
+          subject: message.subject,
+          text: prepare_text_part(message),
+          html: prepare_html_part(message),
+          headers: prepare_headers(message),
+          attachments: prepare_attachments(message.attachments),
+          category: message['category']&.unparsed_value,
+          custom_variables: message['custom_variables']&.unparsed_value
+        )
+      end
+
+      private
+
+      PROCESSED_HEADERS = %w[
+        from
+        to
+        cc
+        bcc
+        subject
+        category
+        customvariables
+        contenttype
+      ].freeze
+
+      def address_list(header)
+        header.respond_to?(:element) ? header.element : header&.address_list
+      end
+
+      def prepare_addresses(addresses)
+        Array(addresses).map { |address| prepare_address(address) }
+      end
+
+      def prepare_headers(message)
+        message
+          .header_fields
+          .reject { |header| PROCESSED_HEADERS.include?(header.name.downcase.delete('-')) }
+          .to_h { |header| [header.name, header.value] }
+          .compact
+      end
+
+      def prepare_address(address)
+        {
+          email: address.address,
+          name: address.display_name
+        }.compact
+      end
+
+      def prepare_attachments(attachments_list = [])
+        attachments_list.map do |attachment|
+          {
+            content: Base64.strict_encode64(attachment.body.decoded),
+            type: attachment.mime_type,
+            filename: attachment.filename,
+            disposition: attachment.header[:content_disposition]&.disposition_type,
+            content_id: attachment&.cid
+          }.compact
+        end
+      end
+
+      def prepare_html_part(message)
+        return message.body.decoded if message.mime_type == 'text/html'
+
+        message.html_part&.decoded
+      end
+
+      def prepare_text_part(message)
+        return message.body.decoded if message.mime_type == 'text/plain' || message.mime_type.nil?
+
+        message.text_part&.decoded
+      end
+    end
+  end
+end

data/lib/mailtrap/sending/client.rb

@@ -19,7 +19,7 @@ module Mailtrap
       end
 
       def send(mail)
-        raise ArgumentError, 'should be Mailtrap::Sending::Mail object' unless mail.is_a? Mailtrap::Sending::Mail
+        raise ArgumentError, 'should be Mailtrap::Mail::Base object' unless mail.is_a? Mail::Base
 
         request = post_request('/api/send', mail.to_json)
         response = http_client.request(request)
@@ -30,7 +30,7 @@ module Mailtrap
       private
 
       def http_client
-        @http_client ||= Net::HTTP.new(API_HOST, API_PORT).tap { |client| client.use_ssl = true }
+        @http_client ||= Net::HTTP.new(api_host, api_port).tap { |client| client.use_ssl = true }
       end
 
       def post_request(path, body)

data/lib/mailtrap/sending.rb

@@ -2,8 +2,6 @@
 
 require_relative 'sending/attachment'
 require_relative 'sending/client'
-require_relative 'sending/convert'
-require_relative 'sending/mail'
 
 module Mailtrap
   module Sending

data/lib/mailtrap/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mailtrap
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/mailtrap.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'mailtrap/action_mailer' if defined? ActionMailer
+require_relative 'mailtrap/mail'
 require_relative 'mailtrap/sending'
 require_relative 'mailtrap/version'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailtrap
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
-- Railsware Products Studio, Inc.
-autorequire: 
+- Railsware Products Studio LLC
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2023-01-31 00:00:00.000000000 Z
 dependencies: []
 description: Official mailtrap.io API client
 email:
@@ -20,6 +20,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
+- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -31,13 +32,13 @@ files:
 - lib/mailtrap/action_mailer.rb
 - lib/mailtrap/action_mailer/delivery_method.rb
 - lib/mailtrap/action_mailer/railtie.rb
+- lib/mailtrap/mail.rb
+- lib/mailtrap/mail/base.rb
+- lib/mailtrap/mail/from_template.rb
 - lib/mailtrap/sending.rb
 - lib/mailtrap/sending/attachment.rb
 - lib/mailtrap/sending/client.rb
-- lib/mailtrap/sending/convert.rb
-- lib/mailtrap/sending/mail.rb
 - lib/mailtrap/version.rb
-- mailtrap.gemspec
 homepage: https://github.com/railsware/mailtrap-ruby
 licenses:
 - MIT
@@ -46,7 +47,7 @@ metadata:
   source_code_uri: https://github.com/railsware/mailtrap-ruby
   changelog_uri: https://github.com/railsware/mailtrap-ruby/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -62,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Official mailtrap.io API client
 test_files: []

data/lib/mailtrap/sending/convert.rb

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-require 'base64'
-
-module Mailtrap
-  module Sending
-    module Convert
-      class << self
-        def from_message(message) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-          Mailtrap::Sending::Mail.new(
-            from: prepare_address(message['from']&.address_list&.addresses&.first),
-            to: prepare_addresses(message['to']&.address_list&.addresses),
-            cc: prepare_addresses(message['cc']&.address_list&.addresses),
-            bcc: prepare_addresses(message['bcc']&.address_list&.addresses),
-            subject: message.subject,
-            text: prepare_text_part(message),
-            html: prepare_html_part(message),
-            headers: prepare_headers(message),
-            attachments: prepare_attachments(message.attachments),
-            category: message['category']&.unparsed_value,
-            custom_variables: message['custom_variables']&.unparsed_value
-          )
-        end
-
-        private
-
-        PROCESSED_HEADERS = %w[
-          from
-          to
-          cc
-          bcc
-          subject
-          category
-          customvariables
-          contenttype
-        ].freeze
-
-        def prepare_addresses(addresses)
-          Array(addresses).map { |address| prepare_address(address) }
-        end
-
-        def prepare_headers(message)
-          message
-            .header_fields
-            .reject { |header| PROCESSED_HEADERS.include?(header.name.downcase.delete('-')) }
-            .to_h { |header| [header.name, header.value] }
-            .compact
-        end
-
-        def prepare_address(address)
-          {
-            email: address.address,
-            name: address.display_name
-          }.compact
-        end
-
-        def prepare_attachments(attachments_list = [])
-          attachments_list.map do |attachment|
-            {
-              content: Base64.strict_encode64(attachment.body.decoded),
-              type: attachment.mime_type,
-              filename: attachment.filename,
-              disposition: attachment.header[:content_disposition]&.disposition_type,
-              content_id: attachment.header[:content_id]&.field&.content_id
-            }.compact
-          end
-        end
-
-        def prepare_html_part(message)
-          return message.body.decoded if message.mime_type == 'text/html'
-
-          message.html_part&.decoded
-        end
-
-        def prepare_text_part(message)
-          return message.body.decoded if message.mime_type == 'text/plain' || message.mime_type.nil?
-
-          message.text_part&.decoded
-        end
-      end
-    end
-  end
-end

data/mailtrap.gemspec

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'lib/mailtrap/version'
-
-Gem::Specification.new do |spec|
-  spec.name = 'mailtrap'
-  spec.version = Mailtrap::VERSION
-  spec.authors = ['Railsware Products Studio, Inc.']
-  spec.email = ['support@mailtrap.io']
-
-  spec.summary = 'Official mailtrap.io API client'
-  spec.description = 'Official mailtrap.io API client'
-  spec.homepage = 'https://github.com/railsware/mailtrap-ruby'
-  spec.license = 'MIT'
-  spec.required_ruby_version = '>= 2.7.0'
-
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/railsware/mailtrap-ruby'
-  spec.metadata['changelog_uri'] = 'https://github.com/railsware/mailtrap-ruby/blob/main/CHANGELOG.md'
-  spec.metadata['rubygems_mfa_required'] = 'true'
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|github|travis|circleci)|appveyor)})
-    end
-  end
-  spec.require_paths = ['lib']
-end