treequel 1.3.1 → 1.3.2

data/ChangeLog

@@ -1,8 +1,79 @@
+2011-01-18  Michael Granger  <ged@FaerieMUD.org>
+
+	* Rakefile:
+	Merged with 400:4caac8976d00
+	[59944084d362] [github/master, master, tip]
+
+	* lib/treequel/model.rb:
+	Ensure the entry hash that's passed to
+	Treequel::Model#apply_applicable_mixins isn't modified; fixes a bug
+	when modifying a new unsaved Model object.
+	[fc28d58f4895]
+
+	* manual/layouts/default.erb, manual/layouts/default.page,
+	manual/layouts/intro.page, manual/lib/api-filter.rb, manual/lib
+	/editorial-filter.rb, manual/lib/examples-filter.rb, manual/lib
+	/links-filter.rb, manual/resources/css/baseline.compress.css,
+	manual/resources/css/manual.css, manual/resources/images/logo-
+	small.png, manual/resources/images/logo.png,
+	manual/resources/js/jquery-1.3.2.min.js,
+	manual/resources/js/jquery-1.4.4.min.js,
+	manual/resources/js/jquery.ThickBox.js,
+	manual/resources/js/manual.js,
+	manual/resources/js/modernizr-1.6.min.js,
+	manual/resources/swf/clipboard.swf, manual/src/index.page:
+	Updating manual resources with hoe-manualgen ones
+	[95a466516639]
+
+	* Rakefile:
+	Adding missing dependency
+	[eaf742c5b836]
+
+2011-01-17  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v1.3.1 for changeset a6ea030fc88f
+	[4caac8976d00]
+
+	* .hgsigs:
+	Added signature for changeset fb7ec4e38f66
+	[a6ea030fc88f] [v1.3.1]
+
+	* Rakefile, lib/treequel.rb, lib/treequel/model/objectclass.rb,
+	spec/treequel/model/objectclass_spec.rb:
+	Fixes a bug in Treequel::Model.new_from_entry which caused DN
+	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:
+	Added tag v1.3.0 for changeset 2ede242fc2cc
+	[754412a4874d]
+
+	* .hgsigs:
+	Added signature for changeset 67955dcd424f
+	[2ede242fc2cc] [v1.3.0]
+
+	* Manifest.txt:
+	Re-ordering the manifest so check_manifest works better.
+	[67955dcd424f]
+
+	* History.md:
+	Updated History.
+	[f5b27dffd1cd]
+
 2011-01-12  Michael Granger  <ged@FaerieMUD.org>
 
 	* lib/treequel/model.rb:
 	Always initialize the dirty flag for Treequel::Model objects.
-	[4a75d892a89d] [github/master, master, tip]
+	[4a75d892a89d]
 
 	* lib/treequel/branch.rb, spec/treequel/branch_spec.rb:
 	Fixed a bug in Treequel::Branch that caused non-schema attribute
@@ -74,14 +145,14 @@
 	Automated merge with ssh://deveiate/Treequel
 	[62e7348050eb]
 
-	* bin/treequel:
-	More logging constant fixes for the treequel shell.
-	[6e159f32ed07]
-
 	* bin/treequel, lib/treequel/model/objectclass.rb:
 	Aesthetic cleanup
 	[78e65cb8f30a]
 
+	* bin/treequel:
+	More logging constant fixes for the treequel shell.
+	[6e159f32ed07]
+
 2011-01-04  Michael Granger  <ged@FaerieMUD.org>
 
 	* bin/treequel:
@@ -493,13 +564,6 @@
 	* 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:
@@ -510,6 +574,17 @@
 	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]
@@ -525,18 +600,18 @@
 	test failure
 	[380662d385e0]
 
-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-11-03  Michael Granger  <ged@FaerieMUD.org>
+
+	* README, README.md:
+	Converting the README to Markdown
+	[cc7c63ff15a0]
+
 2010-10-22  Michael Granger  <ged@FaerieMUD.org>
 
 	* lib/treequel/schema.rb, spec/lib/control_behavior.rb,
@@ -1208,6 +1283,12 @@
 	* 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:
@@ -1216,10 +1297,6 @@
 
 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]
@@ -1250,19 +1327,6 @@
 	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.
@@ -1284,6 +1348,15 @@
 
 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-
@@ -1304,27 +1377,6 @@
 	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-
@@ -1353,6 +1405,25 @@
 	* 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:
@@ -2447,16 +2518,6 @@
 	Merged. Someday I'll get the hang of this.
 	[a5e715f5f877]
 
-2009-07-28  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgignore, Rakefile:
-	Merged with 34cc97817266
-	[395b7bf6f248]
-
-	* .hgignore, Rakefile, docs/manual/src/index.page:
-	Manual rewording, .hgignore updates
-	[89f74035c67d]
-
 2009-07-29  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgignore, Rakefile, docs/manual/src/index.page,
@@ -2467,6 +2528,16 @@
 	 * Made Treequel::Branch#filter treat a Hash like an array of tuples.
 	[46e6dce0c011]
 
+2009-07-28  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgignore, Rakefile:
+	Merged with 34cc97817266
+	[395b7bf6f248]
+
+	* .hgignore, Rakefile, docs/manual/src/index.page:
+	Manual rewording, .hgignore updates
+	[89f74035c67d]
+
 2009-07-27  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgignore, Rakefile:
@@ -2478,6 +2549,10 @@
 
 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]
@@ -2490,10 +2565,6 @@
 	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

@@ -7,6 +7,8 @@ Hoe.plugin :yard
 Hoe.plugin :signing
 Hoe.plugin :manualgen
 
+
+
 Hoe.plugins.delete :rubyforge
 
 hoespec = Hoe.spec 'treequel' do
@@ -17,7 +19,8 @@ hoespec = Hoe.spec 'treequel' do
 	self.developer 'Mahlon E. Smith', 'mahlon@martini.nu'
 
 	self.extra_deps.push *{
-		'ruby-ldap' => '~> 0.9.11'
+		'ruby-ldap' => '~> 0.9.11',
+		'diff-lcs'  => '~> 1.1.2',
 	}
 	self.extra_dev_deps.push *{
 		'rspec'         => '~> 2.4.0',

data/lib/treequel.rb

@@ -53,10 +53,10 @@ end
 module Treequel
 
 	# Library version
-	VERSION = '1.3.1'
+	VERSION = '1.3.2'
 
 	# VCS revision
-	REVISION = %q$Revision: fb7ec4e38f66 $
+	REVISION = %q$Revision: a545351e8cce $
 
 	# Common paths for ldap.conf
 	COMMON_LDAP_CONF_PATHS = %w[

data/lib/treequel/model.rb

@@ -685,45 +685,36 @@ class Treequel::Model < Treequel::Branch
 	### has been looked up.
 	### @return [LDAP::Entry]  the fetched entry object
 	def lookup_entry
-		if entry = super
-			self.log.debug "  applying mixins to %p" % [ entry ]
-			self.apply_applicable_mixins( self.dn, entry )
-		else
-			self.log.debug "  failed to fetch the entry."
+		if entryhash = super
+			self.apply_applicable_mixins( self.dn, entryhash )
 		end
-		return entry
+
+		return entryhash
 	end
 
 
 	### Apply mixins that are applicable considering the receiver's DN and the 
-	### objectClasses from the given entry merged with any unsaved values.
-	def apply_applicable_mixins( dn, entry=nil )
-		entry ||= {}
-		entry.merge!( stringify_keys(@values) )
-		return unless entry['objectClass']
+	### objectClasses from the given +entryhash+ merged with any unsaved values.
+	def apply_applicable_mixins( dn, entryhash=nil )
+		objectclasses = @values[:objectClass] ||
+			(entryhash && entryhash['objectClass'])
+		return unless objectclasses
 
 		# self.log.debug "Applying mixins applicable to %s" % [ dn ]
 		schema = self.directory.schema
 
-		# self.log.debug "  entry is: %p" % [ entry ]
-		ocs = entry['objectClass'].collect do |oc_oid|
+		ocs = objectclasses.collect do |oc_oid|
 			explicit_oc = schema.object_classes[ oc_oid ]
 			explicit_oc.ancestors.collect {|oc| oc.name }
 		end.flatten.uniq
 		# self.log.debug "  got %d candidate objectClasses: %p" % [ ocs.length, ocs ]
 
-		oc_mixins = self.class.mixins_for_objectclasses( *ocs )
-		dn_mixins = self.class.mixins_for_dn( dn )
-		# self.log.debug "  found %d mixins by objectclass (%s), and %d by base (%s)" % [
-		# 	oc_mixins.length,
-		# 	oc_mixins.map(&:name).join(', '),
-		# 	dn_mixins.length,
-		# 	dn_mixins.map(&:name).join(', ')
-		# ]
-
 		# The applicable mixins are those in the intersection of the ones
 		# inferred by its objectclasses and those that apply to its DN
+		oc_mixins = self.class.mixins_for_objectclasses( *ocs )
+		dn_mixins = self.class.mixins_for_dn( dn )
 		mixins = ( oc_mixins & dn_mixins )
+
 		# self.log.debug "  %d mixins remain after intersection: %p" % [ mixins.length, mixins ]
 
 		mixins.each {|mod| self.extend(mod) }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: treequel
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Michael Granger
@@ -36,13 +36,29 @@ cert_chain:
   cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
   -----END CERTIFICATE-----
 
-date: 2011-01-17 00:00:00 -08:00
+date: 2011-01-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ruby-ldap
+  name: diff-lcs
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: ruby-ldap
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -54,11 +70,27 @@ dependencies:
         - 11
         version: 0.9.11
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hoe-mercurial
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hoe-yard
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -70,11 +102,11 @@ dependencies:
         - 2
         version: 0.1.2
   type: :development
-  version_requirements: *id002
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: columnize
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -86,11 +118,11 @@ dependencies:
         - 1
         version: 0.3.1
   type: :development
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: ruby-termios
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -102,11 +134,11 @@ dependencies:
         - 6
         version: 0.9.6
   type: :development
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: ruby-terminfo
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -118,11 +150,11 @@ dependencies:
         - 1
         version: 0.1.1
   type: :development
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -134,11 +166,11 @@ dependencies:
         - 0
         version: 2.4.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: sysexits
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -150,11 +182,11 @@ dependencies:
         - 2
         version: 1.0.2
   type: :development
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -166,7 +198,7 @@ dependencies:
         - 0
         version: 2.8.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id010
 description: |-
   Treequel is an LDAP toolkit for Ruby. It is intended to allow quick, easy
   access to LDAP directories in a manner consistent with LDAP's hierarchical,