astrotrain 0.7.1 → 0.7.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4296a34990455bee98b4615fcb972dfbb65c3231
+  data.tar.gz: 841fe63bce0683a282c8b2406cf023f1b1f53eb0
+SHA512:
+  metadata.gz: 2e4429961a4dd2dbf0aa02568a13ee5b0baadbfbc737c55f89025761ffeb5097f1f85d7c457c5267801d50b7cb8637986e8c6b1c6dbc920209cdc4b93b4a89a3
+  data.tar.gz: 3d81688e966ce59a8edf89d193ff45668851c9c84e86ed80969437ad85b61ec1e88b5c308798ce67a6fd85374f6d30d825544cefb01f02266ea0e03da5d96bec

data/astrotrain.gemspec

@@ -13,7 +13,7 @@ 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.7.1'
+  s.version           = '0.7.2'
   s.date              = '2014-08-27'
   s.rubyforge_project = 'astrotrain'
 

data/lib/astrotrain.rb

@@ -1,5 +1,5 @@
 module Astrotrain
-  VERSION = '0.7.0'
+  VERSION = '0.7.2'
 
   require 'utf8'
   require 'charlock_holmes'

data/lib/astrotrain/message.rb

@@ -63,7 +63,8 @@ module Astrotrain
     # Returns Array of possible recipients.
     def recipients(order = nil)
       if !@recipients.key?(order)
-        order = self.class.recipient_header_order if order.blank?
+        order = Array(order)
+        order = self.class.recipient_header_order if order.empty?
         recipients = []
 
         emails = order.inject([]) do |memo, key|
@@ -309,7 +310,7 @@ module Astrotrain
     # Returns converted String.
     def convert_to_utf8(s)
       # If this string is already valid UTF-8 just hand it back
-      if s.as_utf8.valid?
+      if (!@mail.charset || @mail.charset == 'UTF-8') && s.as_utf8.valid?
         s.force_encoding("UTF-8") if s.respond_to?(:force_encoding)
         return s
       end
@@ -322,7 +323,11 @@ module Astrotrain
       # if the encoding was already set or we just detected it AND it's not already
       # set to UTF-8 - try to transcode the body into UTF-8
       if @mail.charset && @mail.charset != 'UTF-8'
-        s = CharlockHolmes::Converter.convert s, @mail.charset, 'UTF-8'
+        if s.size > 0
+          s = CharlockHolmes::Converter.convert s, @mail.charset, 'UTF-8'
+        else
+          s = ""
+        end
       end
 
       # By the time we get here, `s` is either UTF-8 or we need to force it to be

data/test/message_test.rb

@@ -5,7 +5,7 @@ class MessageParsingTest < Test::Unit::TestCase
   test "bad content type header" do
     msg = astrotrain :bad_content_type
 
-    expected_body   = "This message is being generated automatically to notify you\nthat PowerMTA has crashed on mtasv.net.\n\nAs the information below is likely to be essential for debugging\nthe problem, please forward this message to <support@port25.com>.\nThank you.\nYo"
+    expected_body   = "This message is being generated automatically to notify you\nthat PowerMTA has crashed on mtasv.net.\n\nAs the information below is likely to be essential for debugging\nthe problem, please forward this message to <support@port25.com>.\nThank you.\n\nYo"
     expected_header = "multipart/mixed; boundary=\"====boundary====\""
 
     assert_equal expected_body,   msg.body
@@ -28,7 +28,7 @@ class MessageParsingTest < Test::Unit::TestCase
     assert_equal %(Bob),                       msg.sender.first.display_name
     assert_equal %(user@example.com),          msg.sender.first.address
     assert_equal 'Fwd: blah blah',             msg.subject
-    assert_equal body,                         msg.body
+    assert_equal body + "\n",                  msg.body
   end
 
   test "iso 8859 1 encoded headers" do
@@ -76,7 +76,7 @@ class MessageParsingTest < Test::Unit::TestCase
     assert_kind_of Mail::Message, msg.mail
 
     assert_equal %w(foo@example.com), msg.recipients
-    assert_equal "Testing out rich emails with attachments!\nThis one has a name property on Content-Type.\n[state:hold responsible:rick]",
+    assert_equal "Testing out rich emails with attachments!\nThis one has a name property on Content-Type.\n[state:hold responsible:rick]\n",
       msg.body
     assert_equal 1,            msg.attachments.size
     assert_equal 'bandit.jpg', msg.attachments.first.filename
@@ -89,7 +89,7 @@ class MessageParsingTest < Test::Unit::TestCase
     assert_kind_of Mail::Message, msg.mail
 
     assert_equal %w(foo@example.com), msg.recipients
-    assert_equal "Testing out rich emails with attachments!\nThis one has NO name property on Content-Type.\n[state:hold responsible:rick]",
+    assert_equal "Testing out rich emails with attachments!\nThis one has NO name property on Content-Type.\n[state:hold responsible:rick]\n",
       msg.body
     assert_equal 1,            msg.attachments.size
     assert_equal 'bandit.jpg', msg.attachments.first.filename
@@ -102,7 +102,7 @@ class MessageParsingTest < Test::Unit::TestCase
     assert_kind_of Mail::Message, msg.mail
 
     assert_equal %w(foo@example.com), msg.recipients
-    assert_equal "Let's have a test here:\nYum\n\n\nOn Feb 10, 2009, at 3:37 PM, Tender Support wrote:\n\n> // Add your reply above here\n> ==================================================\n> From: Tyler Durden\n> Subject: Email attachments and file upload\n>\n> not at the moment ... let me test\n>\n> View this Discussion online: http://foobar.com\n> .", 
+    assert_equal "Let's have a test here:\n\n\nYum\n\n\nOn Feb 10, 2009, at 3:37 PM, Tender Support wrote:\n\n> // Add your reply above here\n> ==================================================\n> From: Tyler Durden\n> Subject: Email attachments and file upload\n>\n> not at the moment ... let me test\n>\n> View this Discussion online: http://foobar.com\n> .\n\n\n\n",
       msg.body
     assert_equal 1,           msg.attachments.size
     assert_equal 'logo.gif',  msg.attachments.first.filename
@@ -125,7 +125,7 @@ class MessageParsingTest < Test::Unit::TestCase
   test "recipients in the body" do
     msg = astrotrain(:multiple_with_body_recipients)
 
-    assert_equal %w(processor@astrotrain.com other@example.com processor+foobar@astrotrain.com processor+blah@astrotrain.com), 
+    assert_equal %w(processor@astrotrain.com other@example.com processor+foobar@astrotrain.com processor+blah@astrotrain.com),
       msg.recipients(Astrotrain::Message.recipient_header_order + %w(body))
   end
 
@@ -208,4 +208,10 @@ class MessageParsingTest < Test::Unit::TestCase
       end
     end
   end
+
+  test "iso 2022 jp encoded subject and body" do
+    msg = astrotrain "iso-2022-jp"
+    assert_mail_utf8 msg
+    assert_equal "投稿テスト\n--\nyamada@example.jp", msg.body
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: astrotrain
 version: !ruby/object:Gem::Version
-  version: 0.7.1
-  prerelease: 
+  version: 0.7.2
 platform: ruby
 authors:
 - Rick Olson
@@ -14,7 +13,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: utf8
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,17 +97,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: email => http post
@@ -166,27 +151,25 @@ files:
 - test/transport_test.rb
 homepage: http://github.com/technoweenie/astrotrain
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: astrotrain
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 2
 summary: email => http post
 test_files: []
-has_rdoc: