deac
/
ruby-net-ldap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #16 from mcarpenter/master 

Issue #15: LDIF continuation character
master
Rory O'Connell 2011-09-24 11:31:32 -07:00
parent 7dd6c3a107 d2e00dfd58
commit 5c3cbb7fe6
3 changed files with 88 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/net/ldap/dataset.rb
View File

@ -117,8 +117,8 @@ class Net::LDAP::Dataset < Hash
while line
new_line = io.gets
if new_line =~ /^[\s]+/
line << " " << $'
if new_line =~ /^ /
line << $'
else
nextline = new_line

14
test/test_ldif.rb
View File

@ -32,7 +32,19 @@ class TestLdif < Test::Unit::TestCase
def test_ldif_with_continuation_lines
ds = Net::LDAP::Dataset::read_ldif(StringIO.new("dn: abcdefg\r\n hijklmn\r\n\r\n"))
assert_equal(true, ds.has_key?("abcdefg hijklmn"))
assert_equal(true, ds.has_key?("abcdefghijklmn"))
end
def test_ldif_with_continuation_lines_and_extra_whitespace
ds1 = Net::LDAP::Dataset::read_ldif(StringIO.new("dn: abcdefg\r\n hijklmn\r\n\r\n"))
assert_equal(true, ds1.has_key?("abcdefg hijklmn"))
ds2 = Net::LDAP::Dataset::read_ldif(StringIO.new("dn: abcdefg\r\n hij klmn\r\n\r\n"))
assert_equal(true, ds2.has_key?("abcdefghij klmn"))
end
def test_ldif_tab_is_not_continuation
ds = Net::LDAP::Dataset::read_ldif(StringIO.new("dn: key\r\n\tnotcontinued\r\n\r\n"))
assert_equal(true, ds.has_key?("key"))
end
# TODO, INADEQUATE. We need some more tests