mms2r 1.0.5 → 1.0.6

data/History.txt

@@ -1,3 +1,13 @@
+== 1.0.6 / 2007-04-24 (Pickles the Drummer)
+
+* patch submitted by Luke Francl
+* added support for mms.dobson.net (Dobson aka Cellular One) (Luke)
+* DRY'd up unit tests (Luke)
+* added get_media instance method that returns first video or image as File (Luke)
+* File from get_media can be used by/with attachment_fu (Luke)
+* added get_text instance method that returns first non advertising text
+* File from get_text can be used by/with attachment_fu
+
 == 1.0.5 / 2007-04-10 (William Murderface)
 
 * patch submitted by Luke Francl

data/Manifest.txt

@@ -10,6 +10,7 @@ conf/mms2r_verizonmedia_ignore.yml
 conf/mms2r_verizonmedia_transform.yml
 lib/mms2r.rb
 lib/mms2r/cingular_media.rb
+lib/mms2r/dobson_media.rb
 lib/mms2r/media.rb
 lib/mms2r/mmode_media.rb
 lib/mms2r/nextel_media.rb
@@ -42,6 +43,7 @@ lib/vendor/tmail/stringio.rb
 lib/vendor/tmail/tmail.rb
 lib/vendor/tmail/utils.rb
 test/files/cingularme-text-01.mail
+test/files/dobson-image-01.mail
 test/files/dot.jpg
 test/files/hello_world_mail_multipart.mail
 test/files/hello_world_mail_plain_no_content_type.mail
@@ -65,7 +67,9 @@ test/files/verizon-image-02.mail
 test/files/verizon-text-01.mail
 test/files/verizon-video-01.mail
 test/files/vtext-text-01.mail
+test/test_helper.rb
 test/test_mms2r_cingular.rb
+test/test_mms2r_dobson.rb
 test/test_mms2r_media.rb
 test/test_mms2r_mmode.rb
 test/test_mms2r_nextel.rb

data/README.txt

@@ -21,6 +21,7 @@ Corpus of carriers currently processed by MMS2R:
 * AT&T/Cingular => mmode.com
 * Cingular => mms.mycingular.com
 * Cingular => cingularme.com
+* Dobson/Cellular One => mms.dobson.net
 * Nextel => messaging.nextel.com
 * Sprint => pm.sprint.com
 * Sprint => messaging.sprintpcs.com
@@ -28,10 +29,10 @@ Corpus of carriers currently processed by MMS2R:
 * Verizon => vzwpix.com
 * Verizon => vtext.com
 
-== FEATURES/PROBLEMS:
+== FEATURES
 
-TMail from 1.3.1 of ActionMailer is shipped as a vendor library with MMS2R
- 
+* TMail from 1.3.1 of ActionMailer is shipped as a vendor library with MMS2R
+* get_media and get_text methods return a File that can be used in attachment_fu 
 == SYNOPSIS:
 
   require 'rubygems'
@@ -40,13 +41,24 @@ TMail from 1.3.1 of ActionMailer is shipped as a vendor library with MMS2R
   require 'tmail'
   require 'fileutils'
 
-  media = TMail::Mail.parse(IO.readlines("sample-MMS.file").join)
-  mms = MMS2R::Media.create(media,Logger.new(STDOUT))
+  # TMail::Mail.parse is what ActionMailer::Base.receive(email) does, see:
+  # http://wiki.rubyonrails.com/rails/pages/HowToReceiveEmailsWithActionMailer
+  email = TMail::Mail.parse(IO.readlines("sample-MMS.file").join)
+  mms = MMS2R::Media.create(email,Logger.new(STDOUT))
 
   # process finds all the media in a MMS, strips advertsing, then
   # writes the user generated media to disk in a temporary subdirectory
   mms.process
 
+  # most MMS are either image or video, get_media will blindly return
+  # the first video or image found
+  file = mms.get_media
+  puts "MMS had a media: #{file.inspect}" unless file.nil?
+
+  # get_text will blindly return the first (non-advertising) text found
+  file = mms.get_text
+  puts "MMS had some text: #{file.inspect}" unless file.nil?
+
   # mms.media is a hash that is indexed by mime-type.
   # The mime-type key returns an array of filepaths
   # to media that were extract from the MMS and

data/lib/mms2r.rb

@@ -1,3 +1,3 @@
 $:.unshift(File.dirname(__FILE__) + "/vendor/")
-module MMS2R # :nodoc:
+module MMS2R
 end

data/lib/mms2r/dobson_media.rb

@@ -0,0 +1,14 @@
+require 'mms2r'
+require 'mms2r/media'
+
+module MMS2R
+
+  ##
+  # Dobson/Cellular One version version of MMS2R::Media
+  # So far, Dobson MMS messages do not contain advertising
+  # They do, however, have a weird SMIL file attachment. It
+  # can be safely ignored.
+  
+  class MMS2R::DobsonMedia < MMS2R::Media
+  end
+end

data/lib/mms2r/media.rb

@@ -14,6 +14,7 @@ require 'mms2r/nextel_media'
 require 'mms2r/sprint_media'
 require 'mms2r/tmobile_media'
 require 'mms2r/verizon_media'
+require 'mms2r/dobson_media'
 
 ##
 # MMS2R is a library to collect media files from MMS messages. MMS messages 
@@ -64,7 +65,8 @@ module MMS2R
     'messaging.sprintpcs.com' => MMS2R::SprintMedia,
     'tmomail.net' => MMS2R::TMobileMedia,
     'vtext.com' => MMS2R::VerizonMedia,
-    'vzwpix.com' => MMS2R::VerizonMedia
+    'vzwpix.com' => MMS2R::VerizonMedia,
+    'mms.dobson.net' => MMS2R::DobsonMedia
   }
 
   class MMS2R::Media
@@ -107,6 +109,28 @@ module MMS2R
                      self.class.safe_message_id(@mail.message_id))
     end
 
+    # Returns a File with the most likely candidate for the user-submitted
+    # media. Given that most MMS messages only have one file attached,
+    # this will try to give you that file. First it looks for videos, then
+    # images. It also adds singleton methods to the File object so it can
+    # be used in place of a CGI upload (local_path, original_filename, size,
+    # and content_type)
+    #
+    # Returns nil if no video or image is found.
+
+    def get_media
+      get_attachement(['video', 'image'])
+    end
+
+    # Returns a File with the most likely candidate that is text, or nil
+    # otherwise. It also adds singleton methods to the File object so it can
+    # be used in place of a CGI upload (local_path, original_filename, size,
+    # and content_type)
+
+    def get_text
+      get_attachement(['text'])
+    end
+
     ##
     # Helper for process template method to decode the part based 
     # on its type and write its content to a temporary file.  Returns 
@@ -362,6 +386,49 @@ module MMS2R
       /\/([^\/]+)$/.match(self.part_type?(part))[1]
     end
 
+    private
+
+    ##
+    # used by get_media and get_text to return the first attachment type
+    # listed in the types array
+
+    def get_attachement(types)
+
+      mime_type = nil
+      types.each{|t|
+        mime_type = media.keys.find { |key| 0 == (key =~ /#{t}/) } if mime_type.nil?
+      }
+
+      if mime_type.nil?
+        return nil
+      end
+
+      file = File.new(media[mime_type][0])
+
+      # These singleton methods implement the interface necessary to be used
+      # as a drop-in replacement for files uploaded with CGI.rb.
+      # This helps if you want to use the files with, for example,
+      # attachment_fu.
+      def file.local_path
+        self.path
+      end
+
+      def file.original_filename
+        File.basename(self.path)
+      end
+
+      def file.size
+        File.size(self.path)
+      end
+
+      # this one is kind of confusing because it needs a closure.
+      class << file
+        self
+      end.send(:define_method, :content_type) { mime_type }
+
+      return file
+    end
+
   end
 
 end

data/lib/mms2r/version.rb

@@ -6,7 +6,7 @@ module MMS2R
     ##
     # MMS2R Library version
 
-    VERSION = '1.0.5'
+    VERSION = '1.0.6'
 
   end
 end

data/test/files/dobson-image-01.mail

@@ -0,0 +1,64 @@
+Delivered-To: luke@example.com
+Received: by 10.114.126.6 with SMTP id y6cs662518wac;
+        Wed, 18 Apr 2007 17:30:16 -0700 (PDT)
+Received: by 10.70.37.12 with SMTP id k12mr2098583wxk.1176942615765;
+        Wed, 18 Apr 2007 17:30:15 -0700 (PDT)
+Return-Path: <19075551234@mms.dobson.net>
+Received: from mms.dobson.net ([12.168.76.27])
+        by mx.google.com with SMTP id h13si2340383wxd.2007.04.18.17.30.14;
+        Wed, 18 Apr 2007 17:30:15 -0700 (PDT)
+Received-SPF: neutral (google.com: 12.168.76.27 is neither permitted nor denied by best guess record for domain of 19075551234@mms.dobson.net)
+Received: (qmail 4243 invoked from network); 19 Apr 2007 00:30:14 -0000
+Received: from unknown (HELO mmsc1be1.dobson.net) (172.23.1.158)
+  by 0 with SMTP; 19 Apr 2007 00:30:14 -0000
+Resent-To: luke@example.com
+Received: by mms.dobson.net ; Thu, 19 Apr 2007 00:30:14 GMT
+Content-Type: multipart/related;boundary=1_4626B816_9F1690;Type="application/smil";Start="<mms.smil.txt>"
+Subject: Subject
+Date: Thu, 19 Apr 2007 00:30:14 GMT
+To: luke@example.com
+From: 19075551234@mms.dobson.net
+Message-ID: <AVTD2MlE05dRftqAJ@mmsc1be1.dobson.net>
+Mime-Version: 1.0
+X-Mms-Message-Type: m-send-req
+X-Mms-Transaction-ID: AVTD2MlE05dRftqAJ
+X-Mms-MMS-Version: 1.0
+X-Mms-Message-Class: Personal
+X-Mms-Expiry: 1176949814
+X-Mms-Delivery-Time: 1176942614
+X-Mms-Priority: Normal
+X-Mms-Sender-Visibility: Show
+X-Mms-Delivery-Report: No
+X-Mms-Read-Reply: No
+X-Mms-Message-Size: 73237
+X-Mms-Mmsc-Originated: Yes
+
+--1_4626B816_9F1690
+Content-Type: application/smil;Charset=UTF-8;Name=mms.smil.txt
+content-location: mms.smil.txt
+content-id: <mms.smil.txt>
+Content-Transfer-Encoding: 7bit
+
+<smil><head><layout><root-layout width="176px" height="161px"/><region id="Image" left="0%" top="0%" height="67%" width="100%"/><region id="Text" left="0%" top="67%" height="33%" width="100%"/></layout></head><body><par dur="20s"><img src="media1.jpeg" type="image/jpeg" region="Image" alt="media1.jpeg" /><text src="media2.txt" type="text/plain" region="Text" alt="media2.txt" /></par></body></smil>
+--1_4626B816_9F1690
+Content-Type: image/jpeg;Name=04-18-07_1723.jpg
+content-location: media1.jpeg
+content-id: <media1.jpeg>
+Content-Transfer-Encoding: base64
+
+/9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAXQ3JlYXRl
+ZCB3aXRoIFRoZSBHSU1Q/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxER
+ExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4e
+Hh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAAQAB
+AwEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAH/8QAFBABAAAAAAAAAAAAAAAAAAAA
+AP/EABUBAQEAAAAAAAAAAAAAAAAAAAcI/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQAC
+EQMRAD8AlgA6WW//2Q==
+--1_4626B816_9F1690
+Content-Type: text/plain;Charset=UTF-8;Name=media2.txt
+content-id: <media2.txt>
+content-location: media2.txt
+Content-Transfer-Encoding: 7bit
+
+Body
+--1_4626B816_9F1690--
+

data/test/test_helper.rb

@@ -0,0 +1,14 @@
+module MMS2R
+  module TestHelper
+  
+    def assert_file_size(file, size)
+      assert_not_nil(file, "file was nil")
+      assert(File::exist?(file), "file #{file} does not exist")
+      assert(File::size(file) == size, "file #{file} is #{File::size(file)} bytes, not #{size} bytes")
+    end
+  
+    def load_mail(file)
+      IO.readlines("#{File.dirname(__FILE__)}/files/#{file}")
+    end
+  end
+end

data/test/test_mms2r_cingular.rb

@@ -1,4 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require File.dirname(__FILE__) + "/test_helper"
 require 'test/unit'
 require 'rubygems'
 require 'mms2r'
@@ -8,6 +9,7 @@ require 'logger'
 
 
 class MMS2RCingularTest < Test::Unit::TestCase
+  include MMS2R::TestHelper
 
   def setup
     @log = Logger.new(STDOUT)
@@ -34,9 +36,4 @@ class MMS2RCingularTest < Test::Unit::TestCase
     assert_match(/#{good_text}/m, text)
     mms.purge
   end
-
-  private
-  def load_mail(file)
-    IO.readlines("#{File.dirname(__FILE__)}/files/#{file}")
-  end
 end

data/test/test_mms2r_dobson.rb

@@ -0,0 +1,36 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require File.dirname(__FILE__) + "/test_helper"
+require 'test/unit'
+require 'rubygems'
+require 'mms2r'
+require 'mms2r/media'
+require 'tmail/mail'
+require 'logger'
+
+
+class MMS2RDobson < Test::Unit::TestCase
+  include MMS2R::TestHelper
+
+  def test_dobson_image
+    mail = TMail::Mail.parse(load_mail('dobson-image-01.mail').join)
+    mms = MMS2R::Media.create(mail)
+    assert_equal(mms.class, MMS2R::DobsonMedia)
+
+    mms.process
+  
+    assert(mms.media.size == 3, "Size is #{mms.media.size}")
+    assert_not_nil(mms.media['text/plain'])
+    assert_not_nil(mms.media['application/smil']) # dobson phones have weird SMIL that can be ignored.
+    assert_not_nil(mms.media['image/jpeg'][0])
+    assert_match(/04-18-07_1723.jpg$/, mms.media['image/jpeg'][0])
+
+    assert_file_size(mms.media['image/jpeg'][0], 337)
+  
+    file = mms.media['text/plain'][0]
+    assert_not_nil(file)
+    assert(File::exist?(file), "file #{file} does not exist")
+    text = IO.readlines("#{file}").join
+    assert_equal "Body", text.strip
+    mms.purge
+  end
+end

data/test/test_mms2r_media.rb

@@ -1,4 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require File.dirname(__FILE__) + "/test_helper"
 require 'test/unit'
 require 'rubygems'
 require 'yaml'
@@ -9,6 +10,7 @@ require 'tmail/mail'
 require 'logger'
 
 class MMS2RMediaTest < Test::Unit::TestCase
+  include MMS2R::TestHelper
 
   class MMS2R::FakeCarrier < MMS2R::Media; end
 
@@ -25,7 +27,8 @@ class MMS2RMediaTest < Test::Unit::TestCase
     'messaging.sprintpcs.com' => MMS2R::SprintMedia,
     'tmomail.net' => MMS2R::TMobileMedia,
     'vtext.com' => MMS2R::VerizonMedia,
-    'vzwpix.com' => MMS2R::VerizonMedia
+    'vzwpix.com' => MMS2R::VerizonMedia,
+    'mms.dobson.net' => MMS2R::DobsonMedia
   }
 
   def use_temp_dirs
@@ -285,9 +288,4 @@ class MMS2RMediaTest < Test::Unit::TestCase
     mail = TMail::Mail.parse(load_mail('simple_image.mail').join)
     assert(MMS2R::Media.sub_type?(mail.parts[0]).eql?('gif'))
   end
-
-  private
-  def load_mail(file)
-    IO.readlines("#{File.dirname(__FILE__)}/files/#{file}")
-  end
 end

data/test/test_mms2r_mmode.rb

@@ -1,4 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require File.dirname(__FILE__) + "/test_helper"
 require 'test/unit'
 require 'rubygems'
 require 'mms2r'
@@ -7,6 +8,7 @@ require 'tmail/mail'
 require 'logger'
 
 class MMS2RMModeTest < Test::Unit::TestCase
+  include MMS2R::TestHelper
 
   def setup
     @log = Logger.new(STDOUT)
@@ -28,16 +30,7 @@ class MMS2RMModeTest < Test::Unit::TestCase
     assert_not_nil(mms.media['image/jpeg'][0])
     assert_match(/picture\(3\).jpg$/, mms.media['image/jpeg'][0])
 
-    file = mms.media['image/jpeg'][0]
-    assert_not_nil(file)
-    assert(File::exist?(file), "file #{file} does not exist")
-    assert(File::size(file) == 337, "file #{file} not 337 byts")
-
+    assert_file_size(mms.media['image/jpeg'][0], 337)
     mms.purge
   end
-
-  private
-  def load_mail(file)
-    IO.readlines("#{File.dirname(__FILE__)}/files/#{file}")
-  end
 end

data/test/test_mms2r_nextel.rb

@@ -1,5 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
+require File.dirname(__FILE__) + "/test_helper"
 require 'test/unit'
 require 'rubygems'
 require 'mms2r'
@@ -8,6 +8,7 @@ require 'tmail/mail'
 require 'logger'
 
 class MMS2RNextelTest < Test::Unit::TestCase
+  include MMS2R::TestHelper
 
   def setup
     @log = Logger.new(STDOUT)
@@ -17,6 +18,54 @@ class MMS2RNextelTest < Test::Unit::TestCase
 
   def teardown; end
 
+  def test_simple_get_text_is_nil
+    mail = TMail::Mail.parse(load_mail('nextel-image-01.mail').join)
+    mms = MMS2R::Media.create(mail)
+    mms.process
+
+    assert_nil(mms.get_text)
+
+    mms.purge
+  end
+
+  def test_simple_get_text
+    mail = TMail::Mail.parse(load_mail('cingularme-text-01.mail').join)
+    mms = MMS2R::Media.create(mail)
+    mms.process
+
+    file = mms.get_text
+    assert_file_size(file, 13)
+    assert_match(/\.txt$/, file.original_filename)
+    assert_equal(13, file.size)
+    assert_match(/\.txt$/, file.local_path)
+
+    mms.purge
+  end
+
+  def test_simple_get_media_is_nil
+    mail = TMail::Mail.parse(load_mail('cingularme-text-01.mail').join)
+    mms = MMS2R::Media.create(mail)
+    mms.process
+
+    assert_nil(mms.get_media)
+
+    mms.purge
+  end
+
+  def test_simple_get_media
+    mail = TMail::Mail.parse(load_mail('nextel-image-01.mail').join)
+    mms = MMS2R::Media.create(mail)
+    mms.process
+
+    file = mms.get_media
+    assert_file_size(file, 337)
+    assert_equal('Jan15_0001.jpg', file.original_filename)
+    assert_equal(337, file.size)
+    assert_match(/Jan15_0001.jpg$/, file.local_path)
+
+    mms.purge
+  end
+
   def test_simple_image1
     mail = TMail::Mail.parse(load_mail('nextel-image-01.mail').join)
     mms = MMS2R::Media.create(mail)
@@ -28,10 +77,7 @@ class MMS2RNextelTest < Test::Unit::TestCase
     assert_not_nil(mms.media['image/jpeg'][0])
     assert_match(/Jan15_0001.jpg$/, mms.media['image/jpeg'][0])
 
-    file = mms.media['image/jpeg'][0]
-    assert_not_nil(file)
-    assert(File::exist?(file), "file #{file} does not exist")
-    assert(File::size(file) == 337, "file #{file} not 337 byts")
+    assert_file_size(mms.media['image/jpeg'][0], 337)
 
     mms.purge
   end
@@ -47,10 +93,7 @@ class MMS2RNextelTest < Test::Unit::TestCase
     assert_not_nil(mms.media['image/jpeg'][0])
     assert_match(/Mar12_0001.jpg$/, mms.media['image/jpeg'][0])
 
-    file = mms.media['image/jpeg'][0]
-    assert_not_nil(file)
-    assert(File::exist?(file), "file #{file} does not exist")
-    assert(File::size(file) == 337, "file #{file} not 337 byts")
+    assert_file_size(mms.media['image/jpeg'][0], 337)
 
     mms.purge
   end
@@ -66,10 +109,7 @@ class MMS2RNextelTest < Test::Unit::TestCase
     assert_not_nil(mms.media['image/jpeg'][0])
     assert_match(/Apr01_0001.jpg$/, mms.media['image/jpeg'][0])
 
-    file = mms.media['image/jpeg'][0]
-    assert_not_nil(file)
-    assert(File::exist?(file), "file #{file} does not exist")
-    assert(File::size(file) == 337, "file #{file} not 337 byts")
+    assert_file_size(mms.media['image/jpeg'][0], 337)
 
     mms.purge
   end
@@ -85,16 +125,8 @@ class MMS2RNextelTest < Test::Unit::TestCase
     assert_not_nil(mms.media['image/jpeg'][0])
     assert_match(/Mar20_0001.jpg$/, mms.media['image/jpeg'][0])
 
-    file = mms.media['image/jpeg'][0]
-    assert_not_nil(file)
-    assert(File::exist?(file), "file #{file} does not exist")
-    assert(File::size(file) == 337, "file #{file} not 337 byts")
+    assert_file_size(mms.media['image/jpeg'][0], 337)
 
     mms.purge
   end
-
-  private
-  def load_mail(file)
-    IO.readlines("#{File.dirname(__FILE__)}/files/#{file}")
-  end
 end

data/test/test_mms2r_sprint.rb

@@ -1,5 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
+require File.dirname(__FILE__) + "/test_helper"
 require 'test/unit'
 require 'webrick'
 require 'net/http'
@@ -102,6 +102,7 @@ class Response
 end
 
 class MMS2RSprintTest < Test::Unit::TestCase
+  include MMS2R::TestHelper
 
   def setup
     @log = Logger.new(STDOUT)
@@ -122,10 +123,7 @@ class MMS2RSprintTest < Test::Unit::TestCase
     assert_not_nil(mms.media['video/quicktime'][0])
     assert_match(/000_0123a01234567895_1.mov$/, mms.media['video/quicktime'][0])
 
-    file = mms.media['video/quicktime'][0]
-    assert_not_nil(file)
-    assert(File::exist?(file), "file #{file} does not exist")
-    assert(File::size(file) == 49063, "file #{file} not 49063 byts")
+    assert_file_size(mms.media['video/quicktime'][0], 49063)
     mms.purge
   end
 
@@ -140,10 +138,7 @@ class MMS2RSprintTest < Test::Unit::TestCase
     assert_not_nil(mms.media['image/jpeg'][0])
     assert_match(/000_0123a01234567890_1.jpg$/, mms.media['image/jpeg'][0])
 
-    file = mms.media['image/jpeg'][0]
-    assert_not_nil(file)
-    assert(File::exist?(file), "file #{file} does not exist")
-    assert(File::size(file) == 337, "file #{file} not 337 byts")
+    assert_file_size(mms.media['image/jpeg'][0], 337)
     mms.purge
   end
 
@@ -170,9 +165,4 @@ class MMS2RSprintTest < Test::Unit::TestCase
     assert_match(/hello world/, text)
     mms.purge
   end
-
-  private
-  def load_mail(file)
-    IO.readlines("#{File.dirname(__FILE__)}/files/#{file}")
-  end
 end

data/test/test_mms2r_tmobile.rb

@@ -1,4 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require File.dirname(__FILE__) + "/test_helper"
 require 'test/unit'
 require 'rubygems'
 require 'mms2r'
@@ -7,6 +8,7 @@ require 'tmail/mail'
 require 'logger'
 
 class MMS2RTMobileTest < Test::Unit::TestCase
+  include MMS2R::TestHelper
 
   def setup
     @log = Logger.new(STDOUT)
@@ -27,10 +29,7 @@ class MMS2RTMobileTest < Test::Unit::TestCase
     assert_not_nil(mms.media['image/jpeg'][0])
     assert_match(/12-01-06_1234.jpg$/, mms.media['image/jpeg'][0])
 
-    file = mms.media['image/jpeg'][0]
-    assert_not_nil(file)
-    assert(File::exist?(file), "file #{file} does not exist")
-    assert(File::size(file) == 337, "file #{file} not 337 byts")
+    assert_file_size(mms.media['image/jpeg'][0], 337)
 
     mms.purge
   end
@@ -46,9 +45,7 @@ class MMS2RTMobileTest < Test::Unit::TestCase
     assert_not_nil(mms.media['image/jpeg'][0])
     assert_match(/07-25-05_0935.jpg$/, mms.media['image/jpeg'][0])
     
-    file = mms.media['image/jpeg'][0]
-    assert(File::exist?(file), "file #{file} does not exist")
-    assert(File::size(file) == 337, "file #{file} is not 337 bytes")
+    assert_file_size(mms.media['image/jpeg'][0], 337)
     
     file = mms.media['text/plain'][0]
     assert_not_nil(file)
@@ -58,9 +55,4 @@ class MMS2RTMobileTest < Test::Unit::TestCase
     
     mms.purge
   end
-
-  private
-  def load_mail(file)
-    IO.readlines("#{File.dirname(__FILE__)}/files/#{file}")
-  end
 end

data/test/test_mms2r_verizon.rb

@@ -1,5 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
+require File.dirname(__FILE__) + "/test_helper"
 require 'test/unit'
 require 'rubygems'
 require 'mms2r'
@@ -8,6 +8,7 @@ require 'tmail/mail'
 require 'logger'
 
 class MMS2RVerizonTest < Test::Unit::TestCase
+  include MMS2R::TestHelper
 
   def setup
     @log = Logger.new(STDOUT)
@@ -28,10 +29,8 @@ class MMS2RVerizonTest < Test::Unit::TestCase
     assert_not_nil(mms.media['video/3gpp2'][0])
     assert_match(/012345_67890.3g2$/, mms.media['video/3gpp2'][0])
 
-    file = mms.media['video/3gpp2'][0]
-    assert_not_nil(file)
-    assert(File::exist?(file), "file #{file} does not exist")
-    assert(File::size(file) == 16553, "file #{file} not 16553 byts")
+    assert_file_size(mms.media['video/3gpp2'][0], 16553)
+
     mms.purge
   end
 
@@ -46,10 +45,8 @@ class MMS2RVerizonTest < Test::Unit::TestCase
     assert_not_nil(mms.media['image/jpeg'][0])
     assert_match(/IMAGE_00004.jpg$/, mms.media['image/jpeg'][0])
 
-    file = mms.media['image/jpeg'][0]
-    assert_not_nil(file)
-    assert(File::exist?(file), "file #{file} does not exist")
-    assert(File::size(file) == 337, "file #{file} not 41983 byts")
+    assert_file_size(mms.media['image/jpeg'][0], 337)
+
     mms.purge
   end
 
@@ -92,10 +89,7 @@ class MMS2RVerizonTest < Test::Unit::TestCase
     assert_not_nil(mms.media['image/jpeg'][0])
     assert_match(/04-09-07_1114.jpg$/, mms.media['image/jpeg'][0])
 
-    file = mms.media['image/jpeg'][0]
-    assert_not_nil(file)
-    assert(File::exist?(file), "file #{file} does not exist")
-    assert(File::size(file) == 337, "file #{file} not 337 byts")
+    assert_file_size(mms.media['image/jpeg'][0], 337)
     
     file = mms.media['text/plain'][0]
     assert_not_nil(file)
@@ -105,9 +99,4 @@ class MMS2RVerizonTest < Test::Unit::TestCase
     
     mms.purge
   end
-
-  private
-  def load_mail(file)
-    IO.readlines("#{File.dirname(__FILE__)}/files/#{file}")
-  end
 end

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: mms2r
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
-date: 2007-04-11 00:00:00 -07:00
+  version: 1.0.6
+date: 2007-04-25 00:00:00 -07:00
 summary: Extract media from MMS
 require_paths: 
 - lib
 email: mike@mondragon.cc
 homepage: http://mms2r.rubyforge.org/
 rubyforge_project: mms2r
-description: "== DESCRIPTION:  MMS2R is a library that decodes the parts of an MMS message to disk while  stripping out advertising injected by the cellphone carriers.  MMS messages are  multipart email and the carriers often inject branding into these messages.  Use MMS2R if you want to get at the real user generated content from a MMS without having to deal with the garbage from the carriers.  If MMS2R is not aware of a particular carrier no extra processing is done  to the MMS other than decoding and consolidating its media.  Contact the author to add additional carriers to be processed by the  library.  Suggestions and patches appreciated and welcomed!  Corpus of carriers currently processed by MMS2R:  * AT&T/Cingular => mmode.com * Cingular => mms.mycingular.com * Cingular => cingularme.com * Nextel => messaging.nextel.com * Sprint => pm.sprint.com * Sprint => messaging.sprintpcs.com * T-Mobile => tmomail.net * Verizon => vzwpix.com * Verizon => vtext.com"
+description: "== DESCRIPTION:  MMS2R is a library that decodes the parts of an MMS message to disk while  stripping out advertising injected by the cellphone carriers.  MMS messages are  multipart email and the carriers often inject branding into these messages.  Use MMS2R if you want to get at the real user generated content from a MMS without having to deal with the garbage from the carriers.  If MMS2R is not aware of a particular carrier no extra processing is done  to the MMS other than decoding and consolidating its media.  Contact the author to add additional carriers to be processed by the  library.  Suggestions and patches appreciated and welcomed!  Corpus of carriers currently processed by MMS2R:  * AT&T/Cingular => mmode.com * Cingular => mms.mycingular.com * Cingular => cingularme.com * Dobson/Cellular One => mms.dobson.net * Nextel => messaging.nextel.com * Sprint => pm.sprint.com * Sprint => messaging.sprintpcs.com * T-Mobile => tmomail.net * Verizon => vzwpix.com * Verizon => vtext.com"
 autorequire: 
 default_executable: 
 bindir: bin
@@ -41,6 +41,7 @@ files:
 - conf/mms2r_verizonmedia_transform.yml
 - lib/mms2r.rb
 - lib/mms2r/cingular_media.rb
+- lib/mms2r/dobson_media.rb
 - lib/mms2r/media.rb
 - lib/mms2r/mmode_media.rb
 - lib/mms2r/nextel_media.rb
@@ -73,6 +74,7 @@ files:
 - lib/vendor/tmail/tmail.rb
 - lib/vendor/tmail/utils.rb
 - test/files/cingularme-text-01.mail
+- test/files/dobson-image-01.mail
 - test/files/dot.jpg
 - test/files/hello_world_mail_multipart.mail
 - test/files/hello_world_mail_plain_no_content_type.mail
@@ -96,7 +98,9 @@ files:
 - test/files/verizon-text-01.mail
 - test/files/verizon-video-01.mail
 - test/files/vtext-text-01.mail
+- test/test_helper.rb
 - test/test_mms2r_cingular.rb
+- test/test_mms2r_dobson.rb
 - test/test_mms2r_media.rb
 - test/test_mms2r_mmode.rb
 - test/test_mms2r_nextel.rb
@@ -111,6 +115,8 @@ test_files:
 - test/test_mms2r_sprint.rb
 - test/test_mms2r_mmode.rb
 - test/test_mms2r_nextel.rb
+- test/test_helper.rb
+- test/test_mms2r_dobson.rb
 rdoc_options: []
 
 extra_rdoc_files: []