treequel 1.8.4 → 1.8.5

data/History.rdoc

@@ -1,3 +1,9 @@
+== v1.8.5 [2012-03-07] Michael Granger <ged@FaerieMUD.org>
+
+- Fix an edge-case bug in LDIF-generation logic. Thanks to Mahlon E. Smith
+  for the report and the pair to fix it.
+
+
 == v1.8.4 [2012-02-02] Michael Granger <ged@FaerieMUD.org>
 
 - Fixed a bug with handling of BOOLEAN values in Treequel::Model. Thanks to

data/lib/treequel/mixins.rb

@@ -21,20 +21,20 @@ module Treequel
 
 		### Define the given +delegated_methods+ as delegators to the like-named method
 		### of the return value of the +delegate_method+.
-		### 
+		###
 		###    class MyClass
 		###      extend Treequel::Delegation
-		###      
+		###
 		###      # Delegate the #bound?, #err, and #result2error methods to the connection
 		###      # object returned by the #connection method. This allows the connection
 		###      # to still be loaded on demand/overridden/etc.
 		###      def_method_delegators :connection, :bound?, :err, :result2error
-		###      
+		###
 		###      def connection
 		###        @connection ||= self.connect
 		###      end
 		###    end
-		### 
+		###
 		def def_method_delegators( delegate_method, *delegated_methods )
 			delegated_methods.each do |name|
 				body = make_method_delegator( delegate_method, name )
@@ -46,15 +46,15 @@ module Treequel
 		### Define the given +delegated_methods+ as delegators to the like-named method
 		### of the specified +ivar+. This is pretty much identical with how 'Forwardable'
 		### from the stdlib does delegation, but it's reimplemented here for consistency.
-		### 
+		###
 		###    class MyClass
 		###      extend Treequel::Delegation
-		###      
+		###
 		###      # Delegate the #each method to the @collection ivar
 		###      def_ivar_delegators :@collection, :each
-		###      
+		###
 		###    end
-		### 
+		###
 		def def_ivar_delegators( ivar, *delegated_methods )
 			delegated_methods.each do |name|
 				body = make_ivar_delegator( ivar, name )

data/lib/treequel/model.rb

@@ -347,7 +347,7 @@ class Treequel::Model < Treequel::Branch
 	end
 
 
-	### Validate the object with the specified +options+. Appending validation errors onto
+	### Validate the object with the specified +options+, appending validation errors onto
 	### the #errors object.
 	def validate( options={} )
 		options = DEFAULT_VALIDATION_OPTIONS.merge( options )
@@ -439,32 +439,29 @@ class Treequel::Model < Treequel::Branch
 		self.log.debug "  comparing %s values to entry: %p vs. %p" %
 			[ attribute, values, entry_values ]
 
-		# Calculate differences between the values in the directory and the
-		# values in the model object
-		new_values = values - entry_values
-		old_values = entry_values - values
-
-		# If it's not a delete (no values in the mode), but there were values
-		# removed, it's a REPLACE
-		if !values.empty? && !old_values.empty?
-			self.log.debug "    REPLACE %s: %p with %p" %
-				[ attribute, entry_values, values ]
-			return LDAP::Mod.new( LDAP::LDAP_MOD_REPLACE, attribute, values )
+		# If the attributes on the server are the same as the local ones,
+		# it's a NOOP.
+		if values.sort == entry_values.sort
+			self.log.debug "    no change."
+			return nil
 
-		# ...if there were values added to the model, it's an ADD
-		elsif !new_values.empty?
+		# If the directory doesn't have this attribute, but the local
+		# object does, it's an ADD
+		elsif entry_values.empty?
 			self.log.debug "    ADD %s: %p" % [ attribute, values ]
-			return LDAP::Mod.new( LDAP::LDAP_MOD_ADD, attribute, new_values )
+			return LDAP::Mod.new( LDAP::LDAP_MOD_ADD, attribute, values )
 
-		# ...or if all the values in the model were removed, it's a DELETE
+		# ...or if the local value doesn't have anything for this attribute
+		# but the directory does, it's a DEL
 		elsif values.empty?
 			self.log.debug "    DELETE %s" % [ attribute ]
 			return LDAP::Mod.new( LDAP::LDAP_MOD_DELETE, attribute )
 
-		# otherwise, it's unchanged.
+		# ...otherwise it's a REPLACE
 		else
-			self.log.debug "    no change."
-			return nil
+			self.log.debug "    REPLACE %s: %p with %p" %
+				[ attribute, entry_values, values ]
+			return LDAP::Mod.new( LDAP::LDAP_MOD_REPLACE, attribute, values )
 		end
 
 	end

data/lib/treequel.rb

@@ -26,10 +26,10 @@ end
 module Treequel
 
 	# Library version
-	VERSION = '1.8.4'
+	VERSION = '1.8.5'
 
 	# VCS revision
-	REVISION = %q$Revision: d1834cc0605f $
+	REVISION = %q$Revision: 8bdd6d1581e3 $
 
 	# Common paths for ldap.conf
 	COMMON_LDAP_CONF_PATHS = %w[

data/spec/treequel/model_spec.rb

@@ -673,6 +673,13 @@ describe Treequel::Model do
 				@obj.should_not be_modified()
 			end
 
+			it "doesn't try to mistakenly delete an attribute that's assigned an empty array " +
+			"and isn't set in the directory" do
+				@obj.secretary = []
+				result = @obj.modifications
+				result.should_not include( ldap_mod_delete :secretary )
+			end
+
 		end
 
 		it "avoids Arrayifying Time objects when converting them to generalized time strings" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treequel
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,50 +10,38 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain:
-- ! '-----BEGIN CERTIFICATE-----
-
-  MIIDLDCCAhSgAwIBAgIBADANBgkqhkiG9w0BAQUFADA8MQwwCgYDVQQDDANnZWQx
-
-  FzAVBgoJkiaJk/IsZAEZFgdfYWVyaWVfMRMwEQYKCZImiZPyLGQBGRYDb3JnMB4X
-
-  DTEwMDkxNjE0NDg1MVoXDTExMDkxNjE0NDg1MVowPDEMMAoGA1UEAwwDZ2VkMRcw
-
-  FQYKCZImiZPyLGQBGRYHX2FlcmllXzETMBEGCgmSJomT8ixkARkWA29yZzCCASIw
-
-  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALy//BFxC1f/cPSnwtJBWoFiFrir
-
-  h7RicI+joq/ocVXQqI4TDWPyF/8tqkvt+rD99X9qs2YeR8CU/YiIpLWrQOYST70J
-
-  vDn7Uvhb2muFVqq6+vobeTkILBEO6pionWDG8jSbo3qKm1RjKJDwg9p4wNKhPuu8
-
-  KGue/BFb67KflqyApPmPeb3Vdd9clspzqeFqp7cUBMEpFS6LWxy4Gk+qvFFJBJLB
-
-  BUHE/LZVJMVzfpC5Uq+QmY7B+FH/QqNndn3tOHgsPadLTNimuB1sCuL1a4z3Pepd
-
-  TeLBEFmEao5Dk3K/Q8o8vlbIB/jBDTUx6Djbgxw77909x6gI9doU4LD5XMcCAwEA
-
-  AaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFJeoGkOr9l4B
-
-  +saMkW/ZXT4UeSvVMA0GCSqGSIb3DQEBBQUAA4IBAQBG2KObvYI2eHyyBUJSJ3jN
-
-  vEnU3d60znAXbrSd2qb3r1lY1EPDD3bcy0MggCfGdg3Xu54z21oqyIdk8uGtWBPL
-
-  HIa9EgfFGSUEgvcIvaYqiN4jTUtidfEFw+Ltjs8AP9gWgSIYS6Gr38V0WGFFNzIH
-
-  aOD2wmu9oo/RffW4hS/8GuvfMzcw7CQ355wFR4KB/nyze+EsZ1Y5DerCAagMVuDQ
-
-  U0BLmWDFzPGGWlPeQCrYHCr+AcJz+NRnaHCKLZdSKj/RHuTOt+gblRex8FAh8NeA
-
-  cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
-
-  -----END CERTIFICATE-----
-
-'
-date: 2012-02-02 00:00:00.000000000 Z
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURMRENDQWhTZ0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREE4TVF3d0NnWURWUVFEREFOblpX
+  UXgKRnpBVkJnb0praWFKay9Jc1pBRVpGZ2RmWVdWeWFXVmZNUk13RVFZS0Na
+  SW1pWlB5TEdRQkdSWURiM0puTUI0WApEVEV3TURreE5qRTBORGcxTVZvWERU
+  RXhNRGt4TmpFME5EZzFNVm93UERFTU1Bb0dBMVVFQXd3RFoyVmtNUmN3CkZR
+  WUtDWkltaVpQeUxHUUJHUllIWDJGbGNtbGxYekVUTUJFR0NnbVNKb21UOGl4
+  a0FSa1dBMjl5WnpDQ0FTSXcKRFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURD
+  Q0FRb0NnZ0VCQUx5Ly9CRnhDMWYvY1BTbnd0SkJXb0ZpRnJpcgpoN1JpY0kr
+  am9xL29jVlhRcUk0VERXUHlGLzh0cWt2dCtyRDk5WDlxczJZZVI4Q1UvWWlJ
+  cExXclFPWVNUNzBKCnZEbjdVdmhiMm11RlZxcTYrdm9iZVRrSUxCRU82cGlv
+  bldERzhqU2JvM3FLbTFSaktKRHdnOXA0d05LaFB1dTgKS0d1ZS9CRmI2N0tm
+  bHF5QXBQbVBlYjNWZGQ5Y2xzcHpxZUZxcDdjVUJNRXBGUzZMV3h5NEdrK3F2
+  RkZKQkpMQgpCVUhFL0xaVkpNVnpmcEM1VXErUW1ZN0IrRkgvUXFObmRuM3RP
+  SGdzUGFkTFROaW11QjFzQ3VMMWE0ejNQZXBkClRlTEJFRm1FYW81RGszSy9R
+  OG84dmxiSUIvakJEVFV4NkRqYmd4dzc3OTA5eDZnSTlkb1U0TEQ1WE1jQ0F3
+  RUEKQWFNNU1EY3dDUVlEVlIwVEJBSXdBREFMQmdOVkhROEVCQU1DQkxBd0hR
+  WURWUjBPQkJZRUZKZW9Ha09yOWw0Qgorc2FNa1cvWlhUNFVlU3ZWTUEwR0NT
+  cUdTSWIzRFFFQkJRVUFBNElCQVFCRzJLT2J2WUkyZUh5eUJVSlNKM2pOCnZF
+  blUzZDYwem5BWGJyU2QycWIzcjFsWTFFUEREM2JjeTBNZ2dDZkdkZzNYdTU0
+  ejIxb3F5SWRrOHVHdFdCUEwKSElhOUVnZkZHU1VFZ3ZjSXZhWXFpTjRqVFV0
+  aWRmRUZ3K0x0anM4QVA5Z1dnU0lZUzZHcjM4VjBXR0ZGTnpJSAphT0Qyd211
+  OW9vL1JmZlc0aFMvOEd1dmZNemN3N0NRMzU1d0ZSNEtCL255emUrRXNaMVk1
+  RGVyQ0FhZ01WdURRClUwQkxtV0RGelBHR1dsUGVRQ3JZSENyK0FjSnorTlJu
+  YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
+  Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
+  cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+date: 2012-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ldap
-  requirement: &70230719754780 !ruby/object:Gem::Requirement
+  requirement: &70184430296300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +49,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70230719754780
+  version_requirements: *70184430296300
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70230719754360 !ruby/object:Gem::Requirement
+  requirement: &70184430295820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +60,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70230719754360
+  version_requirements: *70184430295820
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70230719753900 !ruby/object:Gem::Requirement
+  requirement: &70184430295340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +71,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70230719753900
+  version_requirements: *70184430295340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70230719753440 !ruby/object:Gem::Requirement
+  requirement: &70184430294840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,10 +82,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70230719753440
+  version_requirements: *70184430294840
 - !ruby/object:Gem::Dependency
   name: ruby-termios
-  requirement: &70230719753020 !ruby/object:Gem::Requirement
+  requirement: &70184430294400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -105,10 +93,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70230719753020
+  version_requirements: *70184430294400
 - !ruby/object:Gem::Dependency
   name: ruby-terminfo
-  requirement: &70230719752600 !ruby/object:Gem::Requirement
+  requirement: &70184430293960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -116,10 +104,10 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *70230719752600
+  version_requirements: *70184430293960
 - !ruby/object:Gem::Dependency
   name: columnize
-  requirement: &70230719752180 !ruby/object:Gem::Requirement
+  requirement: &70184430293480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -127,10 +115,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70230719752180
+  version_requirements: *70184430293480
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70230719751760 !ruby/object:Gem::Requirement
+  requirement: &70184430293040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -138,10 +126,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70230719751760
+  version_requirements: *70184430293040
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70230719751340 !ruby/object:Gem::Requirement
+  requirement: &70184430292560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -149,10 +137,10 @@ dependencies:
         version: '3.20'
   type: :development
   prerelease: false
-  version_requirements: *70230719751340
+  version_requirements: *70184430292560
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70230719750920 !ruby/object:Gem::Requirement
+  requirement: &70184430292100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -160,10 +148,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70230719750920
+  version_requirements: *70184430292100
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70230719766880 !ruby/object:Gem::Requirement
+  requirement: &70184430291660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -171,7 +159,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *70230719766880
+  version_requirements: *70184430291660
 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/],
@@ -287,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: treequel
-rubygems_version: 1.8.14
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Treequel is an LDAP toolkit for Ruby