griddler-mandrill 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cd7048b321e79882c0e7f57e2d0cc5b64a0c18b
-  data.tar.gz: d543a55548ddcadcb6117d60d899fa02c74b5290
+  metadata.gz: b5734cf6f504c80285028a0c25dc9080553d99aa
+  data.tar.gz: 6b0189f1ff8fda257ad92c9301bff5c88f46b19a
 SHA512:
-  metadata.gz: 613a1f438bccfc844e0f71a4a9e084aa1c705ff896b20682c77719b337017f10cc17fc55715506f0c0a04eb143aeeb44899a7736f0aa5907ea0f8c2662d8a737
-  data.tar.gz: 467dacb9b6103436c45c578940e27c6cd6b774df9f1a3505445bdfeb17131a79de38750cea67f2790664cc5bd6c57f03be825e2db5c52a44ebf260e7f3a95d17
+  metadata.gz: bc106bc175e483060107cc6a931d0fa6dfd26534365364a1a726e7d8533d9bce5080efbdef5e396c2d7eedb628e42b290264f5fbe9119c43ec0f7b675868680f
+  data.tar.gz: c0369360d8329cb6dd39011c6d7323ec6c7a102be4a31d299f5806228e817d13d48f25c451449c5a25196376fb4c26d31c3aa6737a6cfad3d2a1568ad1d7e00a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.2
+* Replace slashes in filenames with underscores for temp file creation. #5 and
+  #6 via [ssidelnikov](https://github.com/ssidelnikov)
+* Only process inbound events. #9 via [mgauthier-joist](https://github.com/mgauthier-joist)
+* Support BCC attribute
+
 ## 1.0.1
 * Respect Mandrill's base64 flag to determine whether text attachments should be
   base64 decoded. #4 via [bdmac](https://github.com/bdmac)

data/lib/griddler/mandrill/adapter.rb

@@ -15,6 +15,7 @@ module Griddler
           {
             to: recipients(:to, event),
             cc: recipients(:cc, event),
+            bcc: recipients(:bcc, event),
             from: full_email([ event[:from_email], event[:from_name] ]),
             subject: event[:subject],
             text: event.fetch(:text, ''),
@@ -30,9 +31,9 @@ module Griddler
       attr_reader :params
 
       def events
-        @events ||= ActiveSupport::JSON.decode(params[:mandrill_events]).map do |event|
-          event['msg'].with_indifferent_access
-        end
+        @events ||= ActiveSupport::JSON.decode(params[:mandrill_events]).map { |event|
+          event['msg'].with_indifferent_access if event['event'] == 'inbound'
+        }.compact
       end
 
       def recipients(field, event)
@@ -60,7 +61,7 @@ module Griddler
       end
 
       def create_tempfile(attachment)
-        filename = attachment[:name]
+        filename = attachment[:name].gsub(/\/|\\/, '_')
         tempfile = Tempfile.new(filename, Dir::tmpdir, encoding: 'ascii-8bit')
         content = attachment[:content]
         content = Base64.decode64(content) if attachment[:base64]

data/lib/griddler/mandrill/version.rb

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

data/spec/griddler/mandrill/adapter_spec.rb

@@ -9,16 +9,19 @@ end
 describe Griddler::Mandrill::Adapter, '.normalize_params' do
   it 'normalizes parameters' do
     Griddler::Mandrill::Adapter.normalize_params(default_params).each do |params|
-      expect(params).to be_normalized_to({
-        to: ['The Token <token@reply.example.com>'],
-        cc: ['Emily <emily@example.mandrillapp.com>',
-             'Joey <joey@example.mandrillapp.com>'],
-        from: 'Hernan Example <hernan@example.com>',
-        subject: 'hello',
-        text: %r{Dear bob},
-        html: %r{<p>Dear bob</p>},
-        raw_body: %r{raw}
-      })
+      expect(params).to be_normalized_to(params_hash_normalized)
+    end
+  end
+
+  it 'does not process events that are not inbound' do
+    params = mixed_event_params
+
+    normalized_params = Griddler::Mandrill::Adapter.normalize_params(params)
+
+    expect(JSON.parse(params[:mandrill_events]).size).to eq(4)
+    expect(normalized_params.size).to eq(2)
+    normalized_params.each do |params|
+      expect(params).to be_normalized_to(params_hash_normalized)
     end
   end
 
@@ -55,6 +58,13 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
     expect(file.size).to eq(upload_3_params[:length])
   end
 
+  it 'works with filenames containing slashes' do
+    params = params_with_attachments_with_slashes
+
+    adapter = Griddler::Mandrill::Adapter.new(params)
+    expect{adapter.normalize_params}.to_not raise_error
+  end
+
   describe 'when the email has no text part' do
     before do
       @params = params_hash
@@ -104,10 +114,33 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
     mandrill_events (params * 2).to_json
   end
 
+  def mixed_event_params
+    mandrill_events ((params_hash * 2) + (mixed_params_hash*2)).to_json
+  end
+
   def mandrill_events(json)
     { mandrill_events: json }
   end
 
+  def mixed_params_hash
+    [{
+      type: 'blacklist',
+      action: 'change',
+      reject: {
+        reason: 'hard-bounce',
+        detail: ' smtp;550 Requested action not taken: mailbox unavailable\n',
+        last_event_at: '2014-11-03 04:56:18',
+        email: 'herman@example.com',
+        created_at: '2014-08-07 04:59:20',
+        expires_at: '2014-11-24 04:56:18',
+        expired: false,
+        subaccount: nil,
+        sender: nil
+      },
+      ts: 1414990578
+    }]
+  end
+
   def params_hash
     [{
       event: 'inbound',
@@ -123,6 +156,7 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
           to: [['token@reply.example.com', 'The Token']],
           cc: [['emily@example.mandrillapp.com', 'Emily'],
                ['joey@example.mandrillapp.com', 'Joey']],
+          bcc: [['hidden@example.mandrillapp.com', 'Roger']],
           subject: "hello",
           spam_report: {
             score: -0.8,
@@ -137,6 +171,20 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
     }]
   end
 
+  def params_hash_normalized
+    {
+      to: ['The Token <token@reply.example.com>'],
+      cc: ['Emily <emily@example.mandrillapp.com>',
+           'Joey <joey@example.mandrillapp.com>'],
+      bcc: ['Roger <hidden@example.mandrillapp.com>'],
+      from: 'Hernan Example <hernan@example.com>',
+      subject: 'hello',
+      text: %r{Dear bob},
+      html: %r{<p>Dear bob</p>},
+      raw_body: %r{raw}
+    }
+  end
+
   def params_with_attachments
     params = params_hash
     params[0][:msg][:attachments] = {
@@ -146,6 +194,15 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
     mandrill_events params.to_json
   end
 
+  def params_with_attachments_with_slashes
+    params = params_hash
+    params[0][:msg][:attachments] = {
+      '=?UTF-8?B?0JrQvtC/0LjRjyB0ZW5kZXJfMTJfcm9zdGEueGxz?=' => upload_4_params,
+      '=?UTF-8?B?0JrQvtC\0LjRjyB0ZW5kZXJfMTJfcm9zdGEueGxz?=' => upload_5_params
+    }
+    mandrill_events params.to_json
+  end
+
   def params_with_csv_attachment
     params = params_hash
     params[0][:msg][:attachments] = {
@@ -214,4 +271,30 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
       }
     end
   end
+
+  def upload_4_params
+    @upload_4_params ||= begin
+      content = 'Some | csv | file | here'
+      {
+        name: '=?UTF-8?B?0JrQvtC/0LjRjyB0ZW5kZXJfMTJfcm9zdGEueGxz?=',
+        content: content,
+        type: 'image/jpeg',
+        type: 'text/plain',
+        base64: false
+      }
+    end
+  end
+
+  def upload_5_params
+    @upload_5_params ||= begin
+      content = 'Some | csv | file | here'
+      {
+        name: '=?UTF-8?B?0JrQvtC\0LjRjyB0ZW5kZXJfMTJfcm9zdGEueGxz?=',
+        content: content,
+        type: 'text/plain',
+        length: content.length,
+        base64: false
+      }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griddler-mandrill
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Stafford Brunk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: griddler