treequel 1.3.0 → 1.3.1

data/Rakefile

@@ -35,6 +35,7 @@ hoespec = Hoe.spec 'treequel' do
 		"    - termios",
 		"    - ruby-terminfo",
 		"    - columnize",
+		"    - sysexits",
 		'',
 		"You can install those automatically if you use the --development flag when",
 		"installing Treequel."
@@ -43,6 +44,7 @@ hoespec = Hoe.spec 'treequel' do
 
 	self.require_ruby_version( '>=1.8.7' )
 
+	self.rspec_options += ['-cfd'] if self.respond_to?( :rspec_options= )
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
 	self.manual_source_dir = 'src' if self.respond_to?( :manual_source_dir= )
 	self.yard_opts = [ '--use-cache', '--protected', '--verbose' ] if

data/lib/treequel.rb

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

data/lib/treequel/model/objectclass.rb

@@ -92,7 +92,7 @@ module Treequel::Model::ObjectClass
 		rdn_pair.split( /\+/ ).each do |attrpair|
 			k, v = attrpair.split( /\s*=\s*/ )
 			entryhash[ k ] ||= []
-			entryhash[ k ] << v
+			entryhash[ k ] << v unless entryhash[ k ].include?( v )
 		end
 
 		return self.model_class.new( directory, dn, entryhash )

data/spec/treequel/model/objectclass_spec.rb

@@ -185,7 +185,21 @@ describe Treequel::Model::ObjectClass do
 			result = mixin.create( @directory, TEST_PERSON_DN )
 			result.should be_a( Treequel::Model )
 			result[:objectClass].should include( 'inetOrgPerson' )
-			result[TEST_PERSON_DN_ATTR].should include( TEST_PERSON_DN_VALUE )
+			result[TEST_PERSON_DN_ATTR].should == [ TEST_PERSON_DN_VALUE ]
+		end
+
+		it "doesn't add the extracted DN attribute if it's already present in the entry" do
+			mixin = Module.new do
+				extend Treequel::Model::ObjectClass
+				model_objectclasses :inetOrgPerson
+			end
+
+			result = mixin.create( @directory, TEST_PERSON_DN,
+				TEST_PERSON_DN_ATTR => [TEST_PERSON_DN_VALUE] )
+			result.should be_a( Treequel::Model )
+			result[:objectClass].should include( 'inetOrgPerson' )
+			result[TEST_PERSON_DN_ATTR].should have( 1 ).member
+			result[TEST_PERSON_DN_ATTR].should == [ TEST_PERSON_DN_VALUE ]
 		end
 
 		it "merges objectClasses passed to the creation method" do
@@ -199,6 +213,7 @@ describe Treequel::Model::ObjectClass do
 			result.should be_a( Treequel::Model )
 			result[:objectClass].should have( 2 ).members
 			result[:objectClass].should include( 'inetOrgPerson', 'person' )
+			result[TEST_PERSON_DN_ATTR].should have( 1 ).member
 			result[TEST_PERSON_DN_ATTR].should include( TEST_PERSON_DN_VALUE )
 		end
 
@@ -216,36 +231,6 @@ describe Treequel::Model::ObjectClass do
 			result[TEST_HOST_MULTIVALUE_DN_ATTR2].should include( TEST_HOST_MULTIVALUE_DN_VALUE2 )
 		end
 
-		it "can instantiate a new model object with its declared objectClasses" do
-			conn = mock( "ldap connection object" )
-			directory = get_fixtured_directory( conn )
-
-			mixin = Module.new do
-				extend Treequel::Model::ObjectClass
-				model_objectclasses :inetOrgPerson
-			end
-
-			result = mixin.create( directory, TEST_PERSON_DN )
-			result.should be_a( Treequel::Model )
-			result[:objectClass].should include( 'inetOrgPerson' )
-		end
-
-		it "merges objectClasses passed to the creation method" do
-			conn = mock( "ldap connection object" )
-			directory = get_fixtured_directory( conn )
-
-			mixin = Module.new do
-				extend Treequel::Model::ObjectClass
-				model_objectclasses :inetOrgPerson
-			end
-
-			result = mixin.create( directory, TEST_PERSON_DN,
-				:objectClass => [:person, :inetOrgPerson] )
-			result.should be_a( Treequel::Model )
-			result[:objectClass].should have( 2 ).members
-			result[:objectClass].should include( 'inetOrgPerson', 'person' )
-		end
-
 	end
 
 	context "module that has one required objectClass declared" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: treequel
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Michael Granger
@@ -36,7 +36,7 @@ cert_chain:
   cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
   -----END CERTIFICATE-----
 
-date: 2011-01-13 00:00:00 -08:00
+date: 2011-01-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -264,6 +264,7 @@ post_install_message: |-
       - termios
       - ruby-terminfo
       - columnize
+      - sysexits
   
   You can install those automatically if you use the --development flag when
   installing Treequel.