libxml-ruby 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 791562c871b9c8d9680778bf68bdde22c5911ad147bd28634f3051d2c3b5bf6a
-  data.tar.gz: e2782de74edb9609634ef022f9d94d98591d3e49c38cb5d667af407ffa87b5da
+  metadata.gz: d298b5603240e7ea8b02a030fce5d7a850cd00f0a6a1aac4325dc37b85f7bed4
+  data.tar.gz: 8f9f870fe5f055d9d4b3d30afc9a20cc5c1dbea3332e11e2426ee703fcb83202
 SHA512:
-  metadata.gz: f3569183ea0e3cc00895c2fa3760b280dd1244f7c69144e661c7fbbdc575f57c67b479b5f0074a6cbf13c93d25bb6e9bd1c89df443388187f8f6472ba00ddfd8
-  data.tar.gz: d856e272adb85fa91aca6d83fd3a5d1c4ae4e1e40f2cb318d9e369ed86c14df973c942c74a4c84e76c83f270eaaadc47021571852e1e39ef750927a3c5930f07
+  metadata.gz: ef9b908bf3c1b2f4fe1fe848557e3e8e5265e980a5285c9f213395b80229c295868e007f2f03913ff286d716720d1d995938bcdcdcccaf65dc73022b2cedf15e
+  data.tar.gz: d44818d023a575fd2e5c6d40580382fe809f694d28462fff16500109aa33fa483ee555c6ea27ece9dd4f9756f7fe6c34d1aeaa34162b99e847d4171585624265

data/HISTORY

@@ -1,5 +1,13 @@
 = Release History
 
+== 4.1.2 / 2023-11-04
+
+* Fix Ruby warnings about undefined allocators (yuuji.yaginuma, Christopher Sahnwaldt)
+* Fix Schema::Element required? and array? (John Andrews)
+* Remove SchemaElement#minOccurs and SchemaElement#maxOccurs since they actually did not work (Charlie Savage)
+* Fix typo: XPatch -> XPath (Christopher Sahnwaldt)
+* Introduce new alternative Homebrew installation search paths to extconf makefile (Pierce Brooks)
+
 == 4.1.1 / 2023-05-01
 
 * Fix compile warning (or error) for input_callbacks_register_input_callbacks (Charlie Savage)

data/ext/libxml/extconf.rb

@@ -1,61 +1,67 @@
-#!/usr/bin/env ruby
-
-require 'mkmf'
-
-def crash(str)
-  printf(" extconf failure: %s\n", str)
-  exit 1
-end
-
-xc = with_config('xml2-config')
-if xc
-  cflags = `#{xc} --cflags`.chomp
-  if $? != 0
-    cflags = nil
-  else
-    libs = `#{xc} --libs`.chomp
-    if $? != 0
-      libs = nil
-    else
-      $CFLAGS += ' ' + cflags
-      $libs = libs + " " + $libs
-    end
-  end
-else
-  dir_config('xml2')
-end
-
-found_header = find_header('libxml/xmlversion.h',
-                           '/opt/include/libxml2',
-                           '/opt/local/include/libxml2',
-                           '/usr/local/include/libxml2',
-                           '/usr/include/libxml2',
-                           '/usr/local/include')
-
-found_lib = find_library('xml2', 'xmlParseDoc',
-                         '/opt/lib',
-                         '/opt/local/lib',
-                         '/usr/local/lib',
-                         '/usr/lib')
-
-found_lib ||= find_library('libxml2', 'xmlParseDoc',
-                           '/opt/lib',
-                           '/opt/local/lib',
-                           '/usr/local/lib',
-                           '/usr/lib')
-
-if !found_header || !found_lib
-    crash(<<~EOL)
-      Cannot find libxml2.
-
-      Install the library or try one of the following options to extconf.rb:
-  
-        --with-xml2-config=/path/to/xml2-config
-        --with-xml2-dir=/path/to/libxml2
-        --with-xml2-lib=/path/to/libxml2/lib
-        --with-xml2-include=/path/to/libxml2/include
-    EOL
-end
-
-create_header()
-create_makefile('libxml_ruby')
+#!/usr/bin/env ruby
+
+require 'mkmf'
+
+def crash(str)
+  printf(" extconf failure: %s\n", str)
+  exit 1
+end
+
+xc = with_config('xml2-config')
+if xc
+  cflags = `#{xc} --cflags`.chomp
+  if $? != 0
+    cflags = nil
+  else
+    libs = `#{xc} --libs`.chomp
+    if $? != 0
+      libs = nil
+    else
+      $CFLAGS += ' ' + cflags
+      $libs = libs + " " + $libs
+    end
+  end
+else
+  dir_config('xml2')
+end
+
+found_header = find_header('libxml/xmlversion.h',
+                           '/opt/include/libxml2',
+                           '/opt/local/include/libxml2',
+                           '/opt/homebrew/opt/libxml2/include/libxml2',
+                           '/usr/local/include/libxml2',
+                           '/usr/include/libxml2',
+                           '/usr/local/include',
+                           '/usr/local/opt/libxml2/include/libxml2')
+
+found_lib = find_library('xml2', 'xmlParseDoc',
+                           '/opt/lib',
+                           '/opt/local/lib',
+                           '/opt/homebrew/opt/libxml2/lib',
+                           '/usr/lib',
+                           '/usr/local/lib',
+                           '/usr/local/opt/libxml2/lib')
+
+found_lib ||= find_library('libxml2', 'xmlParseDoc',
+                           '/opt/lib',
+                           '/opt/local/lib',
+                           '/opt/homebrew/opt/libxml2/lib',
+                           '/usr/lib',
+                           '/usr/local/lib',
+                           '/usr/local/opt/libxml2/lib')
+
+if !found_header || !found_lib
+    crash(<<~EOL)
+      Cannot find libxml2.
+
+      Install the library or try one of the following options to extconf.rb:
+  
+        --with-xml2-config=/path/to/xml2-config
+        --with-xml2-dir=/path/to/libxml2
+        --with-xml2-lib=/path/to/libxml2/lib
+        --with-xml2-include=/path/to/libxml2/include
+    EOL
+end
+
+create_header()
+create_makefile('libxml_ruby')

data/ext/libxml/ruby_xml_attr_decl.c

@@ -1,153 +1,154 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-/*
- * Document-class: LibXML::XML::AttrDecl
- *
- * At attribute declaration is used in XML::Dtds to define 
- * what attributes are allowed on an element.  An attribute
- * declaration defines an attribues name, data type and default
- * value (if any).
- */
-
-#include "ruby_libxml.h"
-
-VALUE cXMLAttrDecl;
-
-void rxml_attr_decl_mark(xmlAttributePtr xattr)
-{
-  rxml_node_mark((xmlNodePtr) xattr);
-}
-
-VALUE rxml_attr_decl_wrap(xmlAttributePtr xattr)
-{
-  return Data_Wrap_Struct(cXMLAttrDecl, rxml_attr_decl_mark, NULL, xattr);
-}
-
-/*
- * call-seq:
- *    attr_decl.doc -> XML::Document
- *
- * Returns this attribute declaration's document.
- */
-static VALUE rxml_attr_decl_doc_get(VALUE self)
-{
-  xmlAttributePtr xattr;
-  Data_Get_Struct(self, xmlAttribute, xattr);
-  if (xattr->doc == NULL)
-    return Qnil;
-  else
-    return rxml_document_wrap(xattr->doc);
-}
-
-
-/*
- * call-seq:
- *    attr_decl.name -> "name"
- *
- * Obtain this attribute declaration's name.
- */
-static VALUE rxml_attr_decl_name_get(VALUE self)
-{
-  xmlAttributePtr xattr;
-  Data_Get_Struct(self, xmlAttribute, xattr);
-
-  if (xattr->name == NULL)
-    return Qnil;
-  else
-    return rxml_new_cstr( xattr->name, xattr->doc->encoding);
-}
-
-/*
- * call-seq:
- *    attr_decl.next -> XML::AttrDecl
- *
- * Obtain the next attribute declaration.
- */
-static VALUE rxml_attr_decl_next_get(VALUE self)
-{
-  xmlAttributePtr xattr;
-  Data_Get_Struct(self, xmlAttribute, xattr);
-  if (xattr->next == NULL)
-    return Qnil;
-  else
-    return rxml_attr_decl_wrap((xmlAttributePtr)xattr->next);
-}
-
-/*
- * call-seq:
- *    attr_decl.type -> num
- *
- * Obtain this attribute declaration's type node type.
- */
-static VALUE rxml_attr_decl_node_type(VALUE self)
-{
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
-  return INT2NUM(xattr->type);
-}
-
-/*
- * call-seq:
- *    attr_decl.parent -> XML::Dtd
- *
- * Obtain this attribute declaration's parent which
- * is an instance of a XML::DTD.
- */
-static VALUE rxml_attr_decl_parent_get(VALUE self)
-{
-  xmlAttributePtr xattr;
-  Data_Get_Struct(self, xmlAttribute, xattr);
-
-  if (xattr->parent == NULL)
-    return Qnil;
-  else
-    return rxml_dtd_wrap(xattr->parent);
-}
-
-/*
- * call-seq:
- *    attr_decl.prev -> (XML::AttrDecl | XML::ElementDecl)
- *
- * Obtain the previous attribute declaration or the owning
- * element declration (not implemented).
- */
-static VALUE rxml_attr_decl_prev_get(VALUE self)
-{
-  xmlAttributePtr xattr;
-  Data_Get_Struct(self, xmlAttribute, xattr);
-
-  if (xattr->prev == NULL)
-    return Qnil;
-  else
-    return rxml_attr_decl_wrap((xmlAttributePtr)xattr->prev);
-}
-
-/*
- * call-seq:
- *    attr_decl.value -> "value"
- *
- * Obtain the default value of this attribute declaration.
- */
-VALUE rxml_attr_decl_value_get(VALUE self)
-{
-  xmlAttributePtr xattr;
-
-  Data_Get_Struct(self, xmlAttribute, xattr);
-
-  if (xattr->defaultValue)
-    return rxml_new_cstr(xattr->defaultValue, NULL);
-  else
-    return Qnil;
-}
-
-void rxml_init_attr_decl(void)
-{
-  cXMLAttrDecl = rb_define_class_under(mXML, "AttrDecl", rb_cObject);
-  rb_define_method(cXMLAttrDecl, "doc", rxml_attr_decl_doc_get, 0);
-  rb_define_method(cXMLAttrDecl, "name", rxml_attr_decl_name_get, 0);
-  rb_define_method(cXMLAttrDecl, "next", rxml_attr_decl_next_get, 0);
-  rb_define_method(cXMLAttrDecl, "node_type", rxml_attr_decl_node_type, 0);
-  rb_define_method(cXMLAttrDecl, "parent", rxml_attr_decl_parent_get, 0);
-  rb_define_method(cXMLAttrDecl, "prev", rxml_attr_decl_prev_get, 0);
-  rb_define_method(cXMLAttrDecl, "value", rxml_attr_decl_value_get, 0);
-}
+/* Please see the LICENSE file for copyright and distribution information */
+
+/*
+ * Document-class: LibXML::XML::AttrDecl
+ *
+ * At attribute declaration is used in XML::Dtds to define 
+ * what attributes are allowed on an element.  An attribute
+ * declaration defines an attribues name, data type and default
+ * value (if any).
+ */
+
+#include "ruby_libxml.h"
+
+VALUE cXMLAttrDecl;
+
+void rxml_attr_decl_mark(xmlAttributePtr xattr)
+{
+  rxml_node_mark((xmlNodePtr) xattr);
+}
+
+VALUE rxml_attr_decl_wrap(xmlAttributePtr xattr)
+{
+  return Data_Wrap_Struct(cXMLAttrDecl, rxml_attr_decl_mark, NULL, xattr);
+}
+
+/*
+ * call-seq:
+ *    attr_decl.doc -> XML::Document
+ *
+ * Returns this attribute declaration's document.
+ */
+static VALUE rxml_attr_decl_doc_get(VALUE self)
+{
+  xmlAttributePtr xattr;
+  Data_Get_Struct(self, xmlAttribute, xattr);
+  if (xattr->doc == NULL)
+    return Qnil;
+  else
+    return rxml_document_wrap(xattr->doc);
+}
+
+
+/*
+ * call-seq:
+ *    attr_decl.name -> "name"
+ *
+ * Obtain this attribute declaration's name.
+ */
+static VALUE rxml_attr_decl_name_get(VALUE self)
+{
+  xmlAttributePtr xattr;
+  Data_Get_Struct(self, xmlAttribute, xattr);
+
+  if (xattr->name == NULL)
+    return Qnil;
+  else
+    return rxml_new_cstr( xattr->name, xattr->doc->encoding);
+}
+
+/*
+ * call-seq:
+ *    attr_decl.next -> XML::AttrDecl
+ *
+ * Obtain the next attribute declaration.
+ */
+static VALUE rxml_attr_decl_next_get(VALUE self)
+{
+  xmlAttributePtr xattr;
+  Data_Get_Struct(self, xmlAttribute, xattr);
+  if (xattr->next == NULL)
+    return Qnil;
+  else
+    return rxml_attr_decl_wrap((xmlAttributePtr)xattr->next);
+}
+
+/*
+ * call-seq:
+ *    attr_decl.type -> num
+ *
+ * Obtain this attribute declaration's type node type.
+ */
+static VALUE rxml_attr_decl_node_type(VALUE self)
+{
+  xmlAttrPtr xattr;
+  Data_Get_Struct(self, xmlAttr, xattr);
+  return INT2NUM(xattr->type);
+}
+
+/*
+ * call-seq:
+ *    attr_decl.parent -> XML::Dtd
+ *
+ * Obtain this attribute declaration's parent which
+ * is an instance of a XML::DTD.
+ */
+static VALUE rxml_attr_decl_parent_get(VALUE self)
+{
+  xmlAttributePtr xattr;
+  Data_Get_Struct(self, xmlAttribute, xattr);
+
+  if (xattr->parent == NULL)
+    return Qnil;
+  else
+    return rxml_dtd_wrap(xattr->parent);
+}
+
+/*
+ * call-seq:
+ *    attr_decl.prev -> (XML::AttrDecl | XML::ElementDecl)
+ *
+ * Obtain the previous attribute declaration or the owning
+ * element declration (not implemented).
+ */
+static VALUE rxml_attr_decl_prev_get(VALUE self)
+{
+  xmlAttributePtr xattr;
+  Data_Get_Struct(self, xmlAttribute, xattr);
+
+  if (xattr->prev == NULL)
+    return Qnil;
+  else
+    return rxml_attr_decl_wrap((xmlAttributePtr)xattr->prev);
+}
+
+/*
+ * call-seq:
+ *    attr_decl.value -> "value"
+ *
+ * Obtain the default value of this attribute declaration.
+ */
+VALUE rxml_attr_decl_value_get(VALUE self)
+{
+  xmlAttributePtr xattr;
+
+  Data_Get_Struct(self, xmlAttribute, xattr);
+
+  if (xattr->defaultValue)
+    return rxml_new_cstr(xattr->defaultValue, NULL);
+  else
+    return Qnil;
+}
+
+void rxml_init_attr_decl(void)
+{
+  cXMLAttrDecl = rb_define_class_under(mXML, "AttrDecl", rb_cObject);
+  rb_undef_alloc_func(cXMLAttrDecl);
+  rb_define_method(cXMLAttrDecl, "doc", rxml_attr_decl_doc_get, 0);
+  rb_define_method(cXMLAttrDecl, "name", rxml_attr_decl_name_get, 0);
+  rb_define_method(cXMLAttrDecl, "next", rxml_attr_decl_next_get, 0);
+  rb_define_method(cXMLAttrDecl, "node_type", rxml_attr_decl_node_type, 0);
+  rb_define_method(cXMLAttrDecl, "parent", rxml_attr_decl_parent_get, 0);
+  rb_define_method(cXMLAttrDecl, "prev", rxml_attr_decl_prev_get, 0);
+  rb_define_method(cXMLAttrDecl, "value", rxml_attr_decl_value_get, 0);
+}