mailfactory 1.3.1 → 1.3.5

data/lib/mailfactory.rb

@@ -26,7 +26,6 @@
 #     smtp.send_message(mail.to_s(), fromaddress, toaddress)
 #   }
 
-require 'base64'
 require 'pathname'
 
 # try to bring in the mime/types module, make a dummy module if it can't be found
@@ -48,6 +47,8 @@ end
 
 # An easy class for creating a mail message
 class MailFactory
+
+  VERSION = '1.3.5'
   
   def initialize()
     @headers = Array.new()
@@ -381,7 +382,7 @@ protected
   # returns a base64 encoded version of the contents of str
   def file_encode(str)
     collection = Array.new()
-    enc = Base64.encode64(str)
+    enc = [str].pack('m')
     #  while(enc.length > 60)
     #    collection << enc.slice!(0..59)
     #  end
@@ -393,29 +394,50 @@ protected
   
   # Convert the given text into quoted printable format, with an instruction
   # that the text be eventually interpreted in the given charset.
+  
   def quoted_printable_with_instruction(text, charset)
-    text = [text].pack("M").gsub(/\n/, "\r\n").chomp.gsub(/ /, "_")
+    text = quoted_printable_encode_header(text)
     "=?#{charset}?Q?#{text}?="
   end
 
+  # rfc2045 compatible. use rfc2047 for headers (such as the Subject line) instead
+  def quoted_printable_encode(text)
+    [text].pack('M').gsub(/\n/, "\r\n").chomp.gsub(/=$/, '')
+  end
 
   # Convert the given character to quoted printable format
-  def quoted_printable_encode(text)
-    [text].pack("M").gsub(/\n/, "\r\n").chomp
+  # see http://tools.ietf.org/html/rfc2047
+  
+  def quoted_printable_encode_header(text)
+    text.scan(/./u).map do |char|
+      (char[0] < 128 and char[0] != 61) ? # 61 is ascii '='
+        char :
+        '=%X' % char[0]
+    end.join('').
+        chomp.
+        gsub(/=$/,'').
+        gsub('?', '=3F').
+        gsub('_', '=5F').
+        gsub(/ /, '_')
   end
 
 
   # A quick-and-dirty regexp for determining whether a string contains any
   # characters that need escaping.
-  if !defined?(CHARS_NEEDING_QUOTING)
-    CHARS_NEEDING_QUOTING = /[\000-\011\013\014\016-\037\177-\377]/
-  end
+  #--
+  # Jun18-08: deprecated, since all multipart blocks are marked quoted-printable, quoting is required
+
+  # if !defined?(CHARS_NEEDING_QUOTING)
+  #   CHARS_NEEDING_QUOTING = /[\000-\011\013\014\016-\037\177-\377]/
+  # end
 
 
   # Quote the given text if it contains any "illegal" characters
   def quote_if_necessary(text, charset, instruction = false)
+    return unless text
     text = text.dup.force_encoding(Encoding::ASCII_8BIT) if text.respond_to?(:force_encoding)
-    (text =~ CHARS_NEEDING_QUOTING) ? (instruction ? quoted_printable_with_instruction(text, charset) : quoted_printable_encode(text)) : text
+    #(text =~ CHARS_NEEDING_QUOTING) ? (instruction ? quoted_printable_with_instruction(text, charset) : quoted_printable_encode(text)) : text
+    instruction ? quoted_printable_with_instruction(text, charset) : quoted_printable_encode(text)
   end
 
 
@@ -436,4 +458,4 @@ protected
     end
   end
   
-end
+end

data/tests/test_mailfactory.rb

@@ -185,8 +185,31 @@ class TC_MailFactory < Test::Unit::TestCase
 		end
 	end
 	
-end
+	def test_quoted_printable_with_instruction
+	  @mail.to="test@test.com"
+		@mail.from="test@othertest.com"
+		@mail.subject="My email subject has a ? in it and also an = and a _ too... Also some non-quoted junk ()!@\#\{\$\%\}"
+		@mail.text = "This is a test message with\na few\n\nlines."
+    assert_equal("=?utf-8?Q?My_email_subject_has_a_=3F_in_it_and_also_an_=3D_and_a_=5F_too..._Also_some_non-quoted_junk_()!@\#\{\$\%\}?=", @mail.subject.to_s)
+  end
+  
+  def test_utf8_quoted_printable_with_instruction
+    @mail.to="test@test.com"
+  	@mail.from="test@othertest.com"
+  	@mail.subject="My email subject has a à which is utf8."
+  	@mail.text = "This is a test message with\na few\n\nlines."
+    assert_equal("=?utf-8?Q?My_email_subject_has_a_=C3_which_is_utf8.?=", @mail.subject.to_s)
+  end
+	
+  def test_quoted_printable_html
+    @mail.to="test@test.com"
+    @mail.from="test@othertest.com"
+    @mail.subject="some html"
+    @mail.html="<a href=\"http://google.com\">click here</a>"
+    assert_match('<a href=3D"http://google.com">click here</a>', @mail.to_s)
+  end
 
+end
 
 $options = get_options()
 Test::Unit::UI::Console::TestRunner.run(TC_MailFactory)

metadata

@@ -1,54 +1,61 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: mailfactory
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
-date: 2008-04-28 00:00:00 +01:00
-summary: MailFactory is a pure-ruby MIME mail generator
-require_paths: 
-- lib
-email: david@grayskies.net
-homepage: http://mailfactory.rubyforge.org
-rubyforge_project: mailfactory
-description: MailFactory is s simple module for producing RFC compliant mail that can include multiple attachments, multiple body parts, and arbitrary headers
-autorequire: mailfactory
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.3.5
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - David Powers
-files: 
-- ./lib/mailfactory.rb
-test_files: 
-- ./tests/test_mailfactory.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
-requirements: []
+autorequire: 
+bindir: bin
+cert_chain: []
 
+date: 2008-06-18 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 1.13.1
     version: 
+description: MailFactory is s simple module for producing RFC compliant mail that can include multiple attachments, multiple body parts, and arbitrary headers
+email: david@grayskies.net
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- ./lib/mailfactory.rb
+has_rdoc: true
+homepage: http://mailfactory.rubyforge.org
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: mailfactory
+rubygems_version: 1.1.1
+signing_key: 
+specification_version: 2
+summary: MailFactory is a pure-ruby MIME mail generator
+test_files: 
+- ./tests/test_mailfactory.rb