remove rubymail_patch

4 files changed, 3 insertions, 53 deletions

diff --git a/lib/feed2imap/itemtomail.rb b/lib/feed2imap/itemtomail.rb
index 06efbeb..c4f5c68 100644
--- a/lib/feed2imap/itemtomail.rb
+++ b/lib/feed2imap/itemtomail.rb
@@ -26,7 +26,7 @@ require 'feedparser'
 require 'feedparser/text-output'
 require 'feedparser/html-output'
 require 'base64'
-require 'feed2imap/rubymail_patch'
+require 'rmail'
 require 'digest/md5'
 
 class String
diff --git a/lib/feed2imap/rubymail_patch.rb b/lib/feed2imap/rubymail_patch.rb
deleted file mode 100644
index 208228c..0000000
--- a/lib/feed2imap/rubymail_patch.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-=begin
-Feed2Imap - RSS/Atom Aggregator uploading to an IMAP Server
-Copyright (c) 2005 Lucas Nussbaum <lucas@lucas-nussbaum.net>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-=end
-
-# Patches for ruby mail
-# The problem is it creates a mail with multipart/mixed (= for attachments), but I need
-# multipart/alternative. I just overwrite the two methods doing this.
-
-require 'rmail'
-
-module RMail
-  class Header
-    undef set_boundary
-    def set_boundary(boundary)
-      params = params_quoted('content-type')
-      params ||= {}
-      params['boundary'] = boundary
-      content_type = content_type()
-      content_type ||= "multipart/alternative"
-      delete('Content-Type')
-      add('Content-Type', content_type, nil, params)
-    end
-  end
-
-  class Message
-    # TODO find a way to avoid the warning. undef'ing initialize causes a warning.
-    def initialize
-      @header = RMail::Header.new
-      @body = nil
-      @epilogue = nil
-      @preamble = nil
-      @delimiters = nil
-    end
-  end
-end
diff --git a/test/tc_mail.rb b/test/tc_mail.rb
index bfc023a..de80f9c 100755
--- a/test/tc_mail.rb
+++ b/test/tc_mail.rb
@@ -3,7 +3,7 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'test/unit'
-require 'feed2imap/rubymail_patch'
+require 'rmail'
 
 class MailTest < Test::Unit::TestCase
   def test_require_rmail
diff --git a/website/index.html b/website/index.html
index 62fe1aa..9dc3854 100644
--- a/website/index.html
+++ b/website/index.html
@@ -108,7 +108,7 @@ when trying to keep up with their feeds. Other solutions to this problem include
 <li>Fetching using HTTP is done in <i>httpfetcher.rb</i>.</li>
 <li>Parsing is done using <a href="http://home.gna.org/ruby-feedparser/">Ruby-feedparser</a>.</li>
 <li>Everything dealing with IMAP is in <i>imap.rb</i>.</li>
-<li><i>rexml_patch.rb</i> and <i>rubymail_patch.rb</i> are small fixes (read: hacks) to REXML and Rubymail.</li>
+<li><i>rexml_patch.rb</i> are small fixes (read: hacks) to REXML.</li>
 </ul>
 </body>
 </html>