Skip to content

Commit 2702b89

Browse files
committed
fix multiline blocks
1 parent 17e2fe6 commit 2702b89

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

test/test_ldif.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ def test_ldif_with_base64_dn_and_continuation_lines
6868
# TODO, INADEQUATE. We need some more tests
6969
# to verify the content.
7070
def test_ldif
71-
File.open(TestLdifFilename, "r") {|f|
71+
File.open(TestLdifFilename, "r") do |f|
7272
ds = Net::LDAP::Dataset::read_ldif(f)
7373
assert_equal(13, ds.length)
74-
}
74+
end
7575
end
7676

7777
# Must test folded lines and base64-encoded lines as well as normal ones.
@@ -84,13 +84,13 @@ def test_to_ldif
8484
entries = data.lines.grep(/^dn:\s*/) { $'.chomp }
8585
dn_entries = entries.dup
8686

87-
ds = Net::LDAP::Dataset::read_ldif(io) { |type, value|
87+
ds = Net::LDAP::Dataset::read_ldif(io) do |type, value|
8888
case type
8989
when :dn
9090
assert_equal(dn_entries.first, value)
9191
dn_entries.shift
9292
end
93-
}
93+
end
9494
assert_equal(entries.size, ds.size)
9595
assert_equal(entries.sort, ds.to_ldif.grep(/^dn:\s*/) { $'.chomp })
9696
end

testserver/ldapserver.rb

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,21 +133,21 @@ def handle_search_request pdu
133133
# TODO, what if this returns nil?
134134
filter = Net::LDAP::Filter.parse_ldap_filter( filters )
135135

136-
$ldif.each {|dn, entry|
136+
$ldif.each do |dn, entry|
137137
if filter.match( entry )
138138
attrs = []
139-
entry.each {|k, v|
139+
entry.each do |k, v|
140140
if requested_attrs == :all or requested_attrs.include?(k.downcase)
141141
attrvals = v.map {|v1| v1.to_ber}.to_ber_set
142142
attrs << [k.to_ber, attrvals].to_ber_sequence
143143
end
144-
}
144+
end
145145

146146
appseq = [dn.to_ber, attrs.to_ber_sequence].to_ber_appsequence(4)
147147
pkt = [msgid.to_ber, appseq].to_ber_sequence
148148
send_data pkt
149149
end
150-
}
150+
end
151151

152152

153153
send_ldap_response 5, pdu[0].to_i, 0, "", "Was that what you wanted?"
@@ -201,10 +201,9 @@ def load_test_data
201201

202202
require 'net/ldap'
203203

204-
EventMachine.run {
204+
EventMachine.run do
205205
$logger.info "starting LDAP server on 127.0.0.1 port 3890"
206206
EventMachine.start_server "127.0.0.1", 3890, LdapServer
207207
EventMachine.add_periodic_timer 60, proc {$logger.info "heartbeat"}
208-
}
208+
end
209209
end
210-

0 commit comments

Comments
 (0)