treequel 1.8.3 → 1.8.4

data/ChangeLog

@@ -1,12 +1,40 @@
+2012-01-30  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v1.8.3 for changeset c9e91880eeb9
+	[142d9a553024] [tip]
+
+	* .hgsigs:
+	Added signature for changeset 5bab245f02aa
+	[c9e91880eeb9] [v1.8.3]
+
+2012-01-27  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rspec-tm, .rvm.gems, .rvmrc:
+	Adding project rvmrc, TextMate RSpec settings.
+	[84cfb6b8e964]
+
+2012-01-26  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc:
+	Fixing a link in the README
+	[55b0f2e1048e]
+
+2012-01-25  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/treequel/monkeypatches.rb:
+	Remove the (now unnecessary) diff/lcs requires.
+	[5bab245f02aa]
+
 2012-01-24  Michael Granger  <ged@FaerieMUD.org>
 
 	* History.rdoc, lib/treequel.rb:
 	Bumping patch version, updating History.
-	[5a4dee114236] [tip]
+	[5a4dee114236]
 
 	* .rspec-tm:
 	Removing TextMate RSpec settings file
-	[c1fefabf1a27] [github/master]
+	[c1fefabf1a27]
 
 	* Rakefile, lib/treequel/model.rb, lib/treequel/monkeypatches.rb,
 	spec/treequel/model_spec.rb:

data/History.rdoc

@@ -1,3 +1,9 @@
+== v1.8.4 [2012-02-02] Michael Granger <ged@FaerieMUD.org>
+
+- Fixed a bug with handling of BOOLEAN values in Treequel::Model. Thanks to
+  Patricio Bruna <pbruna@it-linux.cl> for the bug report.
+
+
 == v1.8.3 [2012-01-24] Michael Granger <ged@FaerieMUD.org>
 
 - A fix for Treequel::Model#save LDIF. Thanks to Patricio Bruna <pbruna@it-linux.cl> for

data/README.rdoc

@@ -8,7 +8,7 @@ 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,
 free-form nature. 
 
-It's inspired by and modeled after [Sequel](http://sequel.rubyforge.org/), a
+It's inspired by and modeled after {Sequel}[http://sequel.rubyforge.org/], a
 kick-ass database library.
 
 

data/lib/treequel.rb

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

data/lib/treequel/model.rb

@@ -78,7 +78,7 @@ class Treequel::Model < Treequel::Branch
 	end
 
 
-	### Return the Treequel::Directory the Model will use for searches, creating it if it 
+	### Return the Treequel::Directory the Model will use for searches, creating it if it
 	### hasn't been created already. The default Directory will be created by calling
 	### Treequel.directory_from_config.
 	def self::directory
@@ -103,7 +103,7 @@ class Treequel::Model < Treequel::Branch
 	end
 
 
-	### Register the given +mixin+ for the specified +objectclasses+. Instances that 
+	### Register the given +mixin+ for the specified +objectclasses+. Instances that
 	### have all the specified +objectclasses+ will be extended with the +mixin+, which should be
 	### a Module extended with Treequel::Model::ObjectClass.
 	def self::register_mixin( mixin )
@@ -157,7 +157,7 @@ class Treequel::Model < Treequel::Branch
 			values_at( *ocsymbols ).
 			inject {|set1,set2| set1 | set2 }
 
-		# Return the mixins whose objectClass requirements are met by the 
+		# Return the mixins whose objectClass requirements are met by the
 		# specified objectclasses
 		return mixins.delete_if do |mixin|
 			!mixin.model_objectclasses.all? {|oc| ocsymbols.include?(oc) }
@@ -186,7 +186,7 @@ class Treequel::Model < Treequel::Branch
 	def self::freeze_converted_values?; false; end
 
 
-	### Create a new Treequel::Model object with the given +entry+ hash from the 
+	### Create a new Treequel::Model object with the given +entry+ hash from the
 	### specified +directory+. Overrides Treequel::Branch.new_from_entry to pass the
 	### +from_directory+ flag to mark it as unmodified.
 	def self::new_from_entry( entry, directory )
@@ -262,7 +262,7 @@ class Treequel::Model < Treequel::Branch
 
 
 	### Index set operator -- set attribute +attrname+ to a new +value+.
-	### Overridden to make Model objects defer writing changes until 
+	### Overridden to make Model objects defer writing changes until
 	### Treequel::Model#save is called.
 	def []=( attrname, value )
 		attrtype = self.find_attribute_type( attrname.to_sym ) or
@@ -270,10 +270,10 @@ class Treequel::Model < Treequel::Branch
 		value = Array( value ) unless attrtype.single?
 
 		self.mark_dirty
-		if value
-			@values[ attrtype.name.to_sym ] = value
-		else
+		if value.nil?
 			@values.delete( attrtype.name.to_sym )
+		else
+			@values[ attrtype.name.to_sym ] = value
 		end
 
 		# If the objectClasses change, we (may) need to re-apply mixins
@@ -289,7 +289,7 @@ class Treequel::Model < Treequel::Branch
 
 
 	### Make the changes to the object specified by the given +attributes+.
-	### Overridden to make Model objects defer writing changes until 
+	### Overridden to make Model objects defer writing changes until
 	### Treequel::Model#save is called.
 	def merge( attributes )
 		attributes.each do |attrname, value|
@@ -299,7 +299,7 @@ class Treequel::Model < Treequel::Branch
 
 
 	### Delete the specified attributes.
-	### Overridden to make Model objects defer writing changes until 
+	### Overridden to make Model objects defer writing changes until
 	### Treequel::Model#save is called.
 	def delete( *attributes )
 		return super if attributes.empty?
@@ -313,8 +313,8 @@ class Treequel::Model < Treequel::Branch
 			if attribute.is_a?( Hash )
 				self.delete_specific_values( attribute )
 
-			# With an array of attributes to delete, replace 
-			# MULTIPLE attribute types with an empty array, and SINGLE 
+			# With an array of attributes to delete, replace
+			# MULTIPLE attribute types with an empty array, and SINGLE
 			# attribute types with nil
 			elsif attribute.respond_to?( :to_sym )
 				attrtype = self.find_attribute_type( attribute.to_sym )
@@ -365,7 +365,7 @@ class Treequel::Model < Treequel::Branch
 
 
 	### Write any pending changes in the model object to the directory. The valid +opts+ are:
-	### 
+	###
 	### [+:raise_on_failure+]
 	###     raise a Treequel::ValidationFailed or Treequel::BeforeHookFailed if either the
 	###     validations or before_{save,create}.
@@ -606,7 +606,7 @@ class Treequel::Model < Treequel::Branch
 	def method_missing( sym, *args )
 		self.log.debug "Dynamic dispatch to %p with args: %p" % [ sym, args ]
 
-		# First, if the entry hasn't yet been loaded, try loading it to make sure the 
+		# First, if the entry hasn't yet been loaded, try loading it to make sure the
 		# object is already extended with any applicable objectClass mixins. If that ends
 		# up defining the method in question, call it.
 		if !@entry && self.entry
@@ -627,7 +627,7 @@ class Treequel::Model < Treequel::Branch
 		plainsym, methodtype = attribute_from_method( sym )
 		return super if methodtype == :reader && !args.empty?
 
-		# Now make a method body for a new method based on what attributeType it is if 
+		# Now make a method body for a new method based on what attributeType it is if
 		# it's a valid attribute
 		attrtype = self.find_attribute_type( plainsym ) or return super
 		methodbody = case methodtype
@@ -688,7 +688,7 @@ class Treequel::Model < Treequel::Branch
 	end
 
 
-	### Overridden to apply applicable mixins to lazily-loaded objects once their entry 
+	### Overridden to apply applicable mixins to lazily-loaded objects once their entry
 	### has been looked up.
 	def lookup_entry
 		if entryhash = super
@@ -699,7 +699,7 @@ class Treequel::Model < Treequel::Branch
 	end
 
 
-	### Apply mixins that are applicable considering the receiver's DN and the 
+	### Apply mixins that are applicable considering the receiver's DN and the
 	### objectClasses from the given +entryhash+ merged with any unsaved values.
 	def apply_applicable_mixins( dn, entryhash=nil )
 		objectclasses = @values[:objectClass] ||

data/lib/treequel/model/schemavalidations.rb

@@ -41,7 +41,7 @@ module Treequel::Model::SchemaValidations
 		self.must_attribute_types.each do |attrtype|
 			oid = attrtype.name
 			if attrtype.single?
-				self.errors.add( oid, "MUST have a value" ) unless self[ oid ]
+				self.errors.add( oid, "MUST have a value" ) if self[ oid ].nil?
 			else
 				self.errors.add( oid, "MUST have at least one value" ) if self[ oid ].empty?
 			end

data/spec/treequel/model_spec.rb

@@ -379,6 +379,22 @@ describe Treequel::Model do
 			@obj.uid.should == ['stampley']
 		end
 
+		it "treats setting an attribute to nil as a delete" do
+			@obj.display_name = 'J. P. Havershaven'
+			@obj.values.should include( :displayName )
+			@obj.display_name = nil
+			@obj.values.should_not include( :displayName )
+		end
+
+		it "allows a BOOLEAN attribute to be set to false" do
+			@obj.object_class += ['sambaAccount']
+			@obj.rid = 1181
+			@obj.pwd_must_change = false
+			@obj.values.should include( :pwdMustChange => false )
+			@obj.pwd_must_change = nil
+			@obj.values.should_not include( :pwdMustChange )
+		end
+
 		it "provides a predicate that tests true for valid singular attributes that are set" do
 			@obj.display_name?.should be_true()
 		end
@@ -413,7 +429,7 @@ describe Treequel::Model do
 		it "adds the objectClass attribute to the attribute list when executing a search that " +
 		   "contains a select" do
 			@conn.should_receive( :search_ext2 ).
-			 	with( @entry['dn'].first, LDAP::LDAP_SCOPE_ONELEVEL, "(cn=magnelion)",
+				with( @entry['dn'].first, LDAP::LDAP_SCOPE_ONELEVEL, "(cn=magnelion)",
 			          ["cn", "objectClass"], false, nil, nil, 0, 0, 0, "", nil ).
 				and_return( [] )
 			@obj.search( :one, '(cn=magnelion)', :selectattrs => ['cn'] )
@@ -422,7 +438,7 @@ describe Treequel::Model do
 		it "doesn't add the objectClass attribute to the attribute list when the search " +
 		   "doesn't contain a select" do
 			@conn.should_receive( :search_ext2 ).
-			 	with( @entry['dn'].first, LDAP::LDAP_SCOPE_ONELEVEL, "(cn=ephelion)",
+				with( @entry['dn'].first, LDAP::LDAP_SCOPE_ONELEVEL, "(cn=ephelion)",
 			          ['*'], false, nil, nil, 0, 0, 0, "", nil ).
 				and_return( [] )
 			@obj.search( :one, '(cn=ephelion)' )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treequel
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -49,11 +49,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2012-01-30 00:00:00.000000000 Z
+date: 2012-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ldap
-  requirement: &70211399407800 !ruby/object:Gem::Requirement
+  requirement: &70230719754780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +61,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70211399407800
+  version_requirements: *70230719754780
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70211399407340 !ruby/object:Gem::Requirement
+  requirement: &70230719754360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +72,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70211399407340
+  version_requirements: *70230719754360
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70211399406840 !ruby/object:Gem::Requirement
+  requirement: &70230719753900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +83,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70211399406840
+  version_requirements: *70230719753900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70211399406360 !ruby/object:Gem::Requirement
+  requirement: &70230719753440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,10 +94,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70211399406360
+  version_requirements: *70230719753440
 - !ruby/object:Gem::Dependency
   name: ruby-termios
-  requirement: &70211399405940 !ruby/object:Gem::Requirement
+  requirement: &70230719753020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -105,10 +105,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70211399405940
+  version_requirements: *70230719753020
 - !ruby/object:Gem::Dependency
   name: ruby-terminfo
-  requirement: &70211399405460 !ruby/object:Gem::Requirement
+  requirement: &70230719752600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -116,10 +116,10 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *70211399405460
+  version_requirements: *70230719752600
 - !ruby/object:Gem::Dependency
   name: columnize
-  requirement: &70211399404960 !ruby/object:Gem::Requirement
+  requirement: &70230719752180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -127,10 +127,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70211399404960
+  version_requirements: *70230719752180
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70211399404520 !ruby/object:Gem::Requirement
+  requirement: &70230719751760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -138,10 +138,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70211399404520
+  version_requirements: *70230719751760
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70211399404060 !ruby/object:Gem::Requirement
+  requirement: &70230719751340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -149,32 +149,32 @@ dependencies:
         version: '3.20'
   type: :development
   prerelease: false
-  version_requirements: *70211399404060
+  version_requirements: *70230719751340
 - !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: &70211399403600 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: &70230719750920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70211399403600
+  version_requirements: *70230719750920
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70211416503480 !ruby/object:Gem::Requirement
+  name: hoe
+  requirement: &70230719766880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *70211416503480
+  version_requirements: *70230719766880
 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/),
+  nature. \n\nIt's inspired by and modeled after {Sequel}[http://sequel.rubyforge.org/],
   a\nkick-ass database library."
 email:
 - ged@FaerieMUD.org
@@ -287,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: treequel
-rubygems_version: 1.8.10
+rubygems_version: 1.8.14
 signing_key: 
 specification_version: 3
 summary: Treequel is an LDAP toolkit for Ruby