nokogiri 1.5.10 → 1.13.0

data/ext/nokogiri/xml_comment.c

@@ -1,12 +1,18 @@
-#include <xml_comment.h>
+#include <nokogiri.h>
+
+VALUE cNokogiriXmlComment;
+
+static ID document_id ;
 
 /*
  * call-seq:
- *  new(document, content)
+ *  new(document_or_node, content)
  *
- * Create a new Comment element on the +document+ with +content+
+ * Create a new Comment element on the +document+ with +content+.
+ * Alternatively, if a +node+ is passed, the +node+'s document is used.
  */
-static VALUE new(int argc, VALUE *argv, VALUE klass)
+static VALUE
+new (int argc, VALUE *argv, VALUE klass)
 {
   xmlDocPtr xml_doc;
   xmlNodePtr node;
@@ -17,38 +23,40 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
 
   rb_scan_args(argc, argv, "2*", &document, &content, &rest);
 
+  if (rb_obj_is_kind_of(document, cNokogiriXmlNode)) {
+    document = rb_funcall(document, document_id, 0);
+  } else if (!rb_obj_is_kind_of(document, cNokogiriXmlDocument)
+             && !rb_obj_is_kind_of(document, cNokogiriXmlDocumentFragment)) {
+    rb_raise(rb_eArgError, "first argument must be a XML::Document or XML::Node");
+  }
+
   Data_Get_Struct(document, xmlDoc, xml_doc);
 
   node = xmlNewDocComment(
-      xml_doc,
-      (const xmlChar *)StringValuePtr(content)
-  );
+           xml_doc,
+           (const xmlChar *)StringValueCStr(content)
+         );
 
-  rb_node = Nokogiri_wrap_xml_node(klass, node);
+  rb_node = noko_xml_node_wrap(klass, node);
   rb_obj_call_init(rb_node, argc, argv);
 
-  nokogiri_root_node(node);
+  noko_xml_document_pin_node(node);
 
-  if(rb_block_given_p()) rb_yield(rb_node);
+  if (rb_block_given_p()) { rb_yield(rb_node); }
 
   return rb_node;
 }
 
-VALUE cNokogiriXmlComment;
-void init_xml_comment()
+void
+noko_init_xml_comment()
 {
-  VALUE nokogiri = rb_define_module("Nokogiri");
-  VALUE xml = rb_define_module_under(nokogiri, "XML");
-  VALUE node = rb_define_class_under(xml, "Node", rb_cObject);
-  VALUE char_data = rb_define_class_under(xml, "CharacterData", node);
-
+  assert(cNokogiriXmlCharacterData);
   /*
    * Comment represents a comment node in an xml document.
    */
-  VALUE klass = rb_define_class_under(xml, "Comment", char_data);
-
+  cNokogiriXmlComment = rb_define_class_under(mNokogiriXml, "Comment", cNokogiriXmlCharacterData);
 
-  cNokogiriXmlComment = klass;
+  rb_define_singleton_method(cNokogiriXmlComment, "new", new, -1);
 
-  rb_define_singleton_method(klass, "new", new, -1);
+  document_id = rb_intern("document");
 }