mms2r 1.1.12 → 2.0.0

data/History.txt

@@ -1,6 +1,36 @@
+== 1.2.0 / 2008-01-17 (Skwisgaar Skwigelf - fastest guitarist alive)
+
+* added support for pxt.vodafone.net.nz PXT New Zealand
+* added support for mms.o2online.de  O2 Germany
+* added support for orangemms.net Orange UK
+* added support for txt.att.net AT&T
+* added support for mms.luxgsm.lu LUXGSM S.A.
+* added support for mms.netcom.no NetCom (Norway)
+* added support for mms.three.co.uk Hutchison 3G UK Ltd
+* removed deprecated #get_number use #number
+* removed deprecated #get_subject use #subject
+* removed deprecated #get_body use #body
+* removed deprecated #get_media use #default_media
+* removed deprecated #get_text use #default_text
+* removed deprecated #get_attachment use #attachment
+* fixed error when Sprint content server responds 500
+* better yaml configs
+* moved TMail dependency from Rails ActionMailer SVN to 'official' Gem
+* ::new greedily processes MMS unless otherwise specified as an initialize 
+  option :process => :lazy
+* logger moved to initialize option :logger => some_logger
+* testing using mocks and stubs instead of duck raped Net::HTTP
+* fixed typo in name of method #attachement to #attachment
+* fixed broken downloading of Sprint videos
+* default subject back to ""
+* sprint subject
+* new zeland
+* heckled! & flogged!
+* link to Trac
+
 == 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
 
-* fetch orginal images from Sprint content server (Layton Wedgeworth)
+* fetch original images from Sprint content server (Layton Wedgeworth)
 * ignore Sprint messages when requested content has been purged from their
   content server
 
@@ -39,7 +69,7 @@ Explosion)
 
 == 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
 
-* Added suport for Orange of Poland, Orange mmsemail.orange.pl (Zbigniew
+* Added support for Orange of Poland, Orange mmsemail.orange.pl (Zbigniew
   Sobiecki)
 * Cleaned up documentation modifiers
 * Cleaned out non-Ruby code idioms

data/Manifest.txt

@@ -2,90 +2,51 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-conf/mms2r_alltel_media_ignore.yml
-conf/mms2r_att_media_subject.yml
-conf/mms2r_cingular_me_media_subject.yml
-conf/mms2r_cingular_me_media_transform.yml
-conf/mms2r_dobson_media_ignore.yml
-conf/mms2r_helio_media_ignore.yml
-conf/mms2r_media_ignore.yml
-conf/mms2r_media_subject.yml
-conf/mms2r_my_cingular_media_subject.yml
-conf/mms2r_nextel_media_ignore.yml
-conf/mms2r_orange_france_media_ignore.yml
-conf/mms2r_orange_poland_media_subject.yml
-conf/mms2r_sprint_media_ignore.yml
-conf/mms2r_sprint_media_subject.yml
-conf/mms2r_t_mobile_media_ignore.yml
-conf/mms2r_verizon_media_ignore.yml
-conf/mms2r_verizon_media_transform.yml
+conf/aliases.yml
+conf/message.alltel.com.yml
+conf/messaging.nextel.com.yml
+conf/mms.att.net.yml
+conf/mms.dobson.net.yml
+conf/mms.luxgsm.lu.yml
+conf/mms.myhelio.com.yml
+conf/mms.netcom.no.yml
+conf/mms.o2online.de.yml
+conf/mms.three.co.uk.yml
+conf/mms2r_media.yml
+conf/orangemms.net.yml
+conf/pm.sprint.com.yml
+conf/pxt.vodafone.net.nz.yml
+conf/tmomail.net.yml
+conf/vzwpix.com.yml
+dev_tools/anonymizer.rb
 dev_tools/debug_sprint_hpricot_parsing.rb
 lib/mms2r.rb
-lib/mms2r/alltel_media.rb
-lib/mms2r/att_media.rb
-lib/mms2r/cingular_me_media.rb
-lib/mms2r/dobson_media.rb
-lib/mms2r/helio_media.rb
-lib/mms2r/m_mode_media.rb
 lib/mms2r/media.rb
-lib/mms2r/my_cingular_media.rb
-lib/mms2r/nextel_media.rb
-lib/mms2r/orange_france_media.rb
-lib/mms2r/orange_poland_media.rb
-lib/mms2r/sprint_media.rb
-lib/mms2r/sprint_pcs_media.rb
-lib/mms2r/t_mobile_media.rb
-lib/mms2r/verizon_media.rb
-lib/mms2r/vtext_media.rb
-lib/vendor/text/format.rb
-lib/vendor/tmail.rb
-lib/vendor/tmail/address.rb
-lib/vendor/tmail/attachments.rb
-lib/vendor/tmail/base64.rb
-lib/vendor/tmail/config.rb
-lib/vendor/tmail/encode.rb
-lib/vendor/tmail/facade.rb
-lib/vendor/tmail/header.rb
-lib/vendor/tmail/info.rb
-lib/vendor/tmail/loader.rb
-lib/vendor/tmail/mail.rb
-lib/vendor/tmail/mailbox.rb
-lib/vendor/tmail/mbox.rb
-lib/vendor/tmail/net.rb
-lib/vendor/tmail/obsolete.rb
-lib/vendor/tmail/parser.rb
-lib/vendor/tmail/port.rb
-lib/vendor/tmail/quoting.rb
-lib/vendor/tmail/scanner.rb
-lib/vendor/tmail/scanner_r.rb
-lib/vendor/tmail/stringio.rb
-lib/vendor/tmail/tmail.rb
-lib/vendor/tmail/utils.rb
+lib/mms2r/media/sprint.rb
 test/fixtures/alltel-image-01.mail
 test/fixtures/att-image-01.mail
 test/fixtures/att-image-02.mail
-test/fixtures/broken_from_spam.mail
+test/fixtures/att-text-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/hello_world_empty_text.mail
-test/fixtures/hello_world_mail_multipart.mail
-test/fixtures/hello_world_mail_plain_no_content_type.mail
-test/fixtures/hello_world_mail_plain_with_content_type.mail
+test/fixtures/helio-message-01.mail
+test/fixtures/luxgsm-image-01.mail
 test/fixtures/mmode-image-01.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/simple-with-two-images-two-texts.mail
-test/fixtures/simple_image.mail
-test/fixtures/simple_multipart_alternative.mail
+test/fixtures/pxt-image-01.mail
 test/fixtures/sprint-broken-image-01.mail
 test/fixtures/sprint-image-01.mail
 test/fixtures/sprint-pcs-text-01.mail
@@ -94,6 +55,7 @@ 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/three-uk-image-01.mail
 test/fixtures/tmobile-image-01.mail
 test/fixtures/tmobile-image-02.mail
 test/fixtures/verizon-image-01.mail
@@ -102,21 +64,21 @@ test/fixtures/verizon-text-01.mail
 test/fixtures/verizon-video-01.mail
 test/fixtures/vtext-text-01.mail
 test/test_helper.rb
-test/test_mms2r_alltel_media.rb
-test/test_mms2r_att_media.rb
-test/test_mms2r_cingular_me_media.rb
-test/test_mms2r_dobson_media.rb
-test/test_mms2r_helio_media.rb
-test/test_mms2r_m_mode_media.rb
+test/test_message_alltel_com.rb
+test/test_messaging_nextel_com.rb
+test/test_messaging_sprintpcs_com.rb
 test/test_mms2r_media.rb
-test/test_mms2r_my_cingular_media.rb
-test/test_mms2r_nextel_media.rb
-test/test_mms2r_orange_france_media.rb
-test/test_mms2r_orange_poland_media.rb
-test/test_mms2r_sprint_media.rb
-test/test_mms2r_sprint_pcs_media.rb
-test/test_mms2r_t_mobile_media.rb
-test/test_mms2r_verizon_media.rb
-test/test_mms2r_vtext_media.rb
+test/test_mms_att_net.rb
+test/test_mms_dobson_net.rb
+test/test_mms_luxgsm_lu.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_orangemms_net.rb
+test/test_pm_sprint_com.rb
+test/test_pxt_vodafone_net_nz.rb
+test/test_tmomail_net.rb
+test/test_vzwpix_com.rb
 vendor/plugins/mms2r/lib/autotest/discover.rb
 vendor/plugins/mms2r/lib/autotest/mms2r.rb

data/README.txt

@@ -1,67 +1,63 @@
 = mms2r
 
-  http://mms2r.rubyforge.org/    
+  http://mms2r.rubyforge.org/ 
+  http://rubyforge.org/tracker/?group_id=3065 
 
 == DESCRIPTION:
   
 MMS2R is a library that decodes the parts of an MMS message to disk while 
-stripping out advertising injected by the cellphone carriers.  MMS messages are 
+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.
+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!
+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:
 
-* Alltel => message.alltel.com
-* AT&T => mms.att.net
-* AT&T/Cingular => mmode.com
-* Cingular => mms.mycingular.com
-* Cingular => cingularme.com
-* Dobson/Cellular One => mms.dobson.net
-* Helio => mms.myhelio.com
-* Nextel => messaging.nextel.com
-* Orange (Poland) => mmsemail.orange.pl
-* Orange (France) => orange.fr
-* Sprint => pm.sprint.com
-* Sprint => messaging.sprintpcs.com
-* T-Mobile => tmomail.net
-* Verizon => vzwpix.com
-* Verizon => vtext.com
+* Alltel: message.alltel.com
+* AT&T/Cingular/Legacy: mms.att.net, txt.att.net, mmode.com, mms.mycingular.com, 
+  cingularme.com
+* Dobson/Cellular One: mms.dobson.net
+* Helio: mms.myhelio.com
+* Hutchison 3G UK Ltd: mms.three.co.uk
+* LUXGSM S.A.: mms.luxgsm.lu
+* 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
+* Sprint: pm.sprint.com, messaging.sprintpcs.com
+* T-Mobile: tmomail.net
+* Verizon: vzwpix.com, vtext.com
 
 == FEATURES
 
 * #default_media and #default_text methods return a File that can be used in 
   attachment_fu 
+* #process supports blocks to for enumerating over the content of the MMS
+* #process can be made lazy when :process => :lazy is passed to new
+* logging is enabled when :logger => your_logger is passed to new
 
 == SYNOPSIS:
 
-  # required to use the MMS2R gem proper
   require 'rubygems'
   require 'mms2r'
 
   # required for the example
   require 'tmail'
   require 'fileutils'
-  require 'logger'
 
-  # TMail::Mail.parse is what ActionMailer::Base.receive(email) does, see:
-  # http://wiki.rubyonrails.com/rails/pages/HowToReceiveEmailsWithActionMailer
-  email = TMail::Mail.parse(IO.readlines("sample-MMS.file").join)
-  mms = MMS2R::Media.create(email,Logger.new(STDOUT))
+  mail = TMail::Mail.parse(IO.readlines("sample-MMS.file").join)
+  mms = MMS2R::Media.new(mail)
 
-  # process finds all the media in a MMS, strips advertsing, then
-  # writes the user generated media to disk in a temporary subdirectory
-  mms.process
+  puts "MMS has default carrier subject" if mms.subject.empty?
 
-  puts "MMS has default carrier subject!" unless mms.subject
-
-  # access the senders phone number
+  # access the sender's phone number
   puts "MMS was from phone #{mms.number}"
 
   # most MMS are either image or video, default_media will return the largest
@@ -69,7 +65,7 @@ Corpus of carriers currently processed by MMS2R:
   file = mms.default_media
   puts "MMS had a media: #{file.inspect}" unless file.nil?
 
-  # text return the largest (non-advertising) text found
+  # finds the largest (non-advertising) text found
   file = mms.default_text
   puts "MMS had some text: #{file.inspect}" unless file.nil?
 
@@ -81,28 +77,33 @@ Corpus of carriers currently processed by MMS2R:
   mms.media['text/plain'].each {|f| puts "#{f}"}
 
   # print the text (assumes MMS had text)
-  text = IO.readlines(mms.media['text/plain'][0]).join
+  text = IO.readlines(mms.media['text/plain'].first).join
   puts text
 
   # save the image (assumes MMS had a jpeg)
-  FileUtils.cp mms.media['image/jpeg'][0], '/some/where/use/ful', :verbose => true
-
-  puts "does the MMS have video? #{!mms.media['video/quicktime'].nil?}"
+  FileUtils.cp mms.media['image/jpeg'].first, '/some/where/useful', :verbose => true
 
-  #remove all the media that was put to temporary disk
-  mms.purge
+  puts "does the MMS have quicktime video? #{!mms.media['video/quicktime'].nil?}"
 
   # Block support, process and receive all media types of video.
-  # Purge is called at the conclusion of the block so be sure
-  # to do something with the bits you are looking for
   mms.process do |media_type, files|
-    # assumes a Clip model
+    # assumes a Clip model that is an AttachmentFu
     Clip.create(:uploaded_data => files.first, :title => "From phone") if media_type =~ /video/
   end
 
+  # Another AttachmentFu example, Picture model is an AttachmentFu
+  picture = Picture.new
+  picture.title = mms.subject
+  picture.uploaded_data = mms.default_media
+  picture.save!
+
+  #remove all the media that was put to temporary disk
+  mms.purge
+
 == REQUIREMENTS:
 
 * Hpricot
+* TMail
 
 == INSTALL:
 
@@ -110,16 +111,14 @@ Corpus of carriers currently processed by MMS2R:
 
 == CONTRIBUTE:
 
-If you contribute a patch that we accept then generally we'll
-give you developer rights for the project on RubyForge.  Please
-ensure your work includes 100% test converage.  Your text 
-coverage can be verified with the rcov rake task.  The library
-is ZenTest autotest discovery enabled so running autotest in the
-root of the project is very helpful during development.
+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
 
-Copyright (c) 2007 by Mike Mondragon (blog[http://blog.mondragon.cc/])
+Copyright (c) 2007-2008 by Mike Mondragon (blog[http://blog.mondragon.cc/])
 
 MMS2R's Flickr page[http://www.flickr.com/photos/8627919@N05/]
 
@@ -133,7 +132,7 @@ MMS2R's Flickr page[http://www.flickr.com/photos/8627919@N05/]
 
 (The MIT License)
 
-Copyright (c) 2007 Mike Mondragon (mikemondragon@gmail.com).
+Copyright (c) 2007, 2008 Mike Mondragon (mikemondragon@gmail.com).
 All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining

data/Rakefile

@@ -2,12 +2,13 @@
 
 require 'rubygems'
 require 'hoe'
+
 begin
   require 'rcov/rcovtask'
 rescue LoadError
 end
 
-$LOAD_PATH.unshift 'lib'
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), "lib")
 require 'mms2r'
 
 Hoe.new('mms2r', MMS2R::Media::VERSION) do |p|
@@ -19,7 +20,7 @@ Hoe.new('mms2r', MMS2R::Media::VERSION) do |p|
   p.url = p.paragraphs_of('README.txt', 1).first.strip
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
   p.extra_deps << ['hpricot', '>= 0.6.0']
-  p.extra_deps << ['mechanize', '>= 0.6.9']
+  p.extra_deps << ['tmail', '>= 1.2.1']
   p.clean_globs << 'coverage'
 end
 

data/conf/aliases.yml

@@ -0,0 +1,8 @@
+--- 
+txt.att.net: mms.att.net
+cingularme.com: mms.att.net
+mmode.com: mms.att.net
+mms.mycingular.com: mms.att.net
+vtext.com: vzwpix.com
+orange.fr: orangemms.net
+mmsemail.orange.pl: orangemms.net

data/conf/message.alltel.com.yml

@@ -0,0 +1,14 @@
+---
+ignore:
+  multipart/alternative:
+  - mms
+  text/html:
+   - /<html>\s+<head>\s+<title>Picture Messaging<\/title>/m
+  image/gif: 
+  - spacer.gif
+  - header.gif
+  - bluebar.gif
+  - divider.gif
+  - greenbar.gif
+  image/jpeg:
+  - alltel_logo.jpg

data/conf/messaging.nextel.com.yml

@@ -0,0 +1,10 @@
+---
+ignore:
+  text/plain: 
+  - /^This is an MMS message.  20\d\d Sprint Nextel. All rights reserved./
+  - /^This is an MMS message. Please go to http:\/\/mms.nextel.com\/mms\/anon\/do\/legacy\/viewDirect/
+  - /^This is a multi-part message in MIME format./
+  text/html: 
+   - /^<html><body>\s+<center>This is an MMS message. <br><center> 20\d\d Sprint Nextel. All rights reserved<\/center><br><img/m
+   - /^<html><body>\s+This is an MMS message. <br><center> 20\d\d Sprint Nextel. All rights reserved/m
+   - /^<html><body>\s+This is an MMS message. Please go to <a href="http:\/\/mms.nextel.com\/mms\/anon\/do\/legacy\/viewDirect/m

data/conf/mms.att.net.yml

@@ -0,0 +1,9 @@
+---
+transform: 
+  text/plain: 
+  - - /^Multimedia message$/i
+    - ""
+  - - /\A(.+?)\s+--\s+=+\s+This mobile text message is brought to you by AT&T.*/im
+    - "\1"
+  - - /\A(.+?)\s+--\s+=+\s+Brought to you by, Cingular Wireless Messaging.*/im
+    - "\1"