griddler 0.3.0 → 0.3.1

data/README.md

@@ -30,7 +30,7 @@ Defaults
 --------
 
 By default Griddler will look for a class to be created in your application
-called EmailProcessor with a class method implemented named process, taking
+called EmailProcessor with a class method implemented, named process, taking
 in one argument (presumably `email`). For example, in `./lib/email_processor.rb`:
 
 ```ruby

data/lib/griddler/email.rb

@@ -5,12 +5,13 @@ class Griddler::Email
   attr_accessor :to, :from, :body, :raw_body, :subject, :attachments
 
   def initialize(params)
+    @params = params
     @to = extract_address(params[:to], config.to)
     @from = extract_address(params[:from], :email)
     @subject = params[:subject]
-    @body = extract_body(params)
+    @body = extract_body
     @raw_body = params[:text] || params[:html]
-    @attachments = extract_attachments(params)
+    @attachments = extract_attachments
 
     processor_class = config.processor_class
     processor_class.process(self)
@@ -18,12 +19,15 @@ class Griddler::Email
 
   private
 
+  attr_reader :params
+
   def config
     Griddler.configuration
   end
 
   def extract_address(address, type)
     parsed = EmailParser.parse_address(address)
+
     if type == :hash
       parsed
     else
@@ -31,7 +35,7 @@ class Griddler::Email
     end
   end
 
-  def extract_attachments(params)
+  def extract_attachments
     attachment_count = params[:attachments].to_i
     attachment_files = []
 
@@ -42,26 +46,51 @@ class Griddler::Email
     attachment_files
   end
 
-  def extract_body(params)
-    body_text = text_or_sanitized_html(params)
+  def extract_body
+    body_text = text_or_sanitized_html
     charsets = params[:charsets]
 
     if charsets.present?
       charsets = ActiveSupport::JSON.decode(charsets)
-      body_text = body_text.encode('UTF-8', invalid: :replace,
-        undef: :replace, replace: '').force_encoding('UTF-8')
+      body_text = body_text.encode(
+        'UTF-8',
+        invalid: :replace,
+        undef: :replace,
+        replace: ''
+      ).force_encoding('UTF-8')
     end
 
     EmailParser.extract_reply_body(body_text)
   end
 
-  def text_or_sanitized_html(params)
+  def text_or_sanitized_html
     if params.key? :text
-      params[:text]
+      clean_text(params[:text])
     elsif params.key? :html
-      HTMLEntities.new.decode(strip_tags(params[:html]))
+      clean_html(params[:html])
     else
       raise Griddler::Errors::EmailBodyNotFound
     end
   end
+
+  def clean_text(text)
+    clean_invalid_utf8_bytes(text)
+  end
+
+  def clean_html(html)
+    cleaned_html = clean_invalid_utf8_bytes(html)
+    cleaned_html = strip_tags(cleaned_html)
+    cleaned_html = HTMLEntities.new.decode(cleaned_html)
+    cleaned_html
+  end
+
+  def clean_invalid_utf8_bytes(text)
+    text.encode(
+      'UTF-8',
+      'binary',
+      invalid: :replace,
+      undef: :replace,
+      replace: ''
+    )
+  end
 end

data/lib/griddler/version.rb

@@ -1,3 +1,3 @@
 module Griddler
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: griddler
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3729493469419997719
+      hash: 4165747324942510967
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3729493469419997719
+      hash: 4165747324942510967
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24