text? helper improved

chrugail · Jan 23, 2011 · bbe2490 · bbe2490
1 parent 13b726a
commit bbe2490
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/lib/mimemagic.rb b/lib/mimemagic.rb
@@ -41,14 +41,7 @@ def self.remove(type)
   end
 
   # Returns true if type is a text format
-  def text?
-    child_of? 'text/plain'
-  end
-
-  # Returns true if type is image
-  def image?
-    mediatype == 'image'
-  end
+  def text?; mediatype == 'text' || child_of?('text/plain'); end
 
   # Mediatype shortcuts
   def image?; mediatype == 'image'; end

diff --git a/test/mimemagic_test.rb b/test/mimemagic_test.rb
@@ -11,6 +11,7 @@
   it 'should have mediatype helpers' do
     MimeMagic.new('text/plain').should.be.text
     MimeMagic.new('text/html').should.be.text
+    MimeMagic.new('application/xhtml+xml').should.be.text
     MimeMagic.new('application/octet-stream').should.not.be.text
     MimeMagic.new('image/png').should.not.be.text
     MimeMagic.new('image/png').should.be.image