emailparser 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15a6b7b74861f6c651c5aad2081904c11dcb384f
-  data.tar.gz: 0374d884ec5fe7d294a5bed47fa04c25abb404d6
+  metadata.gz: 78bbec2213ee625bdf2c016f60fbe671d2419673
+  data.tar.gz: 2e87bb0f3fb9695e72dd92e8075891259a5d1392
 SHA512:
-  metadata.gz: 39ba072cd23cd85aed7d1ec9f5d5bfff931abaea7b4436506e0fb7c22c17c368e1b3f2ce0da3f962400bf9278ff3b75c0b7b25e5cbe0769e19b9ac24890f289c
-  data.tar.gz: 4c6275fe75be1269c110e64896e6e91036f0888d1e0308e9fe82e7e91249836beda32ec1cd7e02cea64df0fa0fa845781dcedc0c78a2cf358ca915f98ddd6eee
+  metadata.gz: 58a964d41185c31d3b34002a382acc7e5e067fe649182a8c9990bf5bcd53bd5590631467587da25956575df4b5510b8193c68ed6ca80aa803d924f4eba641adb
+  data.tar.gz: e5a696ac3795db7d0e6ae80c1c196d516506d12b3f6184b78446c9cbe58a3c4c41d7b05f095e209abc4fc0626f87372f4c873751050111ff2552e709dbc5d781

data/lib/emailparser.rb

@@ -128,17 +128,23 @@ class Emailparser
 	end
 
 	# Voodoo to fix nasty encoded strings
-	def fix_encode(str)
-		if str.is_a?(String)
-		  return str.unpack('C*').pack('U*')
+	def fix_encode(text)
+		if text.is_a?(String)
+			return text.unpack('C*').pack('U*')
+		elsif text.is_a?(Array)
+			fixed = []
+			text.each do | item |
+				fixed.push(item.unpack('C*').pack('U*'))
+			end
+			return fixed
 		else
-		  return str
+			return text
 		end
 	end
 
 	def make_attachment_folder(attachments, source_hash)
 		if (!attachments.empty?)
-			puts "Creating attachments directory: " + source_hash
+			puts "Creating sub-directory: " + source_hash
 			attachments_dir = @attachment_dir + source_hash
       		Dir.mkdir(attachments_dir) if !Dir.exist?(attachments_dir)
 		end
@@ -160,28 +166,34 @@ class Emailparser
 
 		puts "Loading email: " + @message + "\n"
 		source_hash = Digest::SHA256.hexdigest(File.read(@message))
-		puts "Hash of email: " + source_hash
+		puts "SHA256 Hash: " + source_hash
 
 		email = Mail.read(@message)
 
 		# Defaults
 		source_file = @message.split("/").last
+		
+		if email.message_id.nil?
+			message_id = ""
+		else
+			message_id = fix_encode(email.message_id)
+		end
 
 		# Addresses
 		begin
 			email_to = email.to.to_a
 		rescue
-			email_to = [email.to.gsub("<", "").gsub(">", "")]
+			email_to = fix_encode([email.to.gsub("<", "").gsub(">", "")])
 		end
 		begin
 			email_cc = email.cc.to_a
 		rescue
-			email_cc = [email.cc.gsub("<", "").gsub(">", "")]
+			email_cc = fix_encode([email.cc.gsub("<", "").gsub(">", "")])
 		end
 		begin
 			email_from = email.from.to_a
 		rescue
-			email_from = [email.from.gsub("<", "").gsub(">", "")]
+			email_from = fix_encode([email.from.gsub("<", "").gsub(">", "")])
 		end
 		begin
 			recipients = email_to.concat(email_cc)
@@ -213,8 +225,11 @@ class Emailparser
 			end
 		else
 			puts " - is single part\n"
-			body_plain = fix_encode(email.body.decoded)
-			body_html = fix_encode(email.body.decoded)
+			if email.content_type.start_with?('text/html')
+				body_html = fix_encode(email.body.decoded)
+			else 
+				body_plain = fix_encode(email.body.decoded)
+			end
 		end
 
 		# Handle Attachments
@@ -259,12 +274,12 @@ class Emailparser
 		email_data = {
 			source_file: source_file,
 			source_hash: source_hash,
-			message_id: email.message_id,
+			message_id: message_id,
 			date: email.date,
-			sender: email.from,
-			from: email.from,
-			to: email.to,
-			cc: email.cc,
+			sender: email_from,
+			from: email_from,
+			to: email_to,
+			cc: email_cc,
 			recipients: recipients,
 			addresses: addresses,
 			subject: subject,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emailparser
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Brennan Novak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies: []
 description: Parses a signle email file to JSON with attachments
 email: hi@brennannovak.com