treequel 1.4.4 → 1.5.0pre445

data/ChangeLog

@@ -1,8 +1,44 @@
+2011-02-22  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/treequel.rb, lib/treequel/branch.rb, lib/treequel/model.rb,
+	lib/treequel/model/objectclass.rb,
+	spec/treequel/model/objectclass_spec.rb,
+	spec/treequel/model_spec.rb:
+	Add a default directory to Treequel::Model for creating and
+	searching
+	[fb6b6fc03dea] [github/master, master, tip]
+
+	* lib/treequel/mixins.rb, spec/treequel/mixins_spec.rb:
+	Fix delegation to a method that takes a block for
+	Treequel::Delegation
+	[23ea792e2b86]
+
+2011-02-16  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/treequel/branch.rb, lib/treequel/branchset.rb,
+	spec/lib/constants.rb, spec/lib/helpers.rb,
+	spec/treequel/branch_spec.rb, spec/treequel/branchset_spec.rb,
+	spec/treequel/model_spec.rb:
+	* Consistently delete the DN from the entry hash when constructing
+	branches and model objects
+	* Fix Treequel::Branch#-
+	* Fix Treequel::Branchset#to_hash
+	[77e06632b26c]
+
+	* spec/lib/helpers.rb:
+	Fix the fixture function -- use the passed-in conn object instead of
+	@conn
+	[6e66813a8c77]
+
 2011-02-10  Michael Granger  <ged@FaerieMUD.org>
 
+	* Rakefile, lib/treequel.rb:
+	Make dependencies not so pessimistic.
+	[1a8e08a49df5]
+
 	* .hgtags:
 	Added tag v1.4.4 for changeset c8b3e3f8e9b3
-	[706bf854263e] [master, tip]
+	[706bf854263e]
 
 	* .hgsigs:
 	Added signature for changeset 8101dde32328
@@ -138,18 +174,12 @@
 	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,
 	manual/src/index.page:
 	Updating the manual.
-	[ddbb3c3bdd00] [github/master]
+	[ddbb3c3bdd00]
 
 	* LICENSE:
 	I meant the README.md file. NOW update the LICENSE file
@@ -200,8 +230,18 @@
 	Adding missing dependency
 	[eaf742c5b836]
 
+2011-01-14  Michael Granger  <ged@FaerieMUD.org>
+
+	* manual/src/models.page:
+	Fixed some invalid api links in the models section
+	[7759040905e0]
+
 2011-01-17  Michael Granger  <ged@FaerieMUD.org>
 
+	* History.md:
+	Updated History
+	[9c4db65b40d7]
+
 	* .hgtags:
 	Added tag v1.3.1 for changeset a6ea030fc88f
 	[4caac8976d00]
@@ -216,12 +256,6 @@
 	attributes to sometimes be doubled.
 	[fb7ec4e38f66]
 
-2011-01-14  Michael Granger  <ged@FaerieMUD.org>
-
-	* manual/src/models.page:
-	Fixed some invalid api links in the models section
-	[7759040905e0]
-
 2011-01-13  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
@@ -316,14 +350,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:
@@ -735,6 +769,13 @@
 	* Merging with 316:33a7dcde80a1
 	[72dd41272f6f]
 
+	* .hgsubstate, lib/treequel/model.rb, spec/treequel/branch_spec.rb,
+	spec/treequel/model_spec.rb, spec/treequel/monkeypatches_spec.rb:
+	Spec fixes for RSpec 2.0
+	 * Fix RSpec regex workaround for Treequel::Model#respond_to?
+	 * Fix monkeypatch Time tests for running outside of PST8PDT
+	[9f9460125077]
+
 2010-11-09  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgsub, .hgsubstate:
@@ -745,17 +786,6 @@
 	Fixing subrepo corruption caused by rollback
 	[fc9ae9f5b034]
 
-2010-11-11  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgsubstate, lib/treequel/model.rb, spec/treequel/branch_spec.rb,
-	spec/treequel/model_spec.rb, spec/treequel/monkeypatches_spec.rb:
-	Spec fixes for RSpec 2.0
-	 * Fix RSpec regex workaround for Treequel::Model#respond_to?
-	 * Fix monkeypatch Time tests for running outside of PST8PDT
-	[9f9460125077]
-
-2010-11-09  Michael Granger  <ged@FaerieMUD.org>
-
 	* README:
 	Merged with 310:cc7c63ff15a0
 	[c1b750e4e9fc]
@@ -771,18 +801,18 @@
 	test failure
 	[380662d385e0]
 
-2010-11-08  Michael Granger  <ged@FaerieMUD.org>
-
-	* bin/treequel:
-	Fixed treequel shell's cp to support relative and absolute DNs
-	[7f20ab74d6b1]
-
 2010-11-03  Michael Granger  <ged@FaerieMUD.org>
 
 	* README, README.md:
 	Converting the README to Markdown
 	[cc7c63ff15a0]
 
+2010-11-08  Michael Granger  <ged@FaerieMUD.org>
+
+	* bin/treequel:
+	Fixed treequel shell's cp to support relative and absolute DNs
+	[7f20ab74d6b1]
+
 2010-10-22  Michael Granger  <ged@FaerieMUD.org>
 
 	* lib/treequel/schema.rb, spec/lib/control_behavior.rb,
@@ -1454,12 +1484,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:
@@ -1468,6 +1492,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]
@@ -1498,6 +1526,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.
@@ -1519,15 +1560,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-
@@ -1548,6 +1580,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-
@@ -1576,25 +1629,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:
@@ -2689,16 +2723,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:
@@ -2709,6 +2733,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:
@@ -2720,10 +2754,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]
@@ -2736,6 +2766,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

@@ -17,15 +17,16 @@ hoespec = Hoe.spec 'treequel' do
 	self.developer 'Mahlon E. Smith', 'mahlon@martini.nu'
 
 	self.extra_deps.push *{
-		'ruby-ldap' => '~> 0.9.11',
-		'diff-lcs'  => '~> 1.1.2',
+		'ruby-ldap' => '~> 0.9',
+		'diff-lcs'  => '~> 1.1',
 	}
 	self.extra_dev_deps.push *{
-		'rspec'         => '~> 2.4.0',
-		'ruby-termios'  => '~> 0.9.6',
-		'ruby-terminfo' => '~> 0.1.1',
-		'columnize'     => '~> 0.3.1',
-		'sysexits'      => '~> 1.0.2',
+		'rspec'         => '~> 2.4',
+		'ruby-termios'  => '~> 0.9',
+		'ruby-terminfo' => '~> 0.1',
+		'columnize'     => '~> 0.3',
+		'sysexits'      => '~> 1.0',
+		'sequel'        => '~> 3.20',
 	}
 
 	self.spec_extras[:licenses] = ["BSD"]
@@ -33,7 +34,7 @@ hoespec = Hoe.spec 'treequel' do
 		"If you want to use the included 'treequel' LDAP shell, you'll need to install",
 		"the following libraries as well:",
 		'',
-		"    - termios",
+		"    - ruby-termios",
 		"    - ruby-terminfo",
 		"    - columnize",
 		"    - sysexits",

data/lib/treequel.rb

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

data/lib/treequel/branch.rb

@@ -104,7 +104,7 @@ class Treequel::Branch
 	######
 
 	# Delegate some other methods to a new Branchset via the #branchset method
-	def_method_delegators :branchset, :filter, :scope, :select, :limit, :timeout, :order, :as
+	def_method_delegators :branchset, :filter, :scope, :select, :limit, :timeout, :as, :from
 
 	# Delegate some methods to the Branch's directory via its accessor
 	def_method_delegators :directory, :controls, :referrals
@@ -791,6 +791,7 @@ class Treequel::Branch
 			entry = self.directory.get_entry( self )
 		end
 
+		entry.delete( 'dn' ) if entry
 		self.log.debug "  entry is: %p" % [ entry ]
 		return entry
 	end

data/lib/treequel/branchset.rb

@@ -203,7 +203,7 @@ class Treequel::Branchset
 	### @return [Array<Treequel::Branch>]
 	def -( other_object )
 		other_dn = other_object.dn
-		return self.reject {|branch| branch.dn == other_dn }
+		return self.reject {|branch| branch.dn.downcase == other_dn.downcase }
 	end
 
 
@@ -269,10 +269,19 @@ class Treequel::Branchset
 			key = branch[ keyattr ]
 			key = key.first if key.respond_to?( :first )
 
-			value = valueattr ? branch[ valueattr ] : branch.entry
-			value = value.first if value.respond_to?( :first )
+			# Extract either the valueattr, or the whole entry hash if no valueattr was given.
+			if valueattr
+				self.log.debug "  extracting value for attribute %p" % [ valueattr ]
+				if branch[ valueattr ].respond_to?( :first )
+					hash[ key ] = branch[ valueattr ].first
+				else
+					hash[ key ] = branch[ valueattr ]
+				end
+			else
+				self.log.debug "  using the whole entry hash (%p)"
+				hash[ key ] = branch.entry
+			end
 
-			hash[ key ] = value
 			hash
 		end
 	end

data/lib/treequel/mixins.rb

@@ -82,7 +82,7 @@ module Treequel
 				END_CODE
 			else
 				code = <<-END_CODE
-				lambda {|*args| self.#{delegate}.#{name}(*args) }
+				lambda {|*args,&block| self.#{delegate}.#{name}(*args,&block) }
 				END_CODE
 			end
 
@@ -104,7 +104,7 @@ module Treequel
 				END_CODE
 			else
 				code = <<-END_CODE
-				lambda {|*args| #{ivar}.#{name}(*args) }
+				lambda {|*args,&block| #{ivar}.#{name}(*args,&block) }
 				END_CODE
 			end