mms2r 2.1.3 → 2.2.0

data/History.txt

@@ -1,3 +1,25 @@
+### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
+
+* 3 new features
+  * MMS2R::Media#is_mobile? best guess if the sender was a mobile device
+  * MMS2R::Media#device_type? best guess of the mobile device type.  Simple
+    heuristics thus far for :blackberry :iphone :handset :unknown
+    could be expanded for exif probing or additinal shifting of mail header
+  * from array in conf/from.yml to provide granularity to determine carrier 
+    domain (caused by tmo.blackberry.net)
+
+* 4 minor enhancements
+  * support for Virgin Canada messaging service vmobile.ca
+  * support for text service messaging.sprintpcs.com
+  * additional BlackBerry coverage from T-Mobile tmo.blackberry.net provider
+  * legacy support for mobile.mycingular.com, pics.cingularme.com
+
+* 3 bug fixes
+  * iPhone default subject - jesse dp
+    http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
+  * add sprintpcs.com to pm.sprint.com aliases
+  * fix OS X long filename issues - Matt Conway
+
 ### 2.1.3 / 2008-11-06 (Dr. Ramonolith Chesterfield - Military pharmaceutical psychotropic drug manufacturing expert
 
 * 1 minor enhancement

data/Manifest.txt

@@ -6,6 +6,7 @@ Rakefile
 conf/1nbox.net.yml
 conf/aliases.yml
 conf/bellsouth.net.yml
+conf/from.yml
 conf/mediamessaging.o2.co.uk.yml
 conf/messaging.nextel.com.yml
 conf/mms.3ireland.ie.yml
@@ -66,6 +67,7 @@ test/fixtures/cingularme-text-01.mail
 test/fixtures/cingularme-text-02.mail
 test/fixtures/dobson-image-01.mail
 test/fixtures/dot.jpg
+test/fixtures/generic.mail
 test/fixtures/helio-image-01.mail
 test/fixtures/helio-message-01.mail
 test/fixtures/iconv-fr-text-01.mail
@@ -80,6 +82,7 @@ test/fixtures/mms.ae-image-01.mail
 test/fixtures/mms.mycricket.com-pic-and-text.mail
 test/fixtures/mms.mycricket.com-pic.mail
 test/fixtures/mmsreply.t-mobile.co.uk-text-image-01.mail
+test/fixtures/mobile.mycingular.com-text-01.mail
 test/fixtures/mtn-southafrica-mms.mail
 test/fixtures/mycingular-image-01.mail
 test/fixtures/netcom-image-01.mail
@@ -92,6 +95,7 @@ test/fixtures/orange-uk-image-01.mail
 test/fixtures/orangefrance-text-and-image.mail
 test/fixtures/orangepoland-text-01.mail
 test/fixtures/orangepoland-text-02.mail
+test/fixtures/pics.cingularme.com-image-01.mail
 test/fixtures/pxt-image-01.mail
 test/fixtures/rogers-canada-mms-01.mail
 test/fixtures/sasktel-image-01.mail
@@ -106,6 +110,7 @@ test/fixtures/sprint.mov
 test/fixtures/suncom-blackberry.mail
 test/fixtures/telus-image-01.mail
 test/fixtures/three-uk-image-01.mail
+test/fixtures/tmo.blackberry.net-image-01.mail
 test/fixtures/tmobile-blackberry-02.mail
 test/fixtures/tmobile-blackberry.mail
 test/fixtures/tmobile-image-01.mail
@@ -118,6 +123,7 @@ test/fixtures/verizon-image-03.mail
 test/fixtures/verizon-text-01.mail
 test/fixtures/verizon-video-01.mail
 test/fixtures/virgin-mobile-image-01.mail
+test/fixtures/virgin.ca-text-01.mail
 test/fixtures/vodacom4me-co-za-01.mail
 test/fixtures/vodacom4me-co-za-02.mail
 test/fixtures/vodacom4me-southafrica-mms-01.mail

data/README.txt

@@ -26,7 +26,7 @@ Corpus of carriers currently processed by MMS2R:
 * 3 Ireland: mms.3ireland.ie
 * Alltel: mms.alltel.com
 * AT&T/Cingular/Legacy: mms.att.net, txt.att.net, mmode.com, mms.mycingular.com, 
-  cingularme.com
+  cingularme.com, mobile.mycingular.com pics.cingularme.com
 * Bell Canada: txt.bell.ca
 * Bell South / Suncom: bellsouth.net
 * Cricket Wireless: mms.mycricket.com
@@ -46,14 +46,15 @@ Corpus of carriers currently processed by MMS2R:
 * PXT New Zealand: pxt.vodafone.net.nz
 * Rogers of Canada: rci.rogers.com
 * SaskTel: sms.sasktel.com
-* Sprint: pm.sprint.com, messaging.sprintpcs.com
-* T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk
+* Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com
+* T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net
 * TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com
 * UAE MMS: mms.ae
 * Unicel: unicel.com, info2go.com 
   (note: mobile number is tucked away in a text/plain part for unicel.com)
 * Verizon: vzwpix.com, vtext.com
 * Virgin Mobile: vmpix.com
+* Virgin Mobile of Canada: vmobile.ca
 * Vodacom: mms.vodacom4me.co.za
 
 == FEATURES

data/Rakefile

@@ -18,7 +18,7 @@ Hoe.new('mms2r', MMS2R::Media::VERSION) do |p|
   p.summary = 'Extract user media from MMS (and not carrier cruft)'
   p.description = p.paragraphs_of('README.txt', 2..6).join("\n\n")
   p.url = p.paragraphs_of('README.txt', 1).first.strip
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
+  p.changes = p.paragraphs_of('History.txt', 0..3).join("\n\n")
   p.extra_deps << ['hpricot', '>= 0.6.0']
   p.extra_deps << ['tmail', '>= 1.2.1']
   p.clean_globs << 'coverage'

data/conf/aliases.yml

@@ -3,10 +3,15 @@ txt.att.net: mms.att.net
 cingularme.com: mms.att.net
 mmode.com: mms.att.net
 mms.mycingular.com: mms.att.net
+mobile.mycingular.com: mms.att.net
+pics.cingularme.com: mms.att.net
 vtext.com: vzwpix.com
 orange.fr: orangemms.net
 mmsemail.orange.pl: orangemms.net
 message.alltel.com: mms.alltel.com
 mmsreply.t-mobile.co.uk: tmomail.net
+tmo.blackberry.net: tmomail.net
 info2go.com: unicel.com
 mms.telusmobility.com: msg.telus.com
+sprintpcs.com: pm.sprint.com
+vmobile.ca: vmpix.com

data/conf/from.yml

@@ -0,0 +1,2 @@
+---
+- tmo.blackberry.net

data/conf/mms.att.net.yml

@@ -7,3 +7,5 @@ transform:
     - "\1"
   - - /\A(.+?)\s+--\s+=+\s+Brought to you by, Cingular Wireless Messaging.*/im
     - "\1"
+  - - /\A(.+?)\s+--\s+Mobile Email from a Cingular Wireless Customer.*/im
+    - "\1"

data/conf/mms2r_media.yml

@@ -10,7 +10,15 @@ transform:
     - "\1"
   - - /\A(.*?)Sent from my Verizon Wireless BlackBerry$/im
     - "\1"  
-  - - /\A(.*?)Sent from my iPhone.?$/im
+  - - /\A(.*?)Sent from (my|your) iPhone.?$/im
     - "\1"
   - - /\A(.*?)\s+image\/jpeg$/im
     - "\1"
+device_types: 
+  headers: 
+    X-Mailer: 
+    - !ruby/regexp /^iPhone Mail/i
+    - :iphone
+    X-rim-org-msg-ref-id:
+    - !ruby/regexp /.+/
+    - :blackberry

data/conf/vmpix.com.yml

@@ -5,3 +5,7 @@ ignore:
   text/plain: 
   - /^This is an MMS message\.$/i
 
+transform: 
+  text/plain: 
+  - - /(.*?)-+\s+Sent by Text Messaging from a mobile device.*/im
+    - "\1"

data/lib/mms2r.rb

@@ -39,14 +39,14 @@ module MMS2R
     ##
     # MMS2R library version
 
-    VERSION = '2.1.3'
+    VERSION = '2.2.0'
 
   end
 
 end
 
 require 'rubygems'
-gem 'tmail', '>= 1.2.1'
+gem 'tmail', '>= 1.2.3'
 require 'tmail/mail'
 require 'fileutils'
 require 'pathname'

data/lib/mms2r/media.rb

@@ -107,8 +107,9 @@ module MMS2R
       # alias new so that we can use ::create to select the media processor and
       # then initialize the new object
       alias orig_new new
-      def new(mail, opts=nil)
-        klass = MMS2R::Media.create(mail)
+      def new(mail, opts = {})
+        klass, carrier = MMS2R::Media.create(mail)
+        opts[:domain] = carrier
         klass.orig_new(mail, opts)
       end
     end
@@ -147,18 +148,52 @@ module MMS2R
     # object.
 
     def self.create(mail)
-      d = lambda{['mms2r.media',MMS2R::Media]} #sets a default to detect
-      processor = MMS2R::CARRIERS.detect(d) do |n, c| 
-        if mail.header['return-path'] && mail.header['return-path'].to_s.strip =~ /^<.+@([^@]+)>$/
-          domain = $1
+      d = lambda{ ['mms2r.media', MMS2R::Media] } #sets a default to detect
+      from_domain = self.domain(mail)
+      processor = MMS2R::CARRIERS.detect(d) do |domain, klass| 
+        return klass, domain if from_domain == domain
+      end
+      [MMS2R::Media, from_domain]
+    end
+
+    ##
+    # Determine if return-path or from is going to be used to desiginate the
+    # origin carrier.  If the domain in the From header is listed in 
+    # conf/from.yaml then that is the carrier domain.  Else if there is a 
+    # Return-Path header its address's domain is the carrier doamin, else
+    # use From header's address domain.
+
+    def self.domain(mail)
+      return_path = case
+        when mail.header['return-path']
+          matched = /^<.+@([^@]+)>$/.match(mail.header['return-path'].to_s.strip)
+          matched ? matched[1] : ''
         else
-          domain = mail.from.first.split('@').last rescue nil
+          ''
         end
-        domain == n
-      end
-      processor.last
+
+      from_domain = case
+        when mail.from && mail.from.first
+          mail.from.first.split('@').last
+        else
+          ''
+        end
+
+      f = File.join(self.conf_dir(), "from.yml")
+      from = YAML::load_file(f) rescue {}
+
+      ret = case
+        when from.include?(from_domain)
+          from_domain
+        when return_path.any?
+          return_path
+        else
+          from_domain
+        end
+      ret
     end
 
+
     ##
     # Initialize a new MMS2R::Media comprised of a mail.
     #
@@ -172,17 +207,12 @@ module MMS2R
     def initialize(mail, opts={})
 
       @mail = mail
-      @logger = opts[:logger] rescue nil
-      @logger.info("#{self.class} created") unless @logger.nil?
+      @logger = opts[:logger]
+      log("#{self.class} created", :info)
+      @carrier = opts[:domain]
       @dir_count = 0
-      @media_dir = File.join(self.class.tmp_dir(), 
-                     self.class.safe_message_id(@mail.message_id))
-
-      if mail.header['return-path'] && mail.header['return-path'].to_s.strip =~ /^<.+@([^@]+)>$/
-        @carrier = $1
-      else
-        @carrier = mail.from.first.split('@').last rescue 'mms2r.media'
-      end
+      @media_dir = File.join(self.tmp_dir(), 
+                     self.safe_message_id(@mail.message_id))
       @media = {}
       @was_processed = false
       @number = nil
@@ -191,13 +221,11 @@ module MMS2R
       @default_media = nil
       @default_text = nil
       
-      f = File.join(self.class.conf_dir(), "aliases.yml")
+      f = File.join(self.conf_dir(), "aliases.yml")
       @aliases = YAML::load_file(f) rescue {}
 
-      conf = @aliases[@carrier]
-      conf ||= @carrier
-      conf += ".yml"
-      f = File.join(self.class.conf_dir(), conf)
+      conf = "#{@aliases[@carrier] || @carrier}.yml"
+      f = File.join(self.conf_dir(), conf)
       c = YAML::load_file(f) rescue {}
       @config = self.class.initialize_config(c)
 
@@ -213,9 +241,9 @@ module MMS2R
 
     def number
       unless @number
-        params = config['number'] rescue nil
-        if params
-          @number = mail.header[params[0]].to_s.gsub(eval(params[1]), params[2]) rescue nil
+        params = config['number']
+        if params && (header = mail.header[params[0]])
+          @number = header.to_s.gsub(eval(params[1]), params[2])
         end
       end
       @number ||= mail.from.first.split('@').first rescue ""
@@ -229,7 +257,7 @@ module MMS2R
 
       unless @subject
         subject = mail.subject.strip rescue ""
-        ignores = config['ignore']['text/plain'] rescue nil
+        ignores = config['ignore']['text/plain']
         if ignores && ignores.detect{|s| s == subject}
           @subject = ""
         else
@@ -300,7 +328,7 @@ module MMS2R
 
     def process() # :yields: media_type, file
       unless @was_processed
-        @logger.info("#{self.class} processing") unless @logger.nil?
+        log("#{self.class} processing", :info)
   
         parts = mail.multipart? ? mail.parts : [mail]
   
@@ -349,9 +377,9 @@ module MMS2R
     def ignore_media?(type,part)
       ignores = config['ignore'][type] || []
       ignore = ignores.detect{|test| filename?(part) == test}
-      ignore ||= ignores.detect{|test| filename?(part) =~ eval(test) if test.index('/') == 0 rescue nil}
-      ignore ||= ignores.detect{|test| part.body.strip =~ eval(test) if test.index('/') == 0 rescue nil}
-      ignore ||= (part.body.strip.size == 0 ? true : nil) rescue nil
+      ignore ||= ignores.detect{|test| filename?(part) =~ eval(test) if test.index('/') == 0 }
+      ignore ||= ignores.detect{|test| part.body.strip =~ eval(test) if test.index('/') == 0 }
+      ignore ||= (part.body.strip.size == 0 ? true : nil) 
       ignore.nil? ? false : true
     end
 
@@ -386,7 +414,7 @@ module MMS2R
       end
       return type, nil if content.nil? || content.empty?
 
-      @logger.info("#{self.class} writing file #{file}") unless @logger.nil?
+      log("#{self.class} writing file #{file}", :info)
       File.open(file, mode){ |f| f.write(content) }
       return type, file
     end
@@ -397,7 +425,7 @@ module MMS2R
     # configuration.
 
     def transform_text(type, text, original_nencoding = 'ISO-8859-1')
-      return type, text unless transforms = config['transform'][type] rescue nil
+      return type, text unless transforms = config['transform'][type] 
 
       #convert to UTF-8
       begin
@@ -445,7 +473,7 @@ module MMS2R
     # for this producer and all of the media that it contains.
 
     def purge()
-      @logger.info("#{self.class} purging #{@media_dir} and all its contents") unless @logger.nil?
+      log("#{self.class} purging #{@media_dir} and all its contents", :info)
       FileUtils.rm_rf(@media_dir)
     end
 
@@ -479,11 +507,51 @@ module MMS2R
         if part['content-id'] && part['content-id'].real_body.strip =~ /^<(.+)>$/
           name = $1
         else
-          name = "#{Time.now.to_f}.#{self.class.default_ext(part.part_type?)}"
+          name = "#{Time.now.to_f}.#{self.default_ext(part.part_type?)}"
         end
       end
       # XXX fwiw, janky look for dot extension 1 to 4 chars long
-      name =~ /\..{1,4}$/ ? name : "#{name}.#{self.class.default_ext(part.part_type?)}"
+      name = (name =~ /\..{1,4}$/ ? name : "#{name}.#{self.default_ext(part.part_type?)}")
+
+      # handle excessively large filenames
+      if name.size > 255
+        ext = File.extname(name)
+        base = File.basename(name, ext)
+        name = "#{base[0, 255 - ext.size]}#{ext}"
+      end
+      
+      name
+    end
+
+    def aliases
+      @aliases
+    end
+
+    ##
+    # Best guess of the mobile device type.  Simple heuristics thus far for 
+    # :iphone :blackberry :handset :unknown .  Could be expanded for exif 
+    # probing or shifting mail header schemes
+
+    def device_type?
+      headers = config['device_types']['headers'] rescue {}
+      headers.keys.each do |header|
+        if mail.header[header.downcase]
+          regex, type = headers[header]
+          return type if mail.header[header.downcase].to_s =~ regex
+        end
+      end
+
+      return :handset if File.exist?(File.join(self.conf_dir,
+                                     "#{self.aliases[self.carrier] || self.carrier}.yml"))
+      
+      :unknown
+    end
+
+    ##
+    # The source of the MMS was some sort of mobile or smart phone
+    
+    def is_mobile?
+      self.device_type? != :unknown
     end
 
     ##
@@ -525,9 +593,11 @@ module MMS2R
     # Returns a default file extension based on a content type
 
     def self.default_ext(content_type)
-      ext = MMS2R::EXT[content_type] ||
-            content_type.split('/').last rescue nil
-      ext
+      if MMS2R::EXT[content_type]
+        MMS2R::EXT[content_type]
+      elsif content_type
+        content_type.split('/').last 
+      end
     end
 
     ##
@@ -537,7 +607,7 @@ module MMS2R
     def self.initialize_config(c)
       f = File.join(self.conf_dir(), "mms2r_media.yml")
       conf = YAML::load_file(f) rescue {}
-      conf['ignore'] = {} unless conf['ignore']
+      conf['ignore'] ||= {} unless conf['ignore']
       conf['transform'] = {} unless conf['transform']
       conf['number'] = [] unless conf['number']
       return conf unless c
@@ -557,6 +627,45 @@ module MMS2R
       conf
     end
 
+    def log(message, level = :info)
+      @logger.send(level, message) unless @logger.nil?
+    end
+
+    ##
+    # convenience accessor for self.class.conf_dir
+    
+    def conf_dir
+      self.class.conf_dir
+    end
+
+    ##
+    # convenience accessor for self.class.conf_dir
+
+    def tmp_dir
+      self.class.tmp_dir
+    end
+
+    ##
+    # convenience accessor for self.class.default_ext
+
+    def default_ext(type)
+      self.class.default_ext(type)
+    end
+
+    ##
+    # convenience accessor for self.class.safe_message_id
+    
+    def safe_message_id(message_id)
+      self.class.safe_message_id(message_id)
+    end
+
+    ##
+    # convenience accessor for self.class.initialize_confg
+  
+    def initialize_config(config)
+      self.class.initialize_config(config)
+    end
+
     private
 
     ##
@@ -601,7 +710,7 @@ module MMS2R
         if File.size(f) > size
           size = File.size(f)
           file = File.new(f)
-          mime_type = media.detect{|type,files| files.detect{|fl| fl == f}}[0] rescue nil
+          mime_type = media.detect{|type,files| files.detect{|fl| fl == f}}[0] 
         end
       end
 

data/lib/mms2r/media/sprint.rb

@@ -38,7 +38,7 @@ module MMS2R
 
       def process
         unless @was_processed
-          @logger.info("#{self.class} processing") unless @logger.nil?
+          log("#{self.class} processing", :info)
           #sprint MMS are multipart
           parts = @mail.parts
 
@@ -141,14 +141,14 @@ module MMS2R
 
             res = Net::HTTP.get_response(url)
           rescue StandardError => err
-            @logger.error("#{self.class} processing error, #{$!}") unless @logger.nil?
+            log("#{self.class} processing error, #{$!}", :error)
             next
           end
 
           # if the Sprint content server uses response code 500 when the content is purged
           # the content type will text/html and the body will be the message
           if res.content_type == 'text/html' && res.code == "500"
-            @logger.error("Sprint content server returned response code 500") unless @logger.nil?
+            log("Sprint content server returned response code 500", :error)
             next
           end
 
@@ -179,7 +179,7 @@ module MMS2R
 
       def sprint_write_file(type, content, file = nil)
         file = sprint_temp_file(type) if file.nil?
-        @logger.info("#{self.class} writing file #{file}") unless @logger.nil?
+        log("#{self.class} writing file #{file}", :info)
         File.open(file,'w'){ |f| f.write(content) }
         return type, file
       end

data/mms2r.gemspec

@@ -1,29 +1,31 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{mms2r}
-  s.version = "2.1.3"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Mondragon"]
-  s.date = %q{2008-11-06}
-  s.description = %q{== DESCRIPTION  MMS2R is a library that decodes the parts of an MMS message to disk while  stripping out advertising injected by the mobile 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 cruft 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:  * 1nbox/Idea: 1nbox.net * 3 Ireland: mms.3ireland.ie * Alltel: mms.alltel.com * AT&T/Cingular/Legacy: mms.att.net, txt.att.net, mmode.com, mms.mycingular.com,  cingularme.com * Bell Canada: txt.bell.ca * Bell South / Suncom: bellsouth.net * Cricket Wireless: mms.mycricket.com * Dobson/Cellular One: mms.dobson.net * Helio: mms.myhelio.com * Hutchison 3G UK Ltd: mms.three.co.uk * INDOSAT M2: mobile.indosat.net.id * LUXGSM S.A.: mms.luxgsm.lu * Maroc Telecom / mms.mobileiam.ma * MTM South Africa: mms.mtn.co.za * NetCom (Norway): mms.netcom.no * Nextel: messaging.nextel.com * O2 Germany: mms.o2online.de * O2 UK: mediamessaging.o2.co.uk * Orange & Regional Oranges: orangemms.net, mmsemail.orange.pl, orange.fr * PLSPICTURES.COM mms hosting: waw.plspictures.com * PXT New Zealand: pxt.vodafone.net.nz * Rogers of Canada: rci.rogers.com * SaskTel: sms.sasktel.com * Sprint: pm.sprint.com, messaging.sprintpcs.com * T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk * TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com * Unicel: unicel.com, info2go.com  (note: mobile number is tucked away in a text/plain part for unicel.com) * Verizon: vzwpix.com, vtext.com * Virgin Mobile: vmpix.com * Vodacom: mms.vodacom4me.co.za}
+  s.date = %q{2008-12-16}
+  s.description = %q{== DESCRIPTION  MMS2R is a library that decodes the parts of an MMS message to disk while  stripping out advertising injected by the mobile 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 cruft 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:  * 1nbox/Idea: 1nbox.net * 3 Ireland: mms.3ireland.ie * Alltel: mms.alltel.com * AT&T/Cingular/Legacy: mms.att.net, txt.att.net, mmode.com, mms.mycingular.com,  cingularme.com, mobile.mycingular.com pics.cingularme.com * Bell Canada: txt.bell.ca * Bell South / Suncom: bellsouth.net * Cricket Wireless: mms.mycricket.com * Dobson/Cellular One: mms.dobson.net * Helio: mms.myhelio.com * Hutchison 3G UK Ltd: mms.three.co.uk * INDOSAT M2: mobile.indosat.net.id * LUXGSM S.A.: mms.luxgsm.lu * Maroc Telecom / mms.mobileiam.ma * MTM South Africa: mms.mtn.co.za * NetCom (Norway): mms.netcom.no * Nextel: messaging.nextel.com * O2 Germany: mms.o2online.de * O2 UK: mediamessaging.o2.co.uk * Orange & Regional Oranges: orangemms.net, mmsemail.orange.pl, orange.fr * PLSPICTURES.COM mms hosting: waw.plspictures.com * PXT New Zealand: pxt.vodafone.net.nz * Rogers of Canada: rci.rogers.com * SaskTel: sms.sasktel.com * Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com * T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net * TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com * UAE MMS: mms.ae * Unicel: unicel.com, info2go.com  (note: mobile number is tucked away in a text/plain part for unicel.com) * Verizon: vzwpix.com, vtext.com * Virgin Mobile: vmpix.com * Virgin Mobile of Canada: vmobile.ca * Vodacom: mms.vodacom4me.co.za}
   s.email = %q{mikemondragon@gmail.com}
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  s.files = [".gitignore", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "conf/1nbox.net.yml", "conf/aliases.yml", "conf/bellsouth.net.yml", "conf/mediamessaging.o2.co.uk.yml", "conf/messaging.nextel.com.yml", "conf/mms.3ireland.ie.yml", "conf/mms.ae.yml", "conf/mms.alltel.com.yml", "conf/mms.att.net.yml", "conf/mms.dobson.net.yml", "conf/mms.luxgsm.lu.yml", "conf/mms.mobileiam.ma.yml", "conf/mms.mtn.co.za.yml", "conf/mms.mycricket.com.yml", "conf/mms.myhelio.com.yml", "conf/mms.netcom.no.yml", "conf/mms.o2online.de.yml", "conf/mms.three.co.uk.yml", "conf/mms.vodacom4me.co.za.yml", "conf/mms2r_media.yml", "conf/mobile.indosat.net.id.yml", "conf/msg.telus.com.yml", "conf/orangemms.net.yml", "conf/pm.sprint.com.yml", "conf/pxt.vodafone.net.nz.yml", "conf/rci.rogers.com.yml", "conf/sms.sasktel.com.yml", "conf/tmomail.net.yml", "conf/txt.bell.ca.yml", "conf/unicel.com.yml", "conf/vmpix.com.yml", "conf/vzwpix.com.yml", "conf/waw.plspictures.com.yml", "dev_tools/anonymizer.rb", "dev_tools/debug_sprint_hpricot_parsing.rb", "dev_tools/github.rb", "lib/mms2r.rb", "lib/mms2r/media.rb", "lib/mms2r/media/sprint.rb", "lib/tmail_ext.rb", "mms2r.gemspec", "test/fixtures/1nbox-2images-01.mail", "test/fixtures/1nbox-2images-02.mail", "test/fixtures/1nbox-2images-03.mail", "test/fixtures/1nbox-2images-04.mail", "test/fixtures/3ireland-mms-01.mail", "test/fixtures/alltel-image-01.mail", "test/fixtures/alltel-mms-01.mail", "test/fixtures/alltel-mms-03.mail", "test/fixtures/apple-double-image-01.mail", "test/fixtures/att-blackberry-02.mail", "test/fixtures/att-blackberry.mail", "test/fixtures/att-image-01.mail", "test/fixtures/att-image-02.mail", "test/fixtures/att-iphone-01.mail", "test/fixtures/att-iphone-02.mail", "test/fixtures/att-iphone-03.mail", "test/fixtures/att-text-01.mail", "test/fixtures/bell-canada-image-01.mail", "test/fixtures/cingularme-text-01.mail", "test/fixtures/cingularme-text-02.mail", "test/fixtures/dobson-image-01.mail", "test/fixtures/dot.jpg", "test/fixtures/helio-image-01.mail", "test/fixtures/helio-message-01.mail", "test/fixtures/iconv-fr-text-01.mail", "test/fixtures/indosat-image-01.mail", "test/fixtures/indosat-image-02.mail", "test/fixtures/info2go-image-01.mail", "test/fixtures/luxgsm-image-01.mail", "test/fixtures/maroctelecom-france-mms-01.mail", "test/fixtures/mediamessaging_o2_co_uk-image-01.mail", "test/fixtures/mmode-image-01.mail", "test/fixtures/mms.ae-image-01.mail", "test/fixtures/mms.mycricket.com-pic-and-text.mail", "test/fixtures/mms.mycricket.com-pic.mail", "test/fixtures/mmsreply.t-mobile.co.uk-text-image-01.mail", "test/fixtures/mtn-southafrica-mms.mail", "test/fixtures/mycingular-image-01.mail", "test/fixtures/netcom-image-01.mail", "test/fixtures/nextel-image-01.mail", "test/fixtures/nextel-image-02.mail", "test/fixtures/nextel-image-03.mail", "test/fixtures/nextel-image-04.mail", "test/fixtures/o2-de-image-01.mail", "test/fixtures/orange-uk-image-01.mail", "test/fixtures/orangefrance-text-and-image.mail", "test/fixtures/orangepoland-text-01.mail", "test/fixtures/orangepoland-text-02.mail", "test/fixtures/pxt-image-01.mail", "test/fixtures/rogers-canada-mms-01.mail", "test/fixtures/sasktel-image-01.mail", "test/fixtures/sprint-broken-image-01.mail", "test/fixtures/sprint-image-01.mail", "test/fixtures/sprint-pcs-text-01.mail", "test/fixtures/sprint-purged-image-01.mail", "test/fixtures/sprint-text-01.mail", "test/fixtures/sprint-two-images-01.mail", "test/fixtures/sprint-video-01.mail", "test/fixtures/sprint.mov", "test/fixtures/suncom-blackberry.mail", "test/fixtures/telus-image-01.mail", "test/fixtures/three-uk-image-01.mail", "test/fixtures/tmobile-blackberry-02.mail", "test/fixtures/tmobile-blackberry.mail", "test/fixtures/tmobile-image-01.mail", "test/fixtures/tmobile-image-02.mail", "test/fixtures/unicel-image-01.mail", "test/fixtures/verizon-blackberry.mail", "test/fixtures/verizon-image-01.mail", "test/fixtures/verizon-image-02.mail", "test/fixtures/verizon-image-03.mail", "test/fixtures/verizon-text-01.mail", "test/fixtures/verizon-video-01.mail", "test/fixtures/virgin-mobile-image-01.mail", "test/fixtures/vodacom4me-co-za-01.mail", "test/fixtures/vodacom4me-co-za-02.mail", "test/fixtures/vodacom4me-southafrica-mms-01.mail", "test/fixtures/vodacom4me-southafrica-mms-04.mail", "test/fixtures/vtext-text-01.mail", "test/fixtures/waw.plspictures.com-image-01.mail", "test/test_1nbox_net.rb", "test/test_bell_canada.rb", "test/test_bellsouth_net.rb", "test/test_github.rb", "test/test_helper.rb", "test/test_mediamessaging_o2_co_uk.rb", "test/test_messaging_nextel_com.rb", "test/test_messaging_sprintpcs_com.rb", "test/test_mms2r_media.rb", "test/test_mms_3ireland_ie.rb", "test/test_mms_ae.rb", "test/test_mms_alltel_com.rb", "test/test_mms_att_net.rb", "test/test_mms_dobson_net.rb", "test/test_mms_luxgsm_lu.rb", "test/test_mms_mobileiam_ma.rb", "test/test_mms_mtn_co_za.rb", "test/test_mms_mycricket_com.rb", "test/test_mms_myhelio_com.rb", "test/test_mms_netcom_no.rb", "test/test_mms_o2online_de.rb", "test/test_mms_three_co_uk.rb", "test/test_mms_vodacom4me_co_za.rb", "test/test_mobile_indosat_net_id.rb", "test/test_msg_telus_com.rb", "test/test_orangemms_net.rb", "test/test_pm_sprint_com.rb", "test/test_pxt_vodafone_net_nz.rb", "test/test_rci_rogers_com.rb", "test/test_sms_sasktel_com.rb", "test/test_tmomail_net.rb", "test/test_unicel_com.rb", "test/test_vmpix_com.rb", "test/test_vzwpix_com.rb", "test/test_waw_plspictures_com.rb", "vendor/plugins/mms2r/lib/autotest/discover.rb", "vendor/plugins/mms2r/lib/autotest/mms2r.rb"]
+  s.files = [".gitignore", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "conf/1nbox.net.yml", "conf/aliases.yml", "conf/bellsouth.net.yml", "conf/from.yml", "conf/mediamessaging.o2.co.uk.yml", "conf/messaging.nextel.com.yml", "conf/mms.3ireland.ie.yml", "conf/mms.ae.yml", "conf/mms.alltel.com.yml", "conf/mms.att.net.yml", "conf/mms.dobson.net.yml", "conf/mms.luxgsm.lu.yml", "conf/mms.mobileiam.ma.yml", "conf/mms.mtn.co.za.yml", "conf/mms.mycricket.com.yml", "conf/mms.myhelio.com.yml", "conf/mms.netcom.no.yml", "conf/mms.o2online.de.yml", "conf/mms.three.co.uk.yml", "conf/mms.vodacom4me.co.za.yml", "conf/mms2r_media.yml", "conf/mobile.indosat.net.id.yml", "conf/msg.telus.com.yml", "conf/orangemms.net.yml", "conf/pm.sprint.com.yml", "conf/pxt.vodafone.net.nz.yml", "conf/rci.rogers.com.yml", "conf/sms.sasktel.com.yml", "conf/tmomail.net.yml", "conf/txt.bell.ca.yml", "conf/unicel.com.yml", "conf/vmpix.com.yml", "conf/vzwpix.com.yml", "conf/waw.plspictures.com.yml", "dev_tools/anonymizer.rb", "dev_tools/debug_sprint_hpricot_parsing.rb", "dev_tools/github.rb", "lib/mms2r.rb", "lib/mms2r/media.rb", "lib/mms2r/media/sprint.rb", "lib/tmail_ext.rb", "mms2r.gemspec", "test/fixtures/1nbox-2images-01.mail", "test/fixtures/1nbox-2images-02.mail", "test/fixtures/1nbox-2images-03.mail", "test/fixtures/1nbox-2images-04.mail", "test/fixtures/3ireland-mms-01.mail", "test/fixtures/alltel-image-01.mail", "test/fixtures/alltel-mms-01.mail", "test/fixtures/alltel-mms-03.mail", "test/fixtures/apple-double-image-01.mail", "test/fixtures/att-blackberry-02.mail", "test/fixtures/att-blackberry.mail", "test/fixtures/att-image-01.mail", "test/fixtures/att-image-02.mail", "test/fixtures/att-iphone-01.mail", "test/fixtures/att-iphone-02.mail", "test/fixtures/att-iphone-03.mail", "test/fixtures/att-text-01.mail", "test/fixtures/bell-canada-image-01.mail", "test/fixtures/cingularme-text-01.mail", "test/fixtures/cingularme-text-02.mail", "test/fixtures/dobson-image-01.mail", "test/fixtures/dot.jpg", "test/fixtures/generic.mail", "test/fixtures/helio-image-01.mail", "test/fixtures/helio-message-01.mail", "test/fixtures/iconv-fr-text-01.mail", "test/fixtures/indosat-image-01.mail", "test/fixtures/indosat-image-02.mail", "test/fixtures/info2go-image-01.mail", "test/fixtures/luxgsm-image-01.mail", "test/fixtures/maroctelecom-france-mms-01.mail", "test/fixtures/mediamessaging_o2_co_uk-image-01.mail", "test/fixtures/mmode-image-01.mail", "test/fixtures/mms.ae-image-01.mail", "test/fixtures/mms.mycricket.com-pic-and-text.mail", "test/fixtures/mms.mycricket.com-pic.mail", "test/fixtures/mmsreply.t-mobile.co.uk-text-image-01.mail", "test/fixtures/mobile.mycingular.com-text-01.mail", "test/fixtures/mtn-southafrica-mms.mail", "test/fixtures/mycingular-image-01.mail", "test/fixtures/netcom-image-01.mail", "test/fixtures/nextel-image-01.mail", "test/fixtures/nextel-image-02.mail", "test/fixtures/nextel-image-03.mail", "test/fixtures/nextel-image-04.mail", "test/fixtures/o2-de-image-01.mail", "test/fixtures/orange-uk-image-01.mail", "test/fixtures/orangefrance-text-and-image.mail", "test/fixtures/orangepoland-text-01.mail", "test/fixtures/orangepoland-text-02.mail", "test/fixtures/pics.cingularme.com-image-01.mail", "test/fixtures/pxt-image-01.mail", "test/fixtures/rogers-canada-mms-01.mail", "test/fixtures/sasktel-image-01.mail", "test/fixtures/sprint-broken-image-01.mail", "test/fixtures/sprint-image-01.mail", "test/fixtures/sprint-pcs-text-01.mail", "test/fixtures/sprint-purged-image-01.mail", "test/fixtures/sprint-text-01.mail", "test/fixtures/sprint-two-images-01.mail", "test/fixtures/sprint-video-01.mail", "test/fixtures/sprint.mov", "test/fixtures/suncom-blackberry.mail", "test/fixtures/telus-image-01.mail", "test/fixtures/three-uk-image-01.mail", "test/fixtures/tmo.blackberry.net-image-01.mail", "test/fixtures/tmobile-blackberry-02.mail", "test/fixtures/tmobile-blackberry.mail", "test/fixtures/tmobile-image-01.mail", "test/fixtures/tmobile-image-02.mail", "test/fixtures/unicel-image-01.mail", "test/fixtures/verizon-blackberry.mail", "test/fixtures/verizon-image-01.mail", "test/fixtures/verizon-image-02.mail", "test/fixtures/verizon-image-03.mail", "test/fixtures/verizon-text-01.mail", "test/fixtures/verizon-video-01.mail", "test/fixtures/virgin-mobile-image-01.mail", "test/fixtures/virgin.ca-text-01.mail", "test/fixtures/vodacom4me-co-za-01.mail", "test/fixtures/vodacom4me-co-za-02.mail", "test/fixtures/vodacom4me-southafrica-mms-01.mail", "test/fixtures/vodacom4me-southafrica-mms-04.mail", "test/fixtures/vtext-text-01.mail", "test/fixtures/waw.plspictures.com-image-01.mail", "test/test_1nbox_net.rb", "test/test_bell_canada.rb", "test/test_bellsouth_net.rb", "test/test_github.rb", "test/test_helper.rb", "test/test_mediamessaging_o2_co_uk.rb", "test/test_messaging_nextel_com.rb", "test/test_messaging_sprintpcs_com.rb", "test/test_mms2r_media.rb", "test/test_mms_3ireland_ie.rb", "test/test_mms_ae.rb", "test/test_mms_alltel_com.rb", "test/test_mms_att_net.rb", "test/test_mms_dobson_net.rb", "test/test_mms_luxgsm_lu.rb", "test/test_mms_mobileiam_ma.rb", "test/test_mms_mtn_co_za.rb", "test/test_mms_mycricket_com.rb", "test/test_mms_myhelio_com.rb", "test/test_mms_netcom_no.rb", "test/test_mms_o2online_de.rb", "test/test_mms_three_co_uk.rb", "test/test_mms_vodacom4me_co_za.rb", "test/test_mobile_indosat_net_id.rb", "test/test_msg_telus_com.rb", "test/test_orangemms_net.rb", "test/test_pm_sprint_com.rb", "test/test_pxt_vodafone_net_nz.rb", "test/test_rci_rogers_com.rb", "test/test_sms_sasktel_com.rb", "test/test_tmomail_net.rb", "test/test_unicel_com.rb", "test/test_vmpix_com.rb", "test/test_vzwpix_com.rb", "test/test_waw_plspictures_com.rb", "vendor/plugins/mms2r/lib/autotest/discover.rb", "vendor/plugins/mms2r/lib/autotest/mms2r.rb"]
   s.has_rdoc = true
   s.homepage = %q{by Mike Mondragon
 }
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{mms2r}
-  s.rubygems_version = %q{1.2.0}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{Extract user media from MMS (and not carrier cruft)}
-  s.test_files = ["test/test_sms_sasktel_com.rb", "test/test_pxt_vodafone_net_nz.rb", "test/test_mms_mycricket_com.rb", "test/test_mobile_indosat_net_id.rb", "test/test_unicel_com.rb", "test/test_pm_sprint_com.rb", "test/test_messaging_sprintpcs_com.rb", "test/test_vzwpix_com.rb", "test/test_mms_alltel_com.rb", "test/test_mms2r_media.rb", "test/test_waw_plspictures_com.rb", "test/test_mms_ae.rb", "test/test_mms_3ireland_ie.rb", "test/test_msg_telus_com.rb", "test/test_bellsouth_net.rb", "test/test_mms_o2online_de.rb", "test/test_mms_att_net.rb", "test/test_mms_netcom_no.rb", "test/test_rci_rogers_com.rb", "test/test_mms_mtn_co_za.rb", "test/test_tmomail_net.rb", "test/test_mms_myhelio_com.rb", "test/test_mms_three_co_uk.rb", "test/test_mms_dobson_net.rb", "test/test_mms_luxgsm_lu.rb", "test/test_bell_canada.rb", "test/test_github.rb", "test/test_orangemms_net.rb", "test/test_helper.rb", "test/test_vmpix_com.rb", "test/test_mms_mobileiam_ma.rb", "test/test_messaging_nextel_com.rb", "test/test_mediamessaging_o2_co_uk.rb", "test/test_1nbox_net.rb", "test/test_mms_vodacom4me_co_za.rb"]
+  s.test_files = ["test/test_mms_o2online_de.rb", "test/test_helper.rb", "test/test_pm_sprint_com.rb", "test/test_sms_sasktel_com.rb", "test/test_mms_mobileiam_ma.rb", "test/test_msg_telus_com.rb", "test/test_messaging_sprintpcs_com.rb", "test/test_mms_myhelio_com.rb", "test/test_mms_3ireland_ie.rb", "test/test_mms_ae.rb", "test/test_mms_att_net.rb", "test/test_mediamessaging_o2_co_uk.rb", "test/test_bell_canada.rb", "test/test_mms_mtn_co_za.rb", "test/test_vmpix_com.rb", "test/test_github.rb", "test/test_vzwpix_com.rb", "test/test_bellsouth_net.rb", "test/test_unicel_com.rb", "test/test_waw_plspictures_com.rb", "test/test_mms_luxgsm_lu.rb", "test/test_mms_netcom_no.rb", "test/test_mms_mycricket_com.rb", "test/test_mms2r_media.rb", "test/test_rci_rogers_com.rb", "test/test_messaging_nextel_com.rb", "test/test_mms_vodacom4me_co_za.rb", "test/test_tmomail_net.rb", "test/test_1nbox_net.rb", "test/test_pxt_vodafone_net_nz.rb", "test/test_mobile_indosat_net_id.rb", "test/test_mms_three_co_uk.rb", "test/test_mms_alltel_com.rb", "test/test_mms_dobson_net.rb", "test/test_orangemms_net.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if current_version >= 3 then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<hpricot>, [">= 0.6.0"])
       s.add_runtime_dependency(%q<tmail>, [">= 1.2.1"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.2"])

data/test/fixtures/generic.mail

@@ -0,0 +1,50 @@
+Delivered-To: someone@gmail.com
+Received: by 10.143.32.12 with SMTP id k12cs339474wfj;
+        Mon, 1 Dec 2008 11:21:47 -0800 (PST)
+Received: by 10.100.168.18 with SMTP id q18mr6081458ane.7.1228159306677;
+        Mon, 01 Dec 2008 11:21:46 -0800 (PST)
+Return-Path: <noreply@rubyforge.org>
+Received: from rubyforge.org (rubyforge.org [205.234.109.19])
+        by mx.google.com with ESMTP id d21si5824438and.26.2008.12.01.11.21.46;
+        Mon, 01 Dec 2008 11:21:46 -0800 (PST)
+Received-SPF: pass (google.com: domain of noreply@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19;
+Authentication-Results: mx.google.com; spf=pass (google.com: domain of noreply@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=noreply@rubyforge.org
+Received: by rubyforge.org (Postfix, from userid 502)
+	id 037671588057; Mon,  1 Dec 2008 14:21:45 -0500 (EST)
+To: noreply@rubyforge.org
+From:  <noreply@rubyforge.org> 
+Subject: [ mms2r-Patches-22951 ] iPhone default subject line varient
+Content-type: text/plain; charset=UTF-8
+Message-Id: <20081201192146.037671588057@rubyforge.org>
+Date: Mon,  1 Dec 2008 14:21:45 -0500 (EST)
+
+Patches item #22951, was opened at 2008-11-23 14:47
+You can respond by visiting: 
+http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
+
+Category: None
+Group: None
+Status: Open
+Resolution: None
+Priority: 3
+Submitted By: jesse dp (jessedp)
+>Assigned to: Mike Mondragon (mikemondragon)
+Summary: iPhone default subject line varient
+
+Initial Comment:
+On line 13 of conf/mms2r_media.yml, we've changed:
+
+  - - /\A(.*?)Sent from my iPhone.?$/im
+
+to:
+
+  - - /\A(.*?)Sent from (my|your) iPhone.?$/im
+
+
+b/c apparently that's a variation of their default subject too
+
+
+----------------------------------------------------------------------
+
+You can respond by visiting: 
+http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065

data/test/fixtures/mobile.mycingular.com-text-01.mail

@@ -0,0 +1,25 @@
+X-Gmail-Received: 7105037d3e995bef64ac4dc4c60acf6ebb21ffca
+Delivered-To: tommy.tutone@example.com
+Received: by 10.36.78.1 with SMTP id a1cs107902nzb;
+        Mon, 3 Jul 2006 19:40:19 -0700 (PDT)
+Received: by 10.70.128.8 with SMTP id a8mr6891405wxd;
+        Mon, 03 Jul 2006 19:40:19 -0700 (PDT)
+Return-Path: <2068675309@mobile.mycingular.com>
+Received: from wcmta2.mycingular.net (wcmta2.mycingular.net [66.102.172.232])
+        by mx.gmail.com with ESMTP id i20si5782410wxd.2006.07.03.19.40.19;
+        Mon, 03 Jul 2006 19:40:19 -0700 (PDT)
+Received-SPF: neutral (gmail.com: 66.102.172.232 is neither permitted nor denied by best guess record for domain of 2068675309@mobile.mycingular.com)
+Received: from mobile.mycingular.com (wcmmg1.mycingular.net [10.46.26.18])
+	by wcmta2.mycingular.net (8.12.11/8.12.11) with SMTP id k642eI4M028656
+	for tommy.tutone@example.com; Mon, 3 Jul 2006 21:40:18 -0500 (CDT)
+	(envelope-from 2068675309@mobile.mycingular.com)
+Date: Mon, 3 Jul 2006 21:40:18 -0500 (CDT)
+Message-Id: <200607040240.k642eI4M028656@wcmta2.mycingular.net>
+FROM: 2068675309@mobile.mycingular.com
+TO: tommy.tutone@example.com
+
+I hate people that send text messages about skateboarding.
+
+--
+
+Mobile Email from a Cingular Wireless Customer http://www.cingular.com

data/test/fixtures/pics.cingularme.com-image-01.mail

@@ -0,0 +1,44 @@
+X-Gmail-Received: 58ec38dd448cbbe3fa2ca3cc92bc3384a1c0442e
+Delivered-To: tommy.tutone@example.com
+Received: by 10.35.116.17 with SMTP id t17cs497674pym;
+        Wed, 25 Oct 2006 17:03:38 -0700 (PDT)
+Received: by 10.65.180.7 with SMTP id h7mr1899344qbp;
+        Wed, 25 Oct 2006 17:03:38 -0700 (PDT)
+Return-Path: <2068675309@pics.cingularme.com>
+Received: from atlmtaow01.cingularme.com (atlmtaow01.cingularme.com [66.102.165.6])
+
+        Wed, 25 Oct 2006 17:03:38 -0700 (PDT)
+Received-SPF: pass (google.com: domain of 2068675309@pics.cingularme.com designates 66.102.165.6 as permitted sender)
+X-Mms-MMS-Version: 18
+Date: Wed, 25 Oct 2006 20:03:37 -0400
+X-Nokia-Ag-Internal: ; smiltype=true; internaldate=1161821017233
+Content-Type: multipart/mixed;  boundary="----=_Part_773748_29039988.1161821017355"
+X-Mms-Delivery-Report: 0
+Received: from alpagw01 ([209.183.34.196]) by atlmtaow01.cingularme.com (InterMail vM.6.01.04.00 201-2131-118-20041027) with ESMTP id <20061026000337.PKXW18952.atlmtaow01.cingularme.com@alpagw01> for <tommy.tutone@example.com>; Wed, 25 Oct 2006 20:03:37 -0400
+X-Mms-Transaction-ID: E0FE5F627738A9
+From: <2068675309@pics.cingularme.com>
+To: tommy.tutone@example.com
+X-Mms-Message-Class: 0
+X-Mms-Read-Reply: 1
+Mime-Version: 1.0
+Message-ID: <22965942.1161821017378.JavaMail.wluser@alpagw01>
+X-Mms-Priority: 1
+X-Mms-Message-Type: 0
+Subject: Multimedia message
+X-Nokia-Ag-Version: 2.0
+
+------=_Part_773748_29039988.1161821017355
+Content-Type: image/jpeg
+Content-Transfer-Encoding: base64
+Content-Location: 10252006.jpg
+Content-Disposition: inline
+
+/9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAXQ3JlYXRl
+ZCB3aXRoIFRoZSBHSU1Q/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxER
+ExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4e
+Hh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAAQAB
+AwEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAH/8QAFBABAAAAAAAAAAAAAAAAAAAA
+AP/EABUBAQEAAAAAAAAAAAAAAAAAAAcI/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQAC
+EQMRAD8AlgA6WW//2Q==
+------=_Part_773748_29039988.1161821017355--
+

data/test/fixtures/tmo.blackberry.net-image-01.mail

@@ -0,0 +1,48 @@
+Delivered-To: tommy.tutone@example.com
+Received: by 10.150.57.8 with SMTP id f8cs65257yba;
+        Fri, 18 Apr 2008 21:41:30 -0700 (PDT)
+Received: by 10.64.3.5 with SMTP id 5mr6524564qbc.42.1208580089389;
+        Fri, 18 Apr 2008 21:41:29 -0700 (PDT)
+Return-Path: <SRS0=jU8yvZ=VE=tmo.blackberry.net=awindsor@srs.bis.na.blackberry.com>
+Received: from smtp02.bis.na.blackberry.com (smtp02.bis.na.blackberry.com [216.9.248.49])
+        by mx.google.com with ESMTP id c6si658202qbc.11.2008.04.18.21.41.28;
+        Fri, 18 Apr 2008 21:41:29 -0700 (PDT)
+Received-SPF: pass (google.com: domain of SRS0=jU8yvZ=VE=tmo.blackberry.net=awindsor@srs.bis.na.blackberry.com designates 216.9.248.49 as permitted sender) client-ip=216.9.248.49;
+Authentication-Results: mx.google.com; spf=pass (google.com: domain of SRS0=jU8yvZ=VE=tmo.blackberry.net=awindsor@srs.bis.na.blackberry.com designates 216.9.248.49 as permitted sender) smtp.mail=SRS0=jU8yvZ=VE=tmo.blackberry.net=awindsor@srs.bis.na.blackberry.com
+Received: from bxe011.bisx.prod.on.blackberry (bxe011.bisx.prod.on.blackberry [172.20.225.30])
+	by srs.bis.na.blackberry.com (8.13.7 TEAMON/8.13.7) with ESMTP id m3J4Y75g014164
+	for tommy.tutone@example.com; Sat, 19 Apr 2008 04:41:27 GMT
+X-rim-org-msg-ref-id: 2032055546
+Return-Receipt-To: 2068675309@tmo.blackberry.net
+Message-ID: <2032055546-1208580087-cardhu_decombobulator_blackberry.rim.net-600368080-@bxe011.bisx.prod.on.blackberry>
+Reply-To: 2068675309@tmo.blackberry.net
+X-Priority: Normal
+Sensitivity: Normal
+Importance: Normal
+To: tommy.tutone@example.com
+Subject: IMG00440.jpg
+From: 2068675309@tmo.blackberry.net
+Date: Sat, 19 Apr 2008 04:38:59 +0000
+Content-Type: multipart/mixed; boundary="part181419-boundary-1741380772-2064863822"
+MIME-Version: 1.0
+
+
+--part181419-boundary-1741380772-2064863822
+Content-Type: text/plain
+
+
+Sent via BlackBerry from T-Mobile
+--part181419-boundary-1741380772-2064863822
+Content-Transfer-Encoding: base64
+Content-Type: image/jpeg
+Content-Disposition: attachment; filename="=?Windows-1252?B?SU1HMDA0NDAuanBn?="
+
+/9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAXQ3JlYXRl
+ZCB3aXRoIFRoZSBHSU1Q/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxER
+ExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4e
+Hh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAAQAB
+AwEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAH/8QAFBABAAAAAAAAAAAAAAAAAAAA
+AP/EABUBAQEAAAAAAAAAAAAAAAAAAAcI/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQAC
+EQMRAD8AlgA6WW//2Q==
+
+--part181419-boundary-1741380772-2064863822--

data/test/fixtures/virgin.ca-text-01.mail

@@ -0,0 +1,21 @@
+Return-Path: <2068675309@vmobile.ca>
+X-Original-To: tommy.tutone@example.com
+Delivered-To: tommy.tutone@example.com
+Received: from E0100DaMtrMta03.bellmobilite.ca (txt.bellmobility.ca [206.47.78.138])
+	by corkboard.it (Postfix) with ESMTP id 259F0112BB9A
+	for <tommy.tutone@example.com>; Wed,  3 Dec 2008 16:37:58 -0500 (EST)
+Received: from txt.bell.ca (erwdbmgejb01 [172.25.79.138])
+	by E0100DaMtrMta03.bellmobilite.ca (8.11.7p3+Sun/8.11.7) with ESMTP id mB3Lbr304876
+	for <tommy.tutone@example.com>; Wed, 3 Dec 2008 16:37:53 -0500 (EST)
+Message-Id: <200812032137.mB3Lbr304876@E0100DaMtrMta03.bellmobilite.ca>
+Date: 03 Dec 08 16:37:53 -0500
+From: 2068675309@vmobile.ca
+To: tommy.tutone@example.com
+Importance: normal
+
+Hello World
+
+----------------------------------------------------------------
+Sent by Text Messaging from a mobile device.
+Envoy� par messagerie texte d'un appareil mobile.
+----------------------------------------------------------------

data/test/test_1nbox_net.rb

@@ -6,7 +6,7 @@ require 'mocha'
 gem 'tmail', '>= 1.2.1'
 require 'tmail'
 
-class Test1NBoxNet < Test::Unit::TestCase
+class Test1nboxNet < Test::Unit::TestCase
   include MMS2R::TestHelper
   
   def test_image_and_text_and_number

data/test/test_mms2r_media.rb

@@ -118,7 +118,7 @@ class TestMms2rMedia < Test::Unit::TestCase
     mail.expects(:header).at_least_once.returns({})
     mail.expects(:from).at_least_once.returns(['joe@unknown.example.com'])
     mms = MMS2R::Media.create(mail)
-    assert_equal MMS2R::Media, mms
+    assert_equal [MMS2R::Media, 'unknown.example.com'] , mms
   end
 
   def test_create_with_special_processor
@@ -127,15 +127,16 @@ class TestMms2rMedia < Test::Unit::TestCase
     mail.expects(:header).at_least_once.returns({})
     mail.expects(:from).at_least_once.returns(['joe@null.example.com'])
     mms = MMS2R::Media.create(mail)
-    assert_equal MMS2R::Media::NullCarrier, mms
+    assert_equal [MMS2R::Media::NullCarrier, 'null.example.com'], mms
   end
 
   def test_create_with_special_processor_and_return_path
     MMS2R.register('null.example.com', MMS2R::Media::NullCarrier)
     mail = mock()
     mail.expects(:header).at_least_once.returns({'return-path' => '<joe@null.example.com>'})
+    mail.expects(:from).at_least_once.returns([])
     mms = MMS2R::Media.create(mail)
-    assert_equal MMS2R::Media::NullCarrier, mms
+    assert_equal [MMS2R::Media::NullCarrier, 'null.example.com'], mms
   end
 
   def test_create_should_fail_gracefully_with_broken_from
@@ -220,7 +221,7 @@ class TestMms2rMedia < Test::Unit::TestCase
     assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent via BlackBerry from T-Mobile")
     assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent from my Verizon Wireless BlackBerry")
     assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from my iPhone')
-    assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from my iPhone.')
+    assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from your iPhone.')
     assert_equal ['text/plain', ''], mms.transform_text('text/plain', " \n\nimage/jpeg")
 
     # has a bad regexp
@@ -296,7 +297,9 @@ class TestMms2rMedia < Test::Unit::TestCase
     mail = stub_mail()
     mail.stubs(:subject).returns(s)
     mms = MMS2R::Media.new(mail)
-    mms.stubs(:config).returns({'transform' => {'text/plain' => [['/Default Subject: (.+)/', '\1']]}})
+    mms.stubs(:config).returns(
+      { 'ignore' => {},
+        'transform' => {'text/plain' => [['/Default Subject: (.+)/', '\1']]}})
     assert_equal 'hello world', mms.subject
   end
 
@@ -423,17 +426,24 @@ class TestMms2rMedia < Test::Unit::TestCase
     mms.stubs(:config).returns({'ignore' => {type => [name]}})
 
     # type is not in the ingore
-    part = stub(:sub_header => name)
+    part = stub(:sub_header => name, :body => 'a')
     assert_equal false, mms.ignore_media?('text/test', part)
     # type and filename are in the ingore
     part = stub(:sub_header => name)
     assert_equal true, mms.ignore_media?(type, part)
     # type but not file name are in the ignore
-    part = stub(:sub_header => 'bar.txt')
+    part = stub(:sub_header => 'bar.txt', :body => 'a')
     assert_equal false, mms.ignore_media?(type, part)
   end
 
   def test_filename
+    name = 'x' * 300 + '.txt'
+    mms = MMS2R::Media.new(stub_mail())
+    part = stub(:sub_header => name, :content_type => 'text/plain')
+    assert_equal 'x' * 251 + '.txt', mms.filename?(part)
+  end
+
+  def test_long_filename
     name = 'foo.txt'
     mms = MMS2R::Media.new(stub_mail())
     part = stub(:sub_header => name, :content_type => 'text/plain')
@@ -460,13 +470,13 @@ class TestMms2rMedia < Test::Unit::TestCase
     mms.stubs(:config).returns({'ignore' => {type => [regexp, 'nil.txt']}})
 
     # type is not in the ingore
-    part = stub(:sub_header => name)
+    part = stub(:sub_header => name, :body => 'a')
     assert_equal false, mms.ignore_media?('text/test', part)
     # type and regexp for the filename are in the ingore
     part = stub(:sub_header => name)
     assert_equal true, mms.ignore_media?(type, part)
     # type but not regexp for filename are in the ignore
-    part = stub(:sub_header => 'bar.txt')
+    part = stub(:sub_header => 'bar.txt', :body => 'a')
     assert_equal false, mms.ignore_media?(type, part)
   end
 
@@ -684,4 +694,67 @@ class TestMms2rMedia < Test::Unit::TestCase
     mms.purge
   end
 
+  def test_domain_from_return_path
+    mail = mock()
+    mail.expects(:header).at_least_once.returns({'return-path' => '<joe@null.example.com>'})
+    mail.expects(:from).at_least_once.returns([])
+    domain = MMS2R::Media.domain(mail)
+    assert_equal 'null.example.com', domain
+  end
+
+  def test_domain_from_from
+    mail = mock()
+    mail.expects(:header).at_least_once.returns({})
+    mail.expects(:from).at_least_once.returns(['joe@null.example.com'])
+    domain = MMS2R::Media.domain(mail)
+    assert_equal 'null.example.com', domain
+  end
+
+  def test_domain_from_from_yaml
+    f = File.join(MMS2R::Media.conf_dir, 'from.yml')
+    YAML.expects(:load_file).once.with(f).returns(['example.com'])
+    mail = mock()
+    mail.expects(:header).at_least_once.returns({'return-path' => '<joe@null.example.com>'})
+    mail.expects(:from).at_least_once.returns(['joe@example.com'])
+    domain = MMS2R::Media.domain(mail)
+    assert_equal 'example.com', domain
+  end
+
+  def test_unknown_device_type
+    mail = TMail::Mail.load(mail_fixture('generic.mail'))
+    mms = MMS2R::Media.new(mail)
+    assert_equal :unknown, mms.device_type?
+    assert_equal false, mms.is_mobile?
+  end
+
+  def test_iphone_device_type
+    mail = TMail::Mail.load(mail_fixture('att-iphone-01.mail'))
+    mms = MMS2R::Media.new(mail)
+    assert_equal :iphone, mms.device_type?
+    assert_equal true, mms.is_mobile?
+  end
+
+  def test_blackberry_device_type
+    berries = ['att-blackberry.mail',
+               'suncom-blackberry.mail',
+               'tmobile-blackberry-02.mail',
+               'tmobile-blackberry.mail',
+               'tmo.blackberry.net-image-01.mail',
+               'verizon-blackberry.mail',
+               'verizon-blackberry.mail']
+    berries.each do |berry|
+      mail = TMail::Mail.load(mail_fixture(berry))
+      mms = MMS2R::Media.new(mail)
+      assert_equal :blackberry, mms.device_type?, "fixture #{berry} was not a blackberrry"
+      assert_equal true, mms.is_mobile?
+    end
+  end
+
+  def test_handset_device_type
+    mail = TMail::Mail.load(mail_fixture('att-image-01.mail'))
+    mms = MMS2R::Media.new(mail)
+    assert_equal :handset, mms.device_type?
+    assert_equal true, mms.is_mobile?
+  end
+
 end

data/test/test_mms_3ireland_ie.rb

@@ -6,7 +6,7 @@ require 'mocha'
 gem 'tmail', '>= 1.2.1'
 require 'tmail'
 
-class Test3IrelandIe < Test::Unit::TestCase
+class TestMms3irelandIe < Test::Unit::TestCase
   include MMS2R::TestHelper
   
   def test_image_and_text_and_number

data/test/test_mms_att_net.rb

@@ -113,4 +113,30 @@ class TestMmsAttNet < Test::Unit::TestCase
     assert_not_nil mms.media['image/jpeg'].first
     assert_match(/IMG00367.jpg/, mms.media['image/jpeg'].first)
   end
+
+  def test_mobile_mycingular_com
+    # mobile.mycingular.com service
+    mail = TMail::Mail.parse(load_mail('mobile.mycingular.com-text-01.mail').join)
+    mms = MMS2R::Media.new(mail)
+
+    assert_equal 'mobile.mycingular.com', mms.carrier
+    assert_equal 1, mms.media.size
+    assert_not_nil(mms.media['text/plain'])
+    assert_equal "I hate people that send text messages about skateboarding.", IO.read(mms.media['text/plain'][0])
+
+    mms.purge
+  end
+
+  def test_pics_cingularme_com
+    # pics.cingularme.com service
+    mail = TMail::Mail.parse(load_mail('pics.cingularme.com-image-01.mail').join)
+    mms = MMS2R::Media.new(mail)
+
+
+    # TODO this fixture is either mailformed or exposes a tmail problem
+    # since its legacy content fix if necessary
+    assert_equal 'pics.cingularme.com', mms.carrier
+
+    mms.purge
+  end
 end

data/test/test_tmomail_net.rb

@@ -6,7 +6,7 @@ require 'mocha'
 gem 'tmail', '>= 1.2.1'
 require 'tmail'
 
-class TestTmobileNet < Test::Unit::TestCase
+class TestTmomailNet < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def test_ignore_simple_image
@@ -85,6 +85,24 @@ class TestTmobileNet < Test::Unit::TestCase
     file = mms.default_media
     assert_equal 'Image002.jpg', file.original_filename
 
-    #mms.purge
+    mms.purge
+  end
+
+  def test_tmo_blackberry_net
+    mail = TMail::Mail.parse(load_mail('tmo.blackberry.net-image-01.mail').join)
+    mms = MMS2R::Media.new(mail)
+
+    assert_equal '2068675309', mms.number
+    assert_equal 'IMG00440.jpg', mms.subject
+    assert_equal 'tmo.blackberry.net', mms.carrier
+
+    assert_equal 1, mms.media.size
+    assert_equal 1, mms.media['image/jpeg'].size
+
+    assert_file_size mms.media['image/jpeg'][0], 337
+    file = mms.default_media
+    assert_equal '=?Windows-1252?B?SU1HMDA0NDAuanBn?=.jpg', file.original_filename
+
+    mms.purge
   end
 end

data/test/test_unicel_com.rb

@@ -6,7 +6,7 @@ require 'mocha'
 gem 'tmail', '>= 1.2.1'
 require 'tmail'
 
-class TestMmsUnicelCom < Test::Unit::TestCase
+class TestUnicelCom < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def test_subject_number_image_unicel

data/test/test_vmpix_com.rb

@@ -43,4 +43,14 @@ class TestVmpixCom < Test::Unit::TestCase
     mms.purge
   end
 
+  def test_only_valid_content_should_be_retained_for_virgin_canada_text
+    mail = TMail::Mail.parse(load_mail('virgin.ca-text-01.mail').join)
+    mms = MMS2R::Media.new(mail)
+    assert_equal 'vmobile.ca', mms.carrier
+    assert_equal 1, mms.media.size
+    assert_equal 1, mms.media['text/plain'].size
+    assert_equal "Hello World", IO.read(mms.media['text/plain'][0]).strip
+    mms.purge
+  end
+
 end

data/vendor/plugins/mms2r/lib/autotest/mms2r.rb

@@ -4,7 +4,7 @@ class Autotest::Mms2r < Autotest
 
   def initialize # :nodoc:
     super
-    @exceptions = /\.svn/
+    @exceptions = /\.(git|svn)/
     @test_mappings = {
       %r%^conf/aliases.yml$% => proc { |_, m|
         ["test/test_mms2r_media.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mms2r
 version: !ruby/object:Gem::Version 
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors: 
 - Mike Mondragon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-06 00:00:00 -05:00
+date: 2009-01-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.8.2
     version: 
-description: "== DESCRIPTION  MMS2R is a library that decodes the parts of an MMS message to disk while  stripping out advertising injected by the mobile 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 cruft 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:  * 1nbox/Idea: 1nbox.net * 3 Ireland: mms.3ireland.ie * Alltel: mms.alltel.com * AT&T/Cingular/Legacy: mms.att.net, txt.att.net, mmode.com, mms.mycingular.com,  cingularme.com * Bell Canada: txt.bell.ca * Bell South / Suncom: bellsouth.net * Cricket Wireless: mms.mycricket.com * Dobson/Cellular One: mms.dobson.net * Helio: mms.myhelio.com * Hutchison 3G UK Ltd: mms.three.co.uk * INDOSAT M2: mobile.indosat.net.id * LUXGSM S.A.: mms.luxgsm.lu * Maroc Telecom / mms.mobileiam.ma * MTM South Africa: mms.mtn.co.za * NetCom (Norway): mms.netcom.no * Nextel: messaging.nextel.com * O2 Germany: mms.o2online.de * O2 UK: mediamessaging.o2.co.uk * Orange & Regional Oranges: orangemms.net, mmsemail.orange.pl, orange.fr * PLSPICTURES.COM mms hosting: waw.plspictures.com * PXT New Zealand: pxt.vodafone.net.nz * Rogers of Canada: rci.rogers.com * SaskTel: sms.sasktel.com * Sprint: pm.sprint.com, messaging.sprintpcs.com * T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk * TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com * UAE MMS: mms.ae * Unicel: unicel.com, info2go.com  (note: mobile number is tucked away in a text/plain part for unicel.com) * Verizon: vzwpix.com, vtext.com * Virgin Mobile: vmpix.com * Vodacom: mms.vodacom4me.co.za"
+description: "== DESCRIPTION  MMS2R is a library that decodes the parts of an MMS message to disk while  stripping out advertising injected by the mobile 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 cruft 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:  * 1nbox/Idea: 1nbox.net * 3 Ireland: mms.3ireland.ie * Alltel: mms.alltel.com * AT&T/Cingular/Legacy: mms.att.net, txt.att.net, mmode.com, mms.mycingular.com,  cingularme.com, mobile.mycingular.com pics.cingularme.com * Bell Canada: txt.bell.ca * Bell South / Suncom: bellsouth.net * Cricket Wireless: mms.mycricket.com * Dobson/Cellular One: mms.dobson.net * Helio: mms.myhelio.com * Hutchison 3G UK Ltd: mms.three.co.uk * INDOSAT M2: mobile.indosat.net.id * LUXGSM S.A.: mms.luxgsm.lu * Maroc Telecom / mms.mobileiam.ma * MTM South Africa: mms.mtn.co.za * NetCom (Norway): mms.netcom.no * Nextel: messaging.nextel.com * O2 Germany: mms.o2online.de * O2 UK: mediamessaging.o2.co.uk * Orange & Regional Oranges: orangemms.net, mmsemail.orange.pl, orange.fr * PLSPICTURES.COM mms hosting: waw.plspictures.com * PXT New Zealand: pxt.vodafone.net.nz * Rogers of Canada: rci.rogers.com * SaskTel: sms.sasktel.com * Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com * T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net * TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com * UAE MMS: mms.ae * Unicel: unicel.com, info2go.com  (note: mobile number is tucked away in a text/plain part for unicel.com) * Verizon: vzwpix.com, vtext.com * Virgin Mobile: vmpix.com * Virgin Mobile of Canada: vmobile.ca * Vodacom: mms.vodacom4me.co.za"
 email: mikemondragon@gmail.com
 executables: []
 
@@ -61,6 +61,7 @@ files:
 - conf/1nbox.net.yml
 - conf/aliases.yml
 - conf/bellsouth.net.yml
+- conf/from.yml
 - conf/mediamessaging.o2.co.uk.yml
 - conf/messaging.nextel.com.yml
 - conf/mms.3ireland.ie.yml
@@ -121,6 +122,7 @@ files:
 - test/fixtures/cingularme-text-02.mail
 - test/fixtures/dobson-image-01.mail
 - test/fixtures/dot.jpg
+- test/fixtures/generic.mail
 - test/fixtures/helio-image-01.mail
 - test/fixtures/helio-message-01.mail
 - test/fixtures/iconv-fr-text-01.mail
@@ -135,6 +137,7 @@ files:
 - test/fixtures/mms.mycricket.com-pic-and-text.mail
 - test/fixtures/mms.mycricket.com-pic.mail
 - test/fixtures/mmsreply.t-mobile.co.uk-text-image-01.mail
+- test/fixtures/mobile.mycingular.com-text-01.mail
 - test/fixtures/mtn-southafrica-mms.mail
 - test/fixtures/mycingular-image-01.mail
 - test/fixtures/netcom-image-01.mail
@@ -147,6 +150,7 @@ files:
 - test/fixtures/orangefrance-text-and-image.mail
 - test/fixtures/orangepoland-text-01.mail
 - test/fixtures/orangepoland-text-02.mail
+- test/fixtures/pics.cingularme.com-image-01.mail
 - test/fixtures/pxt-image-01.mail
 - test/fixtures/rogers-canada-mms-01.mail
 - test/fixtures/sasktel-image-01.mail
@@ -161,6 +165,7 @@ files:
 - test/fixtures/suncom-blackberry.mail
 - test/fixtures/telus-image-01.mail
 - test/fixtures/three-uk-image-01.mail
+- test/fixtures/tmo.blackberry.net-image-01.mail
 - test/fixtures/tmobile-blackberry-02.mail
 - test/fixtures/tmobile-blackberry.mail
 - test/fixtures/tmobile-image-01.mail
@@ -173,6 +178,7 @@ files:
 - test/fixtures/verizon-text-01.mail
 - test/fixtures/verizon-video-01.mail
 - test/fixtures/virgin-mobile-image-01.mail
+- test/fixtures/virgin.ca-text-01.mail
 - test/fixtures/vodacom4me-co-za-01.mail
 - test/fixtures/vodacom4me-co-za-02.mail
 - test/fixtures/vodacom4me-southafrica-mms-01.mail
@@ -241,43 +247,43 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mms2r
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Extract user media from MMS (and not carrier cruft)
 test_files: 
-- test/test_sms_sasktel_com.rb
-- test/test_pxt_vodafone_net_nz.rb
-- test/test_mms_mycricket_com.rb
-- test/test_mobile_indosat_net_id.rb
-- test/test_unicel_com.rb
+- test/test_mms_o2online_de.rb
+- test/test_helper.rb
 - test/test_pm_sprint_com.rb
+- test/test_sms_sasktel_com.rb
+- test/test_mms_mobileiam_ma.rb
+- test/test_msg_telus_com.rb
 - test/test_messaging_sprintpcs_com.rb
-- test/test_vzwpix_com.rb
-- test/test_mms_alltel_com.rb
-- test/test_mms2r_media.rb
-- test/test_waw_plspictures_com.rb
-- test/test_mms_ae.rb
+- test/test_mms_myhelio_com.rb
 - test/test_mms_3ireland_ie.rb
-- test/test_msg_telus_com.rb
-- test/test_bellsouth_net.rb
-- test/test_mms_o2online_de.rb
+- test/test_mms_ae.rb
 - test/test_mms_att_net.rb
+- test/test_mediamessaging_o2_co_uk.rb
+- test/test_bell_canada.rb
+- test/test_mms_mtn_co_za.rb
+- test/test_vmpix_com.rb
+- test/test_github.rb
+- test/test_vzwpix_com.rb
+- test/test_bellsouth_net.rb
+- test/test_unicel_com.rb
+- test/test_waw_plspictures_com.rb
+- test/test_mms_luxgsm_lu.rb
 - test/test_mms_netcom_no.rb
+- test/test_mms_mycricket_com.rb
+- test/test_mms2r_media.rb
 - test/test_rci_rogers_com.rb
-- test/test_mms_mtn_co_za.rb
+- test/test_messaging_nextel_com.rb
+- test/test_mms_vodacom4me_co_za.rb
 - test/test_tmomail_net.rb
-- test/test_mms_myhelio_com.rb
+- test/test_1nbox_net.rb
+- test/test_pxt_vodafone_net_nz.rb
+- test/test_mobile_indosat_net_id.rb
 - test/test_mms_three_co_uk.rb
+- test/test_mms_alltel_com.rb
 - test/test_mms_dobson_net.rb
-- test/test_mms_luxgsm_lu.rb
-- test/test_bell_canada.rb
-- test/test_github.rb
 - test/test_orangemms_net.rb
-- test/test_helper.rb
-- test/test_vmpix_com.rb
-- test/test_mms_mobileiam_ma.rb
-- test/test_messaging_nextel_com.rb
-- test/test_mediamessaging_o2_co_uk.rb
-- test/test_1nbox_net.rb
-- test/test_mms_vodacom4me_co_za.rb