mms2r 2.4.1 → 3.0.0

data/mms2r.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mms2r}
-  s.version = "2.4.1"
+  s.version = "3.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Mondragon"]
-  s.date = %q{2009-12-20}
+  s.date = %q{2010-02-26}
   s.description = %q{== DESCRIPTION
 
 MMS2R is a library that decodes the parts of an MMS message to disk while
@@ -21,14 +21,14 @@ MMS other than decoding and consolidating its media.
 MMS2R can be used to process any multipart email to conveniently access the
 parts the mail is comprised of.}
   s.email = ["mikemondragon@gmail.com"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt", "email.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_nokogiri_parsing.rb", "dev_tools/github.rb", "email.txt", "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.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_nokogiri_parsing.rb", "dev_tools/github.rb", "init.rb", "lib/mms2r.rb", "lib/mms2r/media.rb", "lib/mms2r/media/sprint.rb", "lib/mail_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.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.5}
+  s.rubygems_version = %q{1.3.6}
   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"]
 
@@ -37,20 +37,26 @@ parts the mail is comprised of.}
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_runtime_dependency(%q<tmail>, [">= 0"])
-      s.add_runtime_dependency(%q<uuidtools>, [">= 0"])
-      s.add_development_dependency(%q<hoe>, [">= 2.4.1"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.0"])
+      s.add_runtime_dependency(%q<mail>, [">= 2.1.0"])
+      s.add_runtime_dependency(%q<uuidtools>, [">= 2.1.0"])
+      s.add_development_dependency(%q<rubyforge>, [">= 2.0.3"])
+      s.add_development_dependency(%q<gemcutter>, [">= 0.4.1"])
+      s.add_development_dependency(%q<hoe>, [">= 2.5.0"])
     else
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<tmail>, [">= 0"])
-      s.add_dependency(%q<uuidtools>, [">= 0"])
-      s.add_dependency(%q<hoe>, [">= 2.4.1"])
+      s.add_dependency(%q<nokogiri>, [">= 1.4.0"])
+      s.add_dependency(%q<mail>, [">= 2.1.0"])
+      s.add_dependency(%q<uuidtools>, [">= 2.1.0"])
+      s.add_dependency(%q<rubyforge>, [">= 2.0.3"])
+      s.add_dependency(%q<gemcutter>, [">= 0.4.1"])
+      s.add_dependency(%q<hoe>, [">= 2.5.0"])
     end
   else
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<tmail>, [">= 0"])
-    s.add_dependency(%q<uuidtools>, [">= 0"])
-    s.add_dependency(%q<hoe>, [">= 2.4.1"])
+    s.add_dependency(%q<nokogiri>, [">= 1.4.0"])
+    s.add_dependency(%q<mail>, [">= 2.1.0"])
+    s.add_dependency(%q<uuidtools>, [">= 2.1.0"])
+    s.add_dependency(%q<rubyforge>, [">= 2.0.3"])
+    s.add_dependency(%q<gemcutter>, [">= 0.4.1"])
+    s.add_dependency(%q<hoe>, [">= 2.5.0"])
   end
 end

data/test/fixtures/att-blackberry-02.mail

@@ -3,12 +3,12 @@ Received: by 10.65.114.15 with SMTP id r15cs144223qbm;
         Thu, 13 Mar 2008 09:38:14 -0700 (PDT)
 Received: by 10.114.126.1 with SMTP id y1mr9717246wac.108.1205426288880;
         Thu, 13 Mar 2008 09:38:08 -0700 (PDT)
-Return-Path: <2068675309>
+Return-Path: <2068675309@mms.att.net>
 Received: from barrierN241.nike.com (barrierm241.nike.com [146.197.27.91])
         by mx.google.com with ESMTP id k21si26738395waf.31.2008.03.13.09.38.06;
         Thu, 13 Mar 2008 09:38:08 -0700 (PDT)
-Received-SPF: pass (google.com: best guess record for domain of 2068675309 designates 146.197.27.91 as permitted sender) client-ip=146.197.27.91;
-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of 2068675309 designates 146.197.27.91 as permitted sender) smtp.mail=2068675309
+Received-SPF: pass (google.com: best guess record for domain of 2068675309@mms.att.net designates 146.197.27.91 as permitted sender) client-ip=146.197.27.91;
+Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of 2068675309@mms.att.net designates 146.197.27.91 as permitted sender) smtp.mail=2068675309@mms.att.net
 X-MimeOLE: Produced By Microsoft Exchange V6.5
 Content-class: urn:content-classes:message
 MIME-Version: 1.0
@@ -21,9 +21,8 @@ X-MS-Has-Attach: yes
 X-MS-TNEF-Correlator: 
 Thread-Topic: IMG00367.jpg
 Thread-Index: AciFKJgctMXWfPg5QbejKsyJmyuE8w==
-From: "Simmons, Craig" <2068675309>
-To: <tommy.tutone@example.com>, "User, Joe" <2068675309>,
-        <simmons_michelle@yahoo.com>
+From: "User, Joe" <2068675309@mms.att.net>
+To: <tommy.tutone@example.com>, "User, Joe" <2068675309@mms.att.net>
 X-OriginalArrivalTime: 13 Mar 2008 16:37:58.0362 (UTC) FILETIME=[987DB3A0:01C88528]
 
 This is a multi-part message in MIME format.

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

@@ -3,7 +3,7 @@ Received: by 10.86.84.9 with SMTP id h9cs212049fgb;
         Sun, 13 Apr 2008 13:45:56 -0700 (PDT)
 Received: by 10.115.79.1 with SMTP id g1mr6089073wal.2.1208119554185;
         Sun, 13 Apr 2008 13:45:54 -0700 (PDT)
-Return-Path: <2068675309>
+Return-Path: <2068675309@mms.att.net>
 Received: from wa-out-1112.google.com (wa-out-1112.google.com [209.85.146.176])
         by mx.google.com with ESMTP id n22si11015104pof.13.2008.04.13.13.45.52;
         Sun, 13 Apr 2008 13:45:54 -0700 (PDT)
@@ -22,13 +22,13 @@ DomainKey-Signature: a=rsa-sha1; c=nofws;
         b=UNVBRv1SU52UN+WCsLeYS3+zbUrIeRrgabXnXRoVsW79cqWHVMem8fBgrqwz/Es9URWr7Lpn4XDVViuSawHTaeMya+V34Ny2YvhR6+/XG2gE5uqVZFXIK15v3zlmWozw9P4heqg/V7fcQvvjEw5mF+tx04ZMkIRkPaTZ8L4HCgo=
 Received: by 10.115.59.2 with SMTP id m2mr2796408wak.197.1208119552501;
         Sun, 13 Apr 2008 13:45:52 -0700 (PDT)
-Return-Path: <2068675309>
+Return-Path: <2068675309@mms.att.net>
 Received: from ?192.168.0.252? ( [65.102.174.9])
         by mx.google.com with ESMTPS id m40sm12467791waf.16.2008.04.13.13.45.48
         (version=TLSv1/SSLv3 cipher=OTHER);
         Sun, 13 Apr 2008 13:45:50 -0700 (PDT)
 Message-Id: <3577FC81-B8BE-4510-9269-82E0CF3BD52E@gmail.com>
-From: Mike Mondragon <2068675309>
+From: Mike Mondragon <2068675309@mms.att.net>
 To: <tommy.tutone@example.com>
 Content-Type: multipart/mixed;
 	boundary=Apple-Mail-1-31533988

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

@@ -3,11 +3,11 @@ Received: by 10.114.126.6 with SMTP id y6cs662518wac;
         Wed, 18 Apr 2007 17:30:16 -0700 (PDT)
 Received: by 10.70.37.12 with SMTP id k12mr2098583wxk.1176942615765;
         Wed, 18 Apr 2007 17:30:15 -0700 (PDT)
-Return-Path: <19075551234@mms.dobson.net>
+Return-Path: <2068675309@mms.dobson.net>
 Received: from mms.dobson.net ([12.168.76.27])
         by mx.google.com with SMTP id h13si2340383wxd.2007.04.18.17.30.14;
         Wed, 18 Apr 2007 17:30:15 -0700 (PDT)
-Received-SPF: neutral (google.com: 12.168.76.27 is neither permitted nor denied by best guess record for domain of 19075551234@mms.dobson.net)
+Received-SPF: neutral (google.com: 12.168.76.27 is neither permitted nor denied by best guess record for domain of 2068675309@mms.dobson.net)
 Received: (qmail 4243 invoked from network); 19 Apr 2007 00:30:14 -0000
 Received: from unknown (HELO mmsc1be1.dobson.net) (172.23.1.158)
   by 0 with SMTP; 19 Apr 2007 00:30:14 -0000
@@ -17,7 +17,7 @@ Content-Type: multipart/related;boundary=1_4626B816_9F1690;Type="application/smi
 Subject: Subject
 Date: Thu, 19 Apr 2007 00:30:14 GMT
 To: luke@example.com
-From: 19075551234@mms.dobson.net
+From: 2068675309@mms.dobson.net
 Message-ID: <AVTD2MlE05dRftqAJ@mmsc1be1.dobson.net>
 Mime-Version: 1.0
 X-Mms-Message-Type: m-send-req

data/test/fixtures/maroctelecom-france-mms-01.mail

@@ -1,5 +1,5 @@
-From 98765432101@mms.mobileiam.ma  Fri Mar  7 21:03:00 2008
-Return-Path: <98765432101@mms.mobileiam.ma>
+From 98206867309@mms.mobileiam.ma  Fri Mar  7 21:03:00 2008
+Return-Path: <98206867309@mms.mobileiam.ma>
 X-Original-To: test@example.com
 Delivered-To: test@example.com
 Received: from mmsemail1.mms.mobileiam.ma (ll212-2-46-54-217-212.ll212-2.iam.net.ma [212.217.54.46])
@@ -13,8 +13,8 @@ Received: from tgw.mms.mobileiam.ma (tgw.mms.mobileiam.ma [212.217.54.54])
 	for <test@example.com>; Sat, 8 Mar 2008 01:45:49 GMT
 Message-ID: <3180046.1204941944434.JavaMail.jboss@mmsemail1>
 Date: Sat, 8 Mar 2008 01:45:48 +0000
-From: 98765432101@mms.mobileiam.ma
-Reply-To: 98765432101 <98765432101_266617381204940748578@mms.mobileiam.ma>
+From: 98206867309@mms.mobileiam.ma
+Reply-To: 98206867309 <98206867309@mms.mobileiam.ma>
 To: test@example.com
 Subject: Multimedia message
 Mime-Version: 1.0

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

@@ -3,11 +3,11 @@ Received: by 10.35.66.7 with SMTP id t7cs256749pyk;
         Tue, 24 Apr 2007 16:40:50 -0700 (PDT)
 Received: by 10.64.143.12 with SMTP id q12mr104771qbd.1177458050520;
         Tue, 24 Apr 2007 16:40:50 -0700 (PDT)
-Return-Path: <3105550101@mms.mycingular.com>
+Return-Path: <2068675309@mms.mycingular.com>
 Received: from iad2.emailsrvr.com (iad2.emailsrvr.com [207.97.227.212])
         by mx.google.com with ESMTP id 7si86743nzn.2007.04.24.16.40.46;
         Tue, 24 Apr 2007 16:40:50 -0700 (PDT)
-Received-SPF: neutral (google.com: 207.97.227.212 is neither permitted nor denied by best guess record for domain of 3105550101@mms.mycingular.com)
+Received-SPF: neutral (google.com: 207.97.227.212 is neither permitted nor denied by best guess record for domain of 2068675309@mms.mycingular.com)
 Received: by mail41a.mail.iad.mlsrvr.com (SMTP Server, from userid 5000)
 	id 0B65D514083; Tue, 24 Apr 2007 19:40:45 -0400 (EDT)
 Received: from gate16.gate.iad.mlsrvr.com (gate16.gate.iad.mlsrvr.com [192.168.1.36])
@@ -31,7 +31,7 @@ Content-Type: multipart/mixed;  boundary="----=_Part_2944038_406917.117745804379
 X-Mms-Delivery-Report: 1
 Received: from alpagw02 ([209.183.34.196]) by atlmtaow02.cingularme.com (InterMail vM.6.01.04.00 201-2131-118-20041027) with ESMTP id <20070424234043.EHXN2345.atlmtaow02.cingularme.com@alpagw02> for <go@example.com>; Tue, 24 Apr 2007 19:40:43 -0400
 X-Mms-Transaction-ID: 1-5190f9
-From: <3105550101@mms.mycingular.com>
+From: <2068675309@mms.mycingular.com>
 To: go@example.com
 X-Mms-Message-Class: 0
 X-Mms-Read-Reply: 1

data/test/fixtures/nextel-image-02.mail

@@ -1,8 +1,8 @@
 Content-Type: multipart/related; boundary="45f5bb5505a8qwerty_0000"; type="multipart/alternative"
 To: <tommytutone@example.com>
 Date: Mon, 12 Mar 2007 20:43:01 GMT
-From: 20686753909@messaging.nextel.com
-Sender: "20686753909" <20686753909@messaging.nextel.com>
+From: 2068675309@messaging.nextel.com
+Sender: "2068675309" <2068675309@messaging.nextel.com>
 X-Priority: 3
 MIME-Version: 1.0
 Message-Id: <20070112204344.ABCD1234.adcext11.messaging.nextel.com@dadslffd>

data/test/fixtures/orangepoland-text-01.mail

@@ -1,4 +1,5 @@
-From: 48509123456@mmsemail.orange.pl
+Delivered-To: foo@bar.com
+From: 48508675309@mmsemail.orange.pl
 To: foo@bar.com
 Subject: Wiadomość multimedialna. 
 Message-ID: <3633598.1180262316735.JavaMail.wluser@mms-ag1-m-vas>

data/test/fixtures/orangepoland-text-02.mail

@@ -1,4 +1,5 @@
-From: 48509123456@mmsemail.orange.pl
+Delivered-To: foo@bar.com
+From: 48508675309@mmsemail.orange.pl
 To: foo@bar.com
 Subject: whazzup
 Message-ID: <3633598.1180262316735.JavaMail.wluser@mms-ag1-m-vas>

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

@@ -6,7 +6,6 @@ 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

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

@@ -1,5 +1,5 @@
-From 3062408361@sms.sasktel.com  Thu Jan 24 12:19:21 2008
-Return-Path: <3062408361@sms.sasktel.com>
+From 3068675309@sms.sasktel.com  Thu Jan 24 12:19:21 2008
+Return-Path: <3068675309@sms.sasktel.com>
 X-Original-To: fohnohch@snapmylife.com
 Delivered-To: catch-all@mtagd.com
 Received: from smtp02.prv.sun2.lightsurf.net (smtp02.sun2.lightsurf.net [64.157.6.51])
@@ -10,7 +10,7 @@ Received: from bwa-back001 (smtp.prv.sun2.lightsurf.net [10.103.1.134])
 	for <fohnohch@snapmylife.com>; Thu, 24 Jan 2008 09:19:20 -0800
 Date: Thu, 24 Jan 2008 09:19:20 -0800
 Message-ID: <10248944.1201195160389.JavaMail.lsadm@bwa-back001>
-From: 3062408361@sms.sasktel.com
+From: 3068675309@sms.sasktel.com
 To: fohnohch@snapmylife.com
 Subject: A Picture/Video Message!
 MIME-Version: 1.0
@@ -1582,7 +1582,7 @@ Content-Transfer-Encoding: 7bit
               <td>&nbsp;</td><td>&nbsp;</td></tr>
             <tr align="left" valign="top">
               <td>&nbsp;</td><td><p> You have received a message from
-                  3062408361 </p>
+                  3068675309 </p>
                 <p>Lil'ndawg</p>
                 <p>
                   <img src="cid:A2.7959841022938083">

data/test/fixtures/sprint-broken-image-01.mail

@@ -46,7 +46,7 @@ Content-Transfer-Encoding: 7bit
 -->
 <!-- lsPictureMail-UserInfo-helloworld0123456789-comment
 &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF&#45;8&quot;?&gt;
-&lt;UserInfo timestamp=&quot;2007&#45;03&#45;04T21:14:27.96+00:00&quot; originating_from_address=&quot;someuser@pm.sprint.com&quot;&gt;&lt;credential name=&quot;MDN&quot;&gt;2068509247&lt;/credential&gt;&lt;/UserInfo&gt;
+&lt;UserInfo timestamp=&quot;2007&#45;03&#45;04T21:14:27.96+00:00&quot; originating_from_address=&quot;someuser@pm.sprint.com&quot;&gt;&lt;credential name=&quot;MDN&quot;&gt;2068675309&lt;/credential&gt;&lt;/UserInfo&gt;
  -->
 </head>
 <body marginheight="0" marginwidth="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">

data/test/fixtures/sprint-text-01.mail

@@ -46,7 +46,7 @@ Content-Transfer-Encoding: 7bit
 -->
 <!-- lsPictureMail-UserInfo-helloworld0123456789-comment
 &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF&#45;8&quot;?&gt;
-&lt;UserInfo timestamp=&quot;2007&#45;03&#45;04T21:14:27.96+00:00&quot; originating_from_address=&quot;someuser@pm.sprint.com&quot;&gt;&lt;credential name=&quot;MDN&quot;&gt;2068509247&lt;/credential&gt;&lt;/UserInfo&gt;
+&lt;UserInfo timestamp=&quot;2007&#45;03&#45;04T21:14:27.96+00:00&quot; originating_from_address=&quot;someuser@pm.sprint.com&quot;&gt;&lt;credential name=&quot;MDN&quot;&gt;2068765309&lt;/credential&gt;&lt;/UserInfo&gt;
  -->
 </head>
 <body marginheight="0" marginwidth="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">

data/test/fixtures/tmobile-blackberry-02.mail

@@ -3,7 +3,7 @@ Received: by 10.64.96.17 with SMTP id t17cs77228qbb;
         Sat, 8 Mar 2008 17:41:11 -0800 (PST)
 Received: by 10.65.96.6 with SMTP id y6mr5506769qbl.5.1205026871007;
         Sat, 08 Mar 2008 17:41:11 -0800 (PST)
-Return-Path: <2068675309>
+Return-Path: <2068675309@example.com>
 Received: from smtp04.bis.na.blackberry.com (smtp04.bis.na.blackberry.com [216.9.248.51])
         by mx.google.com with ESMTP id e14si6100040qbe.24.2008.03.08.17.41.07;
         Sat, 08 Mar 2008 17:41:10 -0800 (PST)
@@ -13,15 +13,15 @@ Received: from bda242-cell03.bisx.prod.on.blackberry (localhost.localdomain [127
 	by bda242.bis.na.blackberry.com (8.13.4 TEAMON/8.13.4) with ESMTP id m291f5QI005057
 	for <tommy.tutone@example.com>; Sun, 9 Mar 2008 01:41:05 GMT
 X-rim-org-msg-ref-id: 1436806694
-Return-Receipt-To: 2068675309
+Return-Receipt-To: 2068675309@example.com
 Message-ID: <1436806694-1205026864-cardhu_decombobulator_blackberry.rim.net-110047835-@bxe002.bisx.prod.on.blackberry>
-Reply-To: 2068675309
+Reply-To: 2068675309@example.com
 X-Priority: Normal
 Sensitivity: Normal
 Importance: Normal
 To: tommy.tutone@example.com
 Subject: IMG00141.jpg
-From: "=?utf-8?B?UGV0ZQ==?=" <2068675309>
+From: "=?utf-8?B?UGV0ZQ==?=" <2068675309@example.com>
 Date: Sun, 9 Mar 2008 01:37:40 +0000
 Content-Type: multipart/mixed; boundary="part42711-boundary-1392797391-905953628"
 MIME-Version: 1.0

data/test/test_1nbox_net.rb

@@ -1,19 +1,14 @@
-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 Test1nboxNet < Test::Unit::TestCase
   include MMS2R::TestHelper
-  
-  def test_image_and_text_and_number
-    mail = TMail::Mail.parse(load_mail('1nbox-2images-01.mail').join)
+
+  def test_image_and_text_and_number_and_carrier
+    mail = mail('1nbox-2images-01.mail')
     mms = MMS2R::Media.new(mail)
-    
+
     assert_equal "+919812345678", mms.number
+    assert_equal "1nbox.net", mms.carrier
     assert_equal 2, mms.media.size
 
     assert_not_nil mms.media['text/plain']
@@ -28,14 +23,15 @@ class Test1nboxNet < Test::Unit::TestCase
   end
 
   def test_image_with_no_plain_text
-    mail = TMail::Mail.parse(load_mail('1nbox-2images-02.mail').join)
+    mail = mail('1nbox-2images-02.mail')
     mms = MMS2R::Media.new(mail)
-    
+
     assert_nil mms.media['text/plain']
 
     assert_equal "+919898765432", mms.number
+    assert_equal "1nbox.net", mms.carrier
     assert_equal 1, mms.media.size
-    
+
     assert_not_nil mms.media['image/jpeg']
     assert_equal 1, mms.media['image/jpeg'].size
     assert_match(/showpicture\.jpeg$/, mms.media['image/jpeg'].first)
@@ -44,12 +40,12 @@ class Test1nboxNet < Test::Unit::TestCase
   end
 
   def test_image_with_extra_chars
-    mail = TMail::Mail.parse(load_mail('1nbox-2images-03.mail').join)
+    mail = mail('1nbox-2images-03.mail')
     mms = MMS2R::Media.new(mail)
-    
+
     assert_equal 1, mms.media.size
     assert_nil mms.media['text/plain']
-    
+
     assert_not_nil mms.media['image/jpeg']
     assert_equal 1, mms.media['image/jpeg'].size
     assert_match(/=\?UTF-8\?Q\?Copy_of_test1\.jpg\?=/, mms.media['image/jpeg'].first)
@@ -58,9 +54,9 @@ class Test1nboxNet < Test::Unit::TestCase
   end
 
   def test_image_with_plain_email
-    mail = TMail::Mail.parse(load_mail('1nbox-2images-04.mail').join)
+    mail = mail('1nbox-2images-04.mail')
     mms = MMS2R::Media.new(mail)
-    
+
     assert_equal 2, mms.media.size
 
     assert_not_nil mms.media['text/plain']
@@ -68,7 +64,8 @@ class Test1nboxNet < Test::Unit::TestCase
     assert_equal "Hi,I'M TESTERS/MALE/23/IND/GOV.SRVC.01234567890.", open(mms.media['text/plain'].first).read
 
     assert_equal "1234567890", mms.number
-    
+    assert_equal "1nbox.net", mms.carrier
+
     assert_not_nil mms.media['image/gif']
     assert_equal 1, mms.media['image/gif'].size
     assert_match(/@003\.gif$/, mms.media['image/gif'].first)

data/test/test_bell_canada.rb

@@ -1,19 +1,14 @@
-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 TestBellCanada < Test::Unit::TestCase
   include MMS2R::TestHelper
-  
+
   def test_image_and_text_and_number
-    mail = TMail::Mail.parse(load_mail('bell-canada-image-01.mail').join)
+    mail = mail('bell-canada-image-01.mail')
     mms = MMS2R::Media.new(mail)
 
     assert_equal "2068675309", mms.number
+    assert_equal "txt.bell.ca", mms.carrier
     assert_equal "A Picture/Video Message!", mms.subject
 
     assert_equal 4, mms.media.size
@@ -24,21 +19,21 @@ class TestBellCanada < Test::Unit::TestCase
 
     # make sure transform strips out massive dtd at start of doc
     assert_equal 3331, File.size(mms.media['text/html'].first)
-    
+
     mms.purge
   end
 
 
   def test_default_media_should_return_user_generated_content
-    mail = TMail::Mail.parse(load_mail('bell-canada-image-01.mail').join)
+    mail = mail('bell-canada-image-01.mail')
     mms = MMS2R::Media.new(mail)
     file = mms.default_media
-    
+
     # make sure the users jpg is the one that we default to
     assert_equal 31962, file.size
     assert_equal '.jpg', File.extname(file.path)
-    
+
     mms.purge
-  end 
+  end
 
 end

data/test/test_bellsouth_net.rb

@@ -1,20 +1,15 @@
-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 TestBellsouthNet < Test::Unit::TestCase
   include MMS2R::TestHelper
-  
+
   def test_image_from_blackberry
-    mail = TMail::Mail.parse(load_mail('suncom-blackberry.mail').join)
+    mail = mail('suncom-blackberry.mail')
     mms = MMS2R::Media.new(mail)
-    
+
+    assert_equal "2068675309", mms.number
     assert_nil mms.media['text/plain']
-    
+
     assert_not_nil mms.media['image/jpeg'].first
     assert_match(/Windows-1252\?B\?SU1HMDAwNjUuanBn/, mms.media['image/jpeg'].first)
     mms.purge