nokolexbor 0.2.2 → 0.2.4

data/ext/nokolexbor/nl_node.c

@@ -43,7 +43,7 @@ nl_rb_node_unwrap(VALUE rb_node)
   lxb_dom_node_t *node;
   if (rb_obj_class(rb_node) == cNokolexborDocument)
   {
-    TypedData_Get_Struct(rb_node, lxb_dom_document_t, &nl_document_type, node);
+    TypedData_Get_Struct(rb_node, lxb_dom_node_t, &nl_document_type, node);
   }
   else
   {
@@ -56,7 +56,6 @@ static VALUE
 nl_node_new(int argc, VALUE *argv, VALUE klass)
 {
   lxb_dom_document_t *document;
-  lxb_dom_node_t *node;
   VALUE rb_name;
   VALUE rb_document;
   VALUE rest;
@@ -68,9 +67,9 @@ nl_node_new(int argc, VALUE *argv, VALUE klass)
     rb_raise(rb_eArgError, "Document must be a Nokolexbor::Document");
   }
 
-  TypedData_Get_Struct(rb_document, lxb_dom_document_t, &nl_document_type, document);
+  document = nl_rb_document_unwrap(rb_document);
 
-  lxb_dom_element_t *element = lxb_dom_document_create_element(document, StringValueCStr(rb_name), RSTRING_LEN(rb_name), NULL);
+  lxb_dom_element_t *element = lxb_dom_document_create_element(document, (const lxb_char_t *)StringValueCStr(rb_name), RSTRING_LEN(rb_name), NULL);
   if (element == NULL)
   {
     rb_raise(rb_eRuntimeError, "Error creating element");
@@ -97,7 +96,7 @@ nl_node_content(VALUE self)
   {
     return rb_str_new("", 0);
   }
-  VALUE rb_str = rb_utf8_str_new(text, str_len);
+  VALUE rb_str = rb_utf8_str_new((char *)text, str_len);
   lxb_dom_document_destroy_text(node->owner_document, text);
 
   return rb_str;
@@ -115,19 +114,19 @@ nl_node_get_attr(VALUE self, VALUE rb_attr)
 
   VALUE rb_attr_s = rb_String(rb_attr);
   const char *attr_c = RSTRING_PTR(rb_attr_s);
-  int attr_len = RSTRING_LEN(rb_attr_s);
+  size_t attr_len = RSTRING_LEN(rb_attr_s);
 
-  lxb_dom_element_t *element = lxb_html_interface_element(node);
+  lxb_dom_element_t *element = lxb_dom_interface_element(node);
 
-  if (!lxb_dom_element_has_attribute(element, attr_c, attr_len))
+  if (!lxb_dom_element_has_attribute(element, (const lxb_char_t *)attr_c, attr_len))
   {
     return Qnil;
   }
 
   size_t attr_value_len;
-  char *attr_value = lxb_dom_element_get_attribute(element, attr_c, attr_len, &attr_value_len);
+  const lxb_char_t *attr_value = lxb_dom_element_get_attribute(element, (const lxb_char_t *)attr_c, attr_len, &attr_value_len);
 
-  return rb_utf8_str_new(attr_value, attr_value_len);
+  return rb_utf8_str_new((const char *)attr_value, attr_value_len);
 }
 
 static VALUE
@@ -144,13 +143,13 @@ nl_node_set_attr(VALUE self, VALUE rb_attr, VALUE rb_value)
   VALUE rb_value_s = rb_String(rb_value);
 
   const char *attr_c = RSTRING_PTR(rb_attr_s);
-  int attr_len = RSTRING_LEN(rb_attr_s);
+  size_t attr_len = RSTRING_LEN(rb_attr_s);
   const char *value_c = RSTRING_PTR(rb_value_s);
-  int value_len = RSTRING_LEN(rb_value_s);
+  size_t value_len = RSTRING_LEN(rb_value_s);
 
-  lxb_dom_element_t *element = lxb_html_interface_element(node);
+  lxb_dom_element_t *element = lxb_dom_interface_element(node);
 
-  lxb_dom_element_set_attribute(element, attr_c, attr_len, value_c, value_len);
+  lxb_dom_element_set_attribute(element, (const lxb_char_t *)attr_c, attr_len, (const lxb_char_t *)value_c, value_len);
 
   return rb_value;
 }
@@ -168,14 +167,14 @@ nl_node_remove_attr(VALUE self, VALUE rb_attr)
   VALUE rb_attr_s = rb_String(rb_attr);
 
   const char *attr_c = RSTRING_PTR(rb_attr_s);
-  int attr_len = RSTRING_LEN(rb_attr_s);
+  size_t attr_len = RSTRING_LEN(rb_attr_s);
 
-  lxb_dom_element_t *element = lxb_html_interface_element(node);
+  lxb_dom_element_t *element = lxb_dom_interface_element(node);
 
-  return lxb_dom_element_remove_attribute(element, attr_c, attr_len) == LXB_STATUS_OK ? Qtrue : Qfalse;
+  return lxb_dom_element_remove_attribute(element, (const lxb_char_t *)attr_c, attr_len) == LXB_STATUS_OK ? Qtrue : Qfalse;
 }
 
-static lxb_status_t
+lxb_status_t
 nl_node_at_css_callback(lxb_dom_node_t *node, lxb_css_selector_specificity_t *spec, void *ctx)
 {
   lexbor_array_t *array = (lexbor_array_t *)ctx;
@@ -188,7 +187,7 @@ nl_node_at_css_callback(lxb_dom_node_t *node, lxb_css_selector_specificity_t *sp
   return LXB_STATUS_STOP;
 }
 
-static lxb_status_t
+lxb_status_t
 nl_node_css_callback(lxb_dom_node_t *node, lxb_css_selector_specificity_t *spec, void *ctx)
 {
   lexbor_array_t *array = (lexbor_array_t *)ctx;
@@ -200,11 +199,11 @@ nl_node_css_callback(lxb_dom_node_t *node, lxb_css_selector_specificity_t *spec,
   return LXB_STATUS_OK;
 }
 
-static void
+void
 nl_node_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx)
 {
   const char *selector_c = StringValuePtr(selector);
-  int selector_len = RSTRING_LEN(selector);
+  size_t selector_len = RSTRING_LEN(selector);
 
   lxb_dom_node_t *node = nl_rb_node_unwrap(self);
 
@@ -226,7 +225,7 @@ nl_node_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx)
 
   /* Parse and get the log. */
   // TODO: Cache the list for reuse, improves performance
-  lxb_css_selector_list_t *list = lxb_css_selectors_parse_relative_list(parser, selector_c, selector_len);
+  lxb_css_selector_list_t *list = lxb_css_selectors_parse_relative_list(parser, (const lxb_char_t *)selector_c, selector_len);
   if (parser->status != LXB_STATUS_OK)
   {
     nl_raise_lexbor_error(parser->status);
@@ -252,15 +251,15 @@ nl_node_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx)
 static void
 mark_node_orders(lxb_dom_node_t *root)
 {
-  int count = 1;
-  root->user = count;
+  size_t count = 1;
+  root->user = (void *)count;
   lxb_dom_node_t *node = root;
   do
   {
     if (node->first_child != NULL)
     {
       node = node->first_child;
-      node->user = ++count;
+      node->user = (void *)++count;
     }
     else
     {
@@ -275,7 +274,7 @@ mark_node_orders(lxb_dom_node_t *root)
       }
 
       node = node->next;
-      node->user = ++count;
+      node->user = (void *)++count;
     }
 
   } while (true);
@@ -285,12 +284,12 @@ mark_node_orders(lxb_dom_node_t *root)
 void sort_nodes_if_necessary(VALUE selector, lxb_dom_document_t *doc, lexbor_array_t *array)
 {
   // No need to sort if there's only one selector, the results are natually in document traversal order
-  if (strstr(RSTRING_PTR(selector), ",") != NULL)
+  if (strchr(RSTRING_PTR(selector), ',') != NULL)
   {
     int need_order = 0;
     // Check if we have already markded orders, note that
     // we need to order again if new nodes are added to the document
-    for (int i = 0; i < array->length; i++)
+    for (size_t i = 0; i < array->length; i++)
     {
       if (((lxb_dom_node_t *)array->list[i])->user == 0)
       {
@@ -300,13 +299,13 @@ void sort_nodes_if_necessary(VALUE selector, lxb_dom_document_t *doc, lexbor_arr
     }
     if (need_order)
     {
-      mark_node_orders(doc);
+      mark_node_orders(&doc->node);
     }
-    css_result_tim_sort(&array->list[0], array->length);
+    css_result_tim_sort((lxb_dom_node_t **)&array->list[0], array->length);
   }
 }
 
-VALUE
+static VALUE
 nl_node_at_css(VALUE self, VALUE selector)
 {
   lxb_dom_node_t *node = nl_rb_node_unwrap(self);
@@ -321,10 +320,14 @@ nl_node_at_css(VALUE self, VALUE selector)
 
   sort_nodes_if_necessary(selector, node->owner_document, array);
 
-  return nl_rb_node_create(array->list[0], nl_rb_document_get(self));
+  VALUE ret = nl_rb_node_create(array->list[0], nl_rb_document_get(self));
+
+  lexbor_array_destroy(array, true);
+
+  return ret;
 }
 
-VALUE
+static VALUE
 nl_node_css(VALUE self, VALUE selector)
 {
   lxb_dom_node_t *node = nl_rb_node_unwrap(self);
@@ -354,7 +357,7 @@ nl_node_inner_html(VALUE self)
 
   if (str.data != NULL)
   {
-    VALUE ret = rb_utf8_str_new(str.data, str.length);
+    VALUE ret = rb_utf8_str_new((const char *)str.data, str.length);
     lexbor_str_destroy(&str, node->owner_document->text, false);
     return ret;
   }
@@ -379,7 +382,7 @@ nl_node_outer_html(VALUE self)
 
   if (str.data != NULL)
   {
-    VALUE ret = rb_utf8_str_new(str.data, str.length);
+    VALUE ret = rb_utf8_str_new((const char *)str.data, str.length);
     lexbor_str_destroy(&str, node->owner_document->text, false);
     return ret;
   }
@@ -399,11 +402,11 @@ nl_node_has_key(VALUE self, VALUE rb_attr)
 
   VALUE rb_attr_s = rb_String(rb_attr);
   const char *attr_c = RSTRING_PTR(rb_attr_s);
-  int attr_len = RSTRING_LEN(rb_attr_s);
+  size_t attr_len = RSTRING_LEN(rb_attr_s);
 
-  lxb_dom_element_t *element = lxb_html_interface_element(node);
+  lxb_dom_element_t *element = lxb_dom_interface_element(node);
 
-  return lxb_dom_element_has_attribute(element, attr_c, attr_len) ? Qtrue : Qfalse;
+  return lxb_dom_element_has_attribute(element, (const lxb_char_t *)attr_c, attr_len) ? Qtrue : Qfalse;
 }
 
 static VALUE
@@ -417,13 +420,13 @@ nl_node_keys(VALUE self)
     return ary_keys;
   }
 
-  lxb_dom_attr_t *attr = lxb_dom_element_first_attribute(lxb_html_interface_element(node));
+  lxb_dom_attr_t *attr = lxb_dom_element_first_attribute(lxb_dom_interface_element(node));
 
   while (attr != NULL)
   {
     size_t tmp_len;
-    lxb_char_t *tmp = lxb_dom_attr_qualified_name(attr, &tmp_len);
-    rb_ary_push(ary_keys, rb_utf8_str_new(tmp, tmp_len));
+    const lxb_char_t *tmp = lxb_dom_attr_qualified_name(attr, &tmp_len);
+    rb_ary_push(ary_keys, rb_utf8_str_new((const char *)tmp, tmp_len));
 
     attr = lxb_dom_element_next_attribute(attr);
   }
@@ -442,15 +445,19 @@ nl_node_values(VALUE self)
     return ary_values;
   }
 
-  lxb_dom_attr_t *attr = lxb_dom_element_first_attribute(lxb_html_interface_element(node));
+  lxb_dom_attr_t *attr = lxb_dom_element_first_attribute(lxb_dom_interface_element(node));
 
   while (attr != NULL)
   {
     size_t tmp_len;
-    lxb_char_t *tmp = lxb_dom_attr_value(attr, &tmp_len);
+    const lxb_char_t *tmp = lxb_dom_attr_value(attr, &tmp_len);
     if (tmp != NULL)
     {
-      rb_ary_push(ary_values, rb_utf8_str_new(tmp, tmp_len));
+      rb_ary_push(ary_values, rb_utf8_str_new((const char *)tmp, tmp_len));
+    }
+    else
+    {
+      rb_ary_push(ary_values, rb_str_new("", 0));
     }
 
     attr = lxb_dom_element_next_attribute(attr);
@@ -470,16 +477,16 @@ nl_node_attrs(VALUE self)
     return rb_hash;
   }
 
-  lxb_dom_attr_t *attr = lxb_dom_element_first_attribute(lxb_html_interface_element(node));
+  lxb_dom_attr_t *attr = lxb_dom_element_first_attribute(lxb_dom_interface_element(node));
 
   while (attr != NULL)
   {
     size_t tmp_len;
-    lxb_char_t *tmp = lxb_dom_attr_qualified_name(attr, &tmp_len);
-    VALUE rb_key = rb_utf8_str_new(tmp, tmp_len);
+    const lxb_char_t *tmp = lxb_dom_attr_qualified_name(attr, &tmp_len);
+    VALUE rb_key = rb_utf8_str_new((const char *)tmp, tmp_len);
 
     tmp = lxb_dom_attr_value(attr, &tmp_len);
-    VALUE rb_value = tmp != NULL ? rb_utf8_str_new(tmp, tmp_len) : Qnil;
+    VALUE rb_value = tmp != NULL ? rb_utf8_str_new((const char *)tmp, tmp_len) : rb_str_new("", 0);
 
     rb_hash_aset(rb_hash, rb_key, rb_value);
 
@@ -604,15 +611,16 @@ nl_node_name(VALUE self)
 {
   lxb_dom_node_t *node = nl_rb_node_unwrap(self);
   size_t len;
-  lxb_char_t *name = lxb_dom_node_name_qualified(node, &len);
-  return rb_utf8_str_new(name, len);
+  const lxb_char_t *name = lxb_dom_node_name_qualified(node, &len);
+  return rb_utf8_str_new((const char *)name, len);
 }
 
 static lxb_dom_node_t *
-nl_node_parse_fragment(lxb_html_document_t *doc, lxb_char_t *html, size_t size)
+nl_node_parse_fragment(lxb_dom_document_t *doc, lxb_char_t *html, size_t size)
 {
   size_t tag_name_len;
-  lxb_char_t *tag_name = lxb_tag_name_by_id(lxb_html_document_tags(doc), LXB_TAG__UNDEF, &tag_name_len);
+  lxb_html_document_t *html_doc = lxb_html_interface_document(doc);
+  const lxb_char_t *tag_name = lxb_tag_name_by_id(lxb_html_document_tags(html_doc), LXB_TAG__UNDEF, &tag_name_len);
   if (tag_name == NULL)
   {
     rb_raise(rb_eRuntimeError, "Error getting tag name");
@@ -622,7 +630,7 @@ nl_node_parse_fragment(lxb_html_document_t *doc, lxb_char_t *html, size_t size)
   {
     rb_raise(rb_eRuntimeError, "Error creating element");
   }
-  lxb_dom_node_t *frag_root = lxb_html_document_parse_fragment(doc, element, html, size);
+  lxb_dom_node_t *frag_root = lxb_html_document_parse_fragment(html_doc, element, html, size);
   if (frag_root == NULL)
   {
     rb_raise(rb_eArgError, "Error parsing HTML");
@@ -637,7 +645,7 @@ nl_node_fragment(VALUE self, VALUE html)
   lxb_dom_node_t *node = nl_rb_node_unwrap(self);
   lxb_dom_document_t *doc = node->owner_document;
 
-  lxb_dom_node_t *frag_root = nl_node_parse_fragment(doc, RSTRING_PTR(html), RSTRING_LEN(html));
+  lxb_dom_node_t *frag_root = nl_node_parse_fragment(doc, (lxb_char_t *)RSTRING_PTR(html), RSTRING_LEN(html));
   return nl_rb_node_create(frag_root, nl_rb_document_get(self));
 }
 
@@ -663,7 +671,7 @@ nl_node_add_sibling(VALUE self, VALUE next_or_previous, VALUE new)
 
   if (TYPE(new) == T_STRING)
   {
-    lxb_dom_node_t *frag_root = nl_node_parse_fragment(doc, RSTRING_PTR(new), RSTRING_LEN(new));
+    lxb_dom_node_t *frag_root = nl_node_parse_fragment(doc, (lxb_char_t *)RSTRING_PTR(new), RSTRING_LEN(new));
 
     while (frag_root->first_child != NULL)
     {
@@ -694,7 +702,7 @@ nl_node_add_child(VALUE self, VALUE new)
 
   if (TYPE(new) == T_STRING)
   {
-    lxb_dom_node_t *frag_root = nl_node_parse_fragment(doc, RSTRING_PTR(new), RSTRING_LEN(new));
+    lxb_dom_node_t *frag_root = nl_node_parse_fragment(doc, (lxb_char_t *)RSTRING_PTR(new), RSTRING_LEN(new));
 
     while (frag_root->first_child != NULL)
     {
@@ -832,11 +840,13 @@ void Init_nl_node(void)
 
   rb_define_alias(cNokolexborNode, "attr", "[]");
   rb_define_alias(cNokolexborNode, "set_attr", "[]=");
+  rb_define_alias(cNokolexborNode, "delete", "remove_attr");
   rb_define_alias(cNokolexborNode, "text", "content");
   rb_define_alias(cNokolexborNode, "inner_text", "content");
   rb_define_alias(cNokolexborNode, "to_str", "content");
   rb_define_alias(cNokolexborNode, "to_html", "outer_html");
   rb_define_alias(cNokolexborNode, "to_s", "outer_html");
+  rb_define_alias(cNokolexborNode, "unlink", "remove");
   rb_define_alias(cNokolexborNode, "type", "node_type");
   rb_define_alias(cNokolexborNode, "dup", "clone");
 }

data/ext/nokolexbor/nl_node_set.c

@@ -5,15 +5,15 @@ extern VALUE cNokolexborNode;
 VALUE cNokolexborNodeSet;
 extern rb_data_type_t nl_document_type;
 
-VALUE nl_node_at_css(VALUE self, VALUE selector);
-VALUE nl_node_css(VALUE self, VALUE selector);
-
-typedef VALUE (*nl_node_find_f)(VALUE self, VALUE selector);
+void nl_node_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx);
+void sort_nodes_if_necessary(VALUE selector, lxb_dom_document_t *doc, lexbor_array_t *array);
+lxb_status_t nl_node_at_css_callback(lxb_dom_node_t *node, lxb_css_selector_specificity_t *spec, void *ctx);
+lxb_status_t nl_node_css_callback(lxb_dom_node_t *node, lxb_css_selector_specificity_t *spec, void *ctx);
 
 lxb_status_t
 lexbor_array_push_unique(lexbor_array_t *array, void *value)
 {
-  for (int i = 0; i < array->length; i++)
+  for (size_t i = 0; i < array->length; i++)
     if (array->list[i] == value)
       return LXB_STATUS_STOPPED;
 
@@ -91,7 +91,7 @@ nl_node_set_delete(VALUE self, VALUE rb_node)
   lexbor_array_t *array = nl_rb_node_set_unwrap(self);
   lxb_dom_node_t *node = nl_rb_node_unwrap(rb_node);
 
-  int i;
+  size_t i;
   for (i = 0; i < array->length; i++)
     if (array->list[i] == node)
     {
@@ -113,7 +113,7 @@ nl_node_set_is_include(VALUE self, VALUE rb_node)
   lexbor_array_t *array = nl_rb_node_set_unwrap(self);
   lxb_dom_node_t *node = nl_rb_node_unwrap(rb_node);
 
-  for (int i = 0; i < array->length; i++)
+  for (size_t i = 0; i < array->length; i++)
     if (array->list[i] == node)
     {
       return Qtrue;
@@ -169,7 +169,7 @@ nl_node_set_subseq(VALUE self, long beg, long len)
     }
   }
 
-  for (int j = beg; j < beg + len; ++j)
+  for (long j = beg; j < beg + len; ++j)
   {
     lxb_status_t status = lexbor_array_push(new_array, old_array->list[j]);
     if (status != LXB_STATUS_OK)
@@ -177,7 +177,7 @@ nl_node_set_subseq(VALUE self, long beg, long len)
       nl_raise_lexbor_error(status);
     }
   }
-  return TypedData_Wrap_Struct(cNokolexborNodeSet, &nl_node_set_type, new_array);
+  return nl_rb_node_set_create_with_data(new_array, nl_rb_document_get(self));
 }
 
 static VALUE
@@ -231,7 +231,7 @@ nl_node_set_to_array(VALUE self)
 
   VALUE list = rb_ary_new2(array->length);
   VALUE doc = nl_rb_document_get(self);
-  for (int i = 0; i < array->length; i++)
+  for (size_t i = 0; i < array->length; i++)
   {
     lxb_dom_node_t *node = (lxb_dom_node_t *)array->list[i];
     VALUE rb_node = nl_rb_node_create(node, doc);
@@ -267,7 +267,7 @@ nl_node_set_union(VALUE self, VALUE other)
   memcpy(new_array->list, self_array->list, sizeof(lxb_dom_node_t *) * self_array->length);
   new_array->length = self_array->length;
 
-  for (int i = 0; i < other_array->length; i++)
+  for (size_t i = 0; i < other_array->length; i++)
   {
     lexbor_array_push_unique(new_array, other_array->list[i]);
   }
@@ -275,16 +275,15 @@ nl_node_set_union(VALUE self, VALUE other)
   return nl_rb_node_set_create_with_data(new_array, nl_rb_document_get(self));
 }
 
-static VALUE
-nl_node_set_find(VALUE self, VALUE selector, nl_node_find_f finder)
+static void
+nl_node_set_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void* ctx)
 {
-  VALUE rb_doc = nl_rb_document_get(self);
-  lxb_dom_document_t *doc;
-  TypedData_Get_Struct(rb_doc, lxb_dom_document_t, &nl_document_type, doc);
+  lxb_dom_document_t *doc = nl_rb_document_unwrap(nl_rb_document_get(self));
   if (doc == NULL)
   {
     rb_raise(rb_eRuntimeError, "Error getting document");
   }
+  // Wrap direct children with a temporary fragment so that they can be searched
   lxb_dom_document_fragment_t *frag = lxb_dom_document_fragment_interface_create(doc);
   if (frag == NULL)
   {
@@ -302,7 +301,7 @@ nl_node_set_find(VALUE self, VALUE selector, nl_node_find_f finder)
     }
   }
   // Backup original node data and re-group them into a fragment
-  for (int i = 0; i < array->length; i++)
+  for (size_t i = 0; i < array->length; i++)
   {
     lxb_dom_node_t *node = (lxb_dom_node_t *)array->list[i];
     lxb_dom_node_t *backup_node = malloc(sizeof(lxb_dom_node_t));
@@ -320,29 +319,51 @@ nl_node_set_find(VALUE self, VALUE selector, nl_node_find_f finder)
   }
   VALUE rb_frag = nl_rb_node_create(&frag->node, nl_rb_document_get(self));
 
-  VALUE ret = finder(rb_frag, selector);
+  nl_node_find(rb_frag, selector, cb, ctx);
 
   lxb_dom_document_fragment_interface_destroy(frag);
   // Restore original node data
-  for (int i = 0; i < array->length; i++)
+  for (size_t i = 0; i < array->length; i++)
   {
     memcpy(array->list[i], backup_array->list[i], sizeof(lxb_dom_node_t));
     free(backup_array->list[i]);
   }
   lexbor_array_destroy(backup_array, true);
-  return ret;
 }
 
 static VALUE
 nl_node_set_at_css(VALUE self, VALUE selector)
 {
-  return nl_node_set_find(self, selector, nl_node_at_css);
+  lexbor_array_t *array = lexbor_array_create();
+  lxb_dom_document_t *doc = nl_rb_document_unwrap(nl_rb_document_get(self));
+
+  nl_node_set_find(self, selector, nl_node_at_css_callback, array);
+
+  if (array->length == 0)
+  {
+    return Qnil;
+  }
+
+  sort_nodes_if_necessary(selector, doc, array);
+
+  VALUE ret = nl_rb_node_create(array->list[0], nl_rb_document_get(self));
+
+  lexbor_array_destroy(array, true);
+
+  return ret;
 }
 
 static VALUE
 nl_node_set_css(VALUE self, VALUE selector)
 {
-  return nl_node_set_find(self, selector, nl_node_css);
+  lexbor_array_t *array = lexbor_array_create();
+  lxb_dom_document_t *doc = nl_rb_document_unwrap(nl_rb_document_get(self));
+
+  nl_node_set_find(self, selector, nl_node_css_callback, array);
+
+  sort_nodes_if_necessary(selector, doc, array);
+
+  return nl_rb_node_set_create_with_data(array, nl_rb_document_get(self));
 }
 
 void Init_nl_node_set(void)