griddler 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aa1ca112493637de599c4d500d4f7866bf6f9d2
-  data.tar.gz: 7982ae7c23c1c5166afc18666804087feedebe7c
+  metadata.gz: 75f194d5d7ffebb9f599c4e67580b66759b894e7
+  data.tar.gz: 7b1fe0580a6ec472aa19a05193e064d8140761b4
 SHA512:
-  metadata.gz: c542fe67d88aa3d1f717a44f595d08f7100df1accecf83c2ee31e9318f2731a5101567152309e06d9bd105e0ee310a586ee4904cd815ed2a54ce859e580c017f
-  data.tar.gz: 1ece4686acf277a564605c23e8d8418430cf43f9e7400466020fccd466d099f2277cd1ba3249e7c99a9aedfc0454cd985edd6e7971685f6242575ae3fd8a4422
+  metadata.gz: 5d44196465d1efb54a6c86e1892b487bed74a88e454b6f55ad20330194aa5459758dbc8656cdd601a6aa76db140c69366a33729d2a7f68779e3489c37db84059
+  data.tar.gz: 5560e05ef5350e6285d92cbebe36415efa4d5e0999d9b175dbd5e934c815c27b9003750f6cf60701d249612696ec79a474b3eb56338198139bc9a5e2e5faaab4

data/README.md

@@ -168,11 +168,13 @@ adapter gem in addition to `griddler`.
 | mandrill    | [griddler-mandrill]
 | mailgun     | [griddler-mailgun]
 | postmark    | [griddler-postmark]
+| sparkpost   | [griddler-sparkpost]
 
 [griddler-sendgrid]: https://github.com/thoughtbot/griddler-sendgrid
 [griddler-mandrill]: https://github.com/wingrunr21/griddler-mandrill
 [griddler-mailgun]: https://github.com/bradpauly/griddler-mailgun
 [griddler-postmark]: https://github.com/r38y/griddler-postmark
+[griddler-sparkpost]: https://github.com/PrestoDoctor/griddler-sparkpost
 
 Writing an Adapter
 ------------------

data/lib/griddler/configuration.rb

@@ -16,25 +16,22 @@ module Griddler
   end
 
   class Configuration
-    attr_accessor :processor_class, :processor_method, :reply_delimiter
+    attr_accessor :processor_method, :reply_delimiter
 
     def processor_class
       @processor_class ||=
         begin
-          if Kernel.const_defined?(:EmailProcessor)
-            "EmailProcessor"
-          else
-            raise NameError.new(<<-ERROR.strip_heredoc, 'EmailProcessor')
-              To use Griddler, you must either define `EmailProcessor` or configure a
-              different processor. See https://github.com/thoughtbot/griddler#defaults for
-              more information.
-            ERROR
-          end
+          EmailProcessor.to_s
+        rescue NameError
+          raise NameError.new(<<-ERROR.strip_heredoc, 'EmailProcessor')
+            To use Griddler, you must either define `EmailProcessor` or configure a
+            different processor. See https://github.com/thoughtbot/griddler#defaults for
+            more information.
+          ERROR
         end
-        
       @processor_class.constantize
     end
-    
+
     def processor_class=(klass)
       @processor_class = klass.to_s
     end
@@ -48,7 +45,9 @@ module Griddler
     end
 
     def email_service
-      @email_service_adapter ||= Griddler.adapter_registry[:default]
+      @email_service_adapter ||=
+        Griddler.adapter_registry[:default] ||
+          raise(Griddler::Errors::EmailServiceAdapterNotFound)
     end
 
     def email_service=(new_email_service)

data/lib/griddler/email.rb

@@ -39,11 +39,12 @@ module Griddler
     def recipients(type)
       params[type].to_a.reject(&:empty?).map do |recipient|
         extract_address(recipient)
-      end
+      end.compact
     end
 
     def extract_address(address)
-      EmailParser.parse_address(clean_text(address))
+      clean_address = clean_text(address)
+      EmailParser.parse_address(clean_address) if clean_address =~ /@/
     end
 
     def extract_subject
@@ -57,6 +58,8 @@ module Griddler
     def extract_headers
       if params[:headers].is_a?(Hash)
         deep_clean_invalid_utf8_bytes(params[:headers])
+      elsif params[:headers].is_a?(Array)
+        deep_clean_invalid_utf8_bytes(params[:headers])
       else
         EmailParser.extract_headers(clean_invalid_utf8_bytes(params[:headers]))
       end

data/lib/griddler/email_parser.rb

@@ -81,9 +81,10 @@ module Griddler::EmailParser
       /^[[:space:]]*[-]+[[:space:]]*Original Message[[:space:]]*[-]+[[:space:]]*$/i,
       /^[[:space:]]*--[[:space:]]*$/,
       /^[[:space:]]*\>?[[:space:]]*On.*\r?\n?.*wrote:\r?\n?$/,
+      /^On.*<\n?.*>.*\n?wrote:$/,
       /On.*wrote:/,
       /\*?From:.*$/i,
-      /^[[:space:]]*\d{4}\/\d{1,2}\/\d{1,2}[[:space:]].*[[:space:]]<.*>?$/i
+      /^[[:space:]]*\d{4}[-\/]\d{1,2}[-\/]\d{1,2}[[:space:]].*[[:space:]]<.*>?$/i
     ]
   end
 

data/lib/griddler/version.rb

@@ -1,3 +1,3 @@
 module Griddler
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: griddler
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Caleb Thompson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails