mms2r 2.4.1 → 3.0.0

data/test/test_mms_mycricket_com.rb

@@ -1,26 +1,24 @@
-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 TestMmsMycricketCom < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def test_subject
     # mms.mycricket.com service
-    mail = TMail::Mail.parse(load_mail('mms.mycricket.com-pic.mail').join)
+    mail = mail('mms.mycricket.com-pic.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "2068675309", mms.number
+    assert_equal "mms.mycricket.com", mms.carrier
     assert_equal "", mms.subject
     mms.purge
   end
 
   def test_image
     # mms.mycricket.com service
-    mail = TMail::Mail.parse(load_mail('mms.mycricket.com-pic.mail').join)
+    mail = mail('mms.mycricket.com-pic.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "2068675309", mms.number
+    assert_equal "mms.mycricket.com", mms.carrier
 
     assert_equal 1, mms.media.size
     assert_nil mms.media['text/plain']
@@ -36,8 +34,10 @@ class TestMmsMycricketCom < Test::Unit::TestCase
 
   def test_image_and_text
     # mms.mycricket.com service
-    mail = TMail::Mail.parse(load_mail('mms.mycricket.com-pic-and-text.mail').join)
+    mail = mail('mms.mycricket.com-pic-and-text.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "2068675309", mms.number
+    assert_equal "mms.mycricket.com", mms.carrier
 
     assert_equal 2, mms.media.size
     assert_nil mms.media['text/html']

data/test/test_mms_myhelio_com.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 TestMmsMyhelioCom < 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('helio-image-01.mail').join)
+    mail = mail('helio-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "5551234", mms.number
+    assert_equal "mms.myhelio.com", mms.carrier
     assert_equal 2, mms.media.size
     assert_equal 1, mms.media['image/jpeg'].size
     assert_equal 1, mms.media['text/plain'].size
@@ -19,40 +15,48 @@ class TestMmsMyhelioCom < Test::Unit::TestCase
   end
 
   def test_only_valid_content_should_be_retained_for_mms_with_text
-    mail = TMail::Mail.parse(load_mail('helio-message-01.mail').join)
+    mail = mail('helio-message-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "5551234", mms.number
+    assert_equal "mms.myhelio.com", mms.carrier
     assert_equal 1, mms.media.size
     assert_equal 1, mms.media['text/plain'].size
     mms.purge
   end
 
   def test_number_should_return_correct_number
-    mail = TMail::Mail.parse(load_mail('helio-image-01.mail').join)
+    mail = mail('helio-image-01.mail')
     mms = MMS2R::Media.new(mail)
-    number = mms.number()
-    assert_equal number, 5551234.to_s
+    assert_equal "5551234", mms.number
+    assert_equal "mms.myhelio.com", mms.carrier
     mms.purge
   end
 
   def test_subject_should_return_correct_subject
-    mail = TMail::Mail.parse(load_mail('helio-image-01.mail').join)
+    mail = mail('helio-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "5551234", mms.number
+    assert_equal "mms.myhelio.com", mms.carrier
     title = mms.subject()
     assert_equal title, "Test image"
     mms.purge
   end
 
   def test_body_should_return_correct_body
-    mail = TMail::Mail.parse(load_mail('helio-image-01.mail').join)
+    mail = mail('helio-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "5551234", mms.number
+    assert_equal "mms.myhelio.com", mms.carrier
     body = mms.body()
     assert_equal body, "Test image"
     mms.purge
   end
 
   def test_attachment_should_return_jpeg
-    mail = TMail::Mail.parse(load_mail('helio-image-01.mail').join)
+    mail = mail('helio-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "5551234", mms.number
+    assert_equal "mms.myhelio.com", mms.carrier
     image = mms.default_media()
     assert_not_nil mms.media['image/jpeg'][0]
     assert_match(/0628070005.jpg$/, mms.media['image/jpeg'][0])

data/test/test_mms_netcom_no.rb

@@ -1,52 +1,54 @@
-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 TestMmsNetcomNo < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def test_subject
-    mail = TMail::Mail.parse(load_mail('netcom-image-01.mail').join)
+    mail = mail('netcom-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "5551234", mms.number
+    assert_equal "mms.netcom.no", mms.carrier
     assert_equal "Morning greetings from norway. This is a", mms.subject
 
     mms.purge
   end
 
   def test_image
-    mail = TMail::Mail.parse(load_mail('netcom-image-01.mail').join)
+    mail = mail('netcom-image-01.mail')
     mms = MMS2R::Media.new(mail)
-  
+    assert_equal "5551234", mms.number
+    assert_equal "mms.netcom.no", mms.carrier
+
     assert_equal 2, mms.media.size
     assert_not_nil mms.media['text/plain']
     assert_equal 1, mms.media['text/plain'].size
     assert_not_nil mms.media['image/jpeg']
     assert_equal 1, mms.media['image/jpeg'].size
     assert_file_size mms.media['image/jpeg'].first, 337
-  
+
     mms.purge
   end
 
   def test_default_media_should_return_user_generated_content
-    mail = TMail::Mail.parse(load_mail('netcom-image-01.mail').join)
+    mail = mail('netcom-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "5551234", mms.number
+    assert_equal "mms.netcom.no", mms.carrier
     file = mms.default_media
     assert_equal 337, file.size
-    
+
     mms.purge
-  end 
+  end
 
   def test_default_text_should_return_user_generated_content
-    mail = TMail::Mail.parse(load_mail('netcom-image-01.mail').join)
+    mail = mail('netcom-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "5551234", mms.number
+    assert_equal "mms.netcom.no", mms.carrier
     file = mms.default_text
     assert_equal "Morning greetings from norway. This is a mms from norwegian carrier netcom.", file.read
-    
+
     mms.purge
-  end 
-  
+  end
+
 end

data/test/test_mms_o2online_de.rb

@@ -1,25 +1,23 @@
-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 TestMmsO2onlineDe < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def test_subject
-    mail = TMail::Mail.parse(load_mail('o2-de-image-01.mail').join)
+    mail = mail('o2-de-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "o2.5551234", mms.number
+    assert_equal "mms.o2online.de", mms.carrier
     assert_equal "this is a subject", mms.subject
     mms.purge
   end
 
   def test_image
-    mail = TMail::Mail.parse(load_mail('o2-de-image-01.mail').join)
+    mail = mail('o2-de-image-01.mail')
     mms = MMS2R::Media.new(mail)
-  
+    assert_equal "o2.5551234", mms.number
+    assert_equal "mms.o2online.de", mms.carrier
+
     # o2 is ungly, you cant' tel the logo is different than user content by its file name
     assert_equal 2, mms.media.size
     assert_not_nil mms.media['text/plain']
@@ -27,27 +25,31 @@ class TestMmsO2onlineDe < Test::Unit::TestCase
     assert_not_nil mms.media['image/jpeg']
     assert_equal 2, mms.media['image/jpeg'].size
     assert mms.media['image/jpeg'].detect{|f| File.size(f) == 337}
-  
+
     mms.purge
   end
 
   def test_default_media_should_return_user_generated_content
-    mail = TMail::Mail.parse(load_mail('o2-de-image-01.mail').join)
+    mail = mail('o2-de-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "o2.5551234", mms.number
+    assert_equal "mms.o2online.de", mms.carrier
     file = mms.default_media
     assert_equal 1275, file.size
-    
+
     mms.purge
-  end 
+  end
 
   def test_default_text_should_return_user_generated_content
-    mail = TMail::Mail.parse(load_mail('o2-de-image-01.mail').join)
+    mail = mail('o2-de-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "o2.5551234", mms.number
+    assert_equal "mms.o2online.de", mms.carrier
     file = mms.default_text
     #assert_equal 42, file.size
-    assert_equal "This is text before the image. Thank you!\n", file.read
-    
+    assert_equal "This is text before the image. Thank you!", file.read.strip
+
     mms.purge
-  end 
-  
+  end
+
 end

data/test/test_mms_three_co_uk.rb

@@ -1,42 +1,42 @@
-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 TestMmsThreeCoUk < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def test_subject
-    mail = TMail::Mail.parse(load_mail('three-uk-image-01.mail').join)
+    mail = mail('three-uk-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "5551234", mms.number
+    assert_equal "mms.three.co.uk", mms.carrier
     assert_equal "", mms.subject
 
     mms.purge
   end
 
   def test_image
-    mail = TMail::Mail.parse(load_mail('three-uk-image-01.mail').join)
+    mail = mail('three-uk-image-01.mail')
     mms = MMS2R::Media.new(mail)
-  
+    assert_equal "5551234", mms.number
+    assert_equal "mms.three.co.uk", 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(/17102007.jpg$/, mms.media['image/jpeg'].first)
     assert_file_size mms.media['image/jpeg'].first, 337
-  
+
     mms.purge
   end
 
   def test_default_media_should_return_user_generated_content
-    mail = TMail::Mail.parse(load_mail('three-uk-image-01.mail').join)
+    mail = mail('three-uk-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "5551234", mms.number
+    assert_equal "mms.three.co.uk", mms.carrier
     file = mms.default_media
     assert_equal '17102007.jpg', file.original_filename
-    
+
     mms.purge
-  end 
-  
+  end
+
 end

data/test/test_mms_vodacom4me_co_za.rb

@@ -1,56 +1,55 @@
-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 TestMmsVodacom4meCoZa < Test::Unit::TestCase
   include MMS2R::TestHelper
-  
+
   def test_image_only
-    mail = TMail::Mail.parse(load_mail('vodacom4me-co-za-01.mail').join)
+    mail = mail('vodacom4me-co-za-01.mail')
     mms = MMS2R::Media.new(mail)
-    
+    assert_equal "+2068675309", mms.number
+    assert_equal "mms.vodacom4me.co.za", mms.carrier
+
     assert_nil mms.media['text/plain']
     assert_nil mms.media['text/html']
-    
+
     assert_not_nil mms.media['image/jpeg'].first
     assert_match(/Ugly\.jpg$/, mms.media['image/jpeg'].first)
     mms.purge
   end
 
   def test_should_have_phone_number
-    mail = TMail::Mail.parse(load_mail('vodacom4me-co-za-01.mail').join)
+    mail = mail('vodacom4me-co-za-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "+2068675309", mms.number
+    assert_equal "mms.vodacom4me.co.za", mms.carrier
 
-    assert_equal '+2068675309', mms.number
-    
     mms.purge
   end
-  
+
   def test_image_and_text
-    mail = TMail::Mail.parse(load_mail('vodacom4me-co-za-02.mail').join)
+    mail = mail('vodacom4me-co-za-02.mail')
     mms = MMS2R::Media.new(mail)
-    
+    assert_equal "+2068675309", mms.number
+    assert_equal "mms.vodacom4me.co.za", mms.carrier
+
     assert_not_nil mms.media['text/plain']
     assert_equal "Hello World", open(mms.media['text/plain'].first).read
-    
+
     assert_nil mms.media['text/html']
-    
+
     assert_not_nil mms.media['image/jpeg'].first
     assert_match(/DSC00184\.JPG$/, mms.media['image/jpeg'].first)
     mms.purge
   end
 
   def test_new_image_and_number
-    mail = TMail::Mail.parse(load_mail('vodacom4me-southafrica-mms-01.mail').join)
+    mail = mail('vodacom4me-southafrica-mms-01.mail')
     mms = MMS2R::Media.new(mail)
-    
+    assert_equal "+12345678901", mms.number
+    assert_equal "mms.vodacom4me.co.za", mms.carrier
+
     assert_nil mms.media['text/plain']
     assert_nil mms.media['text/html']
-    assert_equal '+12345678901', mms.number
 
     assert_equal 1, mms.media.size
     assert_equal 1, mms.media['image/gif'].size
@@ -60,12 +59,13 @@ class TestMmsVodacom4meCoZa < Test::Unit::TestCase
   end
 
   def test_new_lots_of_images
-    mail = TMail::Mail.parse(load_mail('vodacom4me-southafrica-mms-04.mail').join)
+    mail = mail('vodacom4me-southafrica-mms-04.mail')
     mms = MMS2R::Media.new(mail)
-    
+    assert_equal "+12345678901", mms.number
+    assert_equal "mms.vodacom4me.co.za", mms.carrier
+
     assert_nil mms.media['text/plain']
     assert_nil mms.media['text/html']
-    assert_equal '+12345678901', mms.number
 
     assert_not_nil mms.media['image/gif'].at(0)
     assert_match(/ZedLandingMedium\.gif$/, mms.media['image/gif'].at(0))

data/test/test_mobile_indosat_net_id.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 TestMobileIndosatNetId < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def test_mms_indosat_with_yahoo_service
     # mobile.indosat.net.id service
-    mail = TMail::Mail.parse(load_mail('indosat-image-01.mail').join)
+    mail = mail('indosat-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "2068675309", mms.number
     assert_equal "mobile.indosat.net.id", mms.carrier
     assert_equal "", mms.subject
     assert_nil mms.media['text/html']
@@ -28,16 +23,18 @@ class TestMobileIndosatNetId < Test::Unit::TestCase
 
   def test_mms_indosat_phone_number_with_yahoo_service
     # mobile.indosat.net.id service
-    mail = TMail::Mail.parse(load_mail('indosat-image-01.mail').join)
+    mail = mail('indosat-image-01.mail')
     mms = MMS2R::Media.new(mail)
     assert_equal "2068675309", mms.number
+    assert_equal "mobile.indosat.net.id", mms.carrier
     mms.purge
   end
 
   def test_mms_indosat
     # mobile.indosat.net.id service
-    mail = TMail::Mail.parse(load_mail('indosat-image-02.mail').join)
+    mail = mail('indosat-image-02.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "2068675309", mms.number
     assert_equal "mobile.indosat.net.id", mms.carrier
     assert_equal "Please pick up while I prepair another.", mms.subject
     assert_nil mms.media['text/html']