mms2r 1.1.8 → 1.1.9

data/History.txt

@@ -1,3 +1,8 @@
+== 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan 
+Explosion)
+
+* fixed broken support for act_as_attachment and attachment_fu
+
 == 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
    of Blood Ocean)
 

data/lib/mms2r.rb

@@ -65,7 +65,7 @@ module MMS2R
     ##
     # MMS2R Library version
 
-    VERSION = '1.1.8'
+    VERSION = '1.1.9'
 
     end
 

data/lib/mms2r/media.rb

@@ -403,9 +403,7 @@ module MMS2R
     # Helper to add a file to the media hash.
 
     def add_file(type, file)
-      if @media[type].nil?
-        @media[type] = Array.new
-      end
+      @media[type] = [] unless @media[type]
       @media[type] << file
     end
 
@@ -549,8 +547,9 @@ module MMS2R
       return nil if files.empty?
 
       #get the largest file
-      file = nil # explicitly declare the file and sile
+      file = nil # explicitly declare the file and size
       size = 0
+      mime_type = nil
 
       files.each do |f|
         # this will safely evaluate since we wouldn't be looking at
@@ -558,6 +557,11 @@ module MMS2R
         if File.size(f) > size
           size = File.size(f)
           file = File.new(f)
+          # media is hash of types to arrays of file names
+          # detect on the hash returns an array, the 0th element is
+          # the mime type of the file that was found in the files array
+          # i.e. {'text/foo' => ['/foo/bar.txt', '/hello/world.txt']}
+          mime_type = media.detect{|k,v| v.detect{|fl| fl == f}}[0] rescue nil
         end
       end
 

data/test/test_mms2r_media.rb

@@ -374,6 +374,35 @@ class MMS2R::MediaTest < Test::Unit::TestCase
     mms.purge
   end
 
+  def test_get_attachment_should_return_duck_typed_file
+
+    mail = TMail::Mail.parse(load_mail('simple_image.mail').join)
+    mms = MMS2R::Media.create(mail)
+    mms.process
+
+    file_size = 43
+    base_name = 'spacer.gif'
+    mime_type = 'image/gif'
+
+    test = mms.media[mime_type].first
+    assert_not_nil test
+    assert_file_size test, file_size
+    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
+    # act_as_attachment and attachment_fu
+    file = mms.get_media
+    assert_not_nil file, "file #{file} does not exist"
+    assert_equal test, file.local_path
+    assert_equal base_name, file.original_filename
+    assert_equal file_size, file.size
+    assert_equal mime_type, file.content_type
+
+    mms.purge
+  end
+
   def test_yaml_file_name
     assert_equal 'mms2r_my_cingular_media_subject.yml', MMS2R::Media.yaml_file_name(MMS2R::MyCingularMedia,:subject)
     assert_equal 'mms2r_t_mobile_media_subject.yml', MMS2R::Media.yaml_file_name(MMS2R::TMobileMedia,:subject)

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: mms2r
 version: !ruby/object:Gem::Version 
-  version: 1.1.8
+  version: 1.1.9
 date: 2007-09-08 00:00:00 -07:00
 summary: Extract user media from MMS (and not carrier cruft)
 require_paths: