griddler 1.3.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75f194d5d7ffebb9f599c4e67580b66759b894e7
-  data.tar.gz: 7b1fe0580a6ec472aa19a05193e064d8140761b4
+  metadata.gz: 638ce28e726a636413b01cc51837099ec9b828a6
+  data.tar.gz: feca8309eed5360ae57a59846d98b0f163bfe169
 SHA512:
-  metadata.gz: 5d44196465d1efb54a6c86e1892b487bed74a88e454b6f55ad20330194aa5459758dbc8656cdd601a6aa76db140c69366a33729d2a7f68779e3489c37db84059
-  data.tar.gz: 5560e05ef5350e6285d92cbebe36415efa4d5e0999d9b175dbd5e934c815c27b9003750f6cf60701d249612696ec79a474b3eb56338198139bc9a5e2e5faaab4
+  metadata.gz: a91bba6d57fbd43ad02cbec2ac3dbbdfe9bf0cadcb3259e471a753292e20560f587a45aeeece4dce1bc2a8f3938842a1950ed7982ef48dae0503c7067fc2ee76
+  data.tar.gz: 494bac5827de8abeea296d31f8ca81159fbc847fc89a8d0a9a1a7636579d915d577cf91bfe08f0edce51d76f51215e76c7e31e5afe26a0f488e589c840333fef

data/README.md

@@ -14,7 +14,7 @@ Tutorials
 ---------
 
 * SendGrid wrote a
-  [great tutorial](http://blog.sendgrid.com/receiving-email-in-your-rails-app-with-griddler/)
+  [great tutorial](https://sendgrid.com/blog/receiving-email-in-your-rails-app-with-griddler/)
   on integrating Griddler with your application.
 * We have our own blog post on the subject over at
   [Giant Robots](https://robots.thoughtbot.com/griddler-is-better-than-ever).
@@ -53,6 +53,7 @@ Defaults are shown below with sample overrides following. In
 ```ruby
 Griddler.configure do |config|
   config.processor_class = EmailProcessor # CommentViaEmail
+  config.email_class = Griddler::Email # MyEmail
   config.processor_method = :process # :create_comment (A method on CommentViaEmail)
   config.reply_delimiter = '-- REPLY ABOVE THIS LINE --'
   config.email_service = :sendgrid # :cloudmailin, :postmark, :mandrill, :mailgun
@@ -62,8 +63,9 @@ end
 | Option             | Meaning
 | ------             | -------
 | `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
@@ -107,6 +109,7 @@ Griddler::Email attributes
 | `#attachments` | An array of `File` objects containing any attachments.
 | `#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.
+| `#to_h`        | A hash of the above attributes.
 
 ### Email Addresses
 
@@ -165,16 +168,20 @@ adapter gem in addition to `griddler`.
 | Service     | Adapter
 | -------     | -------
 | sendgrid    | [griddler-sendgrid]
+| cloudmailin | [griddler-cloudmailin]
 | mandrill    | [griddler-mandrill]
 | mailgun     | [griddler-mailgun]
 | postmark    | [griddler-postmark]
 | sparkpost   | [griddler-sparkpost]
+| 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
 [griddler-sparkpost]: https://github.com/PrestoDoctor/griddler-sparkpost
+[griddler-ses]: https://github.com/85x14/griddler-ses
 
 Writing an Adapter
 ------------------
@@ -210,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/Rakefile

@@ -1,7 +1,6 @@
 #!/usr/bin/env rake
 begin
   require 'bundler/setup'
-  require 'bundler/gem_tasks'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
   exit 1

data/app/controllers/griddler/emails_controller.rb

@@ -1,7 +1,9 @@
 class Griddler::EmailsController < ActionController::Base
+  skip_before_action :verify_authenticity_token, raise: false
+
   def create
     normalized_params.each do |p|
-      process_email Griddler::Email.new(p)
+      process_email email_class.new(p)
     end
 
     head :ok
@@ -9,9 +11,9 @@ class Griddler::EmailsController < ActionController::Base
 
   private
 
-  delegate :processor_class, :processor_method, :email_service, to: :griddler_configuration
+  delegate :processor_class, :email_class, :processor_method, :email_service, to: :griddler_configuration
 
-  private :processor_class, :processor_method, :email_service
+  private :processor_class, :email_class, :processor_method, :email_service
 
   def normalized_params
     Array.wrap(email_service.normalize_params(params))

data/lib/griddler/configuration.rb

@@ -17,6 +17,7 @@ module Griddler
 
   class Configuration
     attr_accessor :processor_method, :reply_delimiter
+    attr_writer :email_class
 
     def processor_class
       @processor_class ||=
@@ -36,6 +37,10 @@ module Griddler
       @processor_class = klass.to_s
     end
 
+    def email_class
+      @email_class ||= Griddler::Email
+    end
+
     def processor_method
       @processor_method ||= :process
     end

data/lib/griddler/email.rb

@@ -3,8 +3,24 @@ 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,
+                :charsets
 
     def initialize(params)
       @params = params
@@ -22,10 +38,43 @@ 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]
+
+      @charsets = params[:charsets]
+    end
+
+    def to_h
+      @to_h ||= {
+        to: to,
+        from: from,
+        cc: cc,
+        bcc: bcc,
+        subject: subject,
+        body: body,
+        raw_body: raw_body,
+        raw_text: raw_text,
+        raw_html: raw_html,
+        headers: headers,
+        raw_headers: raw_headers,
+        attachments: attachments,
+        vendor_specific: vendor_specific,
+        spam_score: spam_score,
+        spam_report: spam_report,
+        charsets: charsets,
+      }
+    end
+
+    def spam_score
+      @spam_report[:score] if @spam_report
     end
 
     private

data/lib/griddler/email_parser.rb

@@ -81,10 +81,13 @@ 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.*<\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.3.1'
+  VERSION = '1.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: griddler
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Caleb Thompson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2018-05-09 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: []
@@ -141,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: SendGrid Parse API client Rails Engine