mandrill_mailer 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db83dd2cbc825c2c3f08e744629adafa42883d00
-  data.tar.gz: 7f829bc19555e3f6988b0bdf897f5d3dddcd83d2
+  metadata.gz: 413e3b48c2e8f81449c0d426c5184b64523bc09b
+  data.tar.gz: 43cd6aaff9e74945faf6070da60fb41e6f9a00f1
 SHA512:
-  metadata.gz: 4507163ed0e75d8b2c2bec260bc3d0481f1ff83efd3d3f0f019bc2ce1b796ef9d31189004bf2d905cb1ef7ea63aae79c88f6a5fda84234139192d367297562f2
-  data.tar.gz: eb526bb48f908ee0f30311613232451364f5797a698d6de944aff97ab00d7a083475077d79855992070b552539a4cc5f60aa30745201fb23c025a7875fa780fb
+  metadata.gz: f99d80385837a0bde6f8b32182044ce76dac55e3f6bff62a9d544f48f01c3281b25dfb0b5840a25dc477835a864f0886dd2eaaa354f43aed494e87439c38f3ef
+  data.tar.gz: b3c5407a1869fd50aeb4636b8e4bde403eb1e619b762d28282975a3f806114d27fb1d64552ed67535f32df05f4abb707d0dfe121cd99a99fea37eb7028247938

data/CHANGELOG.md

@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.6.0 - 2017-03-23
+- Add support for attaching unencoded content via @brunomperes
+
 ## 1.5.0 - 2017-03-20
 - Update offline adapter for testing to be more compatible with Rails 5 via @eric1234
 

data/README.md

@@ -153,11 +153,13 @@ end
 
    * `:attachments` - An array of file objects with the following keys:
      * `content`: The file contents, this will be encoded into a base64 string internally
+     * `encoded_content` (optional): File content already encoded into base64 string. Overrides `content`
      * `name`: The name of the file
      * `type`: This is the mimetype of the file. Ex. png = image/png, pdf = application/pdf, txt = text/plain etc etc
 
    * `:images` - An array of embedded images to add to the message:
      * `content`: The file contents, this will be encoded into a base64 string internally
+     * `encoded_content` (optional): File content already encoded into base64 string. Overrides `content`
      * `name`: The name of the file
      * `type`: This is the mimetype of the file. Ex. png = image/png, pdf = application/pdf, txt = text/plain etc etc etc
 

data/lib/mandrill_mailer/arg_formatter.rb

@@ -11,7 +11,9 @@ module MandrillMailer
         type = attachment[:mimetype] || attachment[:type]
         name = attachment[:filename] || attachment[:name]
         file = attachment[:file] || attachment[:content]
-        {"type" => type, "name" => name, "content" => Base64.encode64(file)}
+        encoded_file = attachment[:encoded_file] || attachment[:encoded_content]
+        next {"type" => type, "name" => name, "content" => encoded_file} if encoded_file
+        next {"type" => type, "name" => name, "content" => Base64.encode64(file)}
       end
     end
 

data/lib/mandrill_mailer/version.rb

@@ -1,3 +1,3 @@
 module MandrillMailer
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/spec/arg_formatter_spec.rb

@@ -10,6 +10,13 @@ describe MandrillMailer::ArgFormatter do
       content: "testing some test test file"
     }
   end
+  let(:encoded_api_args) do
+    {
+      type: "some/type",
+      name: 'test',
+      encoded_content: Base64.encode64("testing some test test file")
+    }
+  end
 
   let(:file_args) do
     {
@@ -18,6 +25,13 @@ describe MandrillMailer::ArgFormatter do
       file: "testing some test test file"
     }
   end
+  let(:encoded_file_args) do
+    {
+      mimetype: "some/type",
+      filename: 'test',
+      encoded_file: Base64.encode64("testing some test test file")
+    }
+  end
 
 
   describe 'attachment_args' do
@@ -35,6 +49,16 @@ describe MandrillMailer::ArgFormatter do
           'content' => Base64.encode64("testing some test test file")
         }])
       end
+
+      describe "passing an encoded string" do
+        it "formats the correct attachment data" do
+          expect(formatter.attachment_args([encoded_file_args])).to eq([{
+            'type' => "some/type",
+            'name' => 'test',
+            'content' => Base64.encode64("testing some test test file")
+          }])
+        end
+      end
     end
 
     context "with api syntax" do
@@ -45,6 +69,16 @@ describe MandrillMailer::ArgFormatter do
           'content' => Base64.encode64("testing some test test file")
         }])
       end
+
+      describe "passing an encoded string" do
+        it "formats the correct attachment data" do
+          expect(formatter.attachment_args([encoded_api_args])).to eq([{
+            'type' => "some/type",
+            'name' => 'test',
+            'content' => Base64.encode64("testing some test test file")
+          }])
+        end
+      end
     end
   end
 
@@ -233,4 +267,4 @@ describe MandrillMailer::ArgFormatter do
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_mailer
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Adam Rensel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport