meta content-type tag now overrides Page#content_type (GH #114)

lib/mechanize/page.rb

@@ -24,6 +24,7 @@ def initialize(uri=nil, response=nil, body=nil, code=nil, mech=nil)
     raise Mechanize::ContentTypeError, response['content-type'] unless
       response['content-type'] =~ /^(text\/html)|(application\/xhtml\+xml)/i
 
+    @meta_content_type = nil
     @encoding = nil
     @encodings = [nil]
     raise 'no' if mech and not Mechanize === mech
@@ -49,8 +50,9 @@ def initialize(uri=nil, response=nil, body=nil, code=nil, mech=nil)
         elsif meta =~ /http-equiv\s*=\s*(["'])?content-type\1/i
           meta =~ /content=(["'])?(.*?)\1/i
 
-          encoding = charset $2
+          @meta_content_type = $2
 
+          encoding = charset $2
           @encodings << encoding if encoding
         end
       end
@@ -151,7 +153,7 @@ def canonical_uri
 
   # Get the content type
   def content_type
-    response['content-type']
+    @meta_content_type || response['content-type']
   end
 
   # Search through the page like HPricot

test/test_mechanize_page.rb

@@ -52,15 +52,42 @@ def util_page body = @body, res = @res
     Mechanize::Page.new @uri, res, body, 200, @agent
   end
 
-  def test_initialize_content_type
-    assert Mechanize::Page.new nil, 'content-type' => 'application/xhtml+xml'
-    assert Mechanize::Page.new nil, 'content-type' => 'text/html'
+  def test_initialize_supported_content_type
+    page = Mechanize::Page.new nil, 'content-type' => 'application/xhtml+xml'
+    assert page
+    assert_equal 'application/xhtml+xml', page.content_type
+
+    page = Mechanize::Page.new nil, 'content-type' => 'text/html'
+    assert page
+    assert_equal 'text/html', page.content_type
+
+    page = Mechanize::Page.new nil, 'content-type' => 'application/xhtml+xml;charset=utf-8'
+    assert page
+    assert_equal 'application/xhtml+xml;charset=utf-8', page.content_type
+
+    page = Mechanize::Page.new nil, 'content-type' => 'text/html;charset=utf-8'
+    assert page
+    assert_equal 'text/html;charset=utf-8', page.content_type
+  end
 
+  def test_initialize_unsupported_content_type
     e = assert_raises Mechanize::ContentTypeError do
       Mechanize::Page.new nil, 'content-type' => 'text/plain'
     end
 
     assert_equal 'text/plain', e.content_type
+
+    e = assert_raises Mechanize::ContentTypeError do
+      Mechanize::Page.new nil, 'content-type' => 'text/plain;charset=utf-8'
+    end
+
+    assert_equal 'text/plain;charset=utf-8', e.content_type
+  end
+
+  def test_override_content_type
+    page = Mechanize::Page.new nil, {'content-type' => 'text/html'}, WINDOWS_1255
+    assert page
+    assert_equal 'text/html; charset=windows-1255', page.content_type
   end
 
   def test_canonical_uri