mms2r 2.0.5 → 2.1.0

data/History.txt

@@ -1,8 +1,20 @@
-== 2.0.5 / 2008-07-17 (Dr. Ralphus Galkensmelter - Psychological death expert)
+### 2.1.0 / 2008-07-30 (Dr. Gibbons – Birthday expert and Murderface expert)
+
+* 1 major enhancement:
+
+  * opens up TMail for improved query method patterned code in MMS2R
+
+* 2 minor enhancements:
+
+  * UK O2 support mediamessaging.o2.co.uk - Jeremy Wilkins
+  * Write non text files with binary bit set on Windows - Nobody
+  * source hosted on github: git clone git://github.com/monde/mms2r.git
+
+### 2.0.5 / 2008-07-17 (Dr. Ralphus Galkensmelter - Psychological death expert)
 
 * Deal with Apple Mail multipart/appledouble - jesse dp
 
-== 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
+### 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
 
 * updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
 * 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada
@@ -14,7 +26,7 @@
 * mmsreply.t-mobile.co.uk / T-Mobile UK - Vijay Yellapragada
 * waw.plspictures.com / PLSPICTURES.COM mms hosting service
 
-== 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
+### 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
 
 * fix case when part is image/jpeg declared 'application/octet-stream' 
 * trim dangling image/jpeg text from blackberry messages
@@ -23,7 +35,7 @@
 * T-Mobile update -  jesse dp
 * AT&T/T-Mobile Blackberrry update - Dave Myron
 
-== 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
+### 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
 
 * added support for mms.vodacom4me.co.za Vodacom South Africa - Jason Haruska
 * added support for bellsouth.net - Jason Haruska
@@ -35,14 +47,14 @@
 * return sender's phone number for mms.luxgsm.lu
 * return sender's phone number for mms.vodacom4me.co.za
 
-== 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
+### 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
 
 * strip out common blackberry and iPhone signatures
 * handle carriers that use external mail services such as Yahoo! as the From address
 * Add support for mobile.indosat.net.id (and yahoo.co.id) - Jason Haruska
 * Add support for sms.sasktel.com - Jason Haruska
 
-== 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
+### 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
 
 * added support for pxt.vodafone.net.nz PXT New Zealand
 * added support for mms.o2online.de  O2 Germany
@@ -67,13 +79,13 @@
 * fixed typo in name of method #attachement to #attachment
 * fixed broken downloading of Sprint videos
 
-== 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
+### 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
 
 * fetch original images from Sprint content server (Layton Wedgeworth)
 * ignore Sprint messages when requested content has been purged from their
   content server
 
-== 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
+### 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
 
 * minor fix for attachment_fu where it might call #path on the cgi temp file
   that is returned by get_attachment
@@ -89,62 +101,62 @@
 * #get_attachment marked deprecated, use #attachment instead
 * #get_media marked deprecated, use #default_media instead
 
-== 1.1.10 / 2007-09-30 (Face Bones)
+### 1.1.10 / 2007-09-30 (Face Bones)
 
 * fixed a case for a nil match on From in the create method (Luke Francl)
 * added support for Alltel message.alltel.com (Ben Wood)
 
-== 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan 
+### 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan 
 Explosion)
 
 * fixed broken support for act_as_attachment and attachment_fu
 
-== 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
+### 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
    of Blood Ocean)
 
 * Added support for Orange of France, Orange orange.fr (Julian Biard)
 * purge in the process block removed, purge must be called explicitly
   after processing to clean up extracted temporary media files.
 
-== 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
+### 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
 
 * Added support for Orange of Poland, Orange mmsemail.orange.pl (Zbigniew
   Sobiecki)
 * Cleaned up documentation modifiers
 * Cleaned out non-Ruby code idioms
  
-== 1.1.6 / 2007-08-11 (Mustakrakish, the Lake Troll part 2)
+### 1.1.6 / 2007-08-11 (Mustakrakish, the Lake Troll part 2)
 
 * Redo of release mistake of 1.1.5
 
-== 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
+### 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
 
 * AT&T => mms.att.net not clearing out default "multimedia message"
   subject to nil (Will Jessup)
 * Ignore case on default subject for all carriers in 
   corresponding conf/mms2r_XXX_media_subject.yml
 
-== 1.1.4 / 2007-08-07 (Dr. Rockso)
+### 1.1.4 / 2007-08-07 (Dr. Rockso)
 
 * AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
 * get_body returns nil when there is not user text (sorry Will!)
 
-== 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
+### 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
 
 * Helio support by Will Jessup
 * get_subject returns nil on default carrier subjects 
 
-== 1.1.2 / 2007-06-13 (Dethklok roadie #2)
+### 1.1.2 / 2007-06-13 (Dethklok roadie #2)
 
 * placed versioned hpricot dependency in Hoe's extra_deps (an attempt to 
   appease firebrigade gods or not cause Gem::RemoteInstallationCancelled 
   whichever you prefer)
 
-== 1.1.1 / 2007-06-11 (Dethklok roadie)
+### 1.1.1 / 2007-06-11 (Dethklok roadie)
 
 * rescue rcov non-dependency in Rakefile to make firebrigade happy
 
-== 1.1.0 / 2007-06-08 (Toki Wartooth)
+### 1.1.0 / 2007-06-08 (Toki Wartooth)
 
 * get_body to return body text (Luke Francl)
 * get_subject returns "" for default subjects now
@@ -163,7 +175,7 @@ Explosion)
   of that type if the more than one exits in the media (Luke Francl)
 * added block support to process() method (Shane Vitarana)
 
-== 1.0.7 / 2007-04-27 (Senator Stampingston)
+### 1.0.7 / 2007-04-27 (Senator Stampingston)
 
 * patch submitted by Luke Francl
 * added a get_subject method that returns nil when any MMS has a default
@@ -171,7 +183,7 @@ Explosion)
 * get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You
    have new Picture Mail!'
 
-== 1.0.6 / 2007-04-24 (Pickles the Drummer)
+### 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)
@@ -182,7 +194,7 @@ Explosion)
 * 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)
+### 1.0.5 / 2007-04-10 (William Murderface)
 
 * patch submitted by Luke Francl
 * made ignore_media? start its text check from the start of the file (Luke)
@@ -196,7 +208,7 @@ Explosion)
 * added tests for 4 three samples of unique variants of Sprint/Nextel text
 * 100% test coverage!
 
-== 1.0.4 / 2007-04-09 (Metalocalypse)
+### 1.0.4 / 2007-04-09 (Metalocalypse)
 
 * fix teardown in test_mms2r_sprint.rb (shanesbrain.net)
 * clean up Net::HTTP in MMS2R::SprintMedia (shanesbrain.net)
@@ -204,12 +216,12 @@ Explosion)
 * fixed a nil issue with underlying tmp working dir
 * added exception handling around Net::HTTP in MMS2R::SprintMedia
 
-== 1.0.3 / 2007-04-05 (Paper Cut)
+### 1.0.3 / 2007-04-05 (Paper Cut)
 
 * Cleaned up packaging and errors in example found by Shane V. 
   http://shanesbrain.net/
 
-== 1.0.2 / 2007-03-07
+### 1.0.2 / 2007-03-07
 
 * Reorganized tests and fixtures
 * Added carriers:
@@ -217,11 +229,11 @@ Explosion)
 * Nextel => messaging.nextel.com
 * Verizon => vtext.com
 
-== 1.0.1 / 2007-03-07
+### 1.0.1 / 2007-03-07
 
 * Flubbed RubyForge release ... do not use this.
 
-== 1.0.0 / 2007-03-06
+### 1.0.0 / 2007-03-06
 
 * Birthday!
 * AT&T/Cingular => mmode.com

data/Manifest.txt

@@ -5,6 +5,7 @@ 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.alltel.com.yml
@@ -34,6 +35,7 @@ dev_tools/debug_sprint_hpricot_parsing.rb
 lib/mms2r.rb
 lib/mms2r/media.rb
 lib/mms2r/media/sprint.rb
+lib/tmail_ext.rb
 test/fixtures/1nbox-2images-01.mail
 test/fixtures/1nbox-2images-02.mail
 test/fixtures/1nbox-2images-03.mail
@@ -61,6 +63,7 @@ test/fixtures/indosat-image-01.mail
 test/fixtures/indosat-image-02.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.mycricket.com-pic-and-text.mail
 test/fixtures/mms.mycricket.com-pic.mail
@@ -109,6 +112,7 @@ test/fixtures/waw.plspictures.com-image-01.mail
 test/test_1nbox_net.rb
 test/test_bellsouth_net.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

data/README.txt

@@ -4,7 +4,7 @@
   http://mms2r.rubyforge.org/ 
   http://rubyforge.org/tracker/?group_id=3065 
 
-== 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 
@@ -37,6 +37,7 @@ Corpus of carriers currently processed by MMS2R:
 * 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
 * PXT New Zealand: pxt.vodafone.net.nz
 * Rogers of Canada: rci.rogers.com
@@ -55,7 +56,12 @@ Corpus of carriers currently processed by MMS2R:
 * #process can be made lazy when :process => :lazy is passed to new
 * logging is enabled when :logger => your_logger is passed to new
 
-== SYNOPSIS:
+== BOOKS
+
+MMS2R, Making email useful
+http://peepcode.com/products/mms2r-pdf
+
+== SYNOPSIS
 
   require 'rubygems'
   require 'mms2r'
@@ -112,37 +118,50 @@ Corpus of carriers currently processed by MMS2R:
   #remove all the media that was put to temporary disk
   mms.purge
 
-== REQUIREMENTS:
+== REQUIREMENTS
 
 * Hpricot
 * TMail
 
-== INSTALL:
+== INSTALL
 
 * sudo gem install mms2r
 
-== CONTRIBUTE:
+<<<<<<< HEAD:README.txt
+== SOURCE
+
+git clone git://github.com/monde/mms2r.git
+svn co svn://rubyforge.org/var/svn/mms2r/trunk mms2r
+
+=======
+>>>>>>> dcf89451ea7ba0ff098d0d7ebd8ea16db1cc44ef:README.txt
+== CONTRIBUTE
 
 If you contribute a patch that is accepted then you'll get developer rights 
 for the project on RubyForge.  Please ensure your work includes 100% test 
 converage.  The library is ZenTest autotest discovery enabled so running 
 autotest in the root of the project is very helpful during development.
 
-== Authors
+== AUTHORS
 
 Copyright (c) 2007-2008 by Mike Mondragon (blog[http://blog.mondragon.cc/])
 
 MMS2R's Flickr page[http://www.flickr.com/photos/8627919@N05/]
 
-== Contributors
+== CONTRIBUTORS
 
 * Luke Francl (blog[http://railspikes.com/])
 * Will Jessup (blog[http://www.willjessup.com/])
 * Shane Vitarana (blog[http://www.shanesbrain.net/])
 * Layton Wedgeworth (http://www.beenup2.com/)
 * Jason Haruska (blog[http://software.haruska.com/])
+* Dave Myron (company[http://contentfree.com/])
+* Vijay Yellapragada
+* Jesse Dp
+* "Nobody"
+* Jeremy Wilkins
 
-== LICENSE:
+== LICENSE
 
 (The MIT License)
 

data/conf/mediamessaging.o2.co.uk.yml

@@ -0,0 +1,4 @@
+---
+ignore:
+  text/plain:
+  - /This Media Message has been sent using an O2 camera phone/mi

data/lib/mms2r.rb

@@ -39,12 +39,21 @@ module MMS2R
     ##
     # MMS2R library version
 
-    VERSION = '2.0.5'
+    VERSION = '2.1.0'
 
   end
 
 end
 
+require 'rubygems'
+gem 'tmail', '>= 1.2.1'
+require 'tmail/mail'
+require 'fileutils'
+require 'pathname'
+require 'tmpdir'
+require 'yaml'
+
+require File.join(File.dirname(__FILE__), 'tmail_ext')
 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)

data/lib/mms2r/media.rb

@@ -4,20 +4,6 @@
 # Please see the LICENSE file for licensing information
 #++
 
-require 'rubygems'
-gem 'tmail', '>= 1.2.1'
-require 'tmail/mail'
-require 'fileutils'
-require 'pathname'
-require 'tmpdir'
-require 'yaml'
-
-class TMail::MessageIdHeader #:nodoc:
-  def real_body
-    @body
-  end
-end
-
 ##
 # = Synopsis
 #
@@ -274,7 +260,7 @@ module MMS2R
     # Returns nil if there are not any video or image Files found.
 
     def default_media
-      return @default_media ||= attachment(['video', 'image', 'text'])
+      @default_media ||= attachment(['video', 'image', 'text'])
     end
 
     # Returns a File with the most likely candidate that is text, or nil
@@ -286,7 +272,7 @@ module MMS2R
     # Returns nil if there are not any text Files found
 
     def default_text
-      return @default_text ||= attachment(['text'])
+      @default_text ||= attachment(['text'])
     end
 
     ##
@@ -324,7 +310,7 @@ module MMS2R
         for i in 1..2
           flat = []
           parts.each do |p|
-            if MULTIPARTS_TO_SPLIT.include?(self.class.part_type?(p))
+            if MULTIPARTS_TO_SPLIT.include?(p.part_type?)
               p.parts.each {|mp| flat << mp }
             else
               flat << p
@@ -335,7 +321,7 @@ module MMS2R
   
         # get to work
         parts.each do |p|
-          t = self.class.part_type?(p)
+          t = p.part_type?
           unless ignore_media?(t,p)
             t,f = process_media(p)
             add_file(t,f) unless t.nil? || f.nil?
@@ -385,20 +371,23 @@ module MMS2R
       # TMail body auto-magically decodes quoted
       # printable for text/html type.
       file = temp_file(part)
-      case
-      when self.class.main_type?(part).eql?('text')
-        type, content = transform_text_part(part)
-      when self.class.part_type?(part).eql?('application/smil')
+      if part.main_type('text') == 'text' || 
+         part.content_type == 'application/smil'
         type, content = transform_text_part(part)
+        open_bits = 'w'
       else
-        type = self.class.part_type?(part)
-        type = type_from_filename(filename?(part)) if type == 'application/octet-stream'
+        if part.content_type == 'application/octet-stream'
+          type = type_from_filename(filename?(part))
+        else
+          type = part.content_type
+        end
         content = part.body
+        open_bits = 'wb' # open with binary bit for Windows for non text
       end
       return type, nil if content.nil? || content.empty?
 
       @logger.info("#{self.class} writing file #{file}") unless @logger.nil?
-      File.open(file,'w'){ |f| f.write(content) }
+      File.open(file,'wb'){ |f| f.write(content) }
       return type, file
     end
 
@@ -432,7 +421,7 @@ module MMS2R
     # Helper for process_media template method to transform text.
 
     def transform_text_part(part)
-      type = self.class.part_type?(part)
+      type = part.part_type?
       text = part.body.strip
       transform_text(type, text)
     end
@@ -490,11 +479,11 @@ module MMS2R
         if part['content-id'] && part['content-id'].real_body.strip =~ /^<(.+)>$/
           name = $1
         else
-          name = "#{Time.now.to_f}.#{self.class.default_ext(self.class.part_type?(part))}"
+          name = "#{Time.now.to_f}.#{self.class.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(self.class.part_type?(part))}"
+      name =~ /\..{1,4}$/ ? name : "#{name}.#{self.class.default_ext(part.part_type?)}"
     end
 
     ##
@@ -529,43 +518,18 @@ module MMS2R
     # id.
 
     def self.safe_message_id(mid)
-      return "#{Time.now.to_i}" if mid.nil?
-      mid.gsub(/\$|<|>|@|\./, "")
+      mid.nil? ? "#{Time.now.to_i}" : mid.gsub(/\$|<|>|@|\./, "")
     end
 
     ##
     # Returns a default file extension based on a content type
 
     def self.default_ext(content_type)
-      ext = MMS2R::EXT[content_type]
-      ext = content_type.split('/').last if ext.nil? rescue nil
+      ext = MMS2R::EXT[content_type] ||
+            content_type.split('/').last rescue nil
       ext
     end
 
-    ##
-    # Determines the mime-type of a part.  Guarantees a type is returned.
-
-    def self.part_type?(part)
-      if part.content_type.nil?
-        return 'text/plain'
-      end
-      part.content_type
-    end
-
-    ##
-    # Determines the main type of the part's mime-type
-
-    def self.main_type?(part)
-      /^([^\/]+)\//.match(self.part_type?(part))[1]
-    end
-
-    ##
-    # Determines the sub type of the part's mime-type
-
-    def self.sub_type?(part)
-      /\/([^\/]+)$/.match(self.part_type?(part))[1]
-    end
-
     ##
     # Joins the generic mms2r configuration with the carrier specific
     # configuration.

data/lib/mms2r/media/sprint.rb

@@ -45,7 +45,7 @@ module MMS2R
           #find the payload html
           doc = nil
           parts.each do |p|
-            next unless self.class.part_type?(p).eql?('text/html')
+            next unless p.part_type? == 'text/html'
             d = Hpricot(p.body)
             title = d.at('title').inner_html
             if title =~ /You have new Picture Mail!/
@@ -53,7 +53,7 @@ module MMS2R
               @is_video = (p.body =~ /type="VIDEO">/m ? true : false)
             end
           end
-          return if doc.nil? #it was a dud
+          return if doc.nil? # it was a dud
           @is_video ||= false
   
           # break it down

data/lib/tmail_ext.rb

@@ -0,0 +1,17 @@
+
+class TMail::MessageIdHeader #:nodoc:
+  def real_body
+    @body
+  end
+end
+
+class TMail::Mail
+
+    ##
+    # Determines the mime-type of a part.  Guarantees a type is returned.
+
+    def part_type?
+      self.content_type('text/plain')
+    end
+
+end

data/test/fixtures/mediamessaging_o2_co_uk-image-01.mail

@@ -0,0 +1,61 @@
+Return-Path: <+2068675309@mediamessaging.o2.co.uk>
+Delivered-To: testmail-tommy.tutone@example.com
+Received: (qmail 4775 invoked from network); 18 Jul 2008 16:18:50 -0000
+Received: from +2068675309@mediamessaging.o2.co.uk by ds2150.dedicated.turbodns.co.uk by uid 1005 with qmail-scanner-1.22 
+ (clamdscan: 0.74.  Clear:RC:0(192.109.216.142):. 
+ Processed in 9.150085 secs); 18 Jul 2008 16:18:49 -0000
+Received: from unknown (HELO relay5.materna-com.de) (192.109.216.142)
+  by ds2150.dedicated.turbodns.co.uk with SMTP; 18 Jul 2008 16:18:37 -0000
+Received: from romulus.materna-com.de (romulus.materna-com.de [172.30.64.14])
+	by relay5.materna-com.de (Postfix-2.1-rc19/TIM-6.6.6) with ESMTP id 934745893FE
+	for <tommy.tutone@example.com>; Fri, 18 Jul 2008 18:47:42 +0200 (CEST)
+Message-ID: <23041818.1216397891758.JavaMail.macs5@192.109.216.142>
+Date: Fri, 18 Jul 2008 17:18:11 +0100 (BST)
+From: +2068675309@mediamessaging.o2.co.uk
+To: freddy.tutone@example.com
+Subject: Office pic
+MIME-Version: 1.0
+Content-Type: multipart/related; 
+	boundary="----=_Part_90339_494009.1216397887686"
+
+------=_Part_90339_494009.1216397887686
+Content-Type: text/plain; charset=us-ascii
+Content-Transfer-Encoding: 7bit
+
+You have received a Media Message 
+This Media Message has been sent using an O2 camera phone.
+
+Click here to view this message online
+http://mediamessaging.o2.co.uk/mms2legacy/showMessage2.do?encMmsId=8BB0BB9DF2C3168F
+ 
+To reply to this media message you will need to use your own camera phone.
+Simply take a picture, or video and send it to the person that sent you this
+message.
+
+If you do not have a camera phone, get one today! Either visit
+http://shop.o2.co.uk/shop/ or come and see us at your local o2 store.
+
+Please note: You cannot reply to this message via email. 
+
+------=_Part_90339_494009.1216397887686
+Content-Type: image/jpeg; name=DSC00147.JPG
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=DSC00147.JPG
+Content-ID: <DSC00147.JPG>
+
+/9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAXQ3JlYXRl
+ZCB3aXRoIFRoZSBHSU1Q/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxER
+ExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4e
+Hh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAAQAB
+AwEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAH/8QAFBABAAAAAAAAAAAAAAAAAAAA
+AP/EABUBAQEAAAAAAAAAAAAAAAAAAAcI/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQAC
+EQMRAD8AlgA6WW//2Q==
+------=_Part_90339_494009.1216397887686
+Content-Type: text/plain; name=smil.txt; charset=utf-8
+Content-Transfer-Encoding: 7bit
+Content-Disposition: attachment; filename=smil.txt
+Content-ID: <smil.txt>
+
+Office pic
+------=_Part_90339_494009.1216397887686--
+

data/test/test_mediamessaging_o2_co_uk.rb

@@ -0,0 +1,52 @@
+require File.join(File.dirname(__FILE__), "..", "lib", "mms2r")
+require File.join(File.dirname(__FILE__), "test_helper")
+require 'test/unit'
+require 'rubygems'
+require 'mocha'
+gem 'tmail', '>= 1.2.1'
+require 'tmail'
+
+class TestMediamessagingO2CoUk < Test::Unit::TestCase
+  include MMS2R::TestHelper
+
+  def test_subject
+    mail = TMail::Mail.parse(load_mail('mediamessaging_o2_co_uk-image-01.mail').join)
+    mms = MMS2R::Media.new(mail)
+    assert_equal "Office pic", mms.subject
+    mms.purge
+  end
+
+  def test_image
+    mail = TMail::Mail.parse(load_mail('mediamessaging_o2_co_uk-image-01.mail').join)
+    mms = MMS2R::Media.new(mail)
+  
+    assert_equal 2, mms.media.size
+    assert_not_nil mms.media['text/plain']
+    assert_equal 1, mms.media['text/plain'].size
+    assert_not_nil mms.media['image/jpeg']
+    assert_equal 1, mms.media['image/jpeg'].size
+    assert mms.media['image/jpeg'].detect{|f| File.size(f) == 337}
+  
+    mms.purge
+  end
+
+  def test_default_media_should_return_user_generated_content
+    mail = TMail::Mail.parse(load_mail('mediamessaging_o2_co_uk-image-01.mail').join)
+    mms = MMS2R::Media.new(mail)
+    file = mms.default_media
+    assert_equal 337, file.size
+    
+    mms.purge
+  end 
+
+  def test_default_text_should_return_user_generated_content
+    mail = TMail::Mail.parse(load_mail('mediamessaging_o2_co_uk-image-01.mail').join)
+    mms = MMS2R::Media.new(mail)
+    file = mms.default_text
+    assert_equal 10, file.size
+    assert_equal "Office pic", file.read
+    
+    mms.purge
+  end 
+  
+end

data/test/test_mms2r_media.rb

@@ -40,8 +40,11 @@ class TestMms2rMedia < Test::Unit::TestCase
          :from => ['joe@example.com'],
          :multipart? => false,
          :parts => [],
+         :main_type => 'text',
          :content_type => 'text/plain',
+         :part_type? => 'text/plain',
          :sub_header => 'message.txt',
+
          :body => 'a',
          :header => {}
         }.except(keys)
@@ -83,24 +86,6 @@ class TestMms2rMedia < Test::Unit::TestCase
     assert_equal 'test', MMS2R::Media.default_ext('example/test')
   end
 
-  def test_part_type
-    part = stub(:content_type => nil)
-    assert_equal 'text/plain', MMS2R::Media.part_type?(part)
-
-    part = stub(:content_type => 'image/jpeg')
-    assert_equal 'image/jpeg', MMS2R::Media.part_type?(part)
-  end
-
-  def test_main_type
-    part = stub(:content_type => 'image/jpeg')
-    assert_equal 'image', MMS2R::Media.main_type?(part)
-  end
-
-  def test_sub_type
-    part = stub(:content_type => 'image/jpeg')
-    assert_equal 'jpeg', MMS2R::Media.sub_type?(part)
-  end
-
   def test_base_initialize_config_tries_to_open_default_config_yaml
     f = File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml')
     YAML.expects(:load_file).once.with(f).returns({})
@@ -426,12 +411,12 @@ class TestMms2rMedia < Test::Unit::TestCase
   def test_filename_when_file_extension_missing_part
     name = 'foo'
     mms = MMS2R::Media.new(stub_mail())
-    part = stub(:sub_header => name, :content_type => 'text/plain')
+    part = stub(:sub_header => name, :content_type => 'text/plain', :part_type? => 'text/plain')
     assert_equal 'foo.txt', mms.filename?(part)
 
     name = 'foo.janky'
     mms = MMS2R::Media.new(stub_mail())
-    part = stub(:sub_header => name, :content_type => 'text/plain')
+    part = stub(:sub_header => name, :content_type => 'text/plain', :part_type? => 'text/plain')
     assert_equal 'foo.janky.txt', mms.filename?(part)
   end
 
@@ -510,7 +495,7 @@ class TestMms2rMedia < Test::Unit::TestCase
     name = 'foo.txt'
     mms = MMS2R::Media.new(stub_mail())
     mms.stubs(:transform_text_part).returns(['text/plain', nil])
-    part = stub(:sub_header => name, :content_type => 'text/plain')
+    part = stub(:sub_header => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
 
     assert_equal ['text/plain', nil], mms.process_media(part)
 
@@ -525,7 +510,7 @@ class TestMms2rMedia < Test::Unit::TestCase
     name = 'foo.txt'
     mms = MMS2R::Media.new(stub_mail())
     mms.stubs(:transform_text_part).returns(['text/plain', nil])
-    part = stub(:sub_header => name, :content_type => 'text/plain')
+    part = stub(:sub_header => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
 
     assert_equal ['text/plain', nil], mms.process_media(part)
 
@@ -538,7 +523,7 @@ class TestMms2rMedia < Test::Unit::TestCase
     name = 'foo.txt'
     mms = MMS2R::Media.new(stub_mail())
     mms.stubs(:transform_text_part).returns(['application/smil', nil])
-    part = stub(:sub_header => name, :content_type => 'application/smil')
+    part = stub(:sub_header => name, :content_type => 'application/smil', :part_type? => 'application/smil', :main_type => 'application')
 
     assert_equal ['application/smil', nil], mms.process_media(part)
 
@@ -552,7 +537,7 @@ class TestMms2rMedia < Test::Unit::TestCase
   def test_process_media_for_application_octet_stream_when_image
     name = 'fake.jpg'
     mms = MMS2R::Media.new(stub_mail())
-    part = stub(:sub_header => name, :content_type => 'application/octet-stream', :body => "data")
+    part = stub(:sub_header => name, :content_type => 'application/octet-stream', :part_type? => 'application/octet-stream', :body => "data", :main_type => 'application')
     result = mms.process_media(part)
     assert_equal 'image/jpeg', result.first
     assert_match(/fake\.jpg$/, result.last)
@@ -562,11 +547,13 @@ class TestMms2rMedia < Test::Unit::TestCase
   def test_process_media_for_all_other_media
     name = 'foo.txt'
     mms = MMS2R::Media.new(stub_mail())
-    part = stub(:sub_header => name, :content_type => 'faux/text', :body => nil)
+    part = stub(:sub_header => name, :content_type => 'faux/text', :part_type? => 'faux/text', :body => nil)
+    part.expects(:main_type).with('text').returns('faux')
 
     assert_equal ['faux/text', nil], mms.process_media(part)
 
-    part = stub(:sub_header => name, :content_type => 'faux/text', :body => 'hello world')
+    part = stub(:sub_header => name, :content_type => 'faux/text', :part_type? => 'faux/text', :body => 'hello world')
+    part.expects(:main_type).with('text').returns('faux')
     result = mms.process_media(part)
     assert_equal 'faux/text', result.first
     assert_equal 'hello world', IO.read(result.last)
@@ -604,15 +591,16 @@ class TestMms2rMedia < Test::Unit::TestCase
 
   def test_process_with_multipart_alternative_parts
     mail = stub_mail()
-    plain = stub(:sub_header => 'message.txt', :content_type => 'text/plain', :body => 'a')
-    html = stub(:sub_header => 'message.html', :content_type => 'text/html', :body => 'a')
-    multi = stub(:content_type => 'multipart/alternative', :parts => [plain, html])
+    plain = stub(:sub_header => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => 'a', :main_type => 'text')
+    html = stub(:sub_header => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => 'a', :main_type => 'text')
+    multi = stub(:content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
     mail.stubs(:multipart?).returns(true)
     mail.stubs(:parts).returns([multi])
 
     # the multipart/alternative should get flattend to text and html
     mms = MMS2R::Media.new(mail)
     assert_equal 2, mms.media.size
+    assert_equal 2, mms.media.size
     assert_not_nil mms.media['text/plain']
     assert_not_nil mms.media['text/html']
     assert_equal 1, mms.media['text/plain'].size
@@ -628,9 +616,9 @@ class TestMms2rMedia < Test::Unit::TestCase
 
   def test_process_when_media_is_ignored
     mail = stub_mail()
-    plain = stub(:sub_header => 'message.txt', :content_type => 'text/plain', :body => '')
-    html = stub(:sub_header => 'message.html', :content_type => 'text/html', :body => '')
-    multi = stub(:content_type => 'multipart/alternative', :parts => [plain, html])
+    plain = stub(:sub_header => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => '')
+    html = stub(:sub_header => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => '')
+    multi = stub(:content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
     mail.stubs(:multipart?).returns(true)
     mail.stubs(:parts).returns([multi])
     mms = MMS2R::Media.new(mail, :process => :lazy)
@@ -646,8 +634,8 @@ class TestMms2rMedia < Test::Unit::TestCase
   def test_process_when_yielding_to_a_block
     mail = stub_mail()
 
-    plain = stub(:sub_header => 'message.txt', :content_type => 'text/plain', :body => 'a')
-    html = stub(:sub_header => 'message.html', :content_type => 'text/html', :body => 'b')
+    plain = stub(:sub_header => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => 'a', :main_type => 'text')
+    html = stub(:sub_header => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => 'b', :main_type => 'text')
     mail.stubs(:multipart?).returns(true)
     mail.stubs(:parts).returns([plain, html])
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mms2r
 version: !ruby/object:Gem::Version 
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors: 
 - Mike Mondragon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-17 00:00:00 -07:00
+date: 2008-07-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,15 +34,15 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.3
+        version: 1.7.0
     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 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 * Orange & Regional Oranges: orangemms.net, mmsemail.orange.pl, orange.fr * 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 * Vodacom: mms.vodacom4me.co.za * Verizon: vzwpix.com, vtext.com * PLSPICTURES.COM mms hosting: waw.plspictures.com"
+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 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 * 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 * Vodacom: mms.vodacom4me.co.za * Verizon: vzwpix.com, vtext.com * PLSPICTURES.COM mms hosting: waw.plspictures.com"
 email: mikemondragon@gmail.com
 executables: []
 
@@ -60,6 +60,7 @@ files:
 - 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.alltel.com.yml
@@ -89,6 +90,7 @@ files:
 - lib/mms2r.rb
 - lib/mms2r/media.rb
 - lib/mms2r/media/sprint.rb
+- lib/tmail_ext.rb
 - test/fixtures/1nbox-2images-01.mail
 - test/fixtures/1nbox-2images-02.mail
 - test/fixtures/1nbox-2images-03.mail
@@ -116,6 +118,7 @@ files:
 - test/fixtures/indosat-image-02.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.mycricket.com-pic-and-text.mail
 - test/fixtures/mms.mycricket.com-pic.mail
@@ -164,6 +167,7 @@ files:
 - test/test_1nbox_net.rb
 - test/test_bellsouth_net.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
@@ -247,5 +251,6 @@ test_files:
 - test/test_helper.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