treequel 1.5.0 → 1.5.1

data/ChangeLog

@@ -1,26 +1,55 @@
+2011-02-25  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v1.5.1 for changeset b0945a1e6ee0
+	[f3dbf7033b58] [master, tip]
+
+	* .hgsigs:
+	Added signature for changeset 01662c7a2a07
+	[b0945a1e6ee0] [v1.5.1]
+
+	* Rakefile, lib/treequel.rb:
+	Remove YARD flags from gemspec, bump patch version.
+	[01662c7a2a07]
+
 2011-02-24  Michael Granger  <ged@FaerieMUD.org>
 
+	* lib/treequel/branch.rb, lib/treequel/model/schemavalidations.rb,
+	spec/data/schema.yml, spec/lib/constants.rb,
+	spec/treequel/branch_spec.rb,
+	spec/treequel/model/schemavalidations_spec.rb,
+	spec/treequel/schema_spec.rb:
+	Adding handling of operational attributes to Treequel::Model schema
+	validations, updated the subschema test data to a recent OpenLDAP.
+	[ba5c542de616]
+
 	* .hgtags:
 	Added tag v1.5.0 for changeset 6addc39b422a
-	[ae45276a5db6] [master, tip]
+	[ae45276a5db6]
 
 	* .hgsigs:
 	Added signature for changeset 0efb57ad19ad
 	[6addc39b422a] [v1.5.0]
 
 	* Merged with a299917323f8
-	[0efb57ad19ad] [github/master]
+	[0efb57ad19ad]
 
 	* .hgsigs:
 	Added signature for changeset 76473835cff3
 	[bc46034261cc]
 
+2011-02-17  Michael Granger  <ged@FaerieMUD.org>
+
+	* Rakefile:
+	Adding the history file to the hoespec
+	[a299917323f8]
+
 2011-02-22  Michael Granger  <ged@FaerieMUD.org>
 
 	* lib/treequel/model/objectclass.rb,
 	spec/treequel/model/objectclass_spec.rb:
 	Make Treequel::Model::ObjectClass Enumerable, fix a spec error.
-	[76473835cff3]
+	[76473835cff3] [github/master]
 
 	* lib/treequel.rb, lib/treequel/branch.rb, lib/treequel/model.rb,
 	lib/treequel/model/objectclass.rb,
@@ -35,12 +64,6 @@
 	Treequel::Delegation
 	[23ea792e2b86]
 
-2011-02-17  Michael Granger  <ged@FaerieMUD.org>
-
-	* Rakefile:
-	Adding the history file to the hoespec
-	[a299917323f8]
-
 2011-02-16  Michael Granger  <ged@FaerieMUD.org>
 
 	* lib/treequel/branch.rb, lib/treequel/branchset.rb,
@@ -202,12 +225,6 @@
 	Merged with 411:ddbb3c3bdd00
 	[ba7895d4e64b]
 
-2011-01-17  Michael Granger  <ged@FaerieMUD.org>
-
-	* History.md:
-	Updated History
-	[9c4db65b40d7]
-
 2011-01-18  Michael Granger  <ged@FaerieMUD.org>
 
 	* manual/layouts/default.erb, manual/resources/css/manual.css,
@@ -272,6 +289,10 @@
 
 2011-01-17  Michael Granger  <ged@FaerieMUD.org>
 
+	* History.md:
+	Updated History
+	[9c4db65b40d7]
+
 	* .hgtags:
 	Added tag v1.3.1 for changeset a6ea030fc88f
 	[4caac8976d00]
@@ -380,14 +401,14 @@
 	Automated merge with ssh://deveiate/Treequel
 	[62e7348050eb]
 
-	* bin/treequel, lib/treequel/model/objectclass.rb:
-	Aesthetic cleanup
-	[78e65cb8f30a]
-
 	* bin/treequel:
 	More logging constant fixes for the treequel shell.
 	[6e159f32ed07]
 
+	* bin/treequel, lib/treequel/model/objectclass.rb:
+	Aesthetic cleanup
+	[78e65cb8f30a]
+
 2011-01-04  Michael Granger  <ged@FaerieMUD.org>
 
 	* bin/treequel:
@@ -1514,12 +1535,6 @@
 	* Re-sorted the OID constants to be in OID order
 	[8b2fb7415412]
 
-2010-01-13  Michael Granger  <ged@FaerieMUD.org>
-
-	* bin/treequel:
-	Make treequel shell's 'cat' command error for non-existant entries
-	[84087b01d473]
-
 2010-01-24  Michael Granger  <ged@FaerieMUD.org>
 
 	* bin/treequel:
@@ -1528,6 +1543,10 @@
 
 2010-01-13  Michael Granger  <ged@FaerieMUD.org>
 
+	* bin/treequel:
+	Make treequel shell's 'cat' command error for non-existant entries
+	[84087b01d473]
+
 	* bin/treequel:
 	Fix the 'grep' command in the Treequel shell.
 	[669a09149f48]
@@ -1558,6 +1577,19 @@
 	Updated build system
 	[00ac1bc4e917]
 
+2009-12-22  Michael Granger  <ged@FaerieMUD.org>
+
+	* bin/treequel:
+	Reworked LDIF display colors in the shell to be more visible.
+	[d77a0bf26034]
+
+	* bin/treequel:
+	Make the treequel shell fall back to plain connect (with a warning)
+	if TLS fails.
+	[9aeccec1ee84]
+
+2010-01-07  Michael Granger  <ged@FaerieMUD.org>
+
 	* bin/treequel, lib/treequel/branch.rb, lib/treequel/constants.rb,
 	lib/treequel/utils.rb:
 	Improvements to the treequel shell, fixes for 1.9.1.
@@ -1579,15 +1611,6 @@
 
 2009-12-22  Michael Granger  <ged@FaerieMUD.org>
 
-	* bin/treequel:
-	Reworked LDIF display colors in the shell to be more visible.
-	[d77a0bf26034]
-
-	* bin/treequel:
-	Make the treequel shell fall back to plain connect (with a warning)
-	if TLS fails.
-	[9aeccec1ee84]
-
 	* examples/ldap-monitor.rb, examples/ldap-
 	monitor/public/css/master.css, examples/ldap-
 	monitor/public/images/card_small.png, examples/ldap-
@@ -1608,6 +1631,27 @@
 	Automated merge with ssh://hg@deveiate/Treequel
 	[3bdd645530fe]
 
+2009-12-18  Michael Granger  <ged@FaerieMUD.org>
+
+	* Merged with 5fd4033e1556
+	[9571c9d8e4dd]
+
+2009-12-17  Michael Granger  <ged@FaerieMUD.org>
+
+	* docs/openldap-oids.txt, lib/treequel/constants.rb,
+	lib/treequel/controls/contentsync.rb,
+	lib/treequel/controls/persistentsearch.rb,
+	lib/treequel/directory.rb:
+	More controls work, started several more control modules.
+	* Adding a breakdown of all the controls the OpenLDAP server I have
+	has, so I know which controls I can test against.
+	* Added some control constants.
+	* Added the ContentSyncControl and the PersistentSearchControl.
+	* Added a Directory#supported_controls method.
+	[ffc2ebacdfd0]
+
+2009-12-22  Michael Granger  <ged@FaerieMUD.org>
+
 	* bin/treequel, examples/ldap-monitor.rb, examples/ldap-
 	monitor/public/css/master.css, examples/ldap-
 	monitor/public/images/card_small.png, examples/ldap-
@@ -1636,25 +1680,6 @@
 	* Bumped the version to 1.0.2.
 	[31c326800cc6]
 
-2009-12-18  Michael Granger  <ged@FaerieMUD.org>
-
-	* Merged with 5fd4033e1556
-	[9571c9d8e4dd]
-
-2009-12-17  Michael Granger  <ged@FaerieMUD.org>
-
-	* docs/openldap-oids.txt, lib/treequel/constants.rb,
-	lib/treequel/controls/contentsync.rb,
-	lib/treequel/controls/persistentsearch.rb,
-	lib/treequel/directory.rb:
-	More controls work, started several more control modules.
-	* Adding a breakdown of all the controls the OpenLDAP server I have
-	has, so I know which controls I can test against.
-	* Added some control constants.
-	* Added the ContentSyncControl and the PersistentSearchControl.
-	* Added a Directory#supported_controls method.
-	[ffc2ebacdfd0]
-
 2009-12-16  Michael Granger  <ged@FaerieMUD.org>
 
 	* Rakefile, lib/treequel/mixins.rb, project.yml:
@@ -2749,16 +2774,6 @@
 	Merged. Someday I'll get the hang of this.
 	[a5e715f5f877]
 
-2009-07-29  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgignore, Rakefile, docs/manual/src/index.page,
-	lib/treequel/filter.rb, project.yml, spec/treequel/filter_spec.rb:
-	* Adding coverage cache to the ignorefile.
-	 * Added ruby-ldap dependency. Yay!
-	 * More work on the manual.
-	 * Made Treequel::Branch#filter treat a Hash like an array of tuples.
-	[46e6dce0c011]
-
 2009-07-28  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgignore, Rakefile:
@@ -2769,6 +2784,16 @@
 	Manual rewording, .hgignore updates
 	[89f74035c67d]
 
+2009-07-29  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgignore, Rakefile, docs/manual/src/index.page,
+	lib/treequel/filter.rb, project.yml, spec/treequel/filter_spec.rb:
+	* Adding coverage cache to the ignorefile.
+	 * Added ruby-ldap dependency. Yay!
+	 * More work on the manual.
+	 * Made Treequel::Branch#filter treat a Hash like an array of tuples.
+	[46e6dce0c011]
+
 2009-07-27  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgignore, Rakefile:
@@ -2780,10 +2805,6 @@
 
 2009-07-24  Michael Granger  <ged@FaerieMUD.org>
 
-	* .hgsub, .hgsubstate:
-	Unlinking the subrepo, as it doesn't behave well enough quite yet.
-	[fc3c3bac2c22]
-
 	* .hgsub, .hgsubstate:
 	Merging build system fixes
 	[b7a919b2ad5d]
@@ -2796,6 +2817,10 @@
 	Removing subrepo, as it doesn't work quite the way I'd hoped.
 	[f631900a9ad8] <build-system-fixes>
 
+	* .hgsub, .hgsubstate:
+	Unlinking the subrepo, as it doesn't behave well enough quite yet.
+	[fc3c3bac2c22]
+
 	* .hgignore, .hgsubstate, Rakefile, Rakefile.local, project.yml:
 	Initial commit of Mercurial-based tasks
 	[65236b2101e5] <build-system-fixes>

data/Rakefile

@@ -50,8 +50,6 @@ hoespec = Hoe.spec 'treequel' do
 	self.rspec_options += ['-cfd'] if self.respond_to?( :rspec_options= )
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
 	self.manual_source_dir = 'src' if self.respond_to?( :manual_source_dir= )
-	self.yard_opts = [ '--use-cache', '--protected', '--verbose' ] if
-		self.respond_to?( :yard_opts= )
 
 	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
 end

data/lib/treequel/branch.rb

@@ -547,7 +547,10 @@ class Treequel::Branch
 	### Return OIDs (numeric OIDs as Strings, named OIDs as Symbols) for each of the 
 	### receiver's operational attributes.
 	def operational_attribute_oids
-		return self.operational_attribute_types.map( &:oid )
+		return self.operational_attribute_types.inject([]) do |oids, attrtype|
+			oids.push( *attrtype.names )
+			oids << attrtype.oid
+		end
 	end
 
 

data/lib/treequel/model/schemavalidations.rb

@@ -7,6 +7,14 @@ require 'treequel/model'
 # A collection of schema-based validations for LDAP model objects.
 module Treequel::Model::SchemaValidations
 
+	# OpenLDAP servers with syncrepl include 'entryCSN' and 'contextCSN' attributes, but
+	# don't define its attribute type in the subschema. This is a list of operational
+	# attribute types that don't appear in the subschema that shouldn't be considered when 
+	# validating MUST and MAY attributes. 
+	# (http://www.openldap.org/its/index.cgi/Development?id=5573)
+	IGNORED_OPERATIONAL_ATTRS = [ :entryCSN, :contextCSN ]
+
+
 	### Entrypoint -- run all the validations, adding any errors to the
 	### object's #error collector.
 	def validate( options={} )
@@ -46,7 +54,9 @@ module Treequel::Model::SchemaValidations
 	def validate_may_attributes
 		hash = (self.entry || {} ).merge( @values )
 		attributes = hash.keys.map( &:to_sym ).uniq
-		valid_attributes = self.valid_attribute_oids
+		valid_attributes = self.valid_attribute_oids +
+			self.operational_attribute_oids +
+			IGNORED_OPERATIONAL_ATTRS
 
 		self.log.debug "Validating MAY attributes: %p against the list of valid OIDs: %p" %
 			[ attributes, valid_attributes ]

data/lib/treequel.rb

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