[Ruby-activeldap-commit] [ruby-activeldap commit] r771 - in trunk: lib/active_ldap test

[codesite-noreply at google.com]

Author: koutou
Date: Wed Jun 18 17:27:22 2008
New Revision: 771

Modified:
   trunk/lib/active_ldap/ldif.rb
   trunk/test/test_ldif.rb

Log:
* accept comment and empty lines after LDIF content.


Modified: trunk/lib/active_ldap/ldif.rb
==============================================================================
--- trunk/lib/active_ldap/ldif.rb	(original)
+++ trunk/lib/active_ldap/ldif.rb	Wed Jun 18 17:27:22 2008
@@ -364,6 +364,8 @@
           records << parse_record
           break if @scanner.eos?
           raise separator_is_missing if @scanner.scan_separator.nil?
+
+          break if @scanner.scan_separators and @scanner.eos?
         end
         records
       end

Modified: trunk/test/test_ldif.rb
==============================================================================
--- trunk/test/test_ldif.rb	(original)
+++ trunk/test/test_ldif.rb	Wed Jun 18 17:27:22 2008
@@ -9,7 +9,60 @@
   include AlTestUtils::ExampleFile

   priority :must
-  def test_command_lines_and_empty_lines_before_content
+  def test_accept_empty_lines_after_content
+    ldif_source = <<-EOL
+version: 1
+dn: dc=devel,dc=example,dc=com
+dc: devel
+objectClass: top
+objectClass: dcObject
+objectClass: organization
+o: devel
+
+
+EOL
+
+    assert_ldif_to_s(<<-EOL, ldif_source)
+version: 1
+dn: dc=devel,dc=example,dc=com
+dc: devel
+o: devel
+objectClass: dcObject
+objectClass: organization
+objectClass: top
+EOL
+  end
+
+  def test_accept_comments_after_content
+    ldif_source = <<-EOL
+version: 1
+dn: dc=devel,dc=example,dc=com
+dc: devel
+objectClass: top
+objectClass: dcObject
+objectClass: organization
+o: devel
+
+# search result
+
+# numResponse: 1
+# numEntries: 1
+
+EOL
+
+    assert_ldif_to_s(<<-EOL, ldif_source)
+version: 1
+dn: dc=devel,dc=example,dc=com
+dc: devel
+o: devel
+objectClass: dcObject
+objectClass: organization
+objectClass: top
+EOL
+  end
+
+  priority :normal
+  def test_comments_and_empty_lines_before_content
     ldif_source = <<-EOL
 version: 1

@@ -40,7 +93,6 @@
 EOL
   end

-  priority :normal
   def test_unknown_change_type
     ldif_source = <<-EOL
 version: 1