griddler-mandrill 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 986e391f3565a7f5189859a92a3c939b69c0c6e2
-  data.tar.gz: 8f4c5abcec2a7b26503f101bac709bb32ca918eb
+  metadata.gz: 86dc4de8f452cac033829217d59a4c6bc9f773b9
+  data.tar.gz: dce4fb18f34941f751aba6f71a6de09088cdfa83
 SHA512:
-  metadata.gz: 22c435ceb3b901cb4f5c867150dd8f7352292a67eb3c65c6de005cd99f34ffe9a94f9ea8c6f6c56176cc204e8bb4d43c23ac2a8412ff77c00be64bb656885879
-  data.tar.gz: 05073ddb3cbd1c4513174979e4ce5b318badc2a67362b1dd18c96044704059c927d4cdeecbd498afc793046e632a0379fa16ac251d638c987d7c61814450c024
+  metadata.gz: 9b6f95562127f589899a0074386cde554ca8ab3357698504fa633106a25bde17f7eb4743c9011a0ff92f5166fc4f78133b3dfeea6d4cf0218ec5348f6ddd8757
+  data.tar.gz: a42ada7733a4480f76f56cc3144632428d937ffdbb53558a0d3e5cdf02a4758166b5756a691bbe600bd9b10ccc829a74d7f1da6f3242012de73e9d0d429546da

data/CHANGELOG.md

@@ -1,4 +1,13 @@
-## 1.0.3 (master)
+## master
+
+## 1.1.2
+* Use Mandrill's `email` attribute to populate bcc if to and cc don't contain it. #19 and #20 via [Uelb](https://github.com/Uelb)
+
+## 1.1.1
+* Pin minimum Griddler version to >= 1.2.1 to resolve #18
+
+## 1.1.0
+* Allow email headers to be accessed. #12, #13, #14, and #17
 * Replace `nil` for email text/html values with empty strings. #10 via [calleerlandsson](https://github.com/calleerlandsson)
 
 ## 1.0.2

data/lib/griddler/mandrill/adapter.rb

@@ -15,14 +15,15 @@ module Griddler
           {
             to: recipients(:to, event),
             cc: recipients(:cc, event),
-            bcc: recipients(:bcc, event),
+            bcc: resolve_bcc(event),
             headers: event[:headers],
             from: full_email([ event[:from_email], event[:from_name] ]),
             subject: event[:subject],
             text: event[:text] || '',
             html: event[:html] || '',
             raw_body: event[:raw_msg],
-            attachments: attachment_files(event)
+            attachments: attachment_files(event),
+            email: event[:email] # the email address where Mandrill received the message
           }
         end
       end
@@ -41,6 +42,15 @@ module Griddler
         Array.wrap(event[field]).map { |recipient| full_email(recipient) }
       end
 
+      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
+      end
+
       def full_email(contact_info)
         email = contact_info[0]
         if contact_info[1]

data/lib/griddler/mandrill/version.rb

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

data/spec/griddler/mandrill/adapter_spec.rb

@@ -149,6 +149,27 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
     end
   end
 
+  describe 'when there the reception email is not in the TO nor the CCrecipients' do
+    before do
+      @params = params_hash
+      @params.first[:msg][:email] = "hidden@example.com"
+    end
+    it 'passes the email as a bcc recipient' do
+      params = default_params(@params)
+      normalized_params = Griddler::Mandrill::Adapter.normalize_params(params)
+      normalized_params.each do |p|
+        expect(p[:bcc]).to eq ['hidden <hidden@example.com>']
+      end
+    end
+    it 'passes the email in the email param' do
+      params = default_params(@params)
+      normalized_params = Griddler::Mandrill::Adapter.normalize_params(params)
+      normalized_params.each do |p|
+        expect(p[:email]).to eq 'hidden@example.com'
+      end
+    end
+  end
+
   def default_params(params = params_hash)
     mandrill_events (params * 2).to_json
   end
@@ -197,7 +218,6 @@ 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,
@@ -217,7 +237,7 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
       to: ['The Token <token@reply.example.com>'],
       cc: ['Emily <emily@example.mandrillapp.com>',
            'Joey <joey@example.mandrillapp.com>'],
-      bcc: ['Roger <hidden@example.mandrillapp.com>'],
+      bcc: [],
       from: 'Hernan Example <hernan@example.com>',
       headers: {"X-Mailer" => "Airmail (271)",
                 "Mime-Version" => "1.0",
@@ -225,7 +245,8 @@ describe Griddler::Mandrill::Adapter, '.normalize_params' do
       subject: 'hello',
       text: %r{Dear bob},
       html: %r{<p>Dear bob</p>},
-      raw_body: %r{raw}
+      raw_body: %r{raw},
+      email: "token@reply.example.com"
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griddler-mandrill
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Stafford Brunk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-27 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.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Mandrill adapter for Griddler