mms2r 2.0.4 → 2.0.5

data/History.txt

@@ -1,4 +1,8 @@
-== 2.0.4 / 2008-04-20 (Mr. Selatcia - elder member of The Tribunal)
+== 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)
 
 * updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
 * 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada

data/Manifest.txt

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

data/lib/mms2r.rb

@@ -39,7 +39,7 @@ module MMS2R
     ##
     # MMS2R library version
 
-    VERSION = '2.0.4'
+    VERSION = '2.0.5'
 
   end
 

data/lib/mms2r/media.rb

@@ -153,7 +153,7 @@ module MMS2R
     ##
     # Various multi-parts that are bundled into mail
 
-    MULTIPARTS_TO_SPLIT = [ 'multipart/related', 'multipart/alternative', 'multipart/mixed' ]
+    MULTIPARTS_TO_SPLIT = [ 'multipart/related', 'multipart/alternative', 'multipart/mixed', 'multipart/appledouble' ]
 
     ##
     # Factory method that creates MMS2R::Media products based on the domain 

data/test/fixtures/apple-double-image-01.mail

@@ -0,0 +1,53 @@
+Return-Path: <redacted@gmail.com>
+Received: from yw-out-1718.google.com by sp0447a.serverpronto.com with esmtp id 1KHhej-0007t3-QU for <redacted@redacted.com>; Sat, 12 Jul 2008 16:09:06 +0000
+Date: Sat, 12 Jul 2008 15:58:06 +0000
+From: Someone <redacted@gmail.com>
+To: redacted@redacted.com
+Message-Id: <3E665234-0C1C-47D6-B4AA-D065E8B3A20F@gmail.com>
+Subject: En Fuego
+Mime-Version: 1.0
+Content-Type: multipart/mixed; boundary=mimepart_4878d7275deeb_3aba2015b3a81575c
+X-Mailer: Apple Mail (2.753.1)
+
+
+
+--mimepart_4878d7275deeb_3aba2015b3a81575c
+Content-Type: multipart/appledouble; boundary=mimepart_4878d7277edc8_3aba2015b3a81585c
+Content-Disposition: inline
+
+
+
+--mimepart_4878d7277edc8_3aba2015b3a81585c
+Content-Type: application/applefile; name=DSCN1715.jpg
+Content-Transfer-Encoding: Base64
+Content-Disposition: inline; filename=DSCN1715.jpg
+
+/9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAXQ3JlYXRl
+ZCB3aXRoIFRoZSBHSU1Q/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxER
+ExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4e
+Hh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAAQAB
+AwEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAH/8QAFBABAAAAAAAAAAAAAAAAAAAA
+AP/EABUBAQEAAAAAAAAAAAAAAAAAAAcI/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQAC
+EQMRAD8AlgA6WW//2Q==
+
+
+--mimepart_4878d7277edc8_3aba2015b3a81585c
+Content-Type: image/jpeg; name=DSCN1715.jpg; x-mac-type=4A504547; x-mac-creator=3842494D; x-unix-mode=0644
+Content-Transfer-Encoding: Base64
+Content-Disposition: inline; filename=DSCN1715.jpg
+Content-Id: <0C0F0076-B7E7-456E-87C8-D697199BBA15@local>
+
+/9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAXQ3JlYXRl
+ZCB3aXRoIFRoZSBHSU1Q/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxER
+ExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4e
+Hh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAAQAB
+AwEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAH/8QAFBABAAAAAAAAAAAAAAAAAAAA
+AP/EABUBAQEAAAAAAAAAAAAAAAAAAAcI/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQAC
+EQMRAD8AlgA6WW//2Q==
+
+
+--mimepart_4878d7277edc8_3aba2015b3a81585c--
+
+
+--mimepart_4878d7275deeb_3aba2015b3a81575c--
+

data/test/test_mms2r_media.rb

@@ -555,7 +555,7 @@ class TestMms2rMedia < Test::Unit::TestCase
     part = stub(:sub_header => name, :content_type => 'application/octet-stream', :body => "data")
     result = mms.process_media(part)
     assert_equal 'image/jpeg', result.first
-    assert_match /fake\.jpg$/, result.last
+    assert_match(/fake\.jpg$/, result.last)
     mms.purge # have to call purge since a file is put to disk as side effect
   end
 
@@ -584,6 +584,24 @@ class TestMms2rMedia < Test::Unit::TestCase
     mms.purge
   end
 
+  def test_process_with_multipart_double_parts
+    mail = TMail::Mail.parse(load_mail('apple-double-image-01.mail').join)
+    mms = MMS2R::Media.new(mail)
+    
+    assert_equal 2, mms.media.size
+
+    assert_not_nil mms.media['application/applefile']
+    assert_equal 1, mms.media['application/applefile'].size
+
+    assert_not_nil mms.media['image/jpeg']
+    assert_equal 1, mms.media['image/jpeg'].size
+    assert_match(/DSCN1715\.jpg$/, mms.media['image/jpeg'].first)
+
+    assert_file_size mms.media['image/jpeg'].first, 337
+
+    mms.purge
+  end
+
   def test_process_with_multipart_alternative_parts
     mail = stub_mail()
     plain = stub(:sub_header => 'message.txt', :content_type => 'text/plain', :body => 'a')

data/test/test_mms_3ireland_ie.rb

@@ -17,7 +17,7 @@ class Test3IrelandIe < Test::Unit::TestCase
     assert_equal 1, mms.media.size
     assert_equal 1, mms.media['image/jpeg'].size
 
-    assert_match /Image013\.jpg$/, mms.media['image/jpeg'].first
+    assert_match(/Image013\.jpg$/, mms.media['image/jpeg'].first)
     assert_equal 337, File.size(mms.media['image/jpeg'].first)
 
     mms.purge

data/test/test_mms_att_net.rb

@@ -108,7 +108,7 @@ class TestMmsAttNet < Test::Unit::TestCase
     assert_equal 2, mms.media.size
 
     assert_not_nil mms.media['text/plain']
-    assert_match /^Testing memorymail from my blackberry and at&t.$/, IO.readlines(mms.media['text/plain'].first).join.strip
+    assert_match(/^Testing memorymail from my blackberry and at&t.$/, IO.readlines(mms.media['text/plain'].first).join.strip)
     
     assert_not_nil mms.media['image/jpeg'].first
     assert_match(/IMG00367.jpg/, mms.media['image/jpeg'].first)

data/test/test_mms_mobileiam_ma.rb

@@ -18,7 +18,7 @@ class TestMmsMobileiamMa < Test::Unit::TestCase
     assert_equal 1, mms.media.size
 
     assert_equal 1, mms.media['image/gif'].size
-    assert_match /jalwapam\.gif$/, mms.media['image/gif'].first
+    assert_match(/jalwapam\.gif$/, mms.media['image/gif'].first)
     assert_equal 1855, File.size(mms.media['image/gif'].first)
 
     mms.purge

data/test/test_mobile_indosat_net_id.rb

@@ -20,7 +20,7 @@ class TestMobileIndosatNetId < Test::Unit::TestCase
     assert_not_nil mms.media['image/jpeg']
     assert_equal 1, mms.media['image/jpeg'].size
     assert_not_nil mms.media['image/jpeg'].first
-    assert_match /Foto_14_.jpg/, mms.media['image/jpeg'].first
+    assert_match(/Foto_14_.jpg/, mms.media['image/jpeg'].first)
     assert_file_size(mms.media['image/jpeg'].first, 337)
     assert_equal "Hello World", mms.default_text.read
     mms.purge
@@ -45,7 +45,7 @@ class TestMobileIndosatNetId < Test::Unit::TestCase
     assert_not_nil mms.media['image/jpeg']
     assert_equal 1, mms.media['image/jpeg'].size
     assert_not_nil mms.media['image/jpeg'].first
-    assert_match /6033_small.jpeg/, mms.media['image/jpeg'].first
+    assert_match(/6033_small.jpeg/, mms.media['image/jpeg'].first)
     assert_file_size(mms.media['image/jpeg'].first, 337)
     mms.purge
   end

data/test/test_sms_sasktel_com.rb

@@ -20,7 +20,7 @@ class TestSmsSasktelCom < Test::Unit::TestCase
     assert_equal 1, mms.media.size
     assert_not_nil mms.media['image/jpeg']
     assert_equal 1, mms.media['image/jpeg'].size
-    assert_match /A1.8463391017738573.jpg$/, mms.media['image/jpeg'].first
+    assert_match(/A1.8463391017738573.jpg$/, mms.media['image/jpeg'].first)
     assert_file_size(mms.media['image/jpeg'].first, 337)
     mms.purge
   end

data/test/test_waw_plspictures_com.rb

@@ -19,7 +19,7 @@ class TestWawPlspicturesCom < Test::Unit::TestCase
     assert_equal 1, mms.media.size
     assert_not_nil mms.media['image/jpeg']
     assert_equal 1, mms.media['image/jpeg'].size
-    assert_match /A0.7585991693329067.jpg$/, mms.media['image/jpeg'].first
+    assert_match(/A0.7585991693329067.jpg$/, mms.media['image/jpeg'].first)
     assert_file_size(mms.media['image/jpeg'].first, 337)
     mms.purge
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mms2r
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors: 
 - Mike Mondragon
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-28 00:00:00 -07:00
+date: 2008-07-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: tmail
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,12 +34,13 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.5.3
     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"
 email: mikemondragon@gmail.com
@@ -94,6 +97,7 @@ files:
 - 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
@@ -212,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mms2r
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Extract user media from MMS (and not carrier cruft)