treequel 1.2.2 → 1.3.0pre384

data/spec/treequel/model_spec.rb

@@ -59,6 +59,7 @@ describe Treequel::Model do
 			and_return( [:inetOrgPerson] )
 		mixin.should_receive( :model_bases ).at_least( :once ).
 			and_return( [] )
+
 		Treequel::Model.register_mixin( mixin )
 		Treequel::Model.mixins_for_objectclasses( :inetOrgPerson ).should include( mixin )
 	end
@@ -69,6 +70,7 @@ describe Treequel::Model do
 			and_return( [:inetOrgPerson, :organizationalPerson] )
 		mixin.should_receive( :model_bases ).at_least( :once ).
 			and_return( [] )
+
 		Treequel::Model.register_mixin( mixin )
 		Treequel::Model.mixins_for_objectclasses( :inetOrgPerson, :organizationalPerson ).
 			should include( mixin )
@@ -80,6 +82,7 @@ describe Treequel::Model do
 			and_return( [] )
 		mixin.should_receive( :model_bases ).at_least( :once ).
 			and_return( [TEST_PEOPLE_DN] )
+
 		Treequel::Model.register_mixin( mixin )
 		Treequel::Model.mixins_for_dn( TEST_PEOPLE_DN ).should include( mixin )
 	end
@@ -90,6 +93,7 @@ describe Treequel::Model do
 			and_return( [] )
 		mixin.should_receive( :model_bases ).at_least( :once ).
 			and_return( [TEST_PEOPLE_DN] )
+
 		Treequel::Model.register_mixin( mixin )
 		Treequel::Model.mixins_for_dn( TEST_PERSON_DN ).should include( mixin )
 	end
@@ -101,7 +105,6 @@ describe Treequel::Model do
 		mixin.should_receive( :model_bases ).at_least( :once ).and_return( [] )
 
 		Treequel::Model.register_mixin( mixin )
-
 		Treequel::Model.mixins_for_dn( TEST_PERSON_DN ).should include( mixin )
 	end
 
@@ -142,6 +145,29 @@ describe Treequel::Model do
 		obj.should_not be_a( mixin3 )
 	end
 
+	it "extends dups of new instances with registered mixins" do
+		mixin1 = Module.new do
+			extend Treequel::Model::ObjectClass
+			model_bases TEST_HOSTS_DN, TEST_SUBHOSTS_DN
+			model_objectclasses :ipHost
+		end
+		mixin2 = Module.new do
+			extend Treequel::Model::ObjectClass
+			model_bases TEST_HOSTS_DN
+			model_objectclasses :device
+		end
+		mixin3 = Module.new do
+			extend Treequel::Model::ObjectClass
+			model_objectclasses :person
+		end
+
+		obj = Treequel::Model.new( @directory, TEST_SUBHOST_DN, @simple_entry ).dup
+
+		obj.should be_a( mixin1 )
+		obj.should_not be_a( mixin2 )
+		obj.should_not be_a( mixin3 )
+	end
+
 	it "extends new instances with mixins that are implied by objectClass SUP attributes, too" do
 		inherited_mixin = Module.new do
 			extend Treequel::Model::ObjectClass
@@ -184,6 +210,37 @@ describe Treequel::Model do
 		obj.should_not be_a( mixin3 )
 	end
 
+	it "applies applicable mixins to instances which have objectClasses added to them" do
+		mixin1 = Module.new do
+			extend Treequel::Model::ObjectClass
+			model_bases TEST_HOSTS_DN, TEST_SUBHOSTS_DN
+			model_objectclasses :ipHost
+		end
+		mixin2 = Module.new do
+			extend Treequel::Model::ObjectClass
+			model_bases TEST_HOSTS_DN
+			model_objectclasses :device
+		end
+
+		@conn.stub( :search_ext2 ).
+			with( TEST_HOST_DN, LDAP::LDAP_SCOPE_BASE, "(objectClass=*)" ).
+			and_return( [] )
+		obj = Treequel::Model.new( @directory, TEST_HOST_DN )
+
+		obj.extensions.should be_empty()
+
+		obj.object_class += [ :ipHost ]
+		obj.extensions.should have( 1 ).member
+		obj.should be_a( mixin1 )
+		obj.should_not be_a( mixin2 )
+
+		obj.object_class += [ :device ]
+		obj.extensions.should have( 2 ).members
+		obj.should be_a( mixin1 )
+		obj.should be_a( mixin2 )
+
+	end
+
 	it "doesn't try to apply objectclasses to non-existant entries" do
 		mixin1 = Module.new do
 			extend Treequel::Model::ObjectClass
@@ -241,23 +298,31 @@ describe Treequel::Model do
 			@directory.should_receive( :get_entry ).with( @obj ).and_return( @entry )
 			@obj.cn.should == ['Slappy the Frog']
 		end
+
 	end
 
 
-	describe "objects created from entries" do
+	describe "objects loaded from entries" do
 
 		before( :all ) do
 			@entry = {
-				'dn'          => ['uid=slappy,ou=people,dc=acme,dc=com'],
-				'uid'         => ['slappy'],
-				'cn'          => ['Slappy the Frog'],
-				'givenName'   => ['Slappy'],
-				'sn'          => ['Frog'],
-				'l'           => ['a forest in England'],
-				'title'       => ['Forest Fire Prevention Advocate'],
-				'displayName' => ['Slappy the Frog'],
-				'logonTime'   => 'a time string',
-				'objectClass' => %w[
+				'dn'            => ['uid=slappy,ou=people,dc=acme,dc=com'],
+				'uid'           => ['slappy'],
+				'cn'            => ['Slappy the Frog'],
+				'givenName'     => ['Slappy'],
+				'sn'            => ['Frog'],
+				'l'             => ['a forest in England'],
+				'title'         => ['Forest Fire Prevention Advocate'],
+				'displayName'   => ['Slappy the Frog'],
+				'logonTime'     => ['1293167318'],
+				'uidNumber'     => ['1121'],
+				'gidNumber'     => ['200'],
+				'homeDirectory' => ['/u/j/jrandom'],
+				'description'   => [
+					'Smokey the Bear is much more intense in person.', 
+					'Alright.'
+				],
+				'objectClass'   => %w[
 					top
 					person
 					organizationalPerson
@@ -275,103 +340,63 @@ describe Treequel::Model do
 
 
 		it "provides readers for valid attributes" do
-			attrtype = stub( "Treequel attributeType object", :name => :uid )
-
-			@obj.should_receive( :valid_attribute_type ).with( :uid ).and_return( attrtype )
-			@obj.should_receive( :[] ).with( :uid ).and_return( ['slappy'] )
-
 			@obj.uid.should == ['slappy']
 		end
 
-		it "normalizes underbarred readers for camelCased attributes" do
-			attrtype = stub( "Treequel attributeType object", :name => :givenName )
-
-			@obj.should_receive( :valid_attribute_type ).with( :given_name ).and_return( nil )
-			@obj.should_receive( :valid_attribute_type ).with( :givenName ).and_return( attrtype )
-			@obj.should_receive( :[] ).with( :givenName ).and_return( ['Slappy'] )
+		it "provides readers for single-letter attributes" do
+			@obj.l.should == ['a forest in England']
+		end
 
+		it "normalizes underbarred readers for camelCased attributes" do
 			@obj.given_name.should == ['Slappy']
 		end
 
 		it "falls through to branch-traversal for a reader with arguments" do
-			@obj.should_not_receive( :valid_attribute_type )
-			@obj.should_not_receive( :[] )
-
-			@obj.should_receive( :traverse_branch ).
-				with( :dc, :admin, {} ).and_return( :a_child_branch )
-
-			@obj.dc( :admin ).should == :a_child_branch
+			result = @obj.dc( :admin )
+			result.should be_a( Treequel::Model )
+			result.dn.should == "dc=admin,#{@entry['dn'].first}"
 		end
 
 		it "accommodates branch-traversal from its auto-generated readers" do
-			@obj.should_receive( :[] ).with( :uid ).and_return( ['slappy'] )
-			@obj.uid.should == ['slappy']
-
+			@obj.uid # Generate the reader, which should then do traversal, too
 			@obj.uid( :slappy ).should be_a( Treequel::Model )
 		end
 
 		it "provides writers for valid singular attributes" do
-			attrtype = stub( "Treequel attributeType object", :name => :logonTime, :single? => true )
-
-			@obj.should_receive( :valid_attribute_type ).with( :logonTime ).and_return( attrtype )
-			@obj.should_receive( :[]= ).with( :logonTime, 'stampley' )
-
-			@obj.logonTime = 'stampley'
+			@obj.logonTime.should equal( 1293167318 )
 		end
 
 		it "provides writers for valid non-singular attributes that accept a non-array" do
-			attrtype = stub( "Treequel attributeType object", :name => :uid, :single? => false )
-
-			@obj.should_receive( :valid_attribute_type ).with( :uid ).and_return( attrtype )
-			@obj.should_receive( :[]= ).with( :uid, ['stampley'] )
-
 			@obj.uid = 'stampley'
+			@obj.uid.should == ['stampley']
 		end
 
 		it "provides a predicate that tests true for valid singular attributes that are set" do
-			attrtype = stub( "Treequel attributeType object", :name => :activated, :single? => true )
-
-			@obj.should_receive( :valid_attribute_type ).with( :activated ).and_return( attrtype )
-			@obj.should_receive( :[] ).with( :activated ).and_return( :a_time_object )
-
-			@obj.should be_activated()
+			@obj.display_name?.should be_true()
 		end
 
 		it "provides a predicate that tests false for valid singular attributes that are not set" do
-			attrtype = stub( "Treequel attributeType object", :name => :deactivated, :single? => true )
-
-			@obj.should_receive( :valid_attribute_type ).with( :deactivated ).and_return( attrtype )
-			@obj.should_receive( :[] ).with( :deactivated ).and_return( nil )
-
-			@obj.should_not be_deactivated()
+			@obj.delete( :displayName )
+			@obj.display_name?.should be_false()
 		end
 
 		it "provides a predicate that tests true for valid non-singular attributes that have " +
 		   "at least one value" do
-			attrtype = stub( "Treequel attributeType object", :name => :description, :single? => false )
-
-			@obj.should_receive( :valid_attribute_type ).with( :description ).and_return( attrtype )
-			@obj.should_receive( :[] ).with( :description ).
-				and_return([ 'Racoon City', 'St-Michael Clock Tower' ])
+			@obj.should have_given_name()
+		end
 
-			@obj.should have_description()
+		it "provides a predicate that tests true for single-letter non-singular attributes " +
+		   "that have at least one value" do
+			@obj.should have_l()
 		end
 
 		it "provides a predicate that tests false for valid non-singular attributes that don't " +
 		   "have at least one value" do
-			attrtype = stub( "Treequel attributeType object", :name => :l, :single? => false )
-
-			@obj.should_receive( :valid_attribute_type ).with( :locality_name ).and_return( attrtype )
-			@obj.should_receive( :[] ).with( :l ).
-				and_return([])
-
-			@obj.should_not have_locality_name()
+			@obj.delete( :givenName )
+			@obj.should_not have_given_name()
 		end
 
 		it "falls through to the default proxy method for invalid attributes" do
-			@obj.stub( :valid_attribute_type ).and_return( nil )
-			@entry.should_not_receive( :[] )
-
 			expect {
 				@obj.nonexistant
 			}.to raise_exception( NoMethodError, /undefined method/i )
@@ -379,26 +404,214 @@ describe Treequel::Model do
 
 		it "adds the objectClass attribute to the attribute list when executing a search that " +
 		   "contains a select" do
-			@directory.stub( :convert_to_object ).and_return {|oid,str| str }
-			@directory.should_receive( :search ).
-				with( @obj, :scope, :filter, :selectattrs => ['cn', 'objectClass'] )
-			@obj.search( :scope, :filter, :selectattrs => ['cn'] )
+			@conn.should_receive( :search_ext2 ).
+			 	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'] )
 		end
 
 		it "doesn't add the objectClass attribute to the attribute list when the search " +
 		   "doesn't contain a select" do
-			@directory.stub( :convert_to_object ).and_return {|oid,str| str }
-			@directory.should_receive( :search ).
-				with( @obj, :scope, :filter, :selectattrs => [] )
-			@obj.search( :scope, :filter, :selectattrs => [] )
+			@conn.should_receive( :search_ext2 ).
+			 	with( @entry['dn'].first, LDAP::LDAP_SCOPE_ONELEVEL, "(cn=ephelion)",
+			          ['*'], false, nil, nil, 0, 0, 0, "", nil ).
+				and_return( [] )
+			@obj.search( :one, '(cn=ephelion)' )
 		end
 
 		it "knows which attribute methods it responds to" do
-			@directory.stub( :convert_to_object ).and_return {|oid,str| str }
 			@obj.should respond_to( :cn )
 			@obj.should_not respond_to( :humpsize )
 		end
 
+		it "defers writing modifications via #[]= back to the directory" do
+			@conn.should_not_receive( :modify )
+			@obj[ :uid ] = 'slippy'
+			@obj.uid.should == ['slippy']
+		end
+
+		it "defers writing modifications via #merge back to the directory" do
+			@conn.should_not_receive( :modify )
+			@obj.merge( :uid => 'slippy', :givenName => 'Slippy' )
+			@obj.uid.should == ['slippy']
+			@obj.given_name.should == ['Slippy']
+		end
+
+		it "defers writing modifications via #delete back to the directory" do
+			@conn.should_not_receive( :modify )
+			@obj.delete( :uid, :givenName )
+			@obj.uid.should == []
+			@obj.given_name.should == []
+		end
+
+		it "knows if any validation errors have been encountered" do
+			@obj.errors.should be_a( Hash )
+		end
+
+
+		context "with no modified attributes" do
+
+			it "knows that it hasn't been modified" do
+				@obj.should_not be_modified()
+			end
+
+			it "doesn't write anything to the directory when its #save method is called" do
+				@conn.should_not_receive( :modify )
+				@obj.save
+			end
+
+		end
+
+
+		context "with a single modified attribute" do
+
+			before( :each ) do
+				@obj.uid = 'slippy'
+			end
+
+			it "knows that is has been modified" do
+				@obj.should be_modified()
+			end
+
+			it "can return the modification as a list of LDAP::Mod objects" do
+				result = @obj.modifications
+
+				result.should be_an( Array )
+				result.should have( 2 ).members
+				result.should include( ldap_mod_add 'uid', 'slippy' )
+				result.should include( ldap_mod_delete 'uid', 'slappy' )
+			end
+
+			it "reverts the attribute if its #revert method is called" do
+				@conn.should_receive( :search_ext2 ).
+					with( @entry['dn'].first, LDAP::LDAP_SCOPE_BASE, "(objectClass=*)" ).
+					and_return([ @entry ])
+
+				@obj.revert
+
+				@obj.uid.should == @entry['uid']
+				@obj.should_not be_modified()
+			end
+
+			it "updates the modified attribute when saved" do
+				@conn.should_receive( :modify ).
+					with( "uid=slappy,ou=people,dc=acme,dc=com",
+					     [ldap_mod_delete(:uid, 'slappy'), ldap_mod_add(:uid, 'slippy')] )
+				@obj.save
+			end
+
+		end
+
+
+		context "with several modified attributes" do
+
+			before( :each ) do
+				@obj.uid = 'fappy'
+				@obj.given_name = 'Fappy'
+				@obj.display_name = 'Fappy the Bear'
+				@obj.delete( :l )
+				@obj.delete( :description => 'Alright.' )
+				@obj.description << "The new mascot."
+			end
+
+			it "knows that is has been modified" do
+				@obj.should be_modified()
+			end
+
+			it "returns the modified values via its accessors" do
+				@obj.uid.should == ['fappy']
+				@obj.given_name.should == ['Fappy']
+				@obj.display_name.should == 'Fappy the Bear' # SINGLE
+				@obj.l.should == []
+				@obj.description.should have( 2 ).members
+				@obj.description.should include(
+					"Smokey the Bear is much more intense in person.",
+					"The new mascot."
+				  )
+			end
+
+			it "can return the modifications as a list of LDAP::Mod objects" do
+				result = @obj.modifications
+
+				result.should be_an( Array )
+				result.should have( 9 ).members
+				result.should include( ldap_mod_delete :uid, 'slappy' )
+				result.should include( ldap_mod_add :uid, 'fappy' )
+				result.should include( ldap_mod_delete :givenName, 'Slappy' )
+				result.should include( ldap_mod_add :givenName, 'Fappy' )
+				result.should include( ldap_mod_delete :displayName, 'Slappy the Frog' )
+				result.should include( ldap_mod_add :displayName, 'Fappy the Bear' )
+				result.should include( ldap_mod_add :description, 'The new mascot.' )
+				result.should include( ldap_mod_delete :description, 'Alright.' )
+				result.should include( ldap_mod_delete :l, 'a forest in England' )
+
+			end
+
+			it "reverts all of the attributes if its #revert method is called" do
+				@conn.should_receive( :search_ext2 ).
+					with( @entry['dn'].first, LDAP::LDAP_SCOPE_BASE, "(objectClass=*)" ).
+					and_return([ @entry ])
+
+				@obj.revert
+
+				@obj.uid.should == @entry['uid']
+				@obj.given_name.should == @entry['givenName']
+				@obj.display_name.should == @entry['displayName'].first # SINGLE
+				@obj.l.should == @entry['l']
+				@obj.should_not be_modified()
+			end
+
+		end
+
+	end
+
+	describe "objects created in memory" do
+
+		before( :all ) do
+			@entry = {
+				'uid'           => ['jrandom'],
+				'cn'            => ['James'],
+				'sn'            => ['Hacker'],
+				'l'             => ['a forest in England'],
+				'displayName'   => ['J. Random Hacker'],
+				'uidNumber'     => ['1121'],
+				'gidNumber'     => ['200'],
+				'homeDirectory' => ['/u/j/jrandom'],
+				'objectClass'   => %w[
+					person
+					inetOrgPerson
+					posixAccount
+				],
+			}
+		end
+
+		before( :each ) do
+			@obj = Treequel::Model.new( @directory, TEST_PERSON_DN, @entry )
+		end
+
+
+		it "creates the entry in the directory when saved" do
+			@conn.stub( :search_ext2 ).
+				with( TEST_PERSON_DN, LDAP::LDAP_SCOPE_BASE, '(objectClass=*)').
+				and_return( [] )
+
+			@conn.should_receive( :add ).
+				with( TEST_PERSON_DN, [
+					ldap_mod_add("cn", "James"),
+					ldap_mod_add("displayName", "J. Random Hacker"),
+					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", "person", "posixAccount"),
+					ldap_mod_add("sn", "Hacker"),
+					ldap_mod_add("uid", "jrandom"),
+					ldap_mod_add("uidNumber", "1121")
+				] )
+
+			@obj.save
+		end
+
 	end
 
 end