attachments 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/attachments/extract.rb

@@ -30,19 +30,34 @@ module Attachments
       reset
     end
 
-    def parse filename
-      parse_file filename
+    def parse filename_or_hash
+      hash = case
+             when filename_or_hash.is_a?(String) then
+               { :filename => filename_or_hash }
+             when filename_or_hash.is_a?(Hash) then
+               filename_or_hash
+             else
+               {}
+             end
+
+      content = case
+                when hash[:filename] then
+                  read_file(hash[:filename])
+                when hash[:content] then
+                  hash[:content]
+                when hash[:stream] then
+                  hash[:stream].read()
+                else
+                  nil
+                end
+
+      parse_data content if content
     end
 
     def parse_file filename
       @last_parsed = filename
-
-      # Load the email as binary to avoid encoding exceptions
-      file = File.new(filename, "rb")
-      raw_mail_data = file.read()
-      file.close()
-
-      parse_data raw_mail_data
+      content = read_file filename
+      parse_data content
     end
 
     def parse_data raw_mail_data
@@ -112,6 +127,14 @@ module Attachments
       @files = []
     end
 
+    def read_file filename
+      # Load the email as binary to avoid encoding exceptions
+      file = File.new(filename, "rb")
+      content = file.read()
+      file.close()
+      content
+    end
+
     def parse_part mail
       # Filter parts with a type that is not of interest
       if mail.content_type

data/test/test_attachments.rb

@@ -4,13 +4,22 @@ require 'helper'
 require 'iconv'
 
 class TestAttachments < Test::Unit::TestCase
+  def compare_extractors a, b
+    (0...a.files.length).each do |i|
+      tmp_a = a.files[i][:tmpfile]
+      tmp_b = b.files[i][:tmpfile]
+
+      isIdentical = FileUtils::compare_file(tmp_a, tmp_b)
+      assert(isIdentical)
+    end
+  end
+
   context "Parse test cases without crashes" do
     setup do
       @extract = Attachments::Extract.new [ "text/plain", "image/jpeg" ]
     end
 
     teardown do
-      @extract.close
     end
 
     should "parse test mails without raising exceptions" do
@@ -18,6 +27,7 @@ class TestAttachments < Test::Unit::TestCase
         assert_nothing_raised do
           @extract.parse_file filename
         end
+        @extract.close
       end
     end
 
@@ -25,10 +35,9 @@ class TestAttachments < Test::Unit::TestCase
       return unless "".respond_to?(:valid_encoding?)
 
       Dir.glob("./test/data/mail_*.eml") do |filename|
-        assert_nothing_raised do
-          @extract.parse_file filename
-          assert @extract.text_body.valid_encoding?
-        end
+        @extract.parse_file filename
+        assert @extract.text_body.valid_encoding?
+        @extract.close
       end
     end
   end
@@ -126,5 +135,78 @@ class TestAttachments < Test::Unit::TestCase
       end
     end
   end
+
+  context "Parse parameters" do
+    setup do
+      @a = Attachments::Extract.new [ "text/plain", "image/jpeg" ]
+      @b = Attachments::Extract.new [ "text/plain", "image/jpeg" ]
+    end
+
+    teardown do
+    end
+
+
+    should "handle straight filename" do
+      Dir.glob("./test/data/mail_*.eml") do |filename|
+        assert_nothing_raised do
+          @a.parse_file filename
+          @b.parse filename
+
+          compare_extractors(@a, @b)
+        end
+        @a.close
+        @b.close
+      end
+    end
+
+
+    should "handle filename in hash" do
+      Dir.glob("./test/data/mail_*.eml") do |filename|
+        assert_nothing_raised do
+          @a.parse_file filename
+          @b.parse({ :filename => filename })
+
+          compare_extractors(@a, @b)
+        end
+        @a.close
+        @b.close
+      end
+    end
+
+
+    should "handle content in hash" do
+      Dir.glob("./test/data/mail_*.eml") do |filename|
+        assert_nothing_raised do
+          @a.parse_file filename
+
+          f = File.new(filename, "rb")
+          content = f.read()
+          f.close 
+          @b.parse({ :content => content })
+
+          compare_extractors(@a, @b)
+        end
+        @a.close
+        @b.close
+      end
+    end
+
+
+    should "handle stream in hash" do
+      Dir.glob("./test/data/mail_*.eml") do |filename|
+        assert_nothing_raised do
+          @a.parse_file filename
+
+          f = File.new(filename, "rb")
+          @b.parse({ :stream => f })
+          f.close 
+
+          compare_extractors(@a, @b)
+        end
+        @a.close
+        @b.close
+      end
+    end
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: attachments
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Rune Myrland