astrotrain 0.6.2 → 0.6.3

data/astrotrain.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'astrotrain'
-  s.version           = '0.6.2'
-  s.date              = '2012-04-18'
+  s.version           = '0.6.3'
+  s.date              = '2012-04-25'
   s.rubyforge_project = 'astrotrain'
 
   ## Make sure your summary is short. The description may be as long
@@ -81,6 +81,7 @@ Gem::Specification.new do |s|
     test/fixtures/reply.txt
     test/fixtures/undisclosed.txt
     test/fixtures/utf-8.txt
+    test/fixtures/utf8.txt
     test/message_test.rb
     test/test_helper.rb
     test/transport_test.rb

data/lib/astrotrain.rb

@@ -1,5 +1,5 @@
 module Astrotrain
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 
   require 'utf8'
   require 'charlock_holmes'

data/lib/astrotrain/message.rb

@@ -307,7 +307,10 @@ module Astrotrain
     # Returns converted String.
     def convert_to_utf8(s)
       # If this string is already valid UTF-8 just hand it back
-      return s if s.as_utf8.valid?
+      if s.as_utf8.valid?
+        s.force_encoding("UTF-8") if s.respond_to?(:force_encoding)
+        return s
+      end
 
       # First lets try to detect the encoding if the message didn't specify
       if !@mail.charset && detection = CharlockHolmes::EncodingDetector.detect(s)

data/test/fixtures/utf8.txt

@@ -0,0 +1,35 @@
+Return-Path: <user@astrotrain.com>
+X-Original-To: reply@astrotrain.com
+Date: Mon, 16 Apr 2012 15:12:43 -0700
+From: User <user@astrotrain.com>
+To: Processor <processor@astrotrain.com>
+Message-ID: <2B2BC5BB5BCB4F1BB779FEDC693EFDC9@github.com>
+Subject: Fix this thing
+MIME-Version: 1.0
+Content-Type: multipart/alternative; boundary="4f8c995b_6eb5bd4_11cdf"
+
+--4f8c995b_6eb5bd4_11cdf
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+:+1:=5E1 trillion
+
+> =20
+> =E2=80=94
+
+
+
+--4f8c995b_6eb5bd4_11cdf
+Content-Type: text/html; charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+
+                <div style=3D=22font-family: Helvetica; font-size: 13px; =
+=22>:+1:=5E1 trillion<br></div>
+<p style=3D=22font-size:small;-webkit-text-size-adjust:none;color:=23666;=
+=22>=E2=80=94<br>
+            
+--4f8c995b_6eb5bd4_11cdf--
+

data/test/message_test.rb

@@ -52,6 +52,7 @@ class MessageParsingTest < Test::Unit::TestCase
       "Dear Sirs, \r\nWe are given to understand that you are  Manufacturer of  plstic  Bottles\r\nAdd\357\274\232 blah China"
     end
     assert_equal s, msg.body
+    assert_mail_utf8 msg
   end
 
   test "gb2312 encoded body with invalid charset in mime version header" do
@@ -60,6 +61,7 @@ class MessageParsingTest < Test::Unit::TestCase
     # "Dear Sirs, \r\nWe are given to understand that you are  Manufacturer of  plstic  Bottles\r\nAdd： blah China"
     s = "Dear Sirs, \r\nWe are given to understand that you are  Manufacturer of  plstic  Bottles\r\nAdd?? blah China"
     assert_equal s, msg.body
+    assert_mail_utf8 msg
   end
 
   test "utf-8 encoded headers" do
@@ -183,4 +185,20 @@ class MessageParsingTest < Test::Unit::TestCase
     msg  = Astrotrain::Message.read(path)
     assert_equal path, msg.path
   end
+
+  test "parses and transcodes email with utf-8" do
+    path = mail(:utf8)
+    msg = Astrotrain::Message.read(path)
+    assert_mail_utf8 msg
+  end
+
+  def assert_mail_utf8(mail)
+    [:html, :body].each do |attr|
+      str = mail.send(attr)
+      assert str.as_utf8.valid?
+      if str.respond_to?(:encoding)
+        assert_equal "UTF-8", str.encoding.name
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: astrotrain
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utf8
-  requirement: &70356752937340 !ruby/object:Gem::Requirement
+  requirement: &70343659221820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.8
   type: :runtime
   prerelease: false
-  version_requirements: *70356752937340
+  version_requirements: *70343659221820
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70356752936700 !ruby/object:Gem::Requirement
+  requirement: &70343659220900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70356752936700
+  version_requirements: *70343659220900
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70356752936160 !ruby/object:Gem::Requirement
+  requirement: &70343659220240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70356752936160
+  version_requirements: *70343659220240
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70356752935300 !ruby/object:Gem::Requirement
+  requirement: &70343659219600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70356752935300
+  version_requirements: *70343659219600
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70356752934040 !ruby/object:Gem::Requirement
+  requirement: &70343659219040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70356752934040
+  version_requirements: *70343659219040
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
-  requirement: &70356752922600 !ruby/object:Gem::Requirement
+  requirement: &70343659218520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70356752922600
+  version_requirements: *70343659218520
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70356752919900 !ruby/object:Gem::Requirement
+  requirement: &70343659217960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70356752919900
+  version_requirements: *70343659217960
 description: email => http post
 email: technoweenie@gmail.com
 executables: []
@@ -124,6 +124,7 @@ files:
 - test/fixtures/reply.txt
 - test/fixtures/undisclosed.txt
 - test/fixtures/utf-8.txt
+- test/fixtures/utf8.txt
 - test/message_test.rb
 - test/test_helper.rb
 - test/transport_test.rb
@@ -139,6 +140,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1829060415533477535
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: