mms2r 1.1.3 → 1.1.4

data/History.txt

@@ -1,3 +1,8 @@
+== 1.1.4 / 2007-08-07 (Dr. Rockso)
+
+* AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
+* get_body returns nil when there is not user text (sorry Will!)
+
 == 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
 
 * Helio support by Will Jessup

data/Manifest.txt

@@ -17,6 +17,7 @@ conf/mms2r_verizon_media_ignore.yml
 conf/mms2r_verizon_media_transform.yml
 dev_tools/debug_sprint_hpricot_parsing.rb
 lib/mms2r.rb
+lib/mms2r/a_t_t_media.rb
 lib/mms2r/cingular_me_media.rb
 lib/mms2r/dobson_media.rb
 lib/mms2r/helio_media.rb
@@ -53,39 +54,41 @@ lib/vendor/tmail/scanner_r.rb
 lib/vendor/tmail/stringio.rb
 lib/vendor/tmail/tmail.rb
 lib/vendor/tmail/utils.rb
-test/files/cingularme-text-01.mail
-test/files/cingularme-text-02.mail
-test/files/dobson-image-01.mail
-test/files/dot.jpg
-test/files/helio-image-01.mail
-test/files/hello_world_empty_text.mail
-test/files/hello_world_mail_multipart.mail
-test/files/hello_world_mail_plain_no_content_type.mail
-test/files/hello_world_mail_plain_with_content_type.mail
-test/files/mmode-image-01.mail
-test/files/mycingular-image-01.mail
-test/files/nextel-image-01.mail
-test/files/nextel-image-02.mail
-test/files/nextel-image-03.mail
-test/files/nextel-image-04.mail
-test/files/simple-with-two-images-two-texts.mail
-test/files/simple_image.mail
-test/files/simple_multipart_alternative.mail
-test/files/sprint-broken-image-01.mail
-test/files/sprint-image-01.mail
-test/files/sprint-pcs-text-01.mail
-test/files/sprint-text-01.mail
-test/files/sprint-two-images-01.mail
-test/files/sprint-video-01.mail
-test/files/sprint.mov
-test/files/tmobile-image-01.mail
-test/files/tmobile-image-02.mail
-test/files/verizon-image-01.mail
-test/files/verizon-image-02.mail
-test/files/verizon-text-01.mail
-test/files/verizon-video-01.mail
-test/files/vtext-text-01.mail
+test/fixtures/att-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/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/mmode-image-01.mail
+test/fixtures/mycingular-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/simple-with-two-images-two-texts.mail
+test/fixtures/simple_image.mail
+test/fixtures/simple_multipart_alternative.mail
+test/fixtures/sprint-broken-image-01.mail
+test/fixtures/sprint-image-01.mail
+test/fixtures/sprint-pcs-text-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/tmobile-image-01.mail
+test/fixtures/tmobile-image-02.mail
+test/fixtures/verizon-image-01.mail
+test/fixtures/verizon-image-02.mail
+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_a_t_t_media.rb
 test/test_mms2r_cingular_me_media.rb
 test/test_mms2r_dobson_media.rb
 test/test_mms2r_helio_media.rb
@@ -98,8 +101,5 @@ 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
-tinderbox/sandbox/cache/sources-0.0.1.gem
-tinderbox/sandbox/gems/sources-0.0.1/lib/sources.rb
-tinderbox/sandbox/specifications/sources-0.0.1.gemspec
 vendor/plugins/mms2r/lib/autotest/discover.rb
 vendor/plugins/mms2r/lib/autotest/mms2r.rb

data/README.txt

@@ -18,6 +18,7 @@ library.  Suggestions and patches appreciated and welcomed!
 
 Corpus of carriers currently processed by MMS2R:
 
+* AT&T => mms.att.net
 * AT&T/Cingular => mmode.com
 * Cingular => mms.mycingular.com
 * Cingular => cingularme.com

data/lib/mms2r.rb

@@ -6,6 +6,7 @@
 
 $:.unshift(File.dirname(__FILE__) + "/vendor/")
 require 'mms2r/media'
+require 'mms2r/a_t_t_media'
 require 'mms2r/cingular_me_media'
 require 'mms2r/dobson_media'
 require 'mms2r/helio_media'
@@ -28,6 +29,7 @@ module MMS2R
   # is not available MMS2R::Media should be used.
 
   CARRIER_CLASSES = {
+    'mms.att.net' => MMS2R::ATTMedia,
     'cingularme.com' => MMS2R::CingularMeMedia,
     'mms.dobson.net' => MMS2R::DobsonMedia,
     'mms.myhelio.com' => MMS2R::HelioMedia,
@@ -59,7 +61,7 @@ module MMS2R
     ##
     # MMS2R Library version
 
-    VERSION = '1.1.3'
+    VERSION = '1.1.4'
 
     end
 

data/lib/mms2r/a_t_t_media.rb

@@ -0,0 +1,13 @@
+module MMS2R
+
+  ##
+  # AT&T version of MMS2R::Media
+  #
+  # The AT&T examples (like their  MMode brothers) 
+  # do not contain advertising and the subject of the
+  # message can be the file name of the media attached
+  # to the MMS or empty.
+
+  class MMS2R::ATTMedia < MMS2R::Media
+  end
+end

data/lib/mms2r/media.rb

@@ -141,7 +141,7 @@ module MMS2R
 
       text_file = get_text
       if text_file.nil?
-        return @body ||= ""
+        return @body ||= nil
       end
       
       return @body ||= IO.readlines(text_file.path).join.strip

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

@@ -0,0 +1,37 @@
+Date: Thu, 2 Aug 2007 16:05:20 -0700
+From: 12068675309@mms.att.net
+To: hello@example.com
+Message-Id: <6636176.4567095920490.JavaMail.wluser@xyzab01>
+Subject:
+Mime-Version: 1.0
+Content-Type: multipart/mixed; 
+	boundary=mimepart_46b78c9dd2de6_3f318b82120
+Delivery-Date: Thu, 02 Aug 2007 23:05:30 +0000
+X-Mms-Priority: 1
+Envelope-To: hello@example.com
+X-Mms-Transaction-Id: 3268915494-0
+X-Mms-Message-Type: 0
+X-Nokia-Ag-Internal: ; smiltype=true; internaldate=1186095920482
+X-Mms-Sender-Visibility: 1
+X-Mms-Read-Reply: 1
+X-Mms-Message-Class: 0
+X-Mms-Delivery-Report: 1
+X-Mms-Mms-Version: 16
+X-Nokia-Ag-Version: 2.0
+
+
+--mimepart_46b78c9dd2de6_3f318b82120
+Content-Type: image/jpeg
+Content-Transfer-Encoding: Base64
+Content-Disposition: inline
+Content-Location: Photo_12.jpg
+
+/9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAXQ3JlYXRl
+ZCB3aXRoIFRoZSBHSU1Q/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxER
+ExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4e
+Hh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAAQAB
+AwEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAH/8QAFBABAAAAAAAAAAAAAAAAAAAA
+AP/EABUBAQEAAAAAAAAAAAAAAAAAAAcI/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQAC
+EQMRAD8AlgA6WW//2Q==
+
+--mimepart_46b78c9dd2de6_3f318b82120--

data/test/test_helper.rb

@@ -8,7 +8,7 @@ module MMS2R
     end
   
     def load_mail(file)
-      IO.readlines("#{File.dirname(__FILE__)}/files/#{file}")
+      IO.readlines("#{File.dirname(__FILE__)}/fixtures/#{file}")
     end
   end
-end
+end

data/test/test_mms2r_a_t_t_media.rb

@@ -0,0 +1,36 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require File.dirname(__FILE__) + "/test_helper"
+require 'test/unit'
+require 'rubygems'
+require 'mms2r'
+require 'mms2r/media'
+require 'tmail/mail'
+require 'logger'
+
+class MMS2R::ATTMediaTest < Test::Unit::TestCase
+  include MMS2R::TestHelper
+
+  def setup
+    @log = Logger.new(STDOUT)
+    @log.level = Logger::DEBUG
+    @log.datetime_format = "%H:%M:%S"
+  end
+
+  def teardown; end
+
+  def test_simple
+    mail = TMail::Mail.parse(load_mail('att-image-01.mail').join)
+    mms = MMS2R::Media.create(mail)
+    assert_equal(MMS2R::ATTMedia, mms.class, "expected a #{MMS2R::ATTMedia} and received a #{mms.class}")
+    mms.process
+
+    assert(mms.media.size == 1)
+    assert_nil(mms.media['text/plain'])
+    assert_nil(mms.media['text/html'])
+    assert_not_nil(mms.media['image/jpeg'][0])
+    assert_match(/Photo_12.jpg$/, mms.media['image/jpeg'][0])
+
+    assert_file_size(mms.media['image/jpeg'][0], 337)
+    mms.purge
+  end
+end

data/test/test_mms2r_media.rb

@@ -18,6 +18,7 @@ class MMS2R::MediaTest < Test::Unit::TestCase
 
   CARRIER_TO_CLASS = {
     'mms2r.media' => MMS2R::Media,
+    'mms.att.net' => MMS2R::ATTMedia,
     'cingularme.com' => MMS2R::CingularMeMedia,
     'mms.dobson.net' => MMS2R::DobsonMedia,
     'mms.myhelio.com' => MMS2R::HelioMedia,

data/test/test_mms2r_sprint_media.rb

@@ -14,7 +14,7 @@ require 'logger'
 class SimpleImageServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     res['Content-Type'] = "image/jpeg"
-    f = "files/dot.jpg"
+    f = "fixtures/dot.jpg"
     res.body = File.open("#{File.dirname(__FILE__)}/#{f}", 'rb') { |file|
        file.read
     }
@@ -33,7 +33,7 @@ end
 class SimpleVideoServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     res['Content-Type'] = "video/quicktime"
-    f = "files/sprint.mov"
+    f = "fixtures/sprint.mov"
     res.body = File.open("#{File.dirname(__FILE__)}/#{f}", 'rb') { |file|
        file.read
     }
@@ -212,10 +212,10 @@ class MMS2R::SprintMediaTest < Test::Unit::TestCase
     mms.purge
   end
 
-  def test_get_body_should_return_empty_string_when_there_is_no_user_text
+  def test_get_body_should_return_nil_when_there_is_no_user_text
     mail = TMail::Mail.parse(load_mail('sprint-image-01.mail').join)
     mms = MMS2R::Media.create(mail)
     mms.process
-    assert_equal("", mms.get_body)
+    assert_equal nil, mms.get_body
   end
 end

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: mms2r
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
-date: 2007-07-10 00:00:00 -07:00
+  version: 1.1.4
+date: 2007-08-07 00:00:00 -07:00
 summary: Extract user media from MMS (and not carrier cruft)
 require_paths: 
 - lib
 email: mikemondragon@gmail.com
 homepage: http://mms2r.rubyforge.org/
 rubyforge_project: mms2r
-description: "== 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  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:  * 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 * Sprint => pm.sprint.com * Sprint => messaging.sprintpcs.com * T-Mobile => tmomail.net * Verizon => vzwpix.com * Verizon => vtext.com"
+description: "== 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  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:  * 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 * Sprint => pm.sprint.com * Sprint => messaging.sprintpcs.com * T-Mobile => tmomail.net * Verizon => vzwpix.com * Verizon => vtext.com"
 autorequire: 
 default_executable: 
 bindir: bin
@@ -48,6 +48,7 @@ files:
 - conf/mms2r_verizon_media_transform.yml
 - dev_tools/debug_sprint_hpricot_parsing.rb
 - lib/mms2r.rb
+- lib/mms2r/a_t_t_media.rb
 - lib/mms2r/cingular_me_media.rb
 - lib/mms2r/dobson_media.rb
 - lib/mms2r/helio_media.rb
@@ -84,39 +85,41 @@ files:
 - lib/vendor/tmail/stringio.rb
 - lib/vendor/tmail/tmail.rb
 - lib/vendor/tmail/utils.rb
-- test/files/cingularme-text-01.mail
-- test/files/cingularme-text-02.mail
-- test/files/dobson-image-01.mail
-- test/files/dot.jpg
-- test/files/helio-image-01.mail
-- test/files/hello_world_empty_text.mail
-- test/files/hello_world_mail_multipart.mail
-- test/files/hello_world_mail_plain_no_content_type.mail
-- test/files/hello_world_mail_plain_with_content_type.mail
-- test/files/mmode-image-01.mail
-- test/files/mycingular-image-01.mail
-- test/files/nextel-image-01.mail
-- test/files/nextel-image-02.mail
-- test/files/nextel-image-03.mail
-- test/files/nextel-image-04.mail
-- test/files/simple-with-two-images-two-texts.mail
-- test/files/simple_image.mail
-- test/files/simple_multipart_alternative.mail
-- test/files/sprint-broken-image-01.mail
-- test/files/sprint-image-01.mail
-- test/files/sprint-pcs-text-01.mail
-- test/files/sprint-text-01.mail
-- test/files/sprint-two-images-01.mail
-- test/files/sprint-video-01.mail
-- test/files/sprint.mov
-- test/files/tmobile-image-01.mail
-- test/files/tmobile-image-02.mail
-- test/files/verizon-image-01.mail
-- test/files/verizon-image-02.mail
-- test/files/verizon-text-01.mail
-- test/files/verizon-video-01.mail
-- test/files/vtext-text-01.mail
+- test/fixtures/att-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/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/mmode-image-01.mail
+- test/fixtures/mycingular-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/simple-with-two-images-two-texts.mail
+- test/fixtures/simple_image.mail
+- test/fixtures/simple_multipart_alternative.mail
+- test/fixtures/sprint-broken-image-01.mail
+- test/fixtures/sprint-image-01.mail
+- test/fixtures/sprint-pcs-text-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/tmobile-image-01.mail
+- test/fixtures/tmobile-image-02.mail
+- test/fixtures/verizon-image-01.mail
+- test/fixtures/verizon-image-02.mail
+- 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_a_t_t_media.rb
 - test/test_mms2r_cingular_me_media.rb
 - test/test_mms2r_dobson_media.rb
 - test/test_mms2r_helio_media.rb
@@ -129,9 +132,6 @@ files:
 - test/test_mms2r_t_mobile_media.rb
 - test/test_mms2r_verizon_media.rb
 - test/test_mms2r_vtext_media.rb
-- tinderbox/sandbox/cache/sources-0.0.1.gem
-- tinderbox/sandbox/gems/sources-0.0.1/lib/sources.rb
-- tinderbox/sandbox/specifications/sources-0.0.1.gemspec
 - vendor/plugins/mms2r/lib/autotest/discover.rb
 - vendor/plugins/mms2r/lib/autotest/mms2r.rb
 test_files: 
@@ -148,6 +148,7 @@ test_files:
 - test/test_mms2r_verizon_media.rb
 - test/test_helper.rb
 - test/test_mms2r_t_mobile_media.rb
+- test/test_mms2r_a_t_t_media.rb
 rdoc_options: 
 - --main
 - README.txt

data/tinderbox/sandbox/gems/sources-0.0.1/lib/sources.rb

@@ -1,6 +0,0 @@
-module Gem
-  @sources = ["http://gems.rubyforge.org"]
-  def self.sources
-    @sources
-  end
-end

data/tinderbox/sandbox/specifications/sources-0.0.1.gemspec

@@ -1,8 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = %q{sources}
-  s.version = "0.0.1"
-  s.date = %q{2007-06-10}
-  s.summary = %q{This package provides download sources for remote gem installation}
-  s.autorequire = %q{sources}
-  s.files = ["lib/sources.rb"]
-end