From b76b1812c6aaaabdde43d8d9183de5e47803dea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Ler=C3=ADn?= Date: Fri, 23 May 2014 16:59:01 +0200 Subject: [PATCH] Move mime file for avoid conflicts with mime_types gem --- lib/mapi/convert/note-mime.rb | 2 +- lib/mapi/convert/note-tmail.rb | 2 +- lib/{ => mapi}/mime.rb | 0 test/test_mime.rb | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename lib/{ => mapi}/mime.rb (100%) diff --git a/lib/mapi/convert/note-mime.rb b/lib/mapi/convert/note-mime.rb index 7b81bc6..5955d9b 100644 --- a/lib/mapi/convert/note-mime.rb +++ b/lib/mapi/convert/note-mime.rb @@ -1,5 +1,5 @@ require 'base64' -require 'mime' +require 'mapi/mime' require 'time' # there is still some Msg specific stuff in here. diff --git a/lib/mapi/convert/note-tmail.rb b/lib/mapi/convert/note-tmail.rb index 9ccc9e0..e3cae2e 100644 --- a/lib/mapi/convert/note-tmail.rb +++ b/lib/mapi/convert/note-tmail.rb @@ -3,7 +3,7 @@ # these will be removed later require 'time' -require 'mime' +require 'mapi/mime' # there is some Msg specific stuff in here. diff --git a/lib/mime.rb b/lib/mapi/mime.rb similarity index 100% rename from lib/mime.rb rename to lib/mapi/mime.rb diff --git a/test/test_mime.rb b/test/test_mime.rb index 9c65100..196ea57 100644 --- a/test/test_mime.rb +++ b/test/test_mime.rb @@ -3,7 +3,7 @@ $: << File.dirname(__FILE__) + '/../lib' require 'test/unit' -require 'mime' +require 'mapi/mime' class TestMime < Test::Unit::TestCase # test out the way it partitions a message into parts