Nokogiri::XML() supports argument forwarding

Related to https://github.com/sparklemotion/nokogiri#3323
sparklemotion · Dec 8, 2024 · 9d3141a · 9d3141a
1 parent 7b87461
commit 9d3141a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/lib/nokogiri/xml.rb b/lib/nokogiri/xml.rb
@@ -4,8 +4,8 @@ module Nokogiri
   class << self
     ###
     # Parse XML.  Convenience method for Nokogiri::XML::Document.parse
-    def XML(thing, url = nil, encoding = nil, options = XML::ParseOptions::DEFAULT_XML, &block)
-      Nokogiri::XML::Document.parse(thing, url, encoding, options, &block)
+    def XML(...)
+      Nokogiri::XML::Document.parse(...)
     end
   end
 

diff --git a/test/xml/test_document.rb b/test/xml/test_document.rb
@@ -681,6 +681,10 @@ def test_strict_document_throws_syntax_error
             Nokogiri::XML("<foo><bar></foo>", nil, nil, 0)
           end
 
+          assert_raises(Nokogiri::XML::SyntaxError) do
+            Nokogiri::XML("<foo><bar></foo>", options: 0)
+          end
+
           assert_raises(Nokogiri::XML::SyntaxError) do
             Nokogiri::XML("<foo><bar></foo>", &:strict)
           end

diff --git a/test/xml/test_document_encoding.rb b/test/xml/test_document_encoding.rb
@@ -29,6 +29,11 @@ class TestDocumentEncoding < Nokogiri::TestCase
             encoding = "Shift_JIS"
             assert_equal(encoding, Nokogiri::XML(nil, nil, encoding).encoding)
           end
+
+          it "applies the specified kwargs encoding even if on empty documents" do
+            encoding = "Shift_JIS"
+            assert_equal(encoding, Nokogiri::XML(nil, encoding: encoding).encoding)
+          end
         end
 
         describe "#encoding=" do

diff --git a/test/xml/test_node_encoding.rb b/test/xml/test_node_encoding.rb
@@ -39,6 +39,22 @@ def test_encoding_GH_1113
         assert_equal(expected, frag.to_xml.sub(/^<.xml[^>]*>\n/m, "").strip)
       end
 
+      def test_encoding_GH_1113_with_kwargs
+        utf8 = "<frag>shahid ὡ 𐄣 𢂁</frag>"
+        hex = "<frag>shahid &#x1f61; &#x10123; &#x22081;</frag>"
+        decimal = "<frag>shahid &#8033; &#65827; &#139393;</frag>"
+        expected = Nokogiri.jruby? ? hex : decimal
+
+        frag = Nokogiri::XML(utf8, encoding: "UTF-8", options: Nokogiri::XML::ParseOptions::STRICT)
+        assert_equal(utf8, frag.to_xml.sub(/^<.xml[^>]*>\n/m, "").strip)
+
+        frag = Nokogiri::XML(expected, encoding: "UTF-8", options: Nokogiri::XML::ParseOptions::STRICT)
+        assert_equal(utf8, frag.to_xml.sub(/^<.xml[^>]*>\n/m, "").strip)
+
+        frag = Nokogiri::XML(expected, encoding: "US-ASCII", options: Nokogiri::XML::ParseOptions::STRICT)
+        assert_equal(expected, frag.to_xml.sub(/^<.xml[^>]*>\n/m, "").strip)
+      end
+
       VEHICLE_XML = <<-eoxml
         <root>
           <car xmlns:part="http://general-motors.com/">