Ensure meta_encoding checks meta charset tag (closes #919)

leejarvis · leejarvis · commit fb000c51e3ba · 2013-06-14T14:06:26.000+01:00
diff --git a/lib/nokogiri/html/document.rb b/lib/nokogiri/html/document.rb
@@ -6,8 +6,12 @@ class Document < Nokogiri::XML::Document
       # then nil is returned.
       def meta_encoding
         meta = meta_content_type and
-          match = /charset\s*=\s*([\w-]+)/i.match(meta['content']) and
+          match = /charset\s*=\s*([\w-]+)/i.match(meta['content'])
+        if match
           match[1]
+        else
+          cs = at('meta[@charset]') and cs[:charset]
+        end
       end
 
       ###
diff --git a/test/html/test_document.rb b/test/html/test_document.rb
@@ -166,6 +166,20 @@ def test_meta_encoding_handles_malformed_content_charset
         assert_nil doc.meta_encoding
       end
 
+      def test_meta_encoding_checks_charset
+        doc = Nokogiri::HTML(<<-eohtml)
+<html>
+  <head>
+    <meta charset="UTF-8">
+  </head>
+  <body>
+    foo
+  </body>
+</html>
+        eohtml
+        assert_equal 'UTF-8', doc.meta_encoding
+      end
+
       def test_meta_encoding=
         @html.meta_encoding = 'EUC-JP'
         assert_equal 'EUC-JP', @html.meta_encoding
