treequel 1.8.1 → 1.8.2

data/ChangeLog

@@ -1,8 +1,133 @@
+2011-12-19  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rspec-tm, .tm_properties, lib/treequel/model.rb,
+	spec/treequel/model_spec.rb:
+	Combining ADD and DELETE mods
+	[6697b95ce945] [github/master, tip]
+
+2011-12-15  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/treequel/schema.rb:
+	Don't include non-lengthable ivars in
+	Treequel::Schema#ivar_descriptions (thanks to Ben Bleything for
+	reporting this).
+	[5738015684e7]
+
+	* .hgignore:
+	Adding .rbx directory to the ignorefile
+	[919ed9227138]
+
+	* History.rdoc:
+	Whitespace fix for the History file
+	[d568255e82eb]
+
+2011-12-05  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v1.8.1 for changeset 07b44d5fd4bb
+	[035e391ccb4b]
+
+	* .hgsigs:
+	Added signature for changeset 507d14777c50
+	[07b44d5fd4bb] [v1.8.1]
+
+	* History.rdoc, lib/treequel.rb:
+	Bumped patch version, updated history.
+	[507d14777c50]
+
+	* lib/treequel/branch.rb, spec/treequel/branch_spec.rb:
+	Fixed #eql? implementation by using the hash-value instead of just
+	comparing DNs.
+	[7871d9c35a87]
+
+	* .hgtags:
+	Added tag v1.8.0 for changeset 0f8e4ce2a212
+	[48553b84ad54]
+
+	* .hgsigs:
+	Added signature for changeset fa0d500e2dee
+	[0f8e4ce2a212] [v1.8.0]
+
+	* History.rdoc, lib/treequel.rb:
+	Bumped minor version, updated History.
+	[fa0d500e2dee]
+
+	* lib/treequel/branch.rb, spec/treequel/branch_spec.rb:
+	Implemented #eql? for Treequel::Branch for correct behavior in
+	Array#-, Hash#[], etc.
+	[e73641e1fa16]
+
+2011-11-30  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v1.7.2 for changeset af0b6ddd247c
+	[f713aa551e39]
+
+	* .hgsigs:
+	Added signature for changeset a8a3bca987c3
+	[af0b6ddd247c] [v1.7.2]
+
+	* History.rdoc, lib/treequel.rb:
+	Bumped patch version, updated history.
+	[a8a3bca987c3]
+
+2011-11-29  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/treequel/model.rb, spec/treequel/model_spec.rb:
+	Add a workaround for Time objects used in generalizedTime fields,
+	since Time has a #to_ary.
+	[dc2d14ae5880]
+
+	* bin/treewhat:
+	Columns down in treewhat output instead of columns across
+	[194f63cb6a77]
+
+	* lib/treequel/branch.rb, spec/treequel/branch_spec.rb:
+	Fix inheritance of syntax for datatype conversion
+	[e316b9a3b910]
+
+2011-11-28  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v1.7.1 for changeset d6c10cbe2e3f
+	[6ef1954736f0]
+
+	* .hgsigs:
+	Added signature for changeset d2ba344f87e8
+	[d6c10cbe2e3f] [v1.7.1]
+
+	* History.rdoc, lib/treequel.rb:
+	Bumped patch version, updated History.
+	[d2ba344f87e8]
+
+	* README.rdoc:
+	Eliminated examples section from the README
+	[fbf90820a12a]
+
+	* lib/treequel/filter.rb, spec/treequel/filter_spec.rb:
+	Modified filter expressions to eliminate unnecessary ORing
+	[0799cc9deb8e]
+
+	* lib/treequel/model.rb, spec/treequel/model_spec.rb:
+	Efficiency fixes for Treequel::Model#modifications
+	[2792e665949d]
+
+	* lib/treequel/model.rb,
+	spec/treequel/model/schemavalidations_spec.rb,
+	spec/treequel/model_spec.rb:
+	Fixing missing DN attribute/s on Treequel::Model objects created via
+	attribute traversal methods.
+	[30b3df5c2363]
+
+	* lib/treequel/model/errors.rb:
+	Log added errors at ERROR level
+	[90bea31f4b1a]
+
 2011-11-09  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
 	Added tag v1.7.0 for changeset 367d9982ea67
-	[74e7687d2837] [tip]
+	[74e7687d2837]
 
 	* .hgsigs:
 	Added signature for changeset c5b83ddad969
@@ -20,7 +145,7 @@
 	lib/treequel/schema/attributetype.rb,
 	lib/treequel/schema/objectclass.rb, lib/treequel/utils.rb:
 	De-Yarded
-	[c5b83ddad969] [github/master]
+	[c5b83ddad969]
 
 	* Rakefile:
 	Require 'rake/clean' for the CLOBBER FileList

data/History.rdoc

@@ -1,3 +1,12 @@
+== v1.8.2 [2011-12-19] Michael Granger <ged@FaerieMUD.org>
+
+- Fixing Treequel::Model#create by merging ADD and DELETE mods
+  generated by #modifications.
+- Don't include non-lengthable ivars in
+  Treequel::Schema#ivar_descriptions (thanks to Ben Bleything for
+  reporting this).
+
+
 == v1.8.1 [2011-12-05] Michael Granger <ged@FaerieMUD.org>
 
 - Fixed #eql? implementation by using the hash-value instead of just
@@ -8,6 +17,7 @@
 
 - Added signature for changeset fa0d500e2dee
 
+
 == v1.8.0 [2011-12-05] Michael Granger <ged@FaerieMUD.org>
 
 - Implemented #eql? for Treequel::Branch for correct behavior in

data/lib/treequel/model.rb

@@ -438,26 +438,37 @@ class Treequel::Model < Treequel::Branch
 		self.log.debug "  comparing %s values to entry: %p vs. %p" %
 			[ attribute, values, entry_values ]
 
+		mods = Hash.new {|h,k| h[k] = [] }
 		Diff::LCS.sdiff( entry_values.sort, values.sort ) do |change|
 			if change.adding?
 				self.log.debug "    found an addition: %p" % [ change ]
-				mods << LDAP::Mod.new( LDAP::LDAP_MOD_ADD, attribute, [change.new_element] )
+				mods[:add] << change.new_element
 
 			elsif change.changed?
 				self.log.debug "    found a modification: %p" % [ change ]
-				mods << LDAP::Mod.new( LDAP::LDAP_MOD_REPLACE, attribute, 
-				                       [change.old_element, change.new_element] )
+				mods[:replace] << [ change.old_element, change.new_element ]
 
 			elsif change.deleting?
 				self.log.debug "    found a deletion: %p" % [ change ]
-				mods << LDAP::Mod.new( LDAP::LDAP_MOD_DELETE, attribute, [change.old_element] )
+				mods[:del] << change.old_element
 			end
 		end
 
 		self.log.debug "  attribute %p has modifications: %p" %
 			[ attribute, mods ] unless mods.empty?
 
-		return mods
+		# Now turn all of the modifications into LDAP::Mod objects, one per modified
+		# attribute
+		return mods.collect do |kind, values|
+			case kind
+			when :add
+				LDAP::Mod.new( LDAP::LDAP_MOD_ADD, attribute, values )
+			when :replace
+				values.collect {|pair| LDAP::Mod.new(LDAP::LDAP_MOD_REPLACE, attribute, pair) }
+			when :del
+				LDAP::Mod.new( LDAP::LDAP_MOD_DELETE, attribute, values )
+			end
+		end.flatten.compact
 	end
 
 

data/lib/treequel/schema.rb

@@ -349,6 +349,7 @@ class Treequel::Schema
 	### Return descriptions of the schema's artifacts, and how many of each it has.
 	def ivar_descriptions
 		self.instance_variables.sort.collect do |ivar|
+			next unless ivar.respond_to?( :length )
 			len = self.instance_variable_get( ivar ).length
 			"%d %s" % [ len, ivar.to_s.gsub(/_/, ' ')[1..-1] ]
 		end		

data/lib/treequel.rb

@@ -26,10 +26,10 @@ end
 module Treequel
 
 	# Library version
-	VERSION = '1.8.1'
+	VERSION = '1.8.2'
 
 	# VCS revision
-	REVISION = %q$Revision: 507d14777c50 $
+	REVISION = %q$Revision: 343aab59c84b $
 
 	# Common paths for ldap.conf
 	COMMON_LDAP_CONF_PATHS = %w[

data/spec/treequel/model_spec.rb

@@ -715,9 +715,7 @@ describe Treequel::Model do
 					ldap_mod_add("gidNumber", "200"),
 					ldap_mod_add("homeDirectory", "/u/j/jrandom"),
 					ldap_mod_add("l", "a forest in England"),
-					ldap_mod_add("objectClass", "inetOrgPerson"),
-					ldap_mod_add("objectClass", "person"),
-					ldap_mod_add("objectClass", "posixAccount"),
+					ldap_mod_add("objectClass", "inetOrgPerson", "person", "posixAccount"),
 					ldap_mod_add("sn", "Hacker"),
 					ldap_mod_add("uid", "jrandom"),
 					ldap_mod_add("uidNumber", "1121")

data.tar.gz.sig

@@ -1,2 +1 @@
-��jV����m�����H���|��p��%�j���pqإ�����*��
-b74@�e�0�.�z��}��G|���i�z��H�2�E�#��k�MU�<Y�u���[3�XH��V����H���,��lB] .O�Ԃ�t�vW�<o��j�Lj�/�
����)��=4�"i��v�-��+��l���4
+�S�UQ�:U�?d4"6{��}eu��M��G�*�*E����
Oϒ���𶍽�sK?l��ъ��p��\'h��ng�h��9e�]�J�o"�n]s���OyE���2z�`N�և�%S����&��s�5�]�<�
��as���۽z��L��0�Hjeg�4
�D7y���,'�`�7���!�>��Ҙ��9s��nq�ns�7��},�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treequel
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -49,11 +49,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-12-05 00:00:00.000000000 Z
+date: 2011-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ldap
-  requirement: &70360852962800 !ruby/object:Gem::Requirement
+  requirement: &70151954119220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +61,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70360852962800
+  version_requirements: *70151954119220
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &70360852962380 !ruby/object:Gem::Requirement
+  requirement: &70151954118800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +72,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70360852962380
+  version_requirements: *70151954118800
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70360852961960 !ruby/object:Gem::Requirement
+  requirement: &70151954118240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +83,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70360852961960
+  version_requirements: *70151954118240
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
-  requirement: &70360852961500 !ruby/object:Gem::Requirement
+  requirement: &70151954117640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,10 +94,10 @@ dependencies:
         version: 0.2.0
   type: :development
   prerelease: false
-  version_requirements: *70360852961500
+  version_requirements: *70151954117640
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70360852961080 !ruby/object:Gem::Requirement
+  requirement: &70151954117140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -105,10 +105,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70360852961080
+  version_requirements: *70151954117140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70360852960620 !ruby/object:Gem::Requirement
+  requirement: &70151954116680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -116,10 +116,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70360852960620
+  version_requirements: *70151954116680
 - !ruby/object:Gem::Dependency
   name: ruby-termios
-  requirement: &70360852960200 !ruby/object:Gem::Requirement
+  requirement: &70151954116240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -127,10 +127,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70360852960200
+  version_requirements: *70151954116240
 - !ruby/object:Gem::Dependency
   name: ruby-terminfo
-  requirement: &70360852959780 !ruby/object:Gem::Requirement
+  requirement: &70151954115820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -138,10 +138,10 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *70360852959780
+  version_requirements: *70151954115820
 - !ruby/object:Gem::Dependency
   name: columnize
-  requirement: &70360852959360 !ruby/object:Gem::Requirement
+  requirement: &70151954115400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -149,10 +149,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70360852959360
+  version_requirements: *70151954115400
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70360852958940 !ruby/object:Gem::Requirement
+  requirement: &70151954114960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -160,10 +160,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70360852958940
+  version_requirements: *70151954114960
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70360852958520 !ruby/object:Gem::Requirement
+  requirement: &70151954114520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -171,10 +171,10 @@ dependencies:
         version: '3.20'
   type: :development
   prerelease: false
-  version_requirements: *70360852958520
+  version_requirements: *70151954114520
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70360852958100 !ruby/object:Gem::Requirement
+  requirement: &70151954114100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -182,7 +182,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70360852958100
+  version_requirements: *70151954114100
 description: ! "Treequel is an LDAP toolkit for Ruby. It is intended to allow quick,
   easy\naccess to LDAP directories in a manner consistent with LDAP's hierarchical,\nfree-form
   nature. \n\nIt's inspired by and modeled after [Sequel](http://sequel.rubyforge.org/),