RubyGems - mms2r - Versions diffs - 1.1.10 → 1.1.11 - Mend

mms2r 1.1.10 → 1.1.11

Files changed (20) hide show

data/History.txt +16 -1
data/Manifest.txt +2 -2
data/README.txt +8 -7
data/conf/mms2r_t_mobile_media_ignore.yml +2 -1
data/lib/mms2r.rb +3 -3
data/lib/mms2r/{a_t_t_media.rb → att_media.rb} +1 -1
data/lib/mms2r/helio_media.rb +2 -3
data/lib/mms2r/media.rb +50 -10
data/lib/mms2r/sprint_media.rb +8 -1
data/test/test_mms2r_alltel_media.rb +2 -2
data/test/{test_mms2r_a_t_t_media.rb → test_mms2r_att_media.rb} +4 -4
data/test/test_mms2r_dobson_media.rb +2 -2
data/test/test_mms2r_helio_media.rb +8 -8
data/test/test_mms2r_media.rb +14 -14
data/test/test_mms2r_my_cingular_media.rb +2 -2
data/test/test_mms2r_nextel_media.rb +4 -4
data/test/test_mms2r_orange_france_media.rb +3 -3
data/test/test_mms2r_orange_poland_media.rb +2 -2
data/test/test_mms2r_sprint_media.rb +22 -8
metadata +6 -6

data/History.txt CHANGED Viewed

@@ -1,9 +1,24 @@
+== 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven)
+* minor fix for attachment_fu where it might call #path on the cgi temp file
+  that is returned by get_attachment
+* renamed a_t_t_media.rb to att_media.rb to make it autotest happy
+* masthead.jpg misplaced in mms2r_t_mobile_media_ignore.yml (Layton Wedgeworth)
+* overridden SprintMedia#process failed to accept block (Layton Wedgeworth)
+* added method_deprecated to help mark methods that are going to be deprecated
+  in preparation of 1.2.x release
+* #get_number marked deprecated, use #number instead
+* #get_subject marked deprecated, use #subject instead
+* #get_body marked deprecated, use #body instead
+* #get_text marked deprecated, use #default_text instead
+* #get_attachment marked deprecated, use #attachment instead
+* #get_media marked deprecated, use #default_media instead
 == 1.1.10 / 2007-09-30 (Face Bones)
 * fixed a case for a nil match on From in the create method (Luke Francl)
 * added support for Alltel message.alltel.com (Ben Wood)
 == 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan
 Explosion)

data/Manifest.txt CHANGED Viewed

@@ -21,8 +21,8 @@ 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/alltel_media.rb
+lib/mms2r/att_media.rb
 lib/mms2r/cingular_me_media.rb
 lib/mms2r/dobson_media.rb
 lib/mms2r/helio_media.rb
@@ -101,8 +101,8 @@ 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_alltel_media.rb
+test/test_mms2r_att_media.rb
 test/test_mms2r_cingular_me_media.rb
 test/test_mms2r_dobson_media.rb
 test/test_mms2r_helio_media.rb

data/README.txt CHANGED Viewed

@@ -36,7 +36,8 @@ Corpus of carriers currently processed by MMS2R:
 == FEATURES
-* get_media and get_text methods return a File that can be used in attachment_fu
+* #default_media and #default_text methods return a File that can be used in
+  attachment_fu
 == SYNOPSIS:
@@ -58,18 +59,18 @@ 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!" unless mms.get_subject
+  puts "MMS has default carrier subject!" unless mms.subject
   # access the senders phone number
-  puts "MMS was from phone #{mms.get_number}"
+  puts "MMS was from phone #{mms.number}"
-  # most MMS are either image or video, get_media will return the largest
+  # most MMS are either image or video, default_media will return the largest
   # (non-advertising) video or image found
-  file = mms.get_media
+  file = mms.default_media
   puts "MMS had a media: #{file.inspect}" unless file.nil?
-  # get_text return the largest (non-advertising) text found
-  file = mms.get_text
+  # text return the largest (non-advertising) text found
+  file = mms.default_text
   puts "MMS had some text: #{file.inspect}" unless file.nil?
   # mms.media is a hash that is indexed by mime-type.

data/conf/mms2r_t_mobile_media_ignore.yml CHANGED Viewed

@@ -1,12 +1,13 @@
 ---
 text/html:
 - !ruby/regexp /^<html> <head> <title>T-Mobile</title>/
+image/jpeg:
+- masthead.jpg
 image/gif:
 - dottedline350.gif
 - dottedline600.gif
 - dottedLine_350.gif
 - dottedLine_600.gif
-- masthead.jpg
 - spacer.gif
 - video.gif
 - audio.gif

data/lib/mms2r.rb CHANGED Viewed

@@ -7,7 +7,7 @@
 $:.unshift(File.dirname(__FILE__) + "/vendor/")
 require 'mms2r/media'
 require 'mms2r/alltel_media'
-require 'mms2r/a_t_t_media'
+require 'mms2r/att_media'
 require 'mms2r/cingular_me_media'
 require 'mms2r/dobson_media'
 require 'mms2r/helio_media'
@@ -33,7 +33,7 @@ module MMS2R
   CARRIER_CLASSES = {
     'message.alltel.com' => MMS2R::AlltelMedia,
-    'mms.att.net' => MMS2R::ATTMedia,
+    'mms.att.net' => MMS2R::AttMedia,
     'cingularme.com' => MMS2R::CingularMeMedia,
     'mms.dobson.net' => MMS2R::DobsonMedia,
     'mms.myhelio.com' => MMS2R::HelioMedia,
@@ -67,7 +67,7 @@ module MMS2R
     ##
     # MMS2R Library version
-    VERSION = '1.1.10'
+    VERSION = '1.1.11'
     end

data/lib/mms2r/{a_t_t_media.rb → att_media.rb} RENAMED Viewed

@@ -8,6 +8,6 @@ module MMS2R
   # message can be the file name of the media attached
   # to the MMS or empty.
-  class MMS2R::ATTMedia < MMS2R::Media
+  class MMS2R::AttMedia < MMS2R::Media
   end
 end

data/lib/mms2r/helio_media.rb CHANGED Viewed

@@ -11,9 +11,8 @@ module MMS2R
   # in the markup.
   class MMS2R::HelioMedia < MMS2R::Media
-    def get_body
-      text = get_text()
-      d = Hpricot(text)
+    def body
+      d = Hpricot(default_text())
       body = d.search("//table/tr[2]/td/table/tr/td/table/tr[6]/td").inner_html
       body
     end

data/lib/mms2r/media.rb CHANGED Viewed

@@ -111,17 +111,22 @@ module MMS2R
     # your application on your own.  Most carriers are using the real
     # phone number as the username.
-    def get_number
+    def number
       # override this method in a child if the number exists elsewhere (like Sprint)
       @number ||= /^([^@]+)@/.match(mail.from[0])[1]
     end
+    def get_number # :nodoc:
+      sclz.method_deprecated(:get_number, :number)
+      self.number
+    end
     ##
     # Filter some common place holder subjects from MMS messages and
     # return nil such that default carrier subjects can be pragmatically
     # ignored.
-    def get_subject
+    def subject
       return @subject if @subject # we've already done the work
@@ -142,14 +147,19 @@ module MMS2R
       return @subject ||= nil if a.detect{|r| r.match(subject.strip)}
       return @subject ||= subject
     end
+    def get_subject # :nodoc:
+      sclz.method_deprecated(:get_subject, :subject)
+      self.subject
+    end
     # Convenience method that returns a string including all the text of the
     # first text/plain file found. Returns empty string if no body text
     # is found.
-    def get_body
+    def body
       return @body if @body
-      text_file = get_text
+      text_file = default_text
       if text_file.nil?
         return @body ||= nil
       end
@@ -157,6 +167,11 @@ module MMS2R
       return @body ||= IO.readlines(text_file.path).join.strip
     end
+    def get_body # :nodoc:
+      sclz.method_deprecated(:get_body, :body)
+      self.body
+    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
@@ -166,8 +181,13 @@ module MMS2R
     #
     # Returns nil if there are not any video or image Files found.
-    def get_media
-      return @default_media ||= get_attachement(['video', 'image'])
+    def default_media
+      return @default_media ||= attachement(['video', 'image'])
+    end
+    def get_media # :nodoc:
+      sclz.method_deprecated(:get_media, :default_media)
+      self.default_media
     end
     # Returns a File with the most likely candidate that is text, or nil
@@ -177,8 +197,13 @@ module MMS2R
     #
     # Returns nil if there are not any text Files found
-    def get_text
-      return @default_text ||= get_attachement(['text'])
+    def default_text
+      return @default_text ||= attachement(['text'])
+    end
+    def get_text # :nodoc:
+      sclz.method_deprecated(:get_text, :default_text)
+      self.default_text
     end
     ##
@@ -535,10 +560,10 @@ module MMS2R
     private
     ##
-    # used by get_media and get_text to return the biggest attachment type
+    # used by #default_media and #text to return the biggest attachment type
     # listed in the types array
-    def get_attachement(types)
+    def attachement(types)
       # get all the files that are of the major types passed in
       files = Array.new
@@ -568,10 +593,13 @@ module MMS2R
         end
       end
+      return nil if file.nil?
       # These singleton methods implement the interface necessary to be used
       # as a drop-in replacement for files uploaded with CGI.rb.
       # This helps if you want to use the files with, for example,
       # attachment_fu.
       def file.local_path
         self.path
       end
@@ -592,6 +620,18 @@ module MMS2R
       file
     end
+    def get_attachement(types) # :nodoc:
+      sclz.method_deprecated(:get_attachment, :attachment)
+      self.attachement(types)
+    end
+    def self.method_deprecated(from, to) # :nodoc:
+      msg = "Method '#{from}' has been deprecated use method '#{to}'." +
+            "\nMethod '#{from}' will be removed in a future release"
+      @logger.error(msg) if @logger
+      $stderr.puts msg
+    end
   end
 end

data/lib/mms2r/sprint_media.rb CHANGED Viewed

@@ -52,6 +52,13 @@ module MMS2R
       sprint_process_text(doc)
       sprint_process_media(doc)
+      # when process acts upon a block
+      if block_given?
+        media.each do |k, v|
+          yield(k, v)
+        end
+      end
     end
     private
@@ -62,7 +69,7 @@ module MMS2R
     def sprint_phone_number(doc)
       c = doc.search("/html/head/comment()").last
       t = c.content.gsub(/\s+/m," ").strip
-      #@number returned in parent's get_number
+      #@number returned in parent's #number
       @number = / name=&quot;MDN&quot;&gt;(\d+)&lt;/.match(t)[1]
     end

data/test/test_mms2r_alltel_media.rb CHANGED Viewed

@@ -27,11 +27,11 @@ class MMS2R::AlltelMediaTest < Test::Unit::TestCase
     mms.purge
   end
-  def test_get_media_should_return_user_generated_content
+  def test_default_media_should_return_user_generated_content
     mail = TMail::Mail.parse(load_mail('alltel-image-01.mail').join)
     mms = MMS2R::Media.create(mail)
     mms.process
-    file = mms.get_media
+    file = mms.default_media
     assert_equal 'eastern sky.jpg', file.original_filename
     mms.purge
   end

data/test/{test_mms2r_a_t_t_media.rb → test_mms2r_att_media.rb} RENAMED Viewed

@@ -7,7 +7,7 @@ require 'mms2r/media'
 require 'tmail/mail'
 require 'logger'
-class MMS2R::ATTMediaTest < Test::Unit::TestCase
+class MMS2R::AttMediaTest < Test::Unit::TestCase
   include MMS2R::TestHelper
   def setup
@@ -21,7 +21,7 @@ class MMS2R::ATTMediaTest < Test::Unit::TestCase
   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}")
+    assert_equal(MMS2R::AttMedia, mms.class, "expected a #{MMS2R::AttMedia} and received a #{mms.class}")
     mms.process
     assert(mms.media.size == 1)
@@ -37,7 +37,7 @@ class MMS2R::ATTMediaTest < Test::Unit::TestCase
   def test_subject
     mail = TMail::Mail.parse(load_mail('att-image-02.mail').join)
     mms = MMS2R::Media.create(mail)
-    assert_equal(MMS2R::ATTMedia, mms.class, "expected a #{MMS2R::ATTMedia} and received a #{mms.class}")
+    assert_equal(MMS2R::AttMedia, mms.class, "expected a #{MMS2R::AttMedia} and received a #{mms.class}")
     mms.process
     assert(mms.media.size == 1)
@@ -48,7 +48,7 @@ class MMS2R::ATTMediaTest < Test::Unit::TestCase
     assert_file_size(mms.media['image/jpeg'][0], 337)
-    assert_nil mms.get_subject
+    assert_nil mms.subject
     mms.purge
   end
 end

data/test/test_mms2r_dobson_media.rb CHANGED Viewed

@@ -34,12 +34,12 @@ class MMS2R::DobsonMediaTest < Test::Unit::TestCase
     mms.purge
   end
-  def test_get_body_should_return_user_text
+  def test_body_should_return_user_text
     mail = TMail::Mail.parse(load_mail('dobson-image-01.mail').join)
     mms = MMS2R::Media.create(mail)
     mms.process
-    assert_equal 'Body', mms.get_body
+    assert_equal 'Body', mms.body
     mms.purge
   end

data/test/test_mms2r_helio_media.rb CHANGED Viewed

@@ -21,23 +21,23 @@ class MMS2R::HelioMediaTest < Test::Unit::TestCase
     assert_equal @mms.class, MMS2R::HelioMedia
   end
-  def test_get_number_should_return_correct_number
-    number = @mms.get_number()
+  def test_number_should_return_correct_number
+    number = @mms.number()
     assert_equal number, 7608070850.to_s
   end
-  def test_get_subject_should_return_correct_subject
-    title = @mms.get_subject()
+  def test_subject_should_return_correct_subject
+    title = @mms.subject()
     assert_equal title, "Test image"
   end
-  def test_get_body_should_return_correct_body
-    body = @mms.get_body()
+  def test_body_should_return_correct_body
+    body = @mms.body()
     assert_equal body, "Test image"
   end
-  def test_get_attachment_should_return_jpeg
-    image = @mms.get_media()
+  def test_attachment_should_return_jpeg
+    image = @mms.default_media()
     assert_not_nil @mms.media['image/jpeg'][0]
     assert_match(/0628070005.jpg$/, @mms.media['image/jpeg'][0])
   end

data/test/test_mms2r_media.rb CHANGED Viewed

@@ -216,20 +216,20 @@ class MMS2R::MediaTest < Test::Unit::TestCase
     mms.purge
   end
-  def test_mms_with_two_images_should_get_media_to_largest_file
+  def test_mms_with_two_images_should_default_media_to_largest_file
     mail = TMail::Mail.parse(load_mail('simple-with-two-images-two-texts.mail').join)
     mms = MMS2R::Media.create(mail)
     mms.process
-    file = mms.get_media
+    file = mms.default_media
     assert_equal 'big.jpg', file.original_filename
     mms.purge
   end
-  def test_mms_with_two_texts_should_get_text_to_largest_file
+  def test_mms_with_two_texts_should_text_to_largest_file
     mail = TMail::Mail.parse(load_mail('simple-with-two-images-two-texts.mail').join)
     mms = MMS2R::Media.create(mail)
     mms.process
-    file = mms.get_text
+    file = mms.default_text
     assert_equal 'big.txt', file.original_filename
     mms.purge
   end
@@ -238,7 +238,7 @@ class MMS2R::MediaTest < Test::Unit::TestCase
     mail = TMail::Mail.parse(load_mail('hello_world_empty_text.mail').join)
     mms = MMS2R::Media.create(mail)
     mms.process
-    assert_equal '2068675309', mms.get_number
+    assert_equal '2068675309', mms.number
     mms.purge
   end
@@ -339,7 +339,7 @@ class MMS2R::MediaTest < Test::Unit::TestCase
     assert MMS2R::Media.sub_type?(mail.parts[0]).eql?('gif')
   end
-  def test_get_subject
+  def test_subject
     subjects = [nil, '', '(no subject)']
     mail = TMail::Mail.parse(load_mail('hello_world_mail_plain_no_content_type.mail').join)
@@ -347,26 +347,26 @@ class MMS2R::MediaTest < Test::Unit::TestCase
       mail.subject = s
       mms = MMS2R::Media.create(mail)
       mms.process
-      assert_equal nil, mms.get_subject, "Default subject not scrubbed."
+      assert_equal nil, mms.subject, "Default subject not scrubbed."
       mms.purge
     end
     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
+    assert_equal 'text only', mms.subject
     mms.purge
   end
-  def test_get_body
+  def test_body
     mail = TMail::Mail.parse(load_mail('hello_world_mail_plain_no_content_type.mail').join)
     mms = MMS2R::Media.create(mail)
     mms.process
-    assert_equal 'hello world', mms.get_body
+    assert_equal 'hello world', mms.body
     mms.purge
   end
-  def test_get_attachment_should_return_duck_typed_file
+  def test_attachment_should_return_duck_typed_file
     mail = TMail::Mail.parse(load_mail('simple_image.mail').join)
     mms = MMS2R::Media.create(mail)
@@ -382,10 +382,10 @@ class MMS2R::MediaTest < Test::Unit::TestCase
     assert File::exist?(test), "file #{test} does not exist"
     assert_equal base_name, File.basename(test), "file #{test} does not exist as #{base_name}"
-    # get_media calls get_attachment and
-    # get_attachment should return a file that has some duck sauce for
+    # default_media calls attachment and
+    # attachment should return a file that has some duck sauce for
     # act_as_attachment and attachment_fu
-    file = mms.get_media
+    file = mms.default_media
     assert_not_nil file, "file #{file} does not exist"
     assert_equal test, file.local_path
     assert_equal base_name, file.original_filename

data/test/test_mms2r_my_cingular_media.rb CHANGED Viewed

@@ -21,10 +21,10 @@ class MMS2R::MyCingularMediaTest < Test::Unit::TestCase
     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_equal nil, mms.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
+    assert_equal "Water", IO.readlines(mms.default_text.path).join
     mms.purge
   end

data/test/test_mms2r_nextel_media.rb CHANGED Viewed

@@ -10,22 +10,22 @@ require 'logger'
 class MMS2R::NextelMediaTest < Test::Unit::TestCase
   include MMS2R::TestHelper
-  def test_simple_get_text_is_nil
+  def test_simple_text_is_nil
     mail = TMail::Mail.parse(load_mail('nextel-image-01.mail').join)
     mms = MMS2R::Media.create(mail)
     mms.process
-    assert_nil mms.get_text
+    assert_nil mms.default_text
     mms.purge
   end
-  def test_simple_get_media
+  def test_simple_default_media
     mail = TMail::Mail.parse(load_mail('nextel-image-01.mail').join)
     mms = MMS2R::Media.create(mail)
     mms.process
-    file = mms.get_media
+    file = mms.default_media
     assert_file_size file, 337
     assert_equal 'Jan15_0001.jpg', file.original_filename
     assert_equal 337, file.size

data/test/test_mms2r_orange_france_media.rb CHANGED Viewed

@@ -20,7 +20,7 @@ class MMS2R::OrangeFranceMediaTest < Test::Unit::TestCase
     mail = TMail::Mail.parse(load_mail('orangefrance-text-and-image.mail').join)
     mms = MMS2R::Media.create(mail)
     mms.process
-    assert_nil mms.get_subject
+    assert_nil mms.subject
   end
   def test_processed_content
@@ -39,12 +39,12 @@ class MMS2R::OrangeFranceMediaTest < Test::Unit::TestCase
     file = mms.media['text/plain'].first
     assert File::exist?(file), "file #{file} does not exist"
     text = IO.readlines("#{file}").join
-    assert_match /Test ma poule/, text
+    assert_match(/Test ma poule/, text)
     # image
     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_match(/IMAGE.jpeg$/, mms.media['image/jpeg'].first)
     assert_file_size mms.media['image/jpeg'].first, 337
     mms.purge

data/test/test_mms2r_orange_poland_media.rb CHANGED Viewed

@@ -15,7 +15,7 @@ class MMS2R::OrangePolandMediaTest < Test::Unit::TestCase
     mms = MMS2R::Media.create(mail)
     assert_equal MMS2R::OrangePolandMedia, mms.class, "expected a #{MMS2R::OrangePolandMedia} and received a #{mms.class}"
     mms.process
-    assert_nil mms.get_subject
+    assert_nil mms.subject
     assert_not_nil mms.media['text/plain']
     file = mms.media['text/plain'][0]
     assert_not_nil file
@@ -30,7 +30,7 @@ class MMS2R::OrangePolandMediaTest < Test::Unit::TestCase
     mms = MMS2R::Media.create(mail)
     assert_equal MMS2R::OrangePolandMedia, mms.class, "expected a #{MMS2R::OrangePolandMedia} and received a #{mms.class}"
     mms.process
-    assert mms.get_subject, "whazzup"
+    assert mms.subject, "whazzup"
     assert_not_nil mms.media['text/plain']
     file = mms.media['text/plain'][0]
     assert_not_nil file

data/test/test_mms2r_sprint_media.rb CHANGED Viewed

@@ -130,8 +130,8 @@ class MMS2R::SprintMediaTest < Test::Unit::TestCase
     mms.process
     assert_equal 1, mms.media.size
     assert_equal 1, mms.media['text/plain'].size
-    assert_equal 7, mms.get_text.size
-    text = IO.readlines("#{mms.get_text.path}").join
+    assert_equal 7, mms.default_text.size
+    text = IO.readlines("#{mms.default_text.path}").join
     assert_match(/Tea Pot/, text)
     mms.purge
   end
@@ -140,7 +140,7 @@ class MMS2R::SprintMediaTest < Test::Unit::TestCase
     mail = TMail::Mail.parse(load_mail('sprint-image-01.mail').join)
     mms = MMS2R::Media.create(mail)
     mms.process
-    assert_equal '2068509247', mms.get_number
+    assert_equal '2068509247', mms.number
     mms.purge
   end
@@ -157,7 +157,7 @@ class MMS2R::SprintMediaTest < Test::Unit::TestCase
     assert_file_size mms.media['video/quicktime'][0], 49063
-    assert_equal nil, mms.get_subject, "Default Sprint subject not scrubbed."
+    assert_equal nil, mms.subject, "Default Sprint subject not scrubbed."
     mms.purge
   end
@@ -175,11 +175,25 @@ class MMS2R::SprintMediaTest < Test::Unit::TestCase
     assert_file_size mms.media['image/jpeg'][0], 337
-    assert_equal nil, mms.get_subject, "Default Sprint subject not scrubbed"
+    assert_equal nil, mms.subject, "Default Sprint subject not scrubbed"
     mms.purge
   end
+  def test_collect_image_using_block
+    mail = TMail::Mail.parse(load_mail('sprint-image-01.mail').join)
+    mms = MMS2R::Media.create(mail)
+    file_array = nil
+    mms.process do |k, v|
+      file_array = v if (k == 'image/jpeg')
+      assert_not_nil(file = file_array.first)
+      assert(File::exist?(file), "file #{file} does not exist")
+      assert(File.basename(file) =~ /000_0123a01234567890_1-0\.jpg/, "file #{file} does not exist")
+    end
+    # mms.purge has to be called manually
+    assert File.exist?(file_array.first)
+  end
   def test_should_have_two_images
     mail = TMail::Mail.parse(load_mail('sprint-two-images-01.mail').join)
     mms = MMS2R::Media.create(mail)
@@ -197,7 +211,7 @@ class MMS2R::SprintMediaTest < Test::Unit::TestCase
     assert_file_size mms.media['image/jpeg'][0], 337
     assert_file_size mms.media['image/jpeg'][1], 337
-    assert_equal nil, mms.get_subject, "Default Sprint subject not scrubbed"
+    assert_equal nil, mms.subject, "Default Sprint subject not scrubbed"
     mms.purge
   end
@@ -212,10 +226,10 @@ class MMS2R::SprintMediaTest < Test::Unit::TestCase
     mms.purge
   end
-  def test_get_body_should_return_nil_when_there_is_no_user_text
+  def test_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 nil, mms.get_body
+    assert_equal nil, mms.body
   end
 end

metadata CHANGED Viewed

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: mms2r
 version: !ruby/object:Gem::Version
-  version: 1.1.10
-date: 2007-09-30 00:00:00 -07:00
+  version: 1.1.11
+date: 2007-10-20 00:00:00 -07:00
 summary: Extract user media from MMS (and not carrier cruft)
 require_paths:
 - lib
@@ -52,8 +52,8 @@ 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/alltel_media.rb
+- lib/mms2r/att_media.rb
 - lib/mms2r/cingular_me_media.rb
 - lib/mms2r/dobson_media.rb
 - lib/mms2r/helio_media.rb
@@ -132,8 +132,8 @@ files:
 - 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_alltel_media.rb
+- test/test_mms2r_att_media.rb
 - test/test_mms2r_cingular_me_media.rb
 - test/test_mms2r_dobson_media.rb
 - test/test_mms2r_helio_media.rb
@@ -155,6 +155,7 @@ test_files:
 - test/test_mms2r_orange_poland_media.rb
 - test/test_mms2r_helio_media.rb
 - test/test_mms2r_sprint_pcs_media.rb
+- test/test_mms2r_att_media.rb
 - test/test_mms2r_media.rb
 - test/test_mms2r_my_cingular_media.rb
 - test/test_mms2r_nextel_media.rb
@@ -167,7 +168,6 @@ 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
@@ -207,5 +207,5 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0
     version: