Merge branch 'master' into datadog-log-formatting

README.md

@@ -38,6 +38,7 @@ Once you have correctly configured Mandrill, you can go ahead and delete this co
 [Adding Routes]: http://help.mandrill.com/entries/21699367-Inbound-Email-Processing-Overview
 
 #### Allowing domains without SPF configured
+
 Sometimes, due to circumstances outside our control, a domain may not have SPF set up or configured incorrectly.
 
 If that is causing you to miss emails; you may configure the adapter to allow those results through to your applications email processor.
@@ -58,6 +59,8 @@ Griddler::Mandrill.spf_allow.add(:softfail)
 
 # Allow messages from domains where SPF is failing
 Griddler::Mandrill.spf_allow.add(:fail)
+
+Griddler::Mandrill::Adapter.allow_spf_none = true
 ```
 
 ## Credits

lib/griddler/mandrill/adapter.rb

@@ -6,11 +6,29 @@ def initialize(params)
         @params = params
       end
 
+      def self.allow_spf_none?
+        @allow_spf_none || false
+      end
+
+      def allow_spf_none?
+        self.class.allow_spf_none?
+      end
+
+      def self.allow_spf_none=(allow_spf_none)
+        @allow_spf_none = allow_spf_none
+      end
+
       def self.normalize_params(params)
         adapter = new(params)
         adapter.normalize_params
       end
 
+      def event_passes_spf?(event)
+        event[:spf].present? &&
+          ((event[:spf][:result] == 'pass' || event[:spf][:result] == 'neutral') ||
+          (allow_spf_none? && event[:spf][:result] == 'none'))
+      end
+
       def normalize_params
         events.each do |event|
           Rails.logger.warn(logger: "Griddler::Mandrill::Adapter",
@@ -29,7 +47,7 @@ def normalize_params
         end
 
         events.select do |event|
-          spf_filter.passes?(event)
+          event_passes_spf?(event)
         end.map do |event|
           {
             to: recipients(:to, event),

spec/griddler/mandrill/adapter_spec.rb

@@ -160,10 +160,10 @@
 
     context 'when the adapter is configured to allow none' do
       before do
-        Griddler::Mandrill.spf_allow.add(:none)
+        Griddler::Mandrill::Adapter.allow_spf_none = true
       end
       after do
-        Griddler::Mandrill.spf_allow.delete(:none)
+        Griddler::Mandrill::Adapter.allow_spf_none = false
       end
       it 'includes the message' do
         params = default_params(@params)