lib/astrotrain/tmail.rb spec/fixtures/gb2312_encoding.txt spec/fixtures/gb2312_encoding_invalid.txt @@ -56,7 +56,7 @@ class Message end def self.parse(raw) - new TMail::Mail.parse(raw) + new Astrotrain::Mail.parse(raw) end def initialize(mail) app/models/message.rb @@ -16,7 +16,8 @@ Merb::Config.use do |c| end Merb::BootLoader.before_app_loads do - TMail::Mail::ALLOW_MULTIPLE['delivered-to'] = true + require 'astrotrain/tmail' + Astrotrain::Mail::ALLOW_MULTIPLE['delivered-to'] = true # This will get executed after dependencies have been loaded but before your app's classes have loaded. end config/init.rb @@ -111,11 +111,33 @@ describe Message do @raw = mail("iso-8859-1") @message = Message.parse(@raw) end - + it "recognizes From: header with strange encoding" do @message.sender.should == %(Matthéw <user@example.com>) end end + + describe "gb2312 encoded body" do + before :all do + @raw = mail("gb2312_encoding") + @message = Message.parse(@raw) + end + + it "converts to UTF-8" do + @message.body.should == "Dear Sirs, \r\nWe are given to understand that you are Manufacturer of plstic Bottles\r\nAdd： blah China" + end + end + + describe "gb2312 encoded body with invalid charset in mime-version header" do + before :all do + @raw = mail("gb2312_encoding_invalid") + @message = Message.parse(@raw) + end + + it "converts to UTF-8" do + @message.body.should == "Dear Sirs, \r\nWe are given to understand that you are Manufacturer of plstic Bottles\r\nAdd： blah China" + end + end describe "utf-8 encoded headers" do before :all do spec/models/message_spec.rb 1b442afd28517367f073ebdef8fcefb6a92dfad1 rick technoweenie@gmail.com http://github.com/entp/astrotrain/commit/827e038468ebff6f936430f2aa9e315ad302304c 827e038468ebff6f936430f2aa9e315ad302304c 2009-07-06T11:45:40-07:00 2009-07-06T11:45:40-07:00 handle odd cases where the charset is specified in the mime-version (wtf) 39f9d66aad504e25d813367beae3a16c2545aa83 rick technoweenie@gmail.com