mailfakk2 0.1.1 → 0.1.2

data/README.markdown

@@ -25,7 +25,7 @@ Debian / Ubuntu
 ---------------
 
  * sudo apt-get install ruby ruby-dev gs unoconv openoffice.org-headless rubygems xvfb librmagick-ruby 
- * sudo gem install activesupport andand mail prawn
+ * sudo gem install mailfakk2
 
 Cons
 ====
@@ -34,16 +34,16 @@ If you plan to spam by fax you should consider another product. MailFaKK2 is
 kind of slow. This is caused by launching OpenOffice.org for every conversion.
 Speed is not a priority for us (yet).
 
-TODO
-====
+TODO / Features
+===============
 
  * [x] generate cover sheet TIFF frame from email body
  * [x] append OpenOffice.org documents 
  * [ ] append MS Office documents
- * [ ] write TIFF and callfile
- * [-] procmail mode (untested)
+ * [x] write TIFF and callfile
+ * [x] procmail mode
  * [ ] header and footer for every frame
- * [ ] gemspec
+ * [x] gemspec
  * [ ] check if fax was delivered (callfile moved to outgoing_done)
 
 Meta

data/lib/facsimile.rb

@@ -6,8 +6,10 @@ class Facsimile
 
   #include ActiveSupport::Memoization
 
-  class NoPhoneNumberFound < Exception; end
-  class NoContentFound < Exception; end
+  class Error < ::Exception; end
+  class NoPhoneNumberFound < Error; end
+  class NoContentFound < Error; end
+  class BadContent < Error; end
 
   attr_reader :frames
   attr_reader :mail
@@ -43,10 +45,14 @@ class Facsimile
           add_frames text2tiff( part.decoded )
         when %r'opendocument\.text'
           add_frames oo2tiff( part.decoded )
+        when %r'openxmlformats-officedocument' # docx, xlsx
+          add_frames oo2tiff( part.decoded, part.filename )
         when %r'text/html'
           # FIXME ignore html, let's hope a plain text contained everything important
+        when %r'multipart/alternative'
+          # ignore this, stupid outlook
         else
-          STDERR.puts "unsupported content type: #{part.content_type}"
+          log "unsupported content type: #{part.content_type}"
         end
       end
 
@@ -120,15 +126,25 @@ class Facsimile
     read_frame dest.path
   end
 
-  def oo2tiff(source_data)
-    source = mktemp('oo', false)
+  # For some filetypes we need the filename to apend the same extention to the tempfile
+  def oo2tiff(source_data, filename=nil)
+    if filename.blank?
+      source = mktemp('oo', false)
+      pdf_path = source.path + '.pdf'
+    else
+      extention = filename.split('.').last
+      source = mktemp(['oo', ".#{extention}"], false)
+      pdf_path = source.path.sub(/#{extention}$/,'pdf')
+    end
     source.write source_data
     source.close
 
     dest = mktemp('pdf')
     xvfb("unoconv -f pdf #{source.path}")
-    FileUtils.mv source.path + '.pdf', dest.path
-    pdf2tiff(dest.path)
+    if File.file?(pdf_path)
+      FileUtils.mv pdf_path, dest.path
+      pdf2tiff(dest.path)
+    end
   end
 
   def text2pdf(source)

data/spec/facsimile_spec.rb

@@ -68,3 +68,16 @@ describe "text with attached OpenOffice Writer Document (2 Pages)" do
   end
   
 end
+
+describe "mail with word (2 pages) and excel attachment" do
+  before(:each) do
+    @mail_path = mail_path('word_and_excel')
+    @fax = Facsimile.new @mail_path
+  end
+
+  it 'should produce 2+1 frames' do
+    @fax.write result_path('word_and_excel')
+    @fax.should have(3).frames
+  end
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Niklas Hofer