mms2r 2.4.1 → 3.0.0

data/test/test_mms_3ireland_ie.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 TestMms3irelandIe < Test::Unit::TestCase
   include MMS2R::TestHelper
-  
+
   def test_image_and_text_and_number
-    mail = TMail::Mail.parse(load_mail('3ireland-mms-01.mail').join)
+    mail = mail('3ireland-mms-01.mail')
     mms = MMS2R::Media.new(mail)
-    
     assert_equal "351234567890", mms.number
+    assert_equal "mms.3ireland.ie", mms.carrier
+
     assert_equal 1, mms.media.size
     assert_equal 1, mms.media['image/jpeg'].size
 

data/test/test_mms_ae.rb

@@ -1,17 +1,13 @@
-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 TestMmsAe < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def test_only_valid_content_should_be_retained_for_mms_with_image_and_text
-    mail = TMail::Mail.parse(load_mail('mms.ae-image-01.mail').join)
+    mail = mail('mms.ae-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "+2068675309", mms.number
+    assert_equal "mms.ae", mms.carrier
     assert_equal 1, mms.media.size
     assert_equal 1, mms.media['image/jpeg'].size
     assert_file_size(mms.media['image/jpeg'].first, 337)
@@ -20,23 +16,27 @@ class TestMmsAe < Test::Unit::TestCase
   end
 
   def test_number_should_return_correct_number
-    mail = TMail::Mail.parse(load_mail('mms.ae-image-01.mail').join)
+    mail = mail('mms.ae-image-01.mail')
     mms = MMS2R::Media.new(mail)
-    number = mms.number()
-    assert_equal number, "+2068675309"
+    assert_equal "+2068675309", mms.number
+    assert_equal "mms.ae", mms.carrier
     mms.purge
   end
 
   def test_subject_should_return_correct_subject
-    mail = TMail::Mail.parse(load_mail('mms.ae-image-01.mail').join)
+    mail = mail('mms.ae-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "+2068675309", mms.number
+    assert_equal "mms.ae", mms.carrier
     assert_equal "", mms.subject
     mms.purge
   end
 
   def test_attachment_should_return_jpeg
-    mail = TMail::Mail.parse(load_mail('mms.ae-image-01.mail').join)
+    mail = mail('mms.ae-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "+2068675309", mms.number
+    assert_equal "mms.ae", mms.carrier
     image = mms.default_media
     assert_equal 337, image.size
     assert_equal "19102008.jpg", image.original_filename

data/test/test_mms_alltel_com.rb

@@ -1,36 +1,33 @@
-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 TestMmsAlltelCom < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def test_subject_number_image
-    mail = TMail::Mail.parse(load_mail('alltel-mms-01.mail').join)
+    mail = mail('alltel-mms-01.mail')
     mms = MMS2R::Media.new(mail)
 
     assert_equal "", mms.subject
     assert_equal "1234567890", mms.number
+    assert_equal "mms.alltel.com", mms.carrier
 
     assert_equal 1, mms.media.size
     assert_equal 2, mms.media['image/jpeg'].size
 
     first = mms.media['image/jpeg'].detect{|f| /02-19-08_1709\.jpg/ =~ f}
     second = mms.media['image/jpeg'].detect{|f| /02-19-08_1710\.jpg/ =~ f}
-    assert_equal 337, File.size(first) 
-    assert_equal 337, File.size(second) 
+    assert_equal 337, File.size(first)
+    assert_equal 337, File.size(second)
 
     mms.purge
   end
 
   def test_alltel_image
-    mail = TMail::Mail.parse(load_mail('alltel-image-01.mail').join)
+    mail = mail('alltel-image-01.mail')
     mms = MMS2R::Media.new(mail)
-  
+    assert_equal "2068675309", mms.number
+    assert_equal "message.alltel.com", mms.carrier
+
     assert_equal 1, mms.media.size
     assert_not_nil mms.media['image/jpeg']
     assert_equal 2, mms.media['image/jpeg'].size
@@ -38,16 +35,18 @@ class TestMmsAlltelCom < Test::Unit::TestCase
     assert_match(/eastern sky.jpg$/, mms.media['image/jpeg'][1])
     assert_file_size mms.media['image/jpeg'][0], 337
     assert_file_size mms.media['image/jpeg'][1], 337
-  
+
     mms.purge
   end
 
   def test_default_media_should_return_user_generated_content
-    mail = TMail::Mail.parse(load_mail('alltel-image-01.mail').join)
+    mail = mail('alltel-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "2068675309", mms.number
+    assert_equal "message.alltel.com", mms.carrier
     file = mms.default_media
     assert_equal 'eastern sky.jpg', file.original_filename
     mms.purge
-  end 
-  
+  end
+
 end

data/test/test_mms_att_net.rb

@@ -1,18 +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 TestMmsAttNet < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def test_mms_att_net
     # mms.att.net service
-    mail = TMail::Mail.parse(load_mail('att-image-01.mail').join)
+    mail = mail('att-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "12068675309", mms.number
+    assert_equal "mms.att.net", mms.carrier
 
     assert_equal 1, mms.media.size
     assert_not_nil mms.media['image/jpeg']
@@ -26,8 +22,10 @@ class TestMmsAttNet < Test::Unit::TestCase
   def test_mms_att_net_subject
     # mms.att.net service
 
-    mail = TMail::Mail.parse(load_mail('att-image-02.mail').join)
+    mail = mail('att-image-02.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "12068675309", mms.number
+    assert_equal "mms.att.net", mms.carrier
 
     assert_equal "", mms.subject
     mms.purge
@@ -35,8 +33,10 @@ class TestMmsAttNet < Test::Unit::TestCase
 
   def test_txt_att_net
     # txt.att.net service
-    mail = TMail::Mail.parse(load_mail('att-text-01.mail').join)
+    mail = mail('att-text-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "5551234", mms.number
+    assert_equal "txt.att.net", mms.carrier
 
     assert_equal 1, mms.media.size
     assert_not_nil(mms.media['text/plain'])
@@ -47,8 +47,10 @@ class TestMmsAttNet < Test::Unit::TestCase
 
   def test_cingularme_com
     # cingularme.com service
-    mail = TMail::Mail.parse(load_mail('cingularme-text-01.mail').join)
+    mail = mail('cingularme-text-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "2068675309", mms.number
+    assert_equal "cingularme.com", mms.carrier
 
     assert_equal 1, mms.media.size
     assert_not_nil(mms.media['text/plain'])
@@ -59,8 +61,10 @@ class TestMmsAttNet < Test::Unit::TestCase
 
   def test_mmode_com
     # mmode.com service
-    mail = TMail::Mail.parse(load_mail('mmode-image-01.mail').join)
+    mail = mail('mmode-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "12068675309", mms.number
+    assert_equal "mmode.com", mms.carrier
 
     assert_equal 1, mms.media.size
     assert_not_nil mms.media['image/jpeg']
@@ -73,8 +77,10 @@ class TestMmsAttNet < Test::Unit::TestCase
 
   def test_mms_mycingular_com
     # mms.mycingular.com service
-    mail = TMail::Mail.parse(load_mail('mycingular-image-01.mail').join)
+    mail = mail('mycingular-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "2068675309", mms.number
+    assert_equal "mms.mycingular.com", mms.carrier
 
     assert_equal 2, mms.media.size
     assert_not_nil mms.media['text/plain']
@@ -89,37 +95,42 @@ class TestMmsAttNet < Test::Unit::TestCase
     assert_equal "Water", IO.read(mms.media['text/plain'][0])
     mms.purge
   end
-  
+
   def test_image_from_blackberry
-    mail = TMail::Mail.parse(load_mail('att-blackberry.mail').join)
+    mail = mail('att-blackberry.mail')
     mms = MMS2R::Media.new(mail)
-    
+    assert_equal "2068675309", mms.number
+    assert_equal "example.com", mms.carrier
+
     assert_not_nil mms.media['text/plain']
     assert_equal "Hello world", IO.readlines(mms.media['text/plain'].first).join.strip
-    
+
     assert_not_nil mms.media['image/jpeg'].first
     assert_match(/Windows-1252\?B\?QkMtV0FLRS5qcGc/, mms.media['image/jpeg'].first)
   end
 
   def test_image_from_blackberry2
-    mail = TMail::Mail.parse(load_mail('att-blackberry-02.mail').join)
+    mail = mail('att-blackberry-02.mail')
     mms = MMS2R::Media.new(mail)
-    
+    assert_equal "2068675309", mms.number
+    assert_equal "mms.att.net", mms.carrier
+
     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_not_nil mms.media['image/jpeg'].first
     assert_match(/IMG00367.jpg/, mms.media['image/jpeg'].first)
   end
 
   def test_mobile_mycingular_com
     # mobile.mycingular.com service
-    mail = TMail::Mail.parse(load_mail('mobile.mycingular.com-text-01.mail').join)
+    mail = mail('mobile.mycingular.com-text-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "2068675309", mms.number
+    assert_equal "mobile.mycingular.com", mms.carrier
 
-    assert_equal 'mobile.mycingular.com', mms.carrier
     assert_equal 1, mms.media.size
     assert_not_nil(mms.media['text/plain'])
     assert_equal "I hate people that send text messages about skateboarding.", IO.read(mms.media['text/plain'][0])
@@ -129,13 +140,10 @@ class TestMmsAttNet < Test::Unit::TestCase
 
   def test_pics_cingularme_com
     # pics.cingularme.com service
-    mail = TMail::Mail.parse(load_mail('pics.cingularme.com-image-01.mail').join)
+    mail = mail('pics.cingularme.com-image-01.mail')
     mms = MMS2R::Media.new(mail)
-
-
-    # TODO this fixture is either mailformed or exposes a tmail problem
-    # since its legacy content fix if necessary
-    assert_equal 'pics.cingularme.com', mms.carrier
+    assert_equal "2068675309", mms.number
+    assert_equal "pics.cingularme.com", mms.carrier
 
     mms.purge
   end

data/test/test_mms_dobson_net.rb

@@ -1,18 +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 TestMmsDobsonNet < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def test_mms_dobson_net
     # mms.dobson.net service
-    mail = TMail::Mail.parse(load_mail('dobson-image-01.mail').join)
+    mail = mail('dobson-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "2068675309", mms.number
+    assert_equal "mms.dobson.net", mms.carrier
 
     assert_equal 2, mms.media.size
 
@@ -29,13 +25,15 @@ class TestMmsDobsonNet < Test::Unit::TestCase
 
     mms.purge
   end
-  
+
   def test_body_should_return_user_text
-    mail = TMail::Mail.parse(load_mail('dobson-image-01.mail').join)
+    mail = mail('dobson-image-01.mail')
     mms = MMS2R::Media.new(mail)
-    
+    assert_equal "2068675309", mms.number
+    assert_equal "mms.dobson.net", mms.carrier
+
     assert_equal 'Body', mms.body
-    
+
     mms.purge
   end
 end

data/test/test_mms_luxgsm_lu.rb

@@ -1,58 +1,64 @@
-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 TestMmsLuxgsmLu < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def test_subject
-    mail = TMail::Mail.parse(load_mail('luxgsm-image-01.mail').join)
+    mail = mail('luxgsm-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "+5551234", mms.number
+    assert_equal "mms.luxgsm.lu", mms.carrier
+
     assert_equal "MMS2R - LUXGSM", mms.subject
 
     mms.purge
   end
 
   def test_number
-    mail = TMail::Mail.parse(load_mail('luxgsm-image-01.mail').join)
+    mail = mail('luxgsm-image-01.mail')
     mms = MMS2R::Media.new(mail)
     assert_equal "+5551234", mms.number
+    assert_equal "mms.luxgsm.lu", mms.carrier
 
     mms.purge
   end
 
   def test_image
-    mail = TMail::Mail.parse(load_mail('luxgsm-image-01.mail').join)
+    mail = mail('luxgsm-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "+5551234", mms.number
+    assert_equal "mms.luxgsm.lu", mms.carrier
 
     assert_equal 1, mms.media.size
     assert_equal 2, mms.media['image/gif'].size
-  
+
     mms.purge
   end
 
   def test_default_media_should_return_user_generated_content
-    mail = TMail::Mail.parse(load_mail('luxgsm-image-01.mail').join)
+    mail = mail('luxgsm-image-01.mail')
     mms = MMS2R::Media.new(mail)
     file = mms.default_media
+    assert_equal "+5551234", mms.number
+    assert_equal "mms.luxgsm.lu", mms.carrier
+
     assert_equal 8897, file.size
-    
+
     mms.purge
-  end 
+  end
 
   def test_default_text_should_return_user_generated_content
-    mail = TMail::Mail.parse(load_mail('luxgsm-image-01.mail').join)
+    mail = mail('luxgsm-image-01.mail')
     mms = MMS2R::Media.new(mail)
     file = mms.default_text
+    assert_equal "+5551234", mms.number
+    assert_equal "mms.luxgsm.lu", mms.carrier
+
     assert_nil file
 
     # TODO need more fixtures to handle text tests
-    
+
     mms.purge
-  end 
-  
+  end
+
 end

data/test/test_mms_mobileiam_ma.rb

@@ -1,19 +1,13 @@
-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 TestMmsMobileiamMa < Test::Unit::TestCase
   include MMS2R::TestHelper
-  
+
   def test_image_and_number
-    mail = TMail::Mail.parse(load_mail('maroctelecom-france-mms-01.mail').join)
+    mail = mail('maroctelecom-france-mms-01.mail')
     mms = MMS2R::Media.new(mail)
-    
-    assert_equal "98765432101", mms.number
+    assert_equal "98206867309", mms.number
+    assert_equal "mms.mobileiam.ma", mms.carrier
 
     assert_equal 1, mms.media.size
 

data/test/test_mms_mtn_co_za.rb

@@ -1,18 +1,13 @@
-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 TestMmsMtnCoZa < Test::Unit::TestCase
   include MMS2R::TestHelper
-  
+
   def test_image_and_text_and_number
-    mail = TMail::Mail.parse(load_mail('mtn-southafrica-mms.mail').join)
+    mail = mail('mtn-southafrica-mms.mail')
     mms = MMS2R::Media.new(mail)
-    
+    assert_equal "mms.mtn.co.za", mms.carrier
+
     assert_equal "22222222222", mms.number
 
     assert_equal 1, mms.media.size