dm_courier 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b8943c2c5c0940d2bd7682f47f6c0a28e990a95
-  data.tar.gz: 770b51e01c169f6d68d7144d53dff1e5f6eac861
+  metadata.gz: 6b8269252a4a2061684ca025fb7b4d50f26b2efa
+  data.tar.gz: c79802dd3c0616b5685e85a2e37db96e770a97d5
 SHA512:
-  metadata.gz: 5cae0696f9e1d6a629eb7723bd4f8dd992b0b3edf0ff803065fcd8f032aa5de9f56d7b7eacde1b180ebc8b3c7e169ace7ddf9faadeb2e54fa5c27ab53f8494df
-  data.tar.gz: 78365d346b2c0d932d3df221edc56bde790f848afe0606e32e0dd3234628ce22c74c488009a7e682bbe6b6d08a1fe283d9c77829ddea859fc0d9e1a421d91a94
+  metadata.gz: 29d8d0e630c7710ccae8417f752f7adc81c01d4b591cfcd1cb3647203a6e2154b5c7eaa37a626242c289563535cd6685cf72786517808ae37ac4a543a443e02a
+  data.tar.gz: 01ce7c66c0a1197448f9d7f3147cc28e2d3e6bda09de06802c4f9a7e46b3324d73f79e9dc7bd53ce2c55ff8f7f7c38f18ac1fb2a3e6f85ccd5acfaa7f2905ca3

data/.travis.yml

@@ -9,7 +9,7 @@ notifications:
     on_failure: always
 addons:
   code_climate:
-    repo_token: e3eac13dabf5af3f7cd993b869ae5bce1cee735332537815badda3fd4ee2fc28
+    repo_token: 40f3b0db4e0b69a31588221de4aaca19db947e47c838f9eac9b6f4615cf92bab
 script:
 - bundle exec rubocop
 - bundle exec rake spec

data/README.md

@@ -7,8 +7,9 @@
 [![Test Coverage](https://codeclimate.com/github/sumoners/dm_courier/badges/coverage.svg)](https://codeclimate.com/github/sumoners/dm_courier/coverage)
 [![Code Climate](https://codeclimate.com/github/sumoners/dm_courier/badges/gpa.svg)](https://codeclimate.com/github/sumoners/dm_courier)
 
-Stick with just one Gem and be free to choose your email delivery service. Rails
-Courier allows you to change easily the deliery method anytime you want.
+Stick with just one Gem and be free to choose your email delivery service.  DM
+Courier (Delivery Method Courier) allows you to easily change the deliery method
+as you wish.
 
 ## Rails Setup
 
@@ -65,7 +66,7 @@ Option     | Mailer Support | Description
 `track_opens` | true | whether or not to turn on open tracking for the message<br />**Services:** mandrill, sparkpost
 `track_url_without_query_string` | true | whether or not to strip the query string from URLs when aggregating tracked URL data<br />**Services:** mandrill
 `log_content` | true  |  set to false to remove content logging for sensitive emails<br />**Services:** mandrill
-`bcc_address` | true  | an optional address to receive an exact copy of each recipient's email<br />**Services:** mandrill
+`bcc_address` | true  | an optional address to receive an exact copy of each recipient's email<br />**Services:** mandrill, sendgrid
 `return_path_domain` | true | a custom domain to use for the messages's return-path<br />**Services:** mandrill, sparkpost
 `signing_domain` | true | a custom domain to use for SPF/DKIM signing (for "via" or "on behalf of" in email clients)<br />**Services:** mandrill
 `subaccount` | true  | the unique id of a subaccount - must already exist or will fail with an error<br />**Services:** mandrill
@@ -87,6 +88,8 @@ service API. Because of that some options have different names:
 
 > TODO: Sparkpost service implementation does not support BCC emails yet.
 
+### SendGrid
+
 ## Development & Feedback
 
 Questions or problems? Please use the issue tracker. If you would like to

data/lib/dm_courier/service_locator.rb

@@ -1,5 +1,6 @@
 require "dm_courier/services/mandrill"
 require "dm_courier/services/sparkpost"
+require "dm_courier/services/sendgrid"
 
 module DMCourier
   module ServiceLocator

data/lib/dm_courier/services/sendgrid.rb

@@ -0,0 +1,79 @@
+require "sendgrid-ruby"
+require "base64"
+
+require "dm_courier/message_helper"
+
+module DMCourier
+  module Services
+    class Sendgrid
+      include DMCourier::Services::MessageHelper
+
+      attr_reader :api_key, :mail, :options
+
+      def initialize(mail, options = {})
+        @mail = mail
+        @api_key = options.fetch(:api_key)
+        @options = options
+      end
+
+      def name
+        :sendgrid
+      end
+
+      def deliver!
+        sendgrid_api = ::SendGrid::Client.new(api_key)
+        sendgrid_api.send(sendgrid_message)
+      end
+
+      def sendgrid_message
+        message = { to: (mail[:to].formatted if mail[:to]),
+                    cc: (mail[:cc].formatted if mail[:cc]),
+                    bcc: return_string_value(:bcc_address),
+                    from: from_email,
+                    from_name: from_name,
+                    subject: subject,
+                    html: html_part,
+                    text: text_part,
+                    reply_to: reply_to }
+
+        message[:attachments] = regular_attachments
+
+        ::SendGrid::Mail.new(message) do |mail|
+          inline_attachments.each do |attachment|
+            mail.contents << attachment
+          end
+        end
+      end
+
+      private
+
+      def reply_to
+        value = mail["Reply-To"] || options[:reply_to]
+        value.to_s if value
+      end
+
+      def regular_attachments
+        mail.attachments.map do |attachment|
+          next if attachment.inline?
+
+          { file: Faraday::UploadIO.new(StringIO.new(attachment.body.decoded),
+                                        attachment.mime_type,
+                                        attachment.filename),
+            name:  attachment.filename }
+        end.compact
+      end
+
+      def inline_attachments
+        mail.attachments.map do |attachment|
+          next unless attachment.inline?
+
+          { file: Faraday::UploadIO.new(StringIO.new(attachment.body.decoded),
+                                        attachment.mime_type,
+                                        attachment.filename),
+            cid: attachment.cid,
+            name:  attachment.filename }
+        end.compact
+      end
+    end
+  end
+end

data/lib/dm_courier/services/sparkpost.rb

@@ -91,7 +91,7 @@ module DMCourier
         attachments(inline: false).map do |attachment|
           { name: attachment[:name],
             type: attachment[:type],
-            content: attachment[:content] }
+            data: attachment[:content] }
         end
       end
 
@@ -99,7 +99,7 @@ module DMCourier
         attachments(inline: true).map do |attachment|
           { name: attachment[:name],
             type: attachment[:type],
-            content: attachment[:content] }
+            data: attachment[:content] }
         end
       end
     end

data/lib/dm_courier/version.rb

@@ -1,3 +1,3 @@
 module DMCourier
-  VERSION = "0.1.1".freeze
+  VERSION = "0.1.2".freeze
 end

data/rails_courier.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mandrill-api", "~> 1.0.53"
   spec.add_dependency "sparkpost", "~> 0.1.2"
+  spec.add_dependency "sendgrid-ruby", "~> 1.1.6"
   spec.add_dependency "http", "0.9.8"
 
   spec.add_development_dependency "codeclimate-test-reporter", "~> 0.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dm_courier
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jaison Erick
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mandrill-api
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: sendgrid-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.6
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +204,7 @@ files:
 - lib/dm_courier/railtie.rb
 - lib/dm_courier/service_locator.rb
 - lib/dm_courier/services/mandrill.rb
+- lib/dm_courier/services/sendgrid.rb
 - lib/dm_courier/services/sparkpost.rb
 - lib/dm_courier/version.rb
 - lib/monkey_patch/sparkpost/request.rb