mms2r 1.0.6 → 1.0.7

data/History.txt

@@ -1,3 +1,9 @@
+== 1.0.7 / 2007-04-27 (Senator Stampingston)
+
+* patch submitted by Luke Francl
+* added a get_subject method that returns nil when any MMS has a default carrier subject
+* get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You have new Picture Mail!'
+
 == 1.0.6 / 2007-04-24 (Pickles the Drummer)
 
 * patch submitted by Luke Francl

data/Manifest.txt

@@ -42,6 +42,7 @@ lib/vendor/tmail/scanner_r.rb
 lib/vendor/tmail/stringio.rb
 lib/vendor/tmail/tmail.rb
 lib/vendor/tmail/utils.rb
+test/files/cingular-image-01.mail
 test/files/cingularme-text-01.mail
 test/files/dobson-image-01.mail
 test/files/dot.jpg

data/README.txt

@@ -50,6 +50,8 @@ Corpus of carriers currently processed by MMS2R:
   # writes the user generated media to disk in a temporary subdirectory
   mms.process
 
+  puts "MMS has default carrier subject!" if mms.get_subject.nil?
+
   # most MMS are either image or video, get_media will blindly return
   # the first video or image found
   file = mms.get_media

data/lib/mms2r/media.rb

@@ -109,6 +109,19 @@ module MMS2R
                      self.class.safe_message_id(@mail.message_id))
     end
 
+    # Filter some common place holder subjects from MMS messages and replace 
+    # them with nil.
+    
+    def get_subject
+      subject = @mail.subject
+      if subject.nil? || subject.strip.length == 0 ||
+         subject =~ /^(Multimedia message|\(no subject\)|You have new Picture Mail!)$/
+        return nil
+      end
+
+      subject
+    end
+
     # Returns a File with the most likely candidate for the user-submitted
     # media. Given that most MMS messages only have one file attached,
     # this will try to give you that file. First it looks for videos, then

data/lib/mms2r/version.rb

@@ -6,7 +6,7 @@ module MMS2R
     ##
     # MMS2R Library version
 
-    VERSION = '1.0.6'
+    VERSION = '1.0.7'
 
   end
 end

data/test/files/cingular-image-01.mail

@@ -0,0 +1,66 @@
+Delivered-To: luke@example.com
+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>
+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: 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])
+	by mail41a.mail.iad.mlsrvr.com (SMTP Server) with ESMTP id F3302514081
+	for <go@example.com>; Tue, 24 Apr 2007 19:40:44 -0400 (EDT)
+Received: from gate1.gate.sat.mlsrvr.com (gate.sat.emailsrvr.com [66.216.121.101])
+	by gate16.gate.iad.mlsrvr.com (SMTP Server) with ESMTP id BA6FB1380D7
+	for <go@example.com>; Tue, 24 Apr 2007 19:40:44 -0400 (EDT)
+X-Virus-Scanned: OK, w
+X-Spam-Score: -
+X-Spam-Level: 
+X-Spam-Status: No, score=x tagged_above=-100 required=10 WHITELISTED tests=[]
+Received: from atlmtaow02.cingularme.com (atlmtaow02.cingularme.com [66.102.165.7])
+	by gate1.gate.sat.mlsrvr.com (SMTP Server) with ESMTP id 4C1F71B4006
+	for <go@example.com>; Tue, 24 Apr 2007 19:40:44 -0400 (EDT)
+X-Mms-MMS-Version: 18
+Date: Tue, 24 Apr 2007 19:40:43 -0400
+X-Mms-Sender-Visibility: 1
+X-Nokia-Ag-Internal: ; smiltype=true; internaldate=1177458043783
+Content-Type: multipart/mixed;  boundary="----=_Part_2944038_406917.1177458043793"
+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>
+To: go@example.com
+X-Mms-Message-Class: 0
+X-Mms-Read-Reply: 1
+Mime-Version: 1.0
+Message-ID: <18398745.1177458043793.JavaMail.wluser@alpagw02>
+X-Mms-Priority: 1
+X-Mms-Message-Type: 0
+Subject: Multimedia message
+X-Nokia-Ag-Version: 2.0
+
+------=_Part_2944038_406917.1177458043793
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: base64
+Content-Location: smil.txt
+Content-Disposition: inline
+
+V2F0ZXI=
+------=_Part_2944038_406917.1177458043793
+Content-Type: image/jpeg;Name=04-18-07_1723.jpg
+content-location: media1.jpeg
+content-id: <media1.jpeg>
+Content-Transfer-Encoding: base64
+
+/9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAXQ3JlYXRl
+ZCB3aXRoIFRoZSBHSU1Q/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxER
+ExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4e
+Hh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAAQAB
+AwEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAH/8QAFBABAAAAAAAAAAAAAAAAAAAA
+AP/EABUBAQEAAAAAAAAAAAAAAAAAAAcI/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQAC
+EQMRAD8AlgA6WW//2Q==
+------=_Part_2944038_406917.1177458043793--
+

data/test/test_mms2r_cingular.rb

@@ -36,4 +36,23 @@ class MMS2RCingularTest < Test::Unit::TestCase
     assert_match(/#{good_text}/m, text)
     mms.purge
   end
+  
+  def test_image
+    mail = TMail::Mail.parse(load_mail('cingular-image-01.mail').join)
+    mms = MMS2R::Media.create(mail)
+    assert_equal(MMS2R::CingularMedia, mms.class, "expected a #{MMS2R::CingularMedia} and received a #{mms.class}")
+    mms.process
+    
+    assert(mms.media.size == 2, "Size is #{mms.media.size}")
+    assert_not_nil(mms.media['text/plain'])
+    assert_not_nil(mms.media['image/jpeg'][0])
+    assert_match(/04-18-07_1723.jpg$/, mms.media['image/jpeg'][0])
+    
+    assert_equal(nil, mms.get_subject, "Default Cingular subject not stripped")
+    assert_file_size(mms.media['image/jpeg'][0], 337)
+
+    assert_equal("Water", IO.readlines(mms.get_text.path).join)
+    
+    mms.purge
+  end
 end

data/test/test_mms2r_media.rb

@@ -288,4 +288,23 @@ class MMS2RMediaTest < Test::Unit::TestCase
     mail = TMail::Mail.parse(load_mail('simple_image.mail').join)
     assert(MMS2R::Media.sub_type?(mail.parts[0]).eql?('gif'))
   end
+
+  def test_get_subject
+    subjects = [nil, '', 'Multimedia message', '(no subject)', 'You have new Picture Mail!']
+
+    subjects.each{|s|  
+      mail = TMail::Mail.parse(load_mail('hello_world_mail_plain_no_content_type.mail').join)
+      mail.subject = s
+      mms = MMS2R::Media.create(mail)
+      mms.process
+      assert_equal(nil, mms.get_subject)
+      mms.purge
+    }
+
+    mail = TMail::Mail.parse(load_mail('hello_world_mail_plain_no_content_type.mail').join)
+    mms = MMS2R::Media.create(mail)
+    mms.process
+    assert_equal('text only', mms.get_subject)
+    mms.purge
+  end
 end

data/test/test_mms2r_sprint.rb

@@ -124,6 +124,9 @@ class MMS2RSprintTest < Test::Unit::TestCase
     assert_match(/000_0123a01234567895_1.mov$/, mms.media['video/quicktime'][0])
 
     assert_file_size(mms.media['video/quicktime'][0], 49063)
+    
+    assert_equal(nil, mms.get_subject, "Default Sprint subject not scrubbed.")
+    
     mms.purge
   end
 
@@ -139,6 +142,9 @@ class MMS2RSprintTest < Test::Unit::TestCase
     assert_match(/000_0123a01234567890_1.jpg$/, mms.media['image/jpeg'][0])
 
     assert_file_size(mms.media['image/jpeg'][0], 337)
+    
+    assert_equal(nil, mms.get_subject, "Default Sprint subject not scrubbed")
+    
     mms.purge
   end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.0
 specification_version: 1
 name: mms2r
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
-date: 2007-04-25 00:00:00 -07:00
+  version: 1.0.7
+date: 2007-04-27 00:00:00 -07:00
 summary: Extract media from MMS
 require_paths: 
 - lib
@@ -73,6 +73,7 @@ files:
 - lib/vendor/tmail/stringio.rb
 - lib/vendor/tmail/tmail.rb
 - lib/vendor/tmail/utils.rb
+- test/files/cingular-image-01.mail
 - test/files/cingularme-text-01.mail
 - test/files/dobson-image-01.mail
 - test/files/dot.jpg