treequel 1.2.1 → 1.2.2

data/Rakefile

@@ -15,6 +15,7 @@ hoespec = Hoe.spec 'treequel' do
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 	self.developer 'Mahlon E. Smith', 'mahlon@martini.nu'
 
+
 	self.extra_deps <<
 		['ruby-ldap', '~> 0.9.11']
 	self.extra_dev_deps <<
@@ -31,10 +32,12 @@ hoespec = Hoe.spec 'treequel' do
 			"    - ruby-terminfo",
 			"    - columnize",
 		  ].join( "\n" )
+    self.spec_extras[:signing_key] = '/Volumes/Keys/ged-private_gem_key.pem'
 
 	self.require_ruby_version( '>=1.8.7' )
 
-	self.yard_title = 'Treequel'
+	self.hg_sign_tags = true
+
 	self.yard_opts = [ '--use-cache', '--protected', '--verbose' ]
 end
 

data/lib/treequel/branch.rb

@@ -54,6 +54,7 @@ class Treequel::Branch
 	### @return [Treequel::Branch]  The new branch object.
 	def self::new_from_entry( entry, directory )
 		entry = Treequel::HashUtilities.stringify_keys( entry )
+		Treequel.logger.debug "Creating Branch from entry: %p in directory: %p" % [ entry, directory ]
 		return self.new( directory, entry['dn'].first, entry )
 	end
 
@@ -82,6 +83,8 @@ class Treequel::Branch
 		@values    = {}
 
 		@include_operational_attrs = self.class.include_operational_attrs?
+
+		self.log.debug "New branch (%s): entry = %p, directory = %p" % [ @dn, @entry, @directory ]
 	end
 
 
@@ -109,6 +112,7 @@ class Treequel::Branch
 	predicate_attr :include_operational_attrs
 	alias_method :include_operational_attributes?, :include_operational_attrs?
 
+
 	### Change the DN the Branch uses to look up its entry.
 	### 
 	### @param [String] newdn  The new DN.
@@ -792,7 +796,7 @@ class Treequel::Branch
 	def get_converted_attribute( attrsym, object )
 		if attribute = self.directory.schema.attribute_types[ attrsym ]
 			self.log.debug "converting %p object to a %p attribute" %
-				[ attrsym, attribute.syntax.oid ]
+				[ attrsym, attribute.syntax.desc ]
 			return self.directory.convert_to_attribute( attribute.syntax.oid, object )
 		else
 			self.log.info "no attributeType for %p" % [ attrsym ]
@@ -804,6 +808,7 @@ class Treequel::Branch
 	### Clear any cached values when the structural state of the object changes.
 	### @return [void]
 	def clear_caches
+        self.log.debug "Clearing entry and values caches."
 		@entry = nil
 		@values.clear
 	end

data/lib/treequel/directory.rb

@@ -424,8 +424,9 @@ class Treequel::Directory
 		results = []
 		self.conn.search_ext2( base_dn, scope, filter, *parameters ).each do |entry|
 			branch = collectclass.new_from_entry( entry, self )
-			branch.include_operational_attrs = base.include_operational_attrs? if
-				base.respond_to?( :include_operational_attrs? )
+			branch.include_operational_attrs = true if
+				base.respond_to?( :include_operational_attrs? ) &&
+				base.include_operational_attrs?
 
 			if block_given?
 				results << yield( branch )

data/lib/treequel/model.rb

@@ -291,7 +291,7 @@ class Treequel::Model < Treequel::Branch
 			return lambda {|newvalue| self[attrname] = newvalue }
 		else
 			self.log.debug "  attribute isn't SINGLE, so generating an array writer..."
-			return lambda {|*newvalues| self[attrname] = newvalues }
+			return lambda {|*newvalues| self[attrname] = newvalues.flatten }
 		end
 	end
 

data/lib/treequel/monkeypatches.rb

@@ -26,6 +26,27 @@ class LDAP::Control
 end
 
 
+### Extensions to LDAP::Mods to make them grok ==.
+module Treequel::LDAPModExtensions
+
+	### Returns +true+ if the +other+ LDAP::Record is equivalent to the receiver.
+	def ==( other )
+		return ( other.class == self.class ) &&
+			( self.mod_op == other.mod_op ) &&
+			( self.mod_type == other.mod_type ) &&
+			( self.mod_vals == other.mod_vals )
+	end
+
+end # module Treequel::LDAPModExtensions
+
+
+# Include Treequel-specific extensions as a mixin.
+# @private
+class LDAP::Mod
+	include Treequel::LDAPModExtensions
+end
+
+
 ### Extensions to the Time class to add LDAP (RFC4517) Generalized Time syntax
 module Treequel::TimeExtensions
 

data/lib/treequel.rb

@@ -25,7 +25,7 @@ end
 
 # A library for interacting with LDAP modelled after Sequel.
 #
-# @version 1.2.1
+# @version 1.2.2
 # 
 # @example
 #   # Connect to the directory at the specified URL
@@ -53,10 +53,10 @@ end
 module Treequel
 
 	# Library version
-	VERSION = '1.2.1'
+	VERSION = '1.2.2'
 
 	# VCS revision
-	REVISION = %q$Revision: b9106049e6aa $
+	REVISION = %q$Revision: 0c2883d2074a $
 
 	# Common paths for ldap.conf
 	COMMON_LDAP_CONF_PATHS = %w[

data/spec/lib/helpers.rb

@@ -99,6 +99,7 @@ module Treequel::SpecHelpers
 	def get_fixtured_directory( conn )
 		LDAP::SSLConn.stub( :new ).and_return( @conn )
 		conn.stub( :root_dse ).and_return( nil )
+		conn.stub( :set_option )
 		directory = Treequel.directory( TEST_LDAPURI )
 		directory.stub( :schema ).and_return( SCHEMA )
 

data/spec/lib/matchers.rb

@@ -20,6 +20,7 @@ require 'spec/lib/constants'
 ### RSpec matchers
 module Treequel::Matchers
 
+    ### A matcher for unordered array contents
 	class ArrayIncludingMatcher
 		def initialize( expected )
 			@expected = expected