mms2r 2.4.1 → 3.0.0

data/test/test_msg_telus_com.rb

@@ -1,28 +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 TestMsgTelusCom < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def test_subject_number_image
-    mail = TMail::Mail.parse(load_mail('telus-image-01.mail').join)
+    mail = mail('telus-image-01.mail')
     mms = MMS2R::Media.new(mail)
 
     assert_equal "", mms.subject
     assert_equal "2068675309", mms.number
+    assert_equal "mms.telusmobility.com", mms.carrier
 
     assert_equal 1, mms.media.size
     assert_equal 1, mms.media['image/jpeg'].size
 
-    image = mms.media['image/jpeg'].detect{|f| /Lil%20bud%202.jpg/ =~ f}
-    assert_equal 337, File.size(image) 
+    image = mms.media['image/jpeg'].detect{|f| /Lil bud 2.jpg/ =~ f}
+    assert_equal 337, File.size(image)
 
     mms.purge
   end
-  
+
 end

data/test/test_orangemms_net.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 TestOrangemmsNet < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def test_orangemms_subject
     # orangemms.net service
-    mail = TMail::Mail.parse(load_mail('orange-uk-image-01.mail').join)
+    mail = mail('orange-uk-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "5551234", mms.number
+    assert_equal "orangemms.net", mms.carrier
     assert_equal "", mms.subject
     mms.purge
   end
 
   def test_orangemms_image
     # orangemms.net service
-    mail = TMail::Mail.parse(load_mail('orange-uk-image-01.mail').join)
+    mail = mail('orange-uk-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "5551234", mms.number
+    assert_equal "orangemms.net", mms.carrier
 
     assert_equal 1, mms.media.size
     assert_nil mms.media['text/plain']
@@ -35,16 +33,20 @@ class TestOrangemmsNet < Test::Unit::TestCase
 
   def test_orange_france_subject
     # orange.fr service
-    mail = TMail::Mail.parse(load_mail('orangefrance-text-and-image.mail').join)
+    mail = mail('orangefrance-text-and-image.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "0688675309", mms.number
+    assert_equal "orange.fr", mms.carrier
     assert_equal "", mms.subject
     mms.purge
   end
 
   def test_orange_france_processed_content
     # orange.fr service
-    mail = TMail::Mail.parse(load_mail('orangefrance-text-and-image.mail').join)
+    mail = mail('orangefrance-text-and-image.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "0688675309", mms.number
+    assert_equal "orange.fr", mms.carrier
 
     # there should be one text and one image
     assert_equal 2, mms.media.size
@@ -52,7 +54,7 @@ class TestOrangemmsNet < Test::Unit::TestCase
     #text
     # there is a text banner that Orange attaches but
     # that should be ignored
-    assert_not_nil mms.media['text/plain'] 
+    assert_not_nil mms.media['text/plain']
     assert_equal 1, mms.media['text/plain'].size
     file = mms.media['text/plain'].first
     assert File::exist?(file), "file #{file} does not exist"
@@ -60,34 +62,40 @@ class TestOrangemmsNet < Test::Unit::TestCase
     assert_match(/Test ma poule/, text)
 
     # image
-    assert_not_nil mms.media['image/jpeg'] 
+    assert_not_nil mms.media['image/jpeg']
     assert_equal 1, mms.media['image/jpeg'].size
     assert_match(/IMAGE.jpeg$/, mms.media['image/jpeg'].first)
     assert_file_size mms.media['image/jpeg'].first, 337
 
     mms.purge
   end
-  
+
   def test_orange_poland_subject
     # mmsemail.orange.pl service
-    mail = TMail::Mail.parse(load_mail('orangepoland-text-01.mail').join)
+    mail = mail('orangepoland-text-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "48508675309", mms.number
+    assert_equal "mmsemail.orange.pl", mms.carrier
     assert_equal "", mms.subject
     mms.purge
   end
 
   def test_orange_poland_non_empty_subject
     # mmsemail.orange.pl service
-    mail = TMail::Mail.parse(load_mail('orangepoland-text-02.mail').join)
+    mail = mail('orangepoland-text-02.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "48508675309", mms.number
+    assert_equal "mmsemail.orange.pl", mms.carrier
     assert mms.subject, "whazzup"
     mms.purge
   end
 
   def test_orange_poland_content
     # mmsemail.orange.pl service
-    mail = TMail::Mail.parse(load_mail('orangepoland-text-01.mail').join)
+    mail = mail('orangepoland-text-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "48508675309", mms.number
+    assert_equal "mmsemail.orange.pl", mms.carrier
     assert_not_nil mms.media['text/plain']
     file = mms.media['text/plain'][0]
     assert_not_nil file
@@ -96,5 +104,5 @@ class TestOrangemmsNet < Test::Unit::TestCase
     assert_match(/pozdro600/, text)
     mms.purge
   end
-  
+
 end

data/test/test_pm_sprint_com.rb

@@ -1,16 +1,10 @@
-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 TestPmSprintCom < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def mock_sprint_image(message_id)
-    uri = URI.parse('http://pictures.sprintpcs.com//mmps/RECIPIENT/001_2066c7013e7ca833_1/2?wm=1&ext=.jpg&iconifyVideo=true&inviteToken=PE5rJ5PdYzzwk7V7zoXU&outquality=90') 
+    uri = URI.parse('http://pictures.sprintpcs.com//mmps/RECIPIENT/001_2066c7013e7ca833_1/2?wm=1&ext=.jpg&iconifyVideo=true&inviteToken=PE5rJ5PdYzzwk7V7zoXU&outquality=90')
     res = mock()
     body = mock()
     res.expects(:content_type).at_least_once.returns('image/jpeg')
@@ -20,7 +14,7 @@ class TestPmSprintCom < Test::Unit::TestCase
   end
 
   def mock_sprint_purged_image(message_id)
-    uri = URI.parse('http://pictures.sprintpcs.com//mmps/RECIPIENT/001_2066c7013e7ca833_1/2?wm=1&ext=.jpg&iconifyVideo=true&inviteToken=PE5rJ5PdYzzwk7V7zoXU&outquality=90') 
+    uri = URI.parse('http://pictures.sprintpcs.com//mmps/RECIPIENT/001_2066c7013e7ca833_1/2?wm=1&ext=.jpg&iconifyVideo=true&inviteToken=PE5rJ5PdYzzwk7V7zoXU&outquality=90')
     res = mock()
     body = mock()
     res.expects(:content_type).once.returns('text/html')
@@ -30,8 +24,10 @@ class TestPmSprintCom < Test::Unit::TestCase
   end
 
   def test_mms_should_have_text
-    mail = TMail::Mail.parse(load_mail('sprint-text-01.mail').join)
+    mail = mail('sprint-text-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "2068765309", mms.number
+    assert_equal "pm.sprint.com", mms.carrier
 
     assert_equal 1, mms.media.size
     assert_equal 1, mms.media['text/plain'].size
@@ -43,15 +39,16 @@ class TestPmSprintCom < Test::Unit::TestCase
   end
 
   def test_mms_should_have_a_phone_number
-    mail = TMail::Mail.parse(load_mail('sprint-image-01.mail').join)
+    mail = mail('sprint-image-01.mail')
     mms = MMS2R::Media.new(mail)
 
     assert_equal '2068675309', mms.number
+    assert_equal "pm.sprint.com", mms.carrier
     mms.purge
   end
 
   def test_should_have_simple_video
-    mail = TMail::Mail.parse(load_mail('sprint-video-01.mail').join)
+    mail = mail('sprint-video-01.mail')
 
     uri = URI.parse(
      'http://pictures.sprintpcs.com//mmps/RECIPIENT/000_259e41e851be9b1d_1/2?inviteToken=lEvrJnPVY5UfOYmahQcx&amp;iconifyVideo=true&amp;wm=1&amp;limitsize=125,125&amp;outquality=90&amp;squareoutput=255,255,255&amp;ext=.jpg&amp;iconifyVideo=true&amp;wm=1')
@@ -63,6 +60,8 @@ class TestPmSprintCom < Test::Unit::TestCase
     Net::HTTP.expects(:get_response).once.returns res
 
     mms = MMS2R::Media.new(mail)
+    assert_equal '2068675309', mms.number
+    assert_equal "pm.sprint.com", mms.carrier
 
     assert_equal 1, mms.media.size
     assert_nil mms.media['text/plain']
@@ -75,9 +74,11 @@ class TestPmSprintCom < Test::Unit::TestCase
   end
 
   def test_should_have_simple_image
-    mail = TMail::Mail.parse(load_mail('sprint-image-01.mail').join)
+    mail = mail('sprint-image-01.mail')
     mock_sprint_image(mail.message_id)
     mms = MMS2R::Media.new(mail)
+    assert_equal '2068675309', mms.number
+    assert_equal "pm.sprint.com", mms.carrier
 
     assert_equal 1, mms.media.size
     assert_nil mms.media['text/plain']
@@ -89,9 +90,11 @@ class TestPmSprintCom < Test::Unit::TestCase
   end
 
   def test_collect_image_using_block
-    mail = TMail::Mail.parse(load_mail('sprint-image-01.mail').join)
+    mail = mail('sprint-image-01.mail')
     mock_sprint_image(mail.message_id)
     mms = MMS2R::Media.new(mail)
+    assert_equal '2068675309', mms.number
+    assert_equal "pm.sprint.com", mms.carrier
     assert_equal 1, mms.media.size
     file_array = nil
     mms.process do |k, v|
@@ -105,9 +108,11 @@ class TestPmSprintCom < Test::Unit::TestCase
   end
 
   def test_process_internals_should_only_be_executed_once
-    mail = TMail::Mail.parse(load_mail('sprint-image-01.mail').join)
+    mail = mail('sprint-image-01.mail')
     mock_sprint_image(mail.message_id)
     mms = MMS2R::Media.new(mail)
+    assert_equal '2068675309', mms.number
+    assert_equal "pm.sprint.com", mms.carrier
     assert_equal 1, mms.media.size
 
     # second time through shouldn't go into the was_processed block
@@ -119,7 +124,7 @@ class TestPmSprintCom < Test::Unit::TestCase
   end
 
   def test_should_have_two_images
-    mail = TMail::Mail.parse(load_mail('sprint-two-images-01.mail').join)
+    mail = mail('sprint-two-images-01.mail')
 
     uri1 = URI.parse('http://pictures.sprintpcs.com/mmps/RECIPIENT/001_104058d23d79fb6a_1/2?wm=1&ext=.jpg&iconifyVideo=true&inviteToken=5E1rJSPk5hYDkUnY7op0&outquality=90')
     res1 = mock()
@@ -138,6 +143,8 @@ class TestPmSprintCom < Test::Unit::TestCase
     res2.expects(:code).never
     Net::HTTP.expects(:get_response).returns res2
     mms = MMS2R::Media.new(mail)
+    assert_equal '2068675309', mms.number
+    assert_equal "pm.sprint.com", mms.carrier
 
     assert_equal 1, mms.media.size
     assert_nil mms.media['text/plain']
@@ -147,14 +154,16 @@ class TestPmSprintCom < Test::Unit::TestCase
     assert_not_nil mms.media['image/jpeg'][1]
     assert_match(/001_104058d23d79fb6a_1-0.jpg$/, mms.media['image/jpeg'][0])
     assert_match(/001_104058d23d79fb6a_1-1.jpg$/, mms.media['image/jpeg'][1])
-    
+
     mms.purge
   end
 
   def test_image_should_be_missing
-    # this test is questionable 
-    mail = TMail::Mail.parse(load_mail('sprint-broken-image-01.mail').join)
+    # this test is questionable
+    mail = mail('sprint-broken-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal '2068675309', mms.number
+    assert_equal "pm.sprint.com", mms.carrier
 
     assert_equal 0, mms.media.size
 
@@ -162,9 +171,11 @@ class TestPmSprintCom < Test::Unit::TestCase
   end
 
   def test_image_should_be_purged_from_content_server
-    mail = TMail::Mail.parse(load_mail('sprint-image-01.mail').join)
+    mail = mail('sprint-image-01.mail')
     mock_sprint_purged_image(mail.message_id)
     mms = MMS2R::Media.new(mail)
+    assert_equal '2068675309', mms.number
+    assert_equal "pm.sprint.com", mms.carrier
 
     assert_equal 0, mms.media.size
 
@@ -172,16 +183,18 @@ class TestPmSprintCom < Test::Unit::TestCase
   end
 
   def test_body_should_return_empty_when_there_is_no_user_text
-    mail = TMail::Mail.parse(load_mail('sprint-image-01.mail').join)
+    mail = mail('sprint-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal '2068675309', mms.number
+    assert_equal "pm.sprint.com", mms.carrier
     assert_equal "", mms.body
   end
 
   def test_sprint_write_file
     require 'tempfile'
     mail = mock(:message_id => 'a')
-    mail.expects(:header).at_least_once.returns({})
     mail.expects(:from).at_least_once.returns(['joe@pm.sprint.com'])
+    mail.expects(:return_path).at_least_once.returns('joe@pm.sprint.com')
     s = MMS2R::Media::Sprint.new(mail, :process => :lazy)
     type = 'text/plain'
     content = 'foo'
@@ -194,8 +207,10 @@ class TestPmSprintCom < Test::Unit::TestCase
   end
 
   def test_subject
-    mail = TMail::Mail.parse(load_mail('sprint-image-01.mail').join)
+    mail = mail('sprint-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal '2068675309', mms.number
+    assert_equal "pm.sprint.com", mms.carrier
     assert_equal "", mms.subject
   end
 

data/test/test_pxt_vodafone_net_nz.rb

@@ -1,35 +1,31 @@
-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 TestPxtVodafoneNetNz < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def setup
-    mail = TMail::Mail.parse(load_mail('pxt-image-01.mail').join)
+    mail = mail('pxt-image-01.mail')
     @mms = MMS2R::Media.new(mail)
+    assert_equal '+55512345', @mms.number
+    assert_equal 'pxt.vodafone.net.nz', @mms.carrier
   end
-  
+
   def teardown
     @mms.purge
   end
 
   def test_pxt_text_returns_text_plain
     assert_not_nil(@mms.media['text/plain'])
-    
+
     file = @mms.media['text/plain'][0]
     assert_not_nil(file)
     assert(File::exist?(file), "file #{file} does not exist")
     text = IO.readlines("#{file}").join
     assert_match(/Kia ora ano Luke/, text)
-    
+
     assert_match(/Kia ora ano Luke/, @mms.body)
   end
-  
+
   def test_subject_should_clear_default_pxt_message
     assert_equal "", @mms.subject
   end

data/test/test_rci_rogers_com.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 TestRciRogersCom < Test::Unit::TestCase
   include MMS2R::TestHelper
-  
+
   def test_image_and_text_and_number
-    mail = TMail::Mail.parse(load_mail('rogers-canada-mms-01.mail').join)
+    mail = mail('rogers-canada-mms-01.mail')
     mms = MMS2R::Media.new(mail)
 
     assert_equal "1234567890", mms.number
+    assert_equal 'rci.rogers.com', mms.carrier
     assert_equal "", mms.subject
 
     assert_equal 1, mms.media.size

data/test/test_sms_sasktel_com.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 TestSmsSasktelCom < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def test_sms_sasktel_com
     # sms.sasktel.com service
-    mail = TMail::Mail.parse(load_mail('sasktel-image-01.mail').join)
+    mail = mail('sasktel-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "3068675309", mms.number
     assert_equal "sms.sasktel.com", mms.carrier
     assert_equal "", mms.subject
     assert_nil mms.media['text/html']

data/test/test_tmomail_net.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 TestTmomailNet < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def test_ignore_simple_image
-    mail = TMail::Mail.parse(load_mail('tmobile-image-01.mail').join)
+    mail = mail('tmobile-image-01.mail')
     mms = MMS2R::Media.new(mail)
+    assert_equal "2068675309", mms.number
+    assert_equal "tmomail.net", mms.carrier
 
     assert_equal 1, mms.media.size
     assert_nil mms.media['text/plain']
@@ -23,53 +19,59 @@ class TestTmomailNet < Test::Unit::TestCase
 
     mms.purge
   end
-  
+
   def test_message_with_body_text
-    mail = TMail::Mail.parse(load_mail('tmobile-image-02.mail').join)
+    mail = mail('tmobile-image-02.mail')
     mms = MMS2R::Media.new(mail)
-    
+    assert_equal "16128675309", mms.number
+    assert_equal "tmomail.net", mms.carrier
+
     assert_equal 2, mms.media.size
     assert_not_nil mms.media['text/plain']
     assert_nil mms.media['text/html']
     assert_not_nil mms.media['image/jpeg'][0]
     assert_match(/07-25-05_0935.jpg$/, mms.media['image/jpeg'][0])
-    
+
     assert_file_size mms.media['image/jpeg'][0], 337
-    
+
     file = mms.media['text/plain'][0]
     assert_not_nil file
     assert File::exist?(file), "file #{file} does not exist"
     text = IO.readlines("#{file}").join
     assert_equal "Lillies", text.strip
-    
+
     mms.purge
   end
-  
+
   def test_image_from_blackberry
-    mail = TMail::Mail.parse(load_mail('tmobile-blackberry.mail').join)
+    mail = mail('tmobile-blackberry.mail')
     mms = MMS2R::Media.new(mail)
-    
+    assert_equal "2068675309", mms.number
+    assert_equal "srs.bis.na.blackberry.com", mms.carrier
+
     assert_nil mms.media['text/plain']
-    
+
     assert_not_nil mms.media['image/jpeg'].first
     assert_match(/Windows-1252\?B\?SU1HMDAyMzkuanBn/, mms.media['image/jpeg'].first)
     mms.purge
   end
 
   def test_image_from_blackberry2
-    mail = TMail::Mail.parse(load_mail('tmobile-blackberry-02.mail').join)
+    mail = mail('tmobile-blackberry-02.mail')
     mms = MMS2R::Media.new(mail)
-    
+    assert_equal "2068675309", mms.number
+    assert_equal "example.com", mms.carrier
+
     assert_equal 1, mms.media.size
     assert_nil mms.media['text/plain']
-    
+
     assert_not_nil mms.media['image/jpeg'].first
     assert_match(/Windows-1252\?B\?SU1HMDAxNDEuanBn/, mms.media['image/jpeg'].first)
     mms.purge
   end
-  
+
   def test_tmobile_uk_image_and_text_and_number
-    mail = TMail::Mail.parse(load_mail('mmsreply.t-mobile.co.uk-text-image-01.mail').join)
+    mail = mail('mmsreply.t-mobile.co.uk-text-image-01.mail')
     mms = MMS2R::Media.new(mail)
 
     assert_equal '12345678901', mms.number
@@ -89,7 +91,7 @@ class TestTmomailNet < Test::Unit::TestCase
   end
 
   def test_tmo_blackberry_net
-    mail = TMail::Mail.parse(load_mail('tmo.blackberry.net-image-01.mail').join)
+    mail = mail('tmo.blackberry.net-image-01.mail')
     mms = MMS2R::Media.new(mail)
 
     assert_equal '2068675309', mms.number