From afbb1cb5fa5a8d85bfea66637730b09517d6e261 Mon Sep 17 00:00:00 2001
From: Mike Mondragon <mikemondragon@gmail.com>
Date: Sun, 30 Oct 2011 17:51:09 -0700
Subject: [PATCH] Push duck punches to an ext directory.

---
 lib/ext/object.rb | 11 +++++++++++
 lib/mms2r.rb      | 24 +++++-------------------
 2 files changed, 16 insertions(+), 19 deletions(-)
 create mode 100644 lib/ext/object.rb

diff --git a/lib/ext/object.rb b/lib/ext/object.rb
new file mode 100644
index 0000000..70dbc56
--- /dev/null
+++ b/lib/ext/object.rb
@@ -0,0 +1,11 @@
+class Object
+
+  def blank?
+    respond_to?(:empty?) ? empty? : !self
+  end
+
+  def present?
+    !blank?
+  end
+
+end
diff --git a/lib/mms2r.rb b/lib/mms2r.rb
index 85feadb..b99a31d 100644
--- a/lib/mms2r.rb
+++ b/lib/mms2r.rb
@@ -52,24 +52,8 @@ def self.parse raw_mail
 
 end
 
-class Object
-
-  unless defined?(:blank?)
-    def blank?
-      respond_to?(:empty?) ? empty? : !self
-    end
-  end
-
-  unless defined?(:present?)
-    def present?
-      !blank?
-    end
-  end
-end
-
 %W{ mail fileutils pathname tmpdir yaml uuidtools iconv exifr }.each do |g|
   begin
-    gem 'mail', '= 2.2.13' if g == 'mail'
     require g
   rescue LoadError
     require 'rubygems'
@@ -77,7 +61,9 @@ def present?
   end
 end
 
-require File.join(File.dirname(__FILE__), 'mail_ext')
-require File.join(File.dirname(__FILE__), 'mms2r', 'media')
-require File.join(File.dirname(__FILE__), 'mms2r', 'media', 'sprint')
+require File.join(File.dirname(__FILE__), 'ext/mail')
+require File.join(File.dirname(__FILE__), 'ext/object')
+require File.join(File.dirname(__FILE__), 'mms2r/media')
+require File.join(File.dirname(__FILE__), 'mms2r/media/sprint')
+
 MMS2R.register('pm.sprint.com', MMS2R::Media::Sprint)