sendgrid-ruby 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6430c97ce833bb11b86ed69d969f9f37dca211cf
-  data.tar.gz: 54d826be8c3d7d4533166e2cbf0fd5bf4b85567f
+  metadata.gz: fe49ac48dbbef01dbbe18d96e06ed7af349d6858
+  data.tar.gz: 6a722af6c7b10747a1859200da527b22f75f5303
 SHA512:
-  metadata.gz: 99daaa4e54c8f71f2d127201d9c08e9f102008b8d13ff1f71f20d460db728101260a5b6ffd95e41a67cf10baa9b9466c36a9beb888feff75b395a591911b10a4
-  data.tar.gz: fef29993e6322e3b838e52639a7ca3573b7acd5e28303868a8551cde06071a2244620a0db344b8b27439376fb4f3e79dc8de1539c92c583dbbe28ba666aea618
+  metadata.gz: d0a8b7a4a6ccf9a7ac503911f2ed89e6a48c628956c3f7ac8f94256f8c8d25b86e67727a3c69d972f1cae3e872fd46e1d0b118aff1c9399fb6f808efe0b893b5
+  data.tar.gz: 7b963bf04a0388e59b4d8ec357c3b15e037b579ca2e038d2489455aa0ef2c765f0bc062642585cad270eb3ea8d8766375116ec343079abf183589ee583ae7123

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [1.0.5] - 2015-10-06
+### Added
+Inline content support
+
 ## [1.0.3] - 2015-10-01
 ### Fixed
 Payload 'to' attribute fix for smtpapi

data/example.rb

@@ -22,9 +22,11 @@ mail = SendGrid::Mail.new do |m|
   m.to = 'elmer.thomas@sendgrid.com'
   m.from = 'elmer@thinkingserious.com'
   m.subject = 'Hello world!'
-  m.text = 'I heard you like pineapple.'
+  m.text = 'I heard you like the beach.'
+  m.html = 'I heard you like the beach <div><img src="cid:beach"></div>'
 end
-mail.add_attachment('/tmp/report.pdf', 'july_report.pdf')
+mail.add_content('/tmp/beach.jpg', 'beach')
+mail.add_attachment('/tmp/report.pdf', 'report.pdf')
 result = client.send(mail)
 puts result.code
 puts result.body

data/lib/sendgrid/mail.rb

@@ -5,7 +5,7 @@ require 'mimemagic'
 module SendGrid
   class Mail
     attr_accessor :to, :to_name, :from, :from_name, :subject, :text, :html, :cc,
-                  :bcc, :reply_to, :date, :smtpapi, :attachments
+                  :bcc, :reply_to, :date, :smtpapi, :attachments, :content
 
     def initialize(params = {})
       params.each do |k, v|
@@ -103,6 +103,17 @@ module SendGrid
     def attachments
       @attachments ||= []
     end
+    
+    def contents
+      @contents ||= []
+    end
+    
+    def add_content(path, cid)
+      mime_type = MimeMagic.by_path(path)
+      file = Faraday::UploadIO.new(path, mime_type)
+      name ||= File.basename(file)
+      contents << {file: file, cid: cid, name: name}
+    end
 
     def smtpapi
       @smtpapi ||= Smtpapi::Header.new
@@ -123,7 +134,8 @@ module SendGrid
         :text => text,
         :html => html,
         :'x-smtpapi' => smtpapi.to_json,
-        :files => ({":default"=>"0"} unless attachments.empty?)
+        :content => ({":default"=>"0"} unless contents.empty?),
+        :files => ({":default"=>"0"} unless attachments.empty? and contents.empty?)
         # If I don't define a default value, I get a Nil error when
         # in attachments.each do |file|
         #:files => ({} unless attachments.empty?)
@@ -132,13 +144,29 @@ module SendGrid
       payload.delete(:'x-smtpapi') if payload[:'x-smtpapi'] == '{}'
 
       payload[:to] = payload[:from] if payload[:to].nil? and not smtpapi.to.empty?
-
-      return payload if attachments.empty?
       
-      attachments.each do |file|
-        payload[:files][file[:name]] = file[:file]
+      unless attachments.empty?
+        attachments.each do |file|
+          payload[:files][file[:name]] = file[:file]
+        end
+        if payload[:files].has_key?(":default")
+          payload[:files].delete(":default")
+        end
+      end
+      
+      unless contents.empty?
+        contents.each do |content|
+          payload[:content][content[:name]] = content[:cid]
+          payload[:files][content[:name]] = content[:file]
+        end
+        if payload[:content].has_key?(":default")
+          payload[:content].delete(":default")
+        end
       end
-      payload[:files].delete(":default")
+      
+      puts payload[:files]
+      puts payload[:content]
+      
       payload
     end
     # rubocop:enable Style/HashSyntax

data/lib/sendgrid/version.rb

@@ -1,3 +1,3 @@
 module SendGrid
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/spec/lib/sendgrid_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe 'SendGrid' do
   it 'should have a version' do
-    expect(SendGrid::VERSION).to eq('1.0.3')
+    expect(SendGrid::VERSION).to eq('1.0.4')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Robin Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smtpapi
@@ -242,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Official SendGrid Gem