text? helper improved

lib/mimemagic.rb

@@ -41,14 +41,7 @@ class MimeMagic
   end
   end
 
 
   # Returns true if type is a text format
   # 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
   # Mediatype shortcuts
   def image?; mediatype == 'image'; end
   def image?; mediatype == 'image'; end

test/mimemagic_test.rb

@@ -11,6 +11,7 @@ describe 'MimeMagic' do
   it 'should have mediatype helpers' do
   it 'should have mediatype helpers' do
     MimeMagic.new('text/plain').should.be.text
     MimeMagic.new('text/plain').should.be.text
     MimeMagic.new('text/html').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('application/octet-stream').should.not.be.text
     MimeMagic.new('image/png').should.not.be.text
     MimeMagic.new('image/png').should.not.be.text
     MimeMagic.new('image/png').should.be.image
     MimeMagic.new('image/png').should.be.image