mms2r 2.2.0 → 2.3.0

data/lib/mms2r/media/sprint.rb

@@ -1,7 +1,7 @@
 #--
-# Copyright (c) 2007, 2008 by Mike Mondragon (mikemondragon@gmail.com)
+# Copyright (c) 2007-2010 by Mike Mondragon (mikemondragon@gmail.com)
 #
-# Please see the LICENSE file for licensing information
+# Please see the LICENSE file for licensing information.
 #++
 
 require 'net/http'

data/lib/tmail_ext.rb

@@ -1,3 +1,8 @@
+#--
+# Copyright (c) 2007-2010 by Mike Mondragon (mikemondragon@gmail.com)
+#
+# Please see the LICENSE file for licensing information.
+#++
 
 class TMail::MessageIdHeader #:nodoc:
   def real_body

data/mms2r.gemspec

@@ -2,41 +2,55 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mms2r}
-  s.version = "2.2.0"
+  s.version = "2.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Mondragon"]
-  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.date = %q{2009-08-31}
+  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:}
   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/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.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", "init.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/iphone-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/vzwpix.com-image-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.homepage = %q{http://mms2r.rubyforge.org/
 }
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{mms2r}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.2}
   s.summary = %q{Extract user media from MMS (and not carrier cruft)}
   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
+    s.specification_version = 3
 
     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_runtime_dependency(%q<hpricot>, [">= 0"])
+      s.add_runtime_dependency(%q<tmail>, [">= 0"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.2"])
     else
-      s.add_dependency(%q<hpricot>, [">= 0.6.0"])
-      s.add_dependency(%q<tmail>, [">= 1.2.1"])
+      s.add_dependency(%q<hpricot>, [">= 0"])
+      s.add_dependency(%q<tmail>, [">= 0"])
       s.add_dependency(%q<hoe>, [">= 1.8.2"])
     end
   else
-    s.add_dependency(%q<hpricot>, [">= 0.6.0"])
-    s.add_dependency(%q<tmail>, [">= 1.2.1"])
+    s.add_dependency(%q<hpricot>, [">= 0"])
+    s.add_dependency(%q<tmail>, [">= 0"])
     s.add_dependency(%q<hoe>, [">= 1.8.2"])
   end
 end

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

@@ -0,0 +1,62 @@
+Return-Path: <example@gmail.com>
+Delivered-To: unknown
+Received: from imap.gmail.com (216.239.59.109) by swellbo.ws with IMAP4-SSL;
+  17 Aug 2009 02:35:12 -0000
+Delivered-To: tommy.tutone@example.com
+Received: by 10.220.92.148 with SMTP id r20cs434279vcm;
+        Sun, 16 Aug 2009 19:33:36 -0700 (PDT)
+Received: by 10.114.169.7 with SMTP id r7mr4333220wae.8.1250476414501;
+        Sun, 16 Aug 2009 19:33:34 -0700 (PDT)
+Received: from outbound-mail-02.bluehost.com (outbound-mail-02.bluehost.com [69.89.21.12])
+        by mx.google.com with SMTP id 40si9804605pzk.60.2009.08.16.19.33.32;
+        Sun, 16 Aug 2009 19:33:33 -0700 (PDT)
+Received-SPF: pass (google.com: domain of example@gmail.com designates 69.89.21.12 as permitted sender) client-ip=69.89.21.12;
+DomainKey-Status: good
+Authentication-Results: mx.google.com; spf=pass (google.com: domain of example@gmail.com designates 69.89.21.12 as permitted sender) smtp.mail=example@gmail.com; domainkeys=pass header.From=example@gmail.com
+Received: (qmail 19972 invoked by uid 0); 17 Aug 2009 02:33:32 -0000
+Received: from unknown (HELO box322.bluehost.com) (69.89.31.122)
+  by outboundproxy1.bluehost.com with SMTP; 17 Aug 2009 02:33:32 -0000
+DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=concussion.org;
+	h=Received:Message-Id:From:To:Content-Type:Content-Transfer-Encoding:Mime-Version:Date:X-Mailer:X-Identified-User;
+	b=eCT/c5PPMJPXffGvy67LaFbKfi4EZiLRC2KYm41iENyh8OngKuO2cbteIX5H5br4w4jx517mT/Bdxy7rcdk+7m5SXItLOUBYIY5CuWe4a7NW/R9f0lHbr2qMYklMhfec;
+Received: from c-24-5-192-93.hsd1.ca.comcast.net ([24.5.192.93] helo=[10.0.1.5])
+	by box322.bluehost.com with esmtpsa (TLSv1:AES128-SHA:128)
+	(Exim 4.69)
+	(envelope-from <example@gmail.com>)
+	id 1Mcs2K-0001hH-6z
+	for tommy.tutone@example.com; Sun, 16 Aug 2009 20:33:32 -0600
+Message-Id: <0B3F4EF7-BDCC-458C-852C-1D99BF2829B4@concussion.org>
+From: <example@gmail.com>
+To: tommy.tutone@example.com
+Content-Type: multipart/mixed; boundary=Apple-Mail-1--561220374
+Content-Transfer-Encoding: 7bit
+Mime-Version: 1.0 (iPhone Mail 7A400)
+Date: Sun, 16 Aug 2009 19:33:22 -0700
+X-Mailer: iPhone Mail (7A400)
+X-Identified-User: {1154:box322.bluehost.com:concussi:concussion.org} {sentby:smtp auth 24.5.192.93 authed with example@gmail.com}
+
+
+--Apple-Mail-1--561220374
+Content-Type: text/plain;
+	charset=us-ascii;
+	format=flowed
+Content-Transfer-Encoding: 7bit
+
+
+
+
+--Apple-Mail-1--561220374
+Content-Disposition: inline;
+	filename=photo.jpg
+Content-Type: image/jpeg;
+	name=photo.jpg
+Content-Transfer-Encoding: base64
+
+/9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAXQ3JlYXRl
+ZCB3aXRoIFRoZSBHSU1Q/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxER
+ExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4e
+Hh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAAQAB
+AwEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAH/8QAFBABAAAAAAAAAAAAAAAAAAAA
+AP/EABUBAQEAAAAAAAAAAAAAAAAAAAcI/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQAC
+EQMRAD8AlgA6WW//2Q==
+--Apple-Mail-1--561220374--

data/test/fixtures/vzwpix.com-image-01.mail

@@ -0,0 +1,50 @@
+Delivered-To: tommy.tutone@example.com
+Received: by 10.216.17.137 with SMTP id j9cs56753wej;
+        Thu, 27 Aug 2009 21:38:29 -0700 (PDT)
+Received: by 10.220.107.99 with SMTP id a35mr202579vcp.45.1251434307135;
+        Thu, 27 Aug 2009 21:38:27 -0700 (PDT)
+Return-Path: <2068675309@vzwpix.com>
+Received: from njbrspamp5.vtext.com (njbrspamp5.vtext.com [69.78.129.150])
+        by mx.google.com with ESMTP id 34si1359074vws.96.2009.08.27.21.38.23;
+        Thu, 27 Aug 2009 21:38:27 -0700 (PDT)
+Received-SPF: neutral (google.com: 69.78.129.150 is neither permitted nor denied by domain of 2068675309@vzwpix.com) client-ip=69.78.129.150;
+Authentication-Results: mx.google.com; spf=neutral (google.com: 69.78.129.150 is neither permitted nor denied by domain of 2068675309@vzwpix.com) smtp.mail=2068675309@vzwpix.com
+Received: from 24.sub-69-78-130.myvzw.com (HELO m11.vzwpix.com) ([69.78.130.24])
+  by njbrspamp5.vtext.com with SMTP; 28 Aug 2009 04:38:23 +0000
+X-Priority:3
+Importance:Normal
+From:2068675309@vzwpix.com
+To:tommy.tutone@example.com
+Subject:
+Message-ID: <212118194303829751@-212118194303829752>
+Date: Thu, 28 Aug 2009 04:38:23 +0000
+MIME-Version:1.0
+Content-Type: multipart/mixed;
+ type="application/smil";
+ boundary="__CONTENT_64564_PART_BOUNDARY__33243242__"
+
+--__CONTENT_64564_PART_BOUNDARY__33243242__
+Content-Type: text/plain
+
+This message was sent using the Picture and Video Messaging service from Verizon Wireless!
+
+To learn how you can snap pictures and capture videos with your wireless phone visit www.verizonwireless.com/picture.
+
+Note: To play video messages sent to email, QuickTime� 6.5 or higher is required.
+
+--__CONTENT_64564_PART_BOUNDARY__33243242__
+Content-Type: image/jpeg;
+ name="0827092137.jpg"
+Content-ID: <0827092137.jpg>
+Content-Location: 0827092137.jpg
+Content-Transfer-Encoding: base64
+
+/9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAXQ3JlYXRl
+ZCB3aXRoIFRoZSBHSU1Q/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxER
+ExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4e
+Hh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAAQAB
+AwEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAH/8QAFBABAAAAAAAAAAAAAAAAAAAA
+AP/EABUBAQEAAAAAAAAAAAAAAAAAAAcI/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQAC
+EQMRAD8AlgA6WW//2Q==
+--__CONTENT_64564_PART_BOUNDARY__33243242__--
+

data/test/test_mms2r_media.rb

@@ -728,10 +728,14 @@ class TestMms2rMedia < Test::Unit::TestCase
   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?
+    iphones = ['att-iphone-01.mail',
+               'iphone-image-01.mail']
+    iphones.each do |iphone|
+      mail = TMail::Mail.load(mail_fixture(iphone))
+      mms = MMS2R::Media.new(mail)
+      assert_equal :iphone, mms.device_type?, "fixture #{iphone} was not a iphone"
+      assert_equal true, mms.is_mobile?
+    end
   end
 
   def test_blackberry_device_type

data/test/test_vzwpix_com.rb

@@ -10,7 +10,15 @@ class TestVzwpixCom < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def setup
-    @ad = "This message was sent using PIX-FLIX Messaging service from Verizon Wireless!\nTo learn how you can snap pictures with your wireless phone visit\nwww.verizonwireless.com/getitnow/getpix."
+    @ad_new = %q{This message was sent using the Picture and Video Messaging service from Verizon Wireless!
+
+To learn how you can snap pictures and capture videos with your wireless phone visit www.verizonwireless.com/picture.
+
+Note: To play video messages sent to email, QuickTime® 6.5 or higher is required.}
+
+    @ad_old = %q{This message was sent using PIX-FLIX Messaging service from Verizon Wireless!
+To learn how you can snap pictures with your wireless phone visit
+www.verizonwireless.com/getitnow/getpix.}
     @greet = "This message was sent using PIX-FLIX Messaging service from Verizon Wireless!"
   end
 
@@ -90,15 +98,31 @@ class TestVzwpixCom < Test::Unit::TestCase
     assert_match(/04-09-07_1114.jpg$/, mms.media['image/jpeg'][0])
 
     assert_file_size mms.media['image/jpeg'][0], 337
-    
+
     file = mms.media['text/plain'][0]
     assert_not_nil file
     assert_equal true, File::exist?(file)
     text = IO.readlines("#{file}").join
-    assert_no_match(/Regexp.escape(@ad)/, text)
+    assert_no_match(/Regexp.escape(@ad_old)/, text)
     assert_no_match(/Regexp.escape@greet/, text)
     assert_equal "? Weird", text
-    
+
+    mms.purge
+  end
+
+  def test_new_vzpix_com_image_with_body_text
+    # vzwpix.com service
+    mail = TMail::Mail.parse(load_mail('vzwpix.com-image-01.mail').join)
+    mms = MMS2R::Media.new(mail)
+
+    assert_equal 1, mms.media.size
+    assert_nil mms.media['text/plain']
+    assert_nil mms.media['text/html']
+    assert_not_nil mms.media['image/jpeg'][0]
+    assert_match(/0827092137.jpg$/, mms.media['image/jpeg'][0])
+
+    assert_file_size mms.media['image/jpeg'][0], 337
+
     mms.purge
   end
 
@@ -115,14 +139,14 @@ class TestVzwpixCom < Test::Unit::TestCase
     assert_match(/hello world/, text)
     mms.purge
   end
-  
+
   def test_image_from_blackberry
     mail = TMail::Mail.parse(load_mail('verizon-blackberry.mail').join)
     mms = MMS2R::Media.new(mail)
-    
+
     assert_not_nil mms.media['text/plain']
     assert_equal "Wonderful picture!", IO.readlines(mms.media['text/plain'].first).join.strip
-    
+
     assert_not_nil mms.media['image/jpeg'].first
     assert_match(/Windows-1252\?B\?SU1HMDAwMTYuanBn/, mms.media['image/jpeg'].first)
     mms.purge

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mms2r
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Mike Mondragon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-04 00:00:00 -08:00
+date: 2009-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: tmail
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -42,7 +42,57 @@ 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, 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"
+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: []
 
@@ -95,6 +145,7 @@ files:
 - dev_tools/anonymizer.rb
 - dev_tools/debug_sprint_hpricot_parsing.rb
 - dev_tools/github.rb
+- init.rb
 - lib/mms2r.rb
 - lib/mms2r/media.rb
 - lib/mms2r/media/sprint.rb
@@ -129,6 +180,7 @@ files:
 - test/fixtures/indosat-image-01.mail
 - test/fixtures/indosat-image-02.mail
 - test/fixtures/info2go-image-01.mail
+- test/fixtures/iphone-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
@@ -184,6 +236,7 @@ files:
 - test/fixtures/vodacom4me-southafrica-mms-01.mail
 - test/fixtures/vodacom4me-southafrica-mms-04.mail
 - test/fixtures/vtext-text-01.mail
+- test/fixtures/vzwpix.com-image-01.mail
 - test/fixtures/waw.plspictures.com-image-01.mail
 - test/test_1nbox_net.rb
 - test/test_bell_canada.rb
@@ -224,7 +277,9 @@ files:
 - vendor/plugins/mms2r/lib/autotest/mms2r.rb
 has_rdoc: true
 homepage: |
-  by Mike Mondragon
+  http://mms2r.rubyforge.org/
+
+licenses: []
 
 post_install_message: 
 rdoc_options: 
@@ -247,9 +302,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mms2r
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Extract user media from MMS (and not carrier cruft)
 test_files: 
 - test/test_mms_o2online_de.rb