griddler-mandrill 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2197b9fa59d9e6c1006d3083dd0563653ea5cda
-  data.tar.gz: 68d153dde2a5762904f4bc445d252f2b46c32a24
+  metadata.gz: 7cd7048b321e79882c0e7f57e2d0cc5b64a0c18b
+  data.tar.gz: d543a55548ddcadcb6117d60d899fa02c74b5290
 SHA512:
-  metadata.gz: 52aa06aaabeb9b813b737c3024f8187c799fd5b050b2c42908e31d6a44c4f1fb702039501047ed36b2abb6d2abb64f6c139a928234a1ebefa1c69c52d64933d6
-  data.tar.gz: 13979ab10338f143699a488afa39f92ea892e7fc2cc09a65b15a1e85c586798f1bec980c8c1b465c4359dd03c892d40c551a5149e9727dd017605e80ddf5e29d
+  metadata.gz: 613a1f438bccfc844e0f71a4a9e084aa1c705ff896b20682c77719b337017f10cc17fc55715506f0c0a04eb143aeeb44899a7736f0aa5907ea0f8c2662d8a737
+  data.tar.gz: 467dacb9b6103436c45c578940e27c6cd6b774df9f1a3505445bdfeb17131a79de38750cea67f2790664cc5bd6c57f03be825e2db5c52a44ebf260e7f3a95d17

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+## 1.0.1
+* Respect Mandrill's base64 flag to determine whether text attachments should be
+  base64 decoded. #4 via [bdmac](https://github.com/bdmac)
+
+## 1.0.0
+* Initial extraction of the Mandrill adapter from griddler

data/lib/griddler/mandrill/adapter.rb

@@ -62,7 +62,9 @@ module Griddler
       def create_tempfile(attachment)
         filename = attachment[:name]
         tempfile = Tempfile.new(filename, Dir::tmpdir, encoding: 'ascii-8bit')
-        tempfile.write(Base64.decode64(attachment[:content]))
+        content = attachment[:content]
+        content = Base64.decode64(content) if attachment[:base64]
+        tempfile.write(content)
         tempfile.rewind
         tempfile
       end

data/lib/griddler/mandrill/version.rb

@@ -1,5 +1,5 @@
 module Griddler
   module Mandrill
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/spec/griddler/mandrill/adapter_spec.rb

@@ -44,6 +44,17 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
     expect(normalized_params[0][:attachments]).to be_empty
   end
 
+  it 'works with non-base64 encoded files' do
+    params = params_with_csv_attachment
+
+    normalized_params = Griddler::Mandrill::Adapter.normalize_params(params)
+
+    file, = *normalized_params[0][:attachments]
+
+    expect(file.original_filename).to eq('file.csv')
+    expect(file.size).to eq(upload_3_params[:length])
+  end
+
   describe 'when the email has no text part' do
     before do
       @params = params_hash
@@ -135,6 +146,14 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
     mandrill_events params.to_json
   end
 
+  def params_with_csv_attachment
+    params = params_hash
+    params[0][:msg][:attachments] = {
+      'file.csv' => upload_3_params
+    }
+    mandrill_events params.to_json
+  end
+
   def text_body
     <<-EOS.strip_heredoc.strip
       Dear bob
@@ -163,7 +182,8 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
         name: 'photo1.jpg',
         content: Base64.encode64(file.read),
         type: 'image/jpeg',
-        length: size
+        length: size,
+        base64: true
       }
     end
   end
@@ -176,7 +196,21 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
         name: 'photo2.jpg',
         content: Base64.encode64(file.read),
         type: 'image/jpeg',
-        length: size
+        length: size,
+        base64: true
+      }
+    end
+  end
+
+  def upload_3_params
+    @upload_2_params ||= begin
+      content = 'Some | csv | file | here'
+      {
+        name: 'file.csv',
+        content: content,
+        type: 'text/plain',
+        length: content.length,
+        base64: false
       }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griddler-mandrill
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Stafford Brunk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: griddler
@@ -76,6 +76,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt