sendgrid_actionmailer_adapter 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d38361de9e37da89fda355531df6a6eeb9b4918
-  data.tar.gz: 6484a052301a6f940e0ca129b2a994e2c30fb2a4
+  metadata.gz: ee79cf7cc71fee2d3bd2212d2bfb1221d9629d90
+  data.tar.gz: f35a57e974388b72188ae92d9dd168763a662a6c
 SHA512:
-  metadata.gz: f5fbe19d6d53ffb020a1d5fb9cfe464368aebf17ba062de71752022b0d0dc601d3f96a0a969b4ff57b726417da9368e68fa11473d2ab1f1f527aac28aa170b84
-  data.tar.gz: a940aeb57e9755646c88463f2647efefdfcb5cf7e98f3d052730233be54a0aa966439d72c6bc641199d4963da16e10e8cdbba571fc36798989de21c5b083b41a
+  metadata.gz: c37de30e3e2b91fb8cac5860bda517d44eea91eb04d60403ed6af2b3652a6fcb3b003aaafb6bf4550287c6bb115d5d8ad2e22b18d83e68f608a32c2706292585
+  data.tar.gz: d82abaf00a36eec76085fe8df9db0311634dd89ec49df7a799be08b55a13bd04bc1018ee6258775b5609854ffeaaab89e6ceb4930134371bfe03ddc180016b20

data/lib/sendgrid_actionmailer_adapter/converter.rb

@@ -1,67 +1,29 @@
 # frozen_string_literal: true
 
-require 'base64'
-require 'mail'
 require 'sendgrid-ruby'
 require_relative 'errors'
+require_relative 'converters/subject'
+require_relative 'converters/from'
+require_relative 'converters/personalizations'
+require_relative 'converters/attachments'
+require_relative 'converters/contents'
+require_relative 'converters/categories'
+require_relative 'converters/send_at'
+require_relative 'converters/reply_to'
 
 module SendGridActionMailerAdapter
   class Converter
-    VALIDATORS = [
-      ->(mail) { "'from' is required." if mail.from_addrs.empty? },
-      ->(mail) { "'to_addrs' must not be empty." if mail.to_addrs.empty? },
-      ->(mail) { "'subject' is required." if mail.subject.nil? || mail.subject.empty? },
+    CONVERTERS = [
+      ::SendGridActionMailerAdapter::Converters::From.new,
+      ::SendGridActionMailerAdapter::Converters::Subject.new,
+      ::SendGridActionMailerAdapter::Converters::Personalizations.new,
+      ::SendGridActionMailerAdapter::Converters::Attachments.new,
+      ::SendGridActionMailerAdapter::Converters::Contents.new,
+      ::SendGridActionMailerAdapter::Converters::Categories.new,
+      ::SendGridActionMailerAdapter::Converters::SendAt.new,
+      ::SendGridActionMailerAdapter::Converters::ReplyTo.new,
     ].freeze
 
-    CONVERTERS = {
-      from: ->(mail) {
-        addr = mail[:from].addrs.first
-        ::SendGrid::Email.new(email: addr.address, name: addr.display_name)
-      },
-      subject: ->(mail) { mail.subject },
-      personalizations: ->(mail) {
-        # Separate emails per each To address.
-        # Cc and Bcc addresses are shared with each emails.
-        mail[:to].addrs.map do |to_addr|
-          ::SendGrid::Personalization.new.tap do |p|
-            p.to = ::SendGrid::Email.new(email: to_addr.address, name: to_addr.display_name)
-            Array(mail[:cc]&.addrs).each do |addr|
-              p.cc = ::SendGrid::Email.new(email: addr.address, name: addr.display_name)
-            end
-            Array(mail[:bcc]&.addrs).each do |addr|
-              p.bcc = ::SendGrid::Email.new(email: addr.address, name: addr.display_name)
-            end
-          end
-        end
-      },
-      contents: ->(mail) {
-        ::SendGrid::Content.new(type: mail.mime_type, value: mail.body.to_s)
-      },
-      attachments: ->(mail) {
-        mail.attachments.map do |attachment|
-          ::SendGrid::Attachment.new.tap do |sendgrid_attachment|
-            sendgrid_attachment.type = attachment.mime_type
-            sendgrid_attachment.content = ::Base64.strict_encode64(attachment.body.raw_source)
-            sendgrid_attachment.filename = ::Mail::Encodings.decode_encode(
-              attachment.content_type_parameters['filename'], :decode
-            )
-            sendgrid_attachment.content_id = attachment.cid
-          end
-        end
-      },
-      categories: ->(mail) {
-        return nil if mail['categories'].nil?
-        # FIXME: Separator ', ' is dependant on Mail::UnstructuredField implementation,
-        # this may occur unexpected behaviour on 'mail' gem update.
-        mail['categories'].value.split(', ').map { |c| ::SendGrid::Category.new(name: c) }
-      },
-      send_at: ->(mail) { mail['send_at'].value.to_i if mail['send_at'] },
-      reply_to: ->(mail) {
-        addr = mail[:reply_to]&.addrs&.first
-        ::SendGrid::Email.new(email: addr.address, name: addr.display_name) if addr
-      },
-    }.freeze
-
     class << self
       # Convert Mail::Message to SendGrid::Mail.
       #
@@ -76,18 +38,18 @@ module SendGridActionMailerAdapter
       private
 
       def validate!(mail)
-        error_messages = VALIDATORS.map { |validator| validator.call(mail) }.compact
+        error_messages = CONVERTERS.flat_map { |converter| converter.validate(mail) }.compact
         unless error_messages.empty?
-          raise SendGridActionMailerAdapter::ValidationError, "Validation error, #{error_messages}"
+          raise ::SendGridActionMailerAdapter::ValidationError,
+                "Validation error, #{error_messages}"
         end
       end
 
       def convert(mail)
         sendgrid_mail = ::SendGrid::Mail.new
-        CONVERTERS.each do |attr_name, converter|
-          Array(converter.call(mail)).each do |attr_val|
-            sendgrid_mail.send("#{attr_name}=", attr_val)
-          end
+        CONVERTERS.each do |converter|
+          result = converter.convert(mail)
+          converter.assign_attributes(sendgrid_mail, result)
         end
         sendgrid_mail
       end

data/lib/sendgrid_actionmailer_adapter/converters/attachments.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'mail'
+require 'base64'
+require 'sendgrid-ruby'
+
+module SendGridActionMailerAdapter
+  module Converters
+    class Attachments
+      def validate(_mail)
+      end
+
+      def convert(mail)
+        mail.attachments.map do |attachment|
+          ::SendGrid::Attachment.new.tap do |sendgrid_attachment|
+            sendgrid_attachment.type = attachment.mime_type
+            sendgrid_attachment.content = ::Base64.strict_encode64(attachment.body.raw_source)
+            sendgrid_attachment.filename = ::Mail::Encodings.decode_encode(
+              attachment.content_type_parameters['filename'], :decode
+            )
+            sendgrid_attachment.content_id = attachment.cid
+          end
+        end
+      end
+
+      def assign_attributes(sendgrid_mail, value)
+        Array(value).each do |attachment|
+          sendgrid_mail.add_attachment(attachment)
+        end
+      end
+    end
+  end
+end

data/lib/sendgrid_actionmailer_adapter/converters/categories.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'sendgrid-ruby'
+
+module SendGridActionMailerAdapter
+  module Converters
+    class Categories
+      def validate(_mail)
+      end
+
+      def convert(mail)
+        categories_str = mail['categories']&.value
+        return if categories_str.nil? || categories_str.empty?
+        categories_str.split(', ').map { |c| ::SendGrid::Category.new(name: c) }
+      end
+
+      def assign_attributes(sendgrid_mail, value)
+        Array(value).each do |category|
+          sendgrid_mail.add_category(category)
+        end
+      end
+    end
+  end
+end

data/lib/sendgrid_actionmailer_adapter/converters/contents.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'sendgrid-ruby'
+
+module SendGridActionMailerAdapter
+  module Converters
+    class Contents
+      def validate(_mail)
+      end
+
+      def convert(mail)
+        ::SendGrid::Content.new(type: mail.mime_type, value: mail.body.to_s)
+      end
+
+      def assign_attributes(sendgrid_mail, value)
+        Array(value).each do |content|
+          sendgrid_mail.add_content(content)
+        end
+      end
+    end
+  end
+end

data/lib/sendgrid_actionmailer_adapter/converters/from.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'sendgrid-ruby'
+
+module SendGridActionMailerAdapter
+  module Converters
+    class From
+      def validate(mail)
+        error_messages = []
+        if mail.from_addrs.empty?
+          error_messages << "'from' is required."
+        end
+        error_messages
+      end
+
+      def convert(mail)
+        addr = mail[:from].addrs.first
+        ::SendGrid::Email.new(email: addr.address, name: addr.display_name)
+      end
+
+      def assign_attributes(sendgrid_mail, value)
+        sendgrid_mail.from = value
+      end
+    end
+  end
+end

data/lib/sendgrid_actionmailer_adapter/converters/personalizations.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'sendgrid-ruby'
+
+module SendGridActionMailerAdapter
+  module Converters
+    class Personalizations
+      def validate(mail)
+        error_messages = []
+        if mail.to_addrs.empty?
+          error_messages << "'to_addrs' must not be empty."
+        end
+        error_messages
+      end
+
+      def convert(mail)
+        # Separate emails per each To address.
+        # Cc and Bcc addresses are shared with each emails.
+        cc_addrs = mail[:cc]&.addrs
+        bcc_addrs = mail[:bcc]&.addrs
+        mail[:to].addrs.map do |to_addr|
+          to_personalization(to_addr, cc_addrs, bcc_addrs)
+        end
+      end
+
+      def assign_attributes(sendgrid_mail, value)
+        Array(value).each do |personalization|
+          sendgrid_mail.add_personalization(personalization)
+        end
+      end
+
+      private
+
+      def to_personalization(to_addr, cc_addrs, bcc_addrs)
+        ::SendGrid::Personalization.new.tap do |p|
+          p.add_to(::SendGrid::Email.new(email: to_addr.address, name: to_addr.display_name))
+          Array(cc_addrs).each do |addr|
+            p.add_cc(::SendGrid::Email.new(email: addr.address, name: addr.display_name))
+          end
+          Array(bcc_addrs).each do |addr|
+            p.add_bcc(::SendGrid::Email.new(email: addr.address, name: addr.display_name))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sendgrid_actionmailer_adapter/converters/reply_to.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'sendgrid-ruby'
+
+module SendGridActionMailerAdapter
+  module Converters
+    class ReplyTo
+      def validate(_mail)
+      end
+
+      def convert(mail)
+        addr = mail[:reply_to]&.addrs&.first
+        return if addr.nil?
+        ::SendGrid::Email.new(email: addr.address, name: addr.display_name)
+      end
+
+      def assign_attributes(sendgrid_mail, value)
+        sendgrid_mail.reply_to = value
+      end
+    end
+  end
+end

data/lib/sendgrid_actionmailer_adapter/converters/send_at.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'sendgrid-ruby'
+
+module SendGridActionMailerAdapter
+  module Converters
+    class SendAt
+      def validate(_mail)
+      end
+
+      def convert(mail)
+        send_at_str = mail['send_at']&.value
+        return if send_at_str.nil? || send_at_str.empty?
+        send_at_str.to_i
+      end
+
+      def assign_attributes(sendgrid_mail, value)
+        sendgrid_mail.send_at = value
+      end
+    end
+  end
+end

data/lib/sendgrid_actionmailer_adapter/converters/subject.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module SendGridActionMailerAdapter
+  module Converters
+    class Subject
+      def validate(mail)
+        error_messages = []
+        if mail.subject.nil? || mail.subject.empty?
+          error_messages << "'subject' is required."
+        end
+        error_messages
+      end
+
+      def convert(mail)
+        mail.subject
+      end
+
+      def assign_attributes(sendgrid_mail, value)
+        sendgrid_mail.subject = value
+      end
+    end
+  end
+end

data/lib/sendgrid_actionmailer_adapter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SendGridActionMailerAdapter
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid_actionmailer_adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - ryu39
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sendgrid-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,47 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: ryu39cop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.49.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.49.1.0
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,14 @@ files:
 - lib/sendgrid_actionmailer_adapter.rb
 - lib/sendgrid_actionmailer_adapter/configuration.rb
 - lib/sendgrid_actionmailer_adapter/converter.rb
+- lib/sendgrid_actionmailer_adapter/converters/attachments.rb
+- lib/sendgrid_actionmailer_adapter/converters/categories.rb
+- lib/sendgrid_actionmailer_adapter/converters/contents.rb
+- lib/sendgrid_actionmailer_adapter/converters/from.rb
+- lib/sendgrid_actionmailer_adapter/converters/personalizations.rb
+- lib/sendgrid_actionmailer_adapter/converters/reply_to.rb
+- lib/sendgrid_actionmailer_adapter/converters/send_at.rb
+- lib/sendgrid_actionmailer_adapter/converters/subject.rb
 - lib/sendgrid_actionmailer_adapter/delivery_method.rb
 - lib/sendgrid_actionmailer_adapter/errors.rb
 - lib/sendgrid_actionmailer_adapter/version.rb