griddler-mandrill 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11fa381ea4f4b1865823cf93565cbbaa98ed5f40
-  data.tar.gz: f1810eaf5c1295420f384a2647371bf493b75d87
+  metadata.gz: e54f49517c557c787003b280e2fae8b99d6aec51
+  data.tar.gz: 34c8d7d4b71c7f1ce1b4e1136a51affb7e7a148f
 SHA512:
-  metadata.gz: 41142c12a3bfc6034c850e3503424ea7c911bccd5c43d74875d2f955a8d0507059365f0824df0c8907d8c16f74336aef42050f584f8354016bf7bc25b73eff0a
-  data.tar.gz: 00d30dc2c0c3a05699df71924d75272871eee113f23d19afa575279c666195a9f33bea2503ead1a3fba471008473686a6e3021e4201c1eba0ab8561489e7e19c
+  metadata.gz: 7b722cc50ee0fca025414fffadc6c2d240bd464a7bf237d168d903efbb281f8855a78eeb209ebb16d7076b787a804408548433d4b13904579726103239164fbf
+  data.tar.gz: 75a760631eb0439407fdf10cbbadfc8b69fd29ddeb2f3ff366d2f0565a3f85271ab9cf293238db81ed7c3f5e286e78e7837fcbaf57b147835e5ea0a64a0dd2e9

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master
 
+## 1.1.4
+* Add support for inline images. #27 and #29 [MicTech](https://github.com/MicTech)
+* Do not map non-existant to to bcc. #24
+
 ## 1.1.3
 * Protect against SPF spoofing. #22 via [arunthampi](https://github.com/arunthampi)
 

data/lib/griddler/mandrill/adapter.rb

@@ -46,11 +46,8 @@ module Griddler
 
       def resolve_bcc(event)
         email = event[:email]
-        if !event[:to].map(&:first).include?(email) && event[:cc] && !event[:cc].map(&:first).include?(email)
-          [full_email([email, email.split("@")[0]])]
-        else
-          []
-        end
+        to_and_cc = (event[:to].to_a + event[:cc].to_a).compact.map(&:first)
+        to_and_cc.include?(email) ? [] : [full_email([email, email.split("@")[0]])]
       end
 
       def full_email(contact_info)
@@ -63,12 +60,19 @@ module Griddler
       end
 
       def attachment_files(event)
-        attachments = event[:attachments] || Array.new
-        attachments.map do |key, attachment|
+        files(event, :attachments) + files(event, :images)
+      end
+
+      def files(event, key)
+        files = event[key] || Hash.new
+
+        files.map do |key, file|
+          file[:base64] = true if !file.has_key?(:base64)
+
           ActionDispatch::Http::UploadedFile.new({
-            filename: attachment[:name],
-            type: attachment[:type],
-            tempfile: create_tempfile(attachment)
+            filename: file[:name],
+            type: file[:type],
+            tempfile: create_tempfile(file)
           })
         end
       end

data/lib/griddler/mandrill/version.rb

@@ -1,5 +1,5 @@
 module Griddler
   module Mandrill
-    VERSION = '1.1.3'
+    VERSION = '1.1.4'
   end
 end

data/spec/griddler/mandrill/adapter_spec.rb

@@ -74,6 +74,20 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
     expect{adapter.normalize_params}.to_not raise_error
   end
 
+  it 'works with inline images' do
+    params = params_with_inline_images
+
+    normalized_params = Griddler::Mandrill::Adapter.normalize_params(params)
+
+    first, second = *normalized_params[0][:attachments]
+
+    expect(first.original_filename).to eq('ii_111ecfcf901e123c')
+    expect(first.size).to eq(upload_6_params[:length])
+
+    expect(second.original_filename).to eq('ii_151ecfcf901e828c')
+    expect(second.size).to eq(upload_7_params[:length])
+  end
+
   describe 'when the email has no text part' do
     before do
       @params = params_hash
@@ -315,6 +329,15 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
     mandrill_events params.to_json
   end
 
+  def params_with_inline_images
+    params = params_hash
+    params[0][:msg][:images] = {
+      'ii_151ecfcf901e828c' => upload_6_params,
+      'ii_111ecfcf901e123c' => upload_7_params
+    }
+    mandrill_events params.to_json
+  end
+
   def text_body
     <<-EOS.strip_heredoc.strip
       Dear bob
@@ -400,4 +423,31 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
       }
     end
   end
+
+  def upload_6_params
+    @upload_6_params ||= begin
+      file = upload_1
+      size = file.size
+      {
+        name: 'ii_111ecfcf901e123c',
+        content: Base64.encode64(file.read),
+        type: 'image/jpeg',
+        length: size
+      }
+    end
+  end
+
+  def upload_7_params
+    @upload_7_params ||= begin
+      file = upload_2
+      size = file.size
+      {
+        name: 'ii_151ecfcf901e828c',
+        content: Base64.encode64(file.read),
+        type: 'image/jpeg',
+        length: size
+      }
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griddler-mandrill
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Stafford Brunk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2016-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: griddler
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Mandrill adapter for Griddler