griddler 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f86495d4d8db4365d3cb48c7cb3270aab9b23bb
-  data.tar.gz: c4765e837d4102415a3b980503146b6644806126
+  metadata.gz: 033ea4e395dad81582d32273bb841a0fc8cf00b2
+  data.tar.gz: da3e0f317134724e14dbe362de41882f121ebfdb
 SHA512:
-  metadata.gz: 7ab5c192b77282a442a0f1bd0f6a1b386687c694ad68f7eeeeb36d3a7b940e318c43375a64765c9ac4574d1ffe60ce3ab2937dcee262cac297cd85eaee7f9c2e
-  data.tar.gz: 98caf933840397cff2dcd5900cb4961e975e10c92f75f91d3c7b9d179bccf8a314e6f17ff8e5cdc6f26b43b6143a02dc2c7d028c6dc20f81b02d17b4fcb3e447
+  metadata.gz: 753dddc90229903fa836cd31790164431603d3feda2dfa81b1e0a0cd17dc8f2e3428f09ed8fe210a4f54c5ca8e464dc85c86e1fbb5cdfa4f19abd73612a79738
+  data.tar.gz: ab5c5cea2b4d84bfed1e764f5a807bb847c9550c6b604d0ff1d71d33bfeb7df476b79c5500b985d25ccadd50091481c1be7132ee2c14a4c0d0a2f0f298f07acf

data/README.md

@@ -65,7 +65,7 @@ end
 | `processor_class`  | The class Griddler will use to handle your incoming emails.
 | `email_class`      | The class Griddler will use to represent an incoming e-mail. It must support an initializer that receives a hash as the only argument. We recommend inheriting it from Griddler::Email or checking this class to see all the methods it responds to.
 | `processor_method` | The method Griddler will call on the processor class when handling your incoming emails.
-| `reply_delimiter`  | The string searched for that will split your body.
+| `reply_delimiter`  | The string searched for that will split your body. You can also supply an array of string - useful if you need translated versions of the delimiter
 | `email_service`    | Tells Griddler which email service you are using. The supported email service options are `:sendgrid` (the default), `:cloudmailin` (expects multipart format), `:postmark`, `:mandrill` and `:mailgun`. You will also need to have an appropriate [adapter] gem included in your Gemfile.
 
 By default Griddler will look for a class named `EmailProcessor`. The class is
@@ -168,6 +168,7 @@ adapter gem in addition to `griddler`.
 | Service     | Adapter
 | -------     | -------
 | sendgrid    | [griddler-sendgrid]
+| cloudmailin | [griddler-cloudmailin]
 | mandrill    | [griddler-mandrill]
 | mailgun     | [griddler-mailgun]
 | postmark    | [griddler-postmark]
@@ -175,6 +176,7 @@ adapter gem in addition to `griddler`.
 | ses (amazon)| [griddler-ses]
 
 [griddler-sendgrid]: https://github.com/thoughtbot/griddler-sendgrid
+[griddler-cloudmailin]: https://github.com/thoughtbot/griddler-cloudmailin
 [griddler-mandrill]: https://github.com/wingrunr21/griddler-mandrill
 [griddler-mailgun]: https://github.com/bradpauly/griddler-mailgun
 [griddler-postmark]: https://github.com/r38y/griddler-postmark
@@ -215,6 +217,6 @@ Griddler was written by Caleb Thompson and Joel Oliveira.
 
 Thanks to our [contributors](https://github.com/thoughtbot/griddler/contributors)!
 
-![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
+![thoughtbot](http://presskit.thoughtbot.com/images/thoughtbot-logo-for-readmes.svg)
 
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.

data/app/controllers/griddler/emails_controller.rb

@@ -1,4 +1,6 @@
 class Griddler::EmailsController < ActionController::Base
+  skip_before_action :verify_authenticity_token
+
   def create
     normalized_params.each do |p|
       process_email email_class.new(p)

data/lib/griddler/email.rb

@@ -3,8 +3,23 @@ require 'htmlentities'
 module Griddler
   class Email
     include ActionView::Helpers::SanitizeHelper
-    attr_reader :to, :from, :cc, :bcc, :subject, :body, :raw_body, :raw_text, :raw_html,
-      :headers, :raw_headers, :attachments
+
+    attr_reader :to,
+                :from,
+                :cc,
+                :bcc,
+                :original_recipient,
+                :reply_to,
+                :subject,
+                :body,
+                :raw_body,
+                :raw_text,
+                :raw_html,
+                :headers,
+                :raw_headers,
+                :attachments,
+                :vendor_specific,
+                :spam_report
 
     def initialize(params)
       @params = params
@@ -22,10 +37,16 @@ module Griddler
 
       @cc = recipients(:cc)
       @bcc = recipients(:bcc)
+      @original_recipient = extract_address(params[:original_recipient])
+      @reply_to = extract_address(params[:reply_to])
 
       @raw_headers = params[:headers]
 
       @attachments = params[:attachments]
+
+      @vendor_specific = params.fetch(:vendor_specific, {})
+
+      @spam_report = params[:spam_report]
     end
 
     def to_h
@@ -42,9 +63,16 @@ module Griddler
         headers: headers,
         raw_headers: raw_headers,
         attachments: attachments,
+        vendor_specific: vendor_specific,
+        spam_score: spam_score,
+        spam_report: spam_report,
       }
     end
 
+    def spam_score
+      @spam_report[:score] if @spam_report
+    end
+
     private
 
     attr_reader :params

data/lib/griddler/email_parser.rb

@@ -84,7 +84,10 @@ module Griddler::EmailParser
       /^On.*<\r?\n?.*>.*\r?\n?wrote:\r?\n?$/,
       /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,
+      /(_)*\n[[:space:]]*De :.*\n[[:space:]]*Envoyé :.*\n[[:space:]]*À :.*\n[[:space:]]*Objet :.*\n$/i, # French Outlook
+      /^[[:space:]]*\>?[[:space:]]*Le.*<\n?.*>.*\n?a[[:space:]]?\n?écrit :$/, # French
+      /^[[:space:]]*\>?[[:space:]]*El.*<\n?.*>.*\n?escribió:$/ # Spanish
     ]
   end
 

data/lib/griddler/version.rb

@@ -1,3 +1,3 @@
 module Griddler
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: griddler
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Caleb Thompson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,7 +122,8 @@ files:
 - lib/griddler/testing.rb
 - lib/griddler/version.rb
 homepage: http://thoughtbot.com
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []