Merge branch 'master' into support-version-in-dataset

Author: mtodd

.travis.yml

@@ -4,4 +4,7 @@ rvm:
   - 2.0.0
   - jruby-19mode
   - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode
 script: bundle exec rake spec

Manifest.txt

@@ -25,6 +25,7 @@ lib/net/ldap/dataset.rb
 lib/net/ldap/dn.rb
 lib/net/ldap/entry.rb
 lib/net/ldap/filter.rb
+lib/net/ldap/instrumentation.rb
 lib/net/ldap/password.rb
 lib/net/ldap/pdu.rb
 lib/net/ldap/version.rb

README.rdoc

@@ -1,4 +1,4 @@
-= Net::LDAP for Ruby {<img src="https://travis-ci.org/ruby-ldap/ruby-net-ldap.png" />}[https://travis-ci.org/ruby-ldap/ruby-net-ldap]
+= Net::LDAP for Ruby {<img src="https://travis-ci.org/github/ruby-net-ldap.png" />}[https://travis-ci.org/github/ruby-net-ldap]
 
 == Description
 

lib/net/ber/ber_parser.rb

@@ -148,6 +148,9 @@ def read_ber_length
   # implemented on the including object and that it returns a Fixnum value.
   # Also requires #read(bytes) to work.
   #
+  # Yields the object type `id` and the data `content_length` if a block is
+  # given. This is namely to support instrumentation.
+  #
   # This does not work with non-blocking I/O.
   def read_ber(syntax = nil)
     # TODO: clean this up so it works properly with partial packets coming
@@ -157,6 +160,8 @@ def read_ber(syntax = nil)
     id = getbyte or return nil  # don't trash this value, we'll use it later
     content_length = read_ber_length
 
+    yield id, content_length if block_given?
+
     if -1 == content_length
       raise Net::BER::BerError, "Indeterminite BER content length not implemented."
     else