griddler 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7fb296b5effeac25db3cb6002e6f19cbfe2d50f
-  data.tar.gz: 1264bafeb3155a1b2225c0c4f12984c4f1585664
+  metadata.gz: 4c824e6077ccba05b1fafc0c5106df7ff87cb815
+  data.tar.gz: cf20b554c8a45a134f42036268522c6d5eb90367
 SHA512:
-  metadata.gz: e6accc72dc651295925009e576edcf1674ab3aa43b00e341d55b91b8daad5db06b96c458b538efab2ec2795cb1701ad6c5570741d239bae871ce4fc38a1b29a0
-  data.tar.gz: 9820e905ce61d4499ba01b2d013610c666240de18e98aad857c04d1110e95048ec20732305ae59fd6de90bcee248066be70cb4c7776f8f856831522d3c033191
+  metadata.gz: 50c91b14d01bd7b14818963cd53d43837a76720accaa3602154968147b6ec7e9a0b0f33b3d6bef1296528391f31c30d0471d13aca86f1139091aa6658b377287
+  data.tar.gz: cc3997a7bb374fd534aca9953a02862981267304ce4fb220945c66e2c080537fc434308a30c8809de4d5437b5bf79effed933130929cb8e31f895a35fc6553c2

data/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

data/lib/griddler/email.rb

@@ -49,7 +49,14 @@ module Griddler
     end
 
     def extract_headers
-      EmailParser.extract_headers(clean_invalid_utf8_bytes(params[:headers]))
+      if params[:headers].is_a?(Hash)
+        params[:headers].inject({}) do |header_hash, (header_name, header_value)|
+          header_hash[header_name] = clean_invalid_utf8_bytes(header_value)
+          header_hash
+        end
+      else
+        EmailParser.extract_headers(clean_invalid_utf8_bytes(params[:headers]))
+      end
     end
 
     def extract_cc_from_headers(headers)
@@ -74,12 +81,10 @@ module Griddler
 
     def clean_invalid_utf8_bytes(text)
       if text && !text.valid_encoding?
-        text = text
-          .force_encoding('ISO-8859-1')
-          .encode('UTF-8')
+        text.force_encoding('ISO-8859-1').encode('UTF-8')
+      else
+        text
       end
-
-      text
     end
   end
 end

data/lib/griddler/email_parser.rb

@@ -31,8 +31,8 @@ module Griddler::EmailParser
       remove_reply_portion(body)
         .split(/[\r]*\n/)
         .reject do |line|
-          line =~ /^\s+>/ ||
-            line =~ /^\s*Sent from my /
+          line =~ /^[[:space:]]+>/ ||
+            line =~ /^[[:space:]]*Sent from my /
         end.
         join("\n").
         strip
@@ -40,11 +40,15 @@ module Griddler::EmailParser
   end
 
   def self.extract_headers(raw_headers)
-    header_fields = Mail::Header.new(raw_headers).fields
+    if raw_headers.is_a?(Hash)
+      raw_headers
+    else
+      header_fields = Mail::Header.new(raw_headers).fields
 
-    header_fields.inject({}) do |header_hash, header_field|
-      header_hash[header_field.name.to_s] = header_field.value.to_s
-      header_hash
+      header_fields.inject({}) do |header_hash, header_field|
+        header_hash[header_field.name.to_s] = header_field.value.to_s
+        header_hash
+      end
     end
   end
 
@@ -74,12 +78,12 @@ module Griddler::EmailParser
   def self.regex_split_points
     [
       reply_delimeter_regex,
-      /^\s*[-]+\s*Original Message\s*[-]+\s*$/i,
-      /^\s*--\s*$/,
-      /^\s*\>?\s*On.*\r?\n?.*wrote:\r?\n?$/,
+      /^[[:space:]]*[-]+[[:space:]]*Original Message[[:space:]]*[-]+[[:space:]]*$/i,
+      /^[[:space:]]*--[[:space:]]*$/,
+      /^[[:space:]]*\>?[[:space:]]*On.*\r?\n?.*wrote:\r?\n?$/,
       /On.*wrote:/,
-      /From:.*$/i,
-      /^\s*\d{4}\/\d{1,2}\/\d{1,2}\s.*\s<.*>?$/i
+      /\*?From:.*$/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.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: griddler
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Caleb Thompson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: SendGrid Parse API client Rails Engine