@@ -541,7 +541,7 @@ describe TicketsController do @attachment = mock_model Attachment, :file_name => 'file.txt', :attachable => @ticket, - :textual? => true, + :plain? => true, :inline? => true, :readable? => true, :send_arguments => ['path', {}] spec/controllers/tickets_controller_spec.rb @@ -73,18 +73,22 @@ class Attachment < ActiveRecord::Base content_type.match(/^image\/(png|jpg|jpeg|gif)/i).present? end - def textual? - content_type.match(/^text/i).present? + def html? + content_type == Mime::HTML + end + + def plain? + !html? and content_type.starts_with?('text/') end def inline? - textual? || image? + html? || plain? || image? end def send_arguments [physical_path, { :filename => file_name, - :type => textual? ? 'text/plain' : content_type, + :type => plain? ? 'text/plain' : content_type, :disposition => ( inline? ? 'inline' : 'attachment' ) }] end vendor/plugins/has_attachment/lib/attachment.rb @@ -91,10 +91,17 @@ describe Attachment do build_attachment('A').content_type.should == 'text/plain' end - it 'should identify textual content types' do - build_attachment('TEXT', 'file.txt', 'text/plain').should be_textual - build_attachment('GIF89', 'file.gif', 'image/gif').should_not be_textual - build_attachment('PDF', 'file.pdf', 'application/pdf').should_not be_textual + it 'should identify html content types' do + build_attachment('TEXT', 'file.txt', 'text/plain').should_not be_html + build_attachment('HTML', 'file.html', 'text/html').should be_html + end + + it 'should identify plain textual content types' do + build_attachment('TEXT', 'file.txt', 'text/plain').should be_plain + build_attachment('CSV', 'file.csv', 'text/csv').should be_plain + build_attachment('HTML', 'file.html', 'text/html').should_not be_plain + build_attachment('GIF89', 'file.gif', 'image/gif').should_not be_plain + build_attachment('PDF', 'file.pdf', 'application/pdf').should_not be_plain end it 'should identify image content types' do vendor/plugins/has_attachment/spec/attachment_spec.rb 55924800f09052516ab8f499faa3fe676d853671 Dimitrij Denissenko contact@dvisionfactory.com http://github.com/dim/retrospectiva/commit/16eef7816ca297cb78b8163ee0fb9bbd63d3c93f 16eef7816ca297cb78b8163ee0fb9bbd63d3c93f 2009-10-27T00:57:40-07:00 2009-10-27T00:57:40-07:00 Don't convert HTML attachments to plain text f2d6b94e203eb7fa30e89cd90894b949d6a0b7a4 Dimitrij Denissenko contact@dvisionfactory.com