Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add API to set line number, fixes #1657 #1658

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 25 additions & 0 deletions ext/nokogiri/xml_node.c
Original file line number Diff line number Diff line change
Expand Up @@ -1252,6 +1252,30 @@ static VALUE native_write_to(
return io;
}

/*
* call-seq:
* line=
*
* Sets the line number for this Node to +line+
*/
static VALUE set_line(VALUE self, VALUE line)
{
xmlNodePtr node;
int line_int = NUM2INT(line);

Data_Get_Struct(self, xmlNode, node);

if (line_int < 65535)
node->line = (unsigned short)line;
else {
node->line = 65535;
if (node->type == XML_TEXT_NODE)
node->psvi = (void *)line;
}

return self;
}

/*
* call-seq:
* line
Expand Down Expand Up @@ -1657,6 +1681,7 @@ void init_xml_node()
rb_define_method(klass, "create_external_subset", create_external_subset, 3);
rb_define_method(klass, "pointer_id", pointer_id, 0);
rb_define_method(klass, "line", line, 0);
rb_define_method(klass, "line=", set_line, 1);
rb_define_method(klass, "content", get_native_content, 0);
rb_define_method(klass, "native_content=", set_native_content, 1);
rb_define_method(klass, "lang", get_lang, 0);
Expand Down
6 changes: 6 additions & 0 deletions test/xml/test_attribute_decl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ def test_line
end
end

def test_set_line
assert_raise NoMethodError do
@attr_decl.line = 42
end
end

def test_attribute_type
if Nokogiri.uses_libxml?
assert_equal 1, @attr_decl.attribute_type
Expand Down
6 changes: 6 additions & 0 deletions test/xml/test_document.rb
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,12 @@ def test_line
end
end

def test_set_line
assert_raise NoMethodError do
@xml.line = 42
end
end

def test_empty_node_converted_to_html_is_not_self_closing
doc = Nokogiri::XML('<a></a>')
assert_equal "<a></a>", doc.inner_html
Expand Down
6 changes: 6 additions & 0 deletions test/xml/test_dtd.rb
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,12 @@ def test_line
end
end

def test_set_line
assert_raise NoMethodError do
@dtd.line = 42
end
end

def test_validate
if Nokogiri.uses_libxml?
list = @xml.internal_subset.validate @xml
Expand Down
6 changes: 6 additions & 0 deletions test/xml/test_element_decl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ def test_line
end
end

def test_set_line
assert_raise NoMethodError do
@elements.first.line = 42
end
end

def test_namespace
assert_raise NoMethodError do
@elements.first.namespace
Expand Down
6 changes: 6 additions & 0 deletions test/xml/test_entity_decl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ def test_line
end
end

def test_set_line
assert_raise NoMethodError do
@entity_decl.line = 42
end
end

def test_inspect
assert_equal(
"#<#{@entity_decl.class.name}:#{sprintf("0x%x", @entity_decl.object_id)} #{@entity_decl.to_s.inspect}>",
Expand Down
15 changes: 15 additions & 0 deletions test/xml/test_node.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1094,6 +1094,21 @@ def test_line
assert_equal 2, node.line
end

def test_set_line
xml = Nokogiri::XML(<<-eoxml)
<root>
<a>
Hello world
</a>
</root>
eoxml

set = xml.search("//a")
node = set.first
node.line = 42
assert_equal 42, node.line
end

def test_xpath_results_have_document_and_are_decorated
x = Module.new do
def awesome! ; end
Expand Down