libxml-ruby 3.2.0 → 3.2.3

data/test/test_schema.rb

@@ -3,18 +3,19 @@
 require_relative './test_helper'
 
 class TestSchema < Minitest::Test
+  Import_NS = 'http://xml4r.org/libxml-ruby/test/shiporder'.freeze
+
   def setup
     file = File.join(File.dirname(__FILE__), 'model/shiporder.xml')
     @doc = LibXML::XML::Document.file(file)
+    schema_file = File.join(File.dirname(__FILE__), 'model/shiporder.xsd')
+    schema_doc = LibXML::XML::Document.file(schema_file)
+    @schema = LibXML::XML::Schema.document(schema_doc)
   end
 
   def teardown
     @doc = nil
-  end
-
-  def schema
-    document = LibXML::XML::Document.file(File.join(File.dirname(__FILE__), 'model/shiporder.xsd'))
-    LibXML::XML::Schema.document(document)
+    @schema = nil
   end
 
   def check_error(error)
@@ -33,11 +34,50 @@ class TestSchema < Minitest::Test
   end
 
   def test_load_from_doc
-    assert_instance_of(LibXML::XML::Schema, schema)
+    assert_instance_of(LibXML::XML::Schema, @schema)
+  end
+
+  def test_schema_load_from_uri
+    xlink_schema = LibXML::XML::Schema.new('http://www.w3.org/1999/xlink.xsd')
+    assert_instance_of(LibXML::XML::Schema, xlink_schema)
+    assert_instance_of(LibXML::XML::Schema::Element, xlink_schema.elements['title'])
+    assert_instance_of(LibXML::XML::Schema::Type, xlink_schema.types['titleEltType'])
+    assert_equal('http://www.w3.org/1999/xlink', xlink_schema.target_namespace)
+  end
+
+  def test_schema_from_string
+    schema_file = File.join(File.dirname(__FILE__), 'model/shiporder.xsd')
+    schema_from_str = LibXML::XML::Schema.from_string(File.read(schema_file))
+    assert_instance_of(LibXML::XML::Schema, schema_from_str)
+  end
+
+  def test_invalid_schema_doc
+    bad_schema_file = File.join(File.dirname(__FILE__), 'model/shiporder_bad.xsd')
+    bad_schema_doc = LibXML::XML::Document.file(bad_schema_file)
+    bad_schema = nil
+    ## Note: this type of error throws
+    begin
+      bad_schema = LibXML::XML::Schema.document(bad_schema_doc)
+    rescue LibXML::XML::Error => error
+      bad_schema = error
+      assert(error.message.match(/Error: Element '.*': The content is not valid. Expected is \(/))
+      assert_kind_of(LibXML::XML::Error, error)
+      assert_equal(LibXML::XML::Error::SCHEMASP, error.domain)
+      assert_equal(LibXML::XML::Error::SCHEMAP_S4S_ELEM_NOT_ALLOWED, error.code)
+      assert_equal(LibXML::XML::Error::ERROR, error.level)
+      assert(error.file.match(/shiporder_bad.xsd/))
+      assert_equal("Element '{http://www.w3.org/2001/XMLSchema}complexType'", error.str1)
+      refute_nil(error.str2)
+      assert_nil(error.str3)
+      assert_equal(0, error.int1)
+      assert_equal(0, error.int2)
+    end
+    ## Last but not least, make sure we threw an error
+    assert_instance_of(LibXML::XML::Error, bad_schema)
   end
 
   def test_doc_valid
-    assert(@doc.validate_schema(schema))
+    assert(@doc.validate_schema(@schema))
   end
 
   def test_doc_invalid
@@ -45,7 +85,7 @@ class TestSchema < Minitest::Test
     @doc.root << new_node
 
     error = assert_raises(LibXML::XML::Error) do
-      @doc.validate_schema(schema)
+      @doc.validate_schema(@schema)
     end
 
     check_error(error)
@@ -56,7 +96,7 @@ class TestSchema < Minitest::Test
 
   def test_reader_valid
     reader = LibXML::XML::Reader.string(@doc.to_s)
-    assert(reader.schema_validate(schema))
+    assert(reader.schema_validate(@schema))
 
     while reader.read
     end
@@ -74,7 +114,7 @@ class TestSchema < Minitest::Test
     reader = LibXML::XML::Reader.string(@doc.to_s)
 
     # Set a schema
-    assert(reader.schema_validate(schema))
+    assert(reader.schema_validate(@schema))
 
     while reader.read
     end
@@ -91,32 +131,55 @@ class TestSchema < Minitest::Test
 
   # Schema meta-data tests
   def test_elements
-    assert_instance_of(Hash, schema.elements)
-    assert_equal(1, schema.elements.length)
-    assert_instance_of(LibXML::XML::Schema::Element, schema.elements['shiporder'])
+    assert_instance_of(Hash, @schema.elements)
+    assert_equal(1, @schema.elements.length)
+    assert_instance_of(LibXML::XML::Schema::Element, @schema.elements['shiporder'])
   end
 
   def test_types
-    assert_instance_of(Hash, schema.types)
-    assert_equal(1, schema.types.length)
-    assert_instance_of(LibXML::XML::Schema::Type, schema.types['shiporder'])
+    assert_instance_of(Hash, @schema.types)
+    assert_equal(1, @schema.types.length)
+    assert_instance_of(LibXML::XML::Schema::Type, @schema.types['shiporderType'])
   end
 
   def test_imported_types
-    assert_instance_of(Hash, schema.imported_types)
-    assert_equal(1, schema.imported_types.length)
-    assert_instance_of(LibXML::XML::Schema::Type, schema.types['shiporder'])
+    assert_instance_of(Hash, @schema.imported_types)
+    assert_equal(2, @schema.imported_types.length)
+    assert_instance_of(LibXML::XML::Schema::Type, @schema.imported_types['shiporderType'])
+    assert_instance_of(LibXML::XML::Schema::Type, @schema.imported_types['shiporderFooType'])
+  end
+
+  def test_imported_ns_types
+    assert_instance_of(Hash, @schema.imported_ns_types)
+    assert_equal(2, @schema.imported_ns_types.length)
+    assert_equal(1, @schema.imported_ns_types[nil].length)
+    assert_equal(1, @schema.imported_ns_types[Import_NS].length)
+    assert_instance_of(LibXML::XML::Schema::Type, @schema.imported_ns_types[nil]['shiporderType'])
+    assert_instance_of(LibXML::XML::Schema::Type, @schema.imported_ns_types[Import_NS]['shiporderFooType'])
+  end
+
+  def test_imported_ns_elements
+    assert_instance_of(Hash, @schema.imported_ns_elements)
+    assert_equal(2, @schema.imported_ns_elements.length)
+    assert_equal(1, @schema.imported_ns_elements[nil].length)
+    assert_equal(1, @schema.imported_ns_elements[Import_NS].length)
+    assert_instance_of(LibXML::XML::Schema::Element, @schema.imported_ns_elements[nil]['shiporder'])
+    assert_instance_of(LibXML::XML::Schema::Element, @schema.imported_ns_elements[Import_NS]['shiporder'])
+    assert_equal('shiporderType', @schema.imported_ns_elements[nil]['shiporder'].type.name)
+    assert_equal('shiporderFooType', @schema.imported_ns_elements[Import_NS]['shiporder'].type.name)
   end
 
   def test_namespaces
-    assert_instance_of(Array, schema.namespaces)
-    assert_equal(1, schema.namespaces.length)
+    assert_instance_of(Array, @schema.namespaces)
+    ## For some reason, when importing another schema we end up with two xs->http://www.w3.org/2001/XMLSchema namespaces.
+    ## So, we expect 3 here (one for Import_NS and then two for the schema namespace.
+    assert_equal(3, @schema.namespaces.length)
   end
 
   def test_schema_type
-    type = schema.types['shiporder']
+    type = @schema.types['shiporderType']
 
-    assert_equal('shiporder', type.name)
+    assert_equal('shiporderType', type.name)
     assert_nil(type.namespace)
     assert_equal("Shiporder type documentation", type.annotation)
     assert_instance_of(LibXML::XML::Node, type.node)
@@ -130,22 +193,22 @@ class TestSchema < Minitest::Test
   end
 
   def test_schema_element
-    element = schema.types['shiporder'].elements['orderperson']
+    element = @schema.types['shiporderType'].elements['orderperson']
 
     assert_equal('orderperson', element.name)
     assert_nil(element.namespace)
     assert_equal("orderperson element documentation", element.annotation)
 
-    element = schema.types['shiporder'].elements['item']
+    element = @schema.types['shiporderType'].elements['item']
     assert_equal('item', element.name)
 
-    element = schema.types['shiporder'].elements['item'].type.elements['note']
+    element = @schema.types['shiporderType'].elements['item'].type.elements['note']
     assert_equal('note', element.name)
     assert_equal('string', element.type.name)
   end
 
   def test_schema_attributes
-    type = schema.types['shiporder']
+    type = @schema.types['shiporderType']
 
     assert_instance_of(Array, type.attributes)
     assert_equal(2, type.attributes.length)
@@ -153,14 +216,14 @@ class TestSchema < Minitest::Test
   end
 
   def test_schema_attribute
-    attribute = schema.types['shiporder'].attributes.first
+    attribute = @schema.types['shiporderType'].attributes.first
 
     assert_equal("orderid", attribute.name)
     assert_nil(attribute.namespace)
     assert_equal(1, attribute.occurs)
     assert_equal('string', attribute.type.name)
 
-    attribute = schema.types['shiporder'].attributes[1]
+    attribute = @schema.types['shiporderType'].attributes[1]
     assert_equal(2, attribute.occurs)
     assert_equal('1', attribute.default)
     assert_equal('integer', attribute.type.name)

data/test/test_writer.rb

@@ -16,25 +16,48 @@ class TestWriter < Minitest::Test
 
   def test_empty_doc
     writer = LibXML::XML::Writer.string
-    document writer
+    document(writer)
     assert_equal(writer.result.strip!, '<?xml version="1.0"?>')
 
     writer = LibXML::XML::Writer.string
-    document writer, { :encoding => LibXML::XML::Encoding::ISO_8859_1 }
+    document(writer, :encoding => LibXML::XML::Encoding::ISO_8859_1)
     assert_equal(writer.result.strip!, '<?xml version="1.0" encoding="ISO-8859-1"?>')
 
     writer = LibXML::XML::Writer.string
-    document writer, { :standalone => 1 }
+    document(writer, :standalone => 1)
     assert_equal(writer.result.strip!, '<?xml version="1.0" standalone="yes"?>')
 
     writer = LibXML::XML::Writer.string
-    document writer, { :standalone => 1, :encoding => LibXML::XML::Encoding::ISO_8859_1, :foo => :bar }
+    document(writer, :standalone => 1, :encoding => LibXML::XML::Encoding::ISO_8859_1, :foo => :bar)
     assert_equal(writer.result.strip!, '<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>')
   end
 
+  def test_file_encoding
+    value = "François".encode(Encoding::UTF_8)
+
+    File.open('test.xml', 'wb', encoding: 'UTF-8') do |file|
+      writer = LibXML::XML::Writer::io(file)
+      document(writer, encoding: LibXML::XML::Encoding::UTF_8) do
+        writer.write_element('Name', value)
+      end
+    end
+  end
+
+  def test_io_encoding
+    value = "François".encode(Encoding::UTF_8)
+    expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Name>François</Name>".encode(Encoding::UTF_8)
+
+    io = StringIO.new
+    writer = LibXML::XML::Writer::io(io)
+    document(writer, encoding: LibXML::XML::Encoding::UTF_8) do
+      writer.write_element('Name', value)
+    end
+    assert_equal(expected, io.string.strip)
+  end
+
   def test_single_root
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       element writer, 'root'
     end
 
@@ -45,7 +68,7 @@ class TestWriter < Minitest::Test
     expected = "<?xml version=\"1.0\"?>\n<?php echo \"foo\";?>"
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.start_pi('php'))
       assert(writer.write_string('echo "foo";'))
       assert(writer.end_pi)
@@ -53,7 +76,7 @@ class TestWriter < Minitest::Test
     assert_equal(writer.result.strip!, expected)
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.write_pi('php', 'echo "foo";'))
     end
     assert_equal(writer.result.strip!, expected)
@@ -63,7 +86,7 @@ class TestWriter < Minitest::Test
     expected = "<?xml version=\"1.0\"?>\n<!--foo-->"
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.start_comment)
       assert(writer.write_string 'foo')
       assert(writer.end_comment)
@@ -71,7 +94,7 @@ class TestWriter < Minitest::Test
     assert_equal(writer.result.strip!, expected)
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.write_comment 'foo')
     end
     assert_equal(writer.result.strip!, expected)
@@ -81,7 +104,7 @@ class TestWriter < Minitest::Test
     expected = "<?xml version=\"1.0\"?>\n<root><![CDATA[<?php echo $foo; ?>]]></root>"
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       element writer, 'root' do
         assert(writer.start_cdata)
         assert(writer.write_string '<?php echo $foo; ?>')
@@ -91,7 +114,7 @@ class TestWriter < Minitest::Test
     assert_equal(writer.result.strip!, expected)
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       element writer, 'root' do
         assert(writer.write_cdata '<?php echo $foo; ?>')
       end
@@ -101,13 +124,13 @@ class TestWriter < Minitest::Test
 
   def test_write_empty_elements
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.write_element 'foo')
     end
     assert_equal(writer.result.strip!, "<?xml version=\"1.0\"?>\n<foo/>")
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.write_element_ns XSL_PREFIX, 'stylesheet', XSL_URI)
     end
     assert_equal(writer.result.strip!, "<?xml version=\"1.0\"?>\n<" + XSL_PREFIX + ":stylesheet xmlns:xsl=\"" + XSL_URI + "\"/>")
@@ -117,7 +140,7 @@ class TestWriter < Minitest::Test
     expected = "<?xml version=\"1.0\"?>\n<abc>123<def>456<ghi>789</ghi>cueillir des cerises</def>nous irons au bois</abc>"
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.start_element 'abc')
         assert(writer.write_string '123')
         assert(writer.start_element 'def')
@@ -133,7 +156,7 @@ class TestWriter < Minitest::Test
     assert_equal(writer.result.strip!, expected)
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.start_element 'abc')
         assert(writer.write_string '123')
         assert(writer.start_element 'def')
@@ -157,7 +180,7 @@ class TestWriter < Minitest::Test
       "</xsl:stylesheet>"
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.start_element_ns XSL_PREFIX, 'stylesheet', XSL_URI)
         assert(writer.start_element_ns XSL_PREFIX, 'attribute-set')
           assert(writer.start_element_ns XSL_PREFIX, 'attribute')
@@ -172,7 +195,7 @@ class TestWriter < Minitest::Test
     assert_equal(writer.result.strip!, expected)
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.start_element_ns XSL_PREFIX, 'stylesheet', XSL_URI)
         assert(writer.start_element_ns XSL_PREFIX, 'attribute-set')
           assert(writer.write_element_ns XSL_PREFIX, 'attribute', nil, '20px')
@@ -185,7 +208,7 @@ class TestWriter < Minitest::Test
 
   def test_attribute
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       element writer, 'root' do
         element writer, 'child' do
           assert(writer.start_attribute 'foo')
@@ -197,7 +220,7 @@ class TestWriter < Minitest::Test
     assert_equal(writer.result.strip!, "<?xml version=\"1.0\"?>\n<root><child foo=\"bar\"/></root>")
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       element writer, 'root' do
         element writer, 'child' do
           assert(writer.write_attribute 'abc', 'def')
@@ -212,7 +235,7 @@ class TestWriter < Minitest::Test
     expected = "<?xml version=\"1.0\"?>\n<root><link xlink:href=\"abc\" xhtml:class=\"def\"/></root>"
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       element writer, 'root' do
         element writer, 'link' do
           assert(writer.write_attribute_ns 'xlink', 'href', nil, 'abc')
@@ -223,7 +246,7 @@ class TestWriter < Minitest::Test
     assert_equal(writer.result.strip!, expected)
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       element writer, 'root' do
         element writer, 'link' do
           assert(writer.start_attribute_ns 'xlink', 'href')
@@ -242,7 +265,7 @@ class TestWriter < Minitest::Test
     if LibXML::XML::Writer.method_defined? :set_quote_char
       writer = LibXML::XML::Writer.string
       writer.set_quote_char "'"
-      document writer do
+      document(writer) do
         element writer, 'root' do
           assert(writer.start_attribute 'abc')
           assert(writer.write_string 'def')
@@ -257,7 +280,7 @@ class TestWriter < Minitest::Test
     if LibXML::XML::Writer.method_defined? :set_indent
       writer = LibXML::XML::Writer.string
       assert(writer.set_indent true)
-      document writer do
+      document(writer) do
         element writer, 'root' do
           element writer, 'child' do
             assert(writer.start_attribute 'abc')
@@ -275,7 +298,7 @@ class TestWriter < Minitest::Test
       writer = LibXML::XML::Writer.string
       assert(writer.set_indent true)
       assert(writer.set_indent_string ' ' * 4)
-      document writer do
+      document(writer) do
         element writer, 'root' do
           element writer, 'child' do
             assert(writer.start_attribute 'abc')
@@ -395,7 +418,7 @@ class TestWriter < Minitest::Test
     iso = 'éloïse'.encode 'ISO-8859-1'
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.write_element iso)
     end
     assert_equal(writer.result.strip!, "<?xml version=\"1.0\"?>\n<éloïse/>")

data/test/test_xml.rb

@@ -183,7 +183,8 @@ class TestXml < Minitest::Test
   end
 
   def test_enabled_iconv
-    assert(LibXML::XML.enabled_iconv?)
+    iconv_enabled = RUBY_PLATFORM !~ /darwin/
+    assert_equal(iconv_enabled, LibXML::XML.enabled_iconv?)
   end
 
   def test_enabled_memory_debug

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libxml-ruby
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.3
 platform: ruby
 authors:
 - Ross Bamform
@@ -11,10 +11,10 @@ authors:
 - Anurag Priyam
 - Charlie Savage
 - Ryan Johnson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2022-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -50,7 +50,7 @@ description: |2
       Libxml-ruby's primary advantage over REXML is performance - if speed
       is your need, these are good libraries to consider, as demonstrated
       by the informal benchmark below.
-email: 
+email:
 executables: []
 extensions:
 - ext/libxml/extconf.rb
@@ -61,7 +61,6 @@ files:
 - MANIFEST
 - README.rdoc
 - Rakefile
-- ext/libxml/extconf.h
 - ext/libxml/extconf.rb
 - ext/libxml/libxml.c
 - ext/libxml/libxml_ruby.def
@@ -216,6 +215,8 @@ files:
 - test/model/shiporder.rng
 - test/model/shiporder.xml
 - test/model/shiporder.xsd
+- test/model/shiporder_bad.xsd
+- test/model/shiporder_import.xsd
 - test/model/soap.xml
 - test/model/xinclude.xml
 - test/test_attr.rb
@@ -259,11 +260,11 @@ files:
 - test/test_xpath_context.rb
 - test/test_xpath_expression.rb
 - test/test_xpointer.rb
-homepage: http://xml4r.github.com/libxml-ruby
+homepage: https://xml4r.github.io/libxml-ruby/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -278,14 +279,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.4
+signing_key:
 specification_version: 4
 summary: Ruby Bindings for LibXML2
 test_files:
 - test/test_attr.rb
-- test/test_attributes.rb
 - test/test_attr_decl.rb
+- test/test_attributes.rb
 - test/test_canonicalize.rb
 - test/test_deprecated_require.rb
 - test/test_document.rb

data/ext/libxml/extconf.h

@@ -1,3 +0,0 @@
-#ifndef EXTCONF_H
-#define EXTCONF_H
-#endif