griddler-mandrill 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5734cf6f504c80285028a0c25dc9080553d99aa
-  data.tar.gz: 6b0189f1ff8fda257ad92c9301bff5c88f46b19a
+  metadata.gz: 986e391f3565a7f5189859a92a3c939b69c0c6e2
+  data.tar.gz: 8f4c5abcec2a7b26503f101bac709bb32ca918eb
 SHA512:
-  metadata.gz: bc106bc175e483060107cc6a931d0fa6dfd26534365364a1a726e7d8533d9bce5080efbdef5e396c2d7eedb628e42b290264f5fbe9119c43ec0f7b675868680f
-  data.tar.gz: c0369360d8329cb6dd39011c6d7323ec6c7a102be4a31d299f5806228e817d13d48f25c451449c5a25196376fb4c26d31c3aa6737a6cfad3d2a1568ad1d7e00a
+  metadata.gz: 22c435ceb3b901cb4f5c867150dd8f7352292a67eb3c65c6de005cd99f34ffe9a94f9ea8c6f6c56176cc204e8bb4d43c23ac2a8412ff77c00be64bb656885879
+  data.tar.gz: 05073ddb3cbd1c4513174979e4ce5b318badc2a67362b1dd18c96044704059c927d4cdeecbd498afc793046e632a0379fa16ac251d638c987d7c61814450c024

data/.travis.yml

@@ -1,4 +1,7 @@
+sudo: false
+cache: bundler
 language: ruby
 rvm:
   - 2.0
   - 2.1
+  - 2.2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.3 (master)
+* Replace `nil` for email text/html values with empty strings. #10 via [calleerlandsson](https://github.com/calleerlandsson)
+
 ## 1.0.2
 * Replace slashes in filenames with underscores for temp file creation. #5 and
   #6 via [ssidelnikov](https://github.com/ssidelnikov)

data/griddler-mandrill.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Stafford Brunk']
   spec.email         = ['stafford.brunk@gmail.com']
   spec.summary       = %q{Mandrill adapter for Griddler}
-  spec.description   = %q{Adapter to allow the use of Mandrill's Inboud Email Processing with Griddler}
+  spec.description   = %q{Adapter to allow the use of Mandrill's Inbound Email Processing with Griddler}
   spec.homepage      = 'https://github.com/wingrunr21/griddler-mandrill'
   spec.license       = 'MIT'
 
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'griddler'
+  spec.add_dependency 'griddler', '>= 1.2.1'
 
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rake'

data/lib/griddler/mandrill/adapter.rb

@@ -16,10 +16,11 @@ module Griddler
             to: recipients(:to, event),
             cc: recipients(:cc, event),
             bcc: recipients(:bcc, event),
+            headers: event[:headers],
             from: full_email([ event[:from_email], event[:from_name] ]),
             subject: event[:subject],
-            text: event.fetch(:text, ''),
-            html: event.fetch(:html, ''),
+            text: event[:text] || '',
+            html: event[:html] || '',
             raw_body: event[:raw_msg],
             attachments: attachment_files(event)
           }

data/lib/griddler/mandrill/version.rb

@@ -1,5 +1,5 @@
 module Griddler
   module Mandrill
-    VERSION = '1.0.2'
+    VERSION = '1.1.1'
   end
 end

data/spec/griddler/mandrill/adapter_spec.rb

@@ -25,6 +25,15 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
     end
   end
 
+  describe Griddler::Email do
+    it 'accepts the mandrill headers hash without error' do
+      params = mixed_event_params
+      params_to_send = Griddler::Mandrill::Adapter.normalize_params(params)
+      headers = Griddler::EmailParser.extract_headers(params_to_send.first[:headers])
+      expect{headers}.not_to raise_error
+    end
+  end
+
   it 'passes the received array of files' do
     params = params_with_attachments
 
@@ -80,6 +89,21 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
     end
   end
 
+  describe 'when the email text part is nil' do
+    before do
+      @params = params_hash
+      @params.first[:msg][:text] = nil
+    end
+
+    it 'sets :text to an empty string' do
+      params = default_params(@params)
+      normalized_params = Griddler::Mandrill::Adapter.normalize_params(params)
+      normalized_params.each do |p|
+        expect(p[:text]).to eq ''
+      end
+    end
+  end
+
   describe 'when the email has no html part' do
     before do
       @params = params_hash
@@ -95,6 +119,21 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
     end
   end
 
+  describe 'when the email html part is nil' do
+    before do
+      @params = params_hash
+      @params.first[:msg][:html] = nil
+    end
+
+    it 'sets :html to an empty string' do
+      params = default_params(@params)
+      normalized_params = Griddler::Mandrill::Adapter.normalize_params(params)
+      normalized_params.each do |p|
+        expect(p[:html]).to eq ''
+      end
+    end
+  end
+
   describe 'when the email has no CC recipients' do
     before do
       @params = params_hash
@@ -148,7 +187,9 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
       msg:
         {
           raw_msg: 'raw',
-          headers: {},
+          headers: {"X-Mailer" => "Airmail (271)",
+                    "Mime-Version" => "1.0",
+                    "Content-Type" => "multipart/alternative; boundary=\"546876a7_66334873_aa8\""},
           text: text_body,
           html: text_html,
           from_email: 'hernan@example.com',
@@ -178,6 +219,9 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
            'Joey <joey@example.mandrillapp.com>'],
       bcc: ['Roger <hidden@example.mandrillapp.com>'],
       from: 'Hernan Example <hernan@example.com>',
+      headers: {"X-Mailer" => "Airmail (271)",
+                "Mime-Version" => "1.0",
+                "Content-Type" => "multipart/alternative; boundary=\"546876a7_66334873_aa8\""},
       subject: 'hello',
       text: %r{Dear bob},
       html: %r{<p>Dear bob</p>},
@@ -278,7 +322,6 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
       {
         name: '=?UTF-8?B?0JrQvtC/0LjRjyB0ZW5kZXJfMTJfcm9zdGEueGxz?=',
         content: content,
-        type: 'image/jpeg',
         type: 'text/plain',
         base64: false
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griddler-mandrill
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Stafford Brunk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: griddler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Adapter to allow the use of Mandrill's Inboud Email Processing with Griddler
+description: Adapter to allow the use of Mandrill's Inbound Email Processing with
+  Griddler
 email:
 - stafford.brunk@gmail.com
 executables: []
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Mandrill adapter for Griddler