Not forcing processing on hashes

matthewbarram · gabebw · commit c4b3c3969ada · 2015-06-06T13:53:29.000-04:00
diff --git a/README.md b/README.md
@@ -105,7 +105,7 @@ Griddler::Email attributes
 | `#raw_html`    | The raw html part of the body.
 | `#raw_body`    | The raw body information provided by the email service.
 | `#attachments` | An array of `File` objects containing any attachments.
-| `#headers`     | A hash of headers parsed by `Mail::Header`.
+| `#headers`     | A hash of headers parsed by `Mail::Header`, unless they are already formatted as a hash when received from the adapter in which case the original hash is returned.
 | `#raw_headers` | The raw headers included in the message.
 
 ### Email Addresses
diff --git a/lib/griddler/email_parser.rb b/lib/griddler/email_parser.rb
@@ -40,6 +40,9 @@ def self.extract_reply_body(body)
   end
 
   def self.extract_headers(raw_headers)
+    if raw_headers.is_a?(Hash)
+      return raw_headers
+    end
     header_fields = Mail::Header.new(raw_headers).fields
 
     header_fields.inject({}) do |header_hash, header_field|
diff --git a/spec/griddler/email_spec.rb b/spec/griddler/email_spec.rb
@@ -458,6 +458,15 @@ def email_with_params(params)
     expect(headers[header_name]).to eq header_value
   end
 
+  it 'handles a hash being submitted' do
+    header = {
+                "X-Mailer" => "Airmail (271)",
+                "Mime-Version" => "1.0"
+              }
+    headers = header_from_email(header)
+    expect(headers["X-Mailer"]).to eq("Airmail (271)")
+  end
+
   it 'handles no matched headers' do
     headers = header_from_email('')
     expect(headers).to eq({})
