griddler 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a3833d3d95363c7d1c7a96d6078cf765420809e
-  data.tar.gz: 77d63d65d0711aa139fb0e2eea6a8e57ec1bbcf6
+  metadata.gz: e7fb296b5effeac25db3cb6002e6f19cbfe2d50f
+  data.tar.gz: 1264bafeb3155a1b2225c0c4f12984c4f1585664
 SHA512:
-  metadata.gz: f0542546228a7e7685623346b580ba24768469e5648f3da2124df7447a54cf2f5b3dbe5892f9efcc60ff864cf07e9426f1f459ccfb94fa33313be676148cec77
-  data.tar.gz: 430a118db9bf578b9c2f43f3274458a248342390db5a109e06fba769ae60f33a7b2bd5e9057e5e0962871deb40a12dfefbc758f1c6fd124a304b22eee83857e1
+  metadata.gz: e6accc72dc651295925009e576edcf1674ab3aa43b00e341d55b91b8daad5db06b96c458b538efab2ec2795cb1701ad6c5570741d239bae871ce4fc38a1b29a0
+  data.tar.gz: 9820e905ce61d4499ba01b2d013610c666240de18e98aad857c04d1110e95048ec20732305ae59fd6de90bcee248066be70cb4c7776f8f856831522d3c033191

data/README.md

@@ -66,9 +66,10 @@ end
 | `reply_delimiter`  | The string searched for that will split your body.
 | `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` with a method
-named `process`, taking in one argument, a `Griddler::Email` instance
-representing the incoming email.  For example, in `./lib/email_processor.rb`:
+By default Griddler will look for a class named `EmailProcessor`. The class is 
+initialized with a `Griddler::Email` instance representing the incoming
+email, and has a `process` method to actually process the email.
+For example, in `./lib/email_processor.rb`:
 
 ```ruby
 class EmailProcessor
@@ -131,7 +132,7 @@ with the following sample factory:
 factory :email, class: OpenStruct do
   # Assumes Griddler.configure.to is :hash (default)
   to [{ full: 'to_user@email.com', email: 'to_user@email.com', token: 'to_user', host: 'email.com', name: nil }]
-  from 'user@email.com'
+  from({ token: 'from_user', host: 'email.com', email: 'from_email@email.com', full: 'From User <from_user@email.com>', name: 'From User' })
   subject 'email subject'
   body 'Hello!'
   attachments {[]}
@@ -189,7 +190,7 @@ your adapter returns a hash with these keys:
 | `:from`        | The sender field
 | `:subject`     | Email subject
 | `:text`        | The text body of the email
-| `:html`        | The html body of the email, nil or empty string if not present
+| `:html`        | The html body of the email, or an empty string
 | `:attachments` | Array of attachments to the email. Can be an empty array.
 | `:headers`     | The raw headers of the email. **Optional**.
 | `:charsets`    | A JSON string containing the character sets of the fields extracted from the message. **Optional**.

data/lib/griddler/configuration.rb

@@ -22,7 +22,7 @@ module Griddler
       @processor_class ||=
         begin
           if Kernel.const_defined?(:EmailProcessor)
-            EmailProcessor
+            "EmailProcessor"
           else
             raise NameError.new(<<-ERROR.strip_heredoc, 'EmailProcessor')
               To use Griddler, you must either define `EmailProcessor` or configure a
@@ -31,6 +31,12 @@ module Griddler
             ERROR
           end
         end
+        
+      @processor_class.constantize
+    end
+    
+    def processor_class=(klass)
+      @processor_class = klass.to_s
     end
 
     def processor_method

data/lib/griddler/email.rb

@@ -3,7 +3,7 @@ require 'htmlentities'
 module Griddler
   class Email
     include ActionView::Helpers::SanitizeHelper
-    attr_reader :to, :from, :cc, :subject, :body, :raw_body, :raw_text, :raw_html,
+    attr_reader :to, :from, :cc, :bcc, :subject, :body, :raw_body, :raw_text, :raw_html,
       :headers, :raw_headers, :attachments
 
     def initialize(params)
@@ -21,6 +21,7 @@ module Griddler
       @headers = extract_headers
 
       @cc = recipients(:cc)
+      @bcc = recipients(:bcc)
 
       @raw_headers = params[:headers]
 
@@ -48,7 +49,7 @@ module Griddler
     end
 
     def extract_headers
-      EmailParser.extract_headers(params[:headers])
+      EmailParser.extract_headers(clean_invalid_utf8_bytes(params[:headers]))
     end
 
     def extract_cc_from_headers(headers)
@@ -72,7 +73,7 @@ module Griddler
     end
 
     def clean_invalid_utf8_bytes(text)
-      if !text.valid_encoding?
+      if text && !text.valid_encoding?
         text = text
           .force_encoding('ISO-8859-1')
           .encode('UTF-8')

data/lib/griddler/testing.rb

@@ -81,8 +81,8 @@ RSpec::Matchers.define :be_normalized_to do |expected|
   match do |actual|
     expected.each do |k, v|
       case v
-      when Regexp then expect(actual[k]).to =~ v
-      else expect(actual[k]).to === v
+      when Regexp then expect(actual[k]).to match(v)
+      else expect(actual[k]).to eq(v)
       end
     end
   end

data/lib/griddler/version.rb

@@ -1,3 +1,3 @@
 module Griddler
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: griddler
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Caleb Thompson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -124,10 +124,7 @@ files:
 homepage: http://thoughtbot.com
 licenses: []
 metadata: {}
-post_install_message: |
-  When upgrading from a Griddler version previous to 0.5.0, it is important that
-  you view https://github.com/thoughtbot/griddler/#upgrading-to-griddler-050 for
-  upgrade information.
+post_install_message: 
 rdoc_options: []
 require_paths:
 - app