Nokogiri::Schema{,new,read_memory}() support argument forwarding

Related to https://github.com/sparklemotion/nokogiri#3323

lib/nokogiri/xml/schema.rb

@@ -17,8 +17,8 @@ class << self
       # - +parse_options+ (Nokogiri::XML::ParseOptions)
       # [Returns] Nokogiri::XML::Schema
       #
-      def Schema(input, parse_options = ParseOptions::DEFAULT_SCHEMA)
-        Schema.new(input, parse_options)
+      def Schema(...)
+        Schema.new(...)
       end
     end
 
@@ -67,8 +67,8 @@ class Schema
       #
       # [Returns] Nokogiri::XML::Schema
       #
-      def self.new(input, parse_options = ParseOptions::DEFAULT_SCHEMA)
-        read_memory(input, parse_options)
+      def self.new(...)
+        read_memory(...)
       end
 
       # :call-seq:
@@ -86,7 +86,7 @@ def self.new(input, parse_options = ParseOptions::DEFAULT_SCHEMA)
       #   Defaults to Nokogiri::XML::ParseOptions::DEFAULT_SCHEMA
       #
       # [Returns] Nokogiri::XML::Schema
-      def self.read_memory(input, parse_options = ParseOptions::DEFAULT_SCHEMA)
+      def self.read_memory(input, parse_options_ = ParseOptions::DEFAULT_SCHEMA, parse_options: parse_options_)
         from_document(Nokogiri::XML::Document.parse(input), parse_options)
       end
 

test/xml/test_schema.rb

@@ -398,6 +398,16 @@ class TestNokogiriXMLSchema < Nokogiri::TestCase
             assert_equal(1, errors.grep(%r{failed to load.*http://localhost:8000/making-a-request}).length)
           end
 
+          it "XML::Schema parsing attempts to access external DTDs with kwargs" do
+            doc = Nokogiri::XML::Schema.new(schema, parse_options: Nokogiri::XML::ParseOptions.new.nononet)
+            errors = doc.errors.map(&:to_s)
+            assert_empty(
+              errors.grep(/Attempt to load network entity/),
+              "Should not see xmlIO.c:xmlNoNetExternalEntityLoader() raising XML_IO_NETWORK_ATTEMPT",
+            )
+            assert_equal(1, errors.grep(%r{failed to load.*http://localhost:8000/making-a-request}).length)
+          end
+
           it "XML::Schema parsing of memory attempts to access external DTDs" do
             doc = Nokogiri::XML::Schema.read_memory(schema, Nokogiri::XML::ParseOptions.new.nononet)
             errors = doc.errors.map(&:to_s)
@@ -407,6 +417,16 @@ class TestNokogiriXMLSchema < Nokogiri::TestCase
             )
             assert_equal(1, errors.grep(%r{failed to load.*http://localhost:8000/making-a-request}).length)
           end
+
+          it "XML::Schema parsing of memory attempts to access external DTDs with kwargs" do
+            doc = Nokogiri::XML::Schema.read_memory(schema, parse_options: Nokogiri::XML::ParseOptions.new.nononet)
+            errors = doc.errors.map(&:to_s)
+            assert_empty(
+              errors.grep(/ERROR: Attempt to load network entity/),
+              "Should not see xmlIO.c:xmlNoNetExternalEntityLoader() raising XML_IO_NETWORK_ATTEMPT",
+            )
+            assert_equal(1, errors.grep(%r{failed to load.*http://localhost:8000/making-a-request}).length)
+          end
         end
       end
 
@@ -429,10 +449,20 @@ class TestNokogiriXMLSchema < Nokogiri::TestCase
             assert_equal 0, doc.errors.map(&:to_s).grep(/WARNING: Attempt to load network entity/).length
           end
 
+          it "XML::Schema parsing attempts to access external DTDs with kwargs" do
+            doc = Nokogiri::XML::Schema.new(schema, parse_options: Nokogiri::XML::ParseOptions.new.nononet)
+            assert_equal 0, doc.errors.map(&:to_s).grep(/WARNING: Attempt to load network entity/).length
+          end
+
           it "XML::Schema parsing of memory attempts to access external DTDs" do
             doc = Nokogiri::XML::Schema.read_memory(schema, Nokogiri::XML::ParseOptions.new.nononet)
             assert_equal 0, doc.errors.map(&:to_s).grep(/WARNING: Attempt to load network entity/).length
           end
+
+          it "XML::Schema parsing of memory attempts to access external DTDs with kwargs" do
+            doc = Nokogiri::XML::Schema.read_memory(schema, parse_options: :XML::ParseOptions.new.nononet)
+            assert_equal 0, doc.errors.map(&:to_s).grep(/WARNING: Attempt to load network entity/).length
+          end
         end
       end
     end