treequel 1.2.2 → 1.3.0pre384

data/spec/treequel/model/errors_spec.rb

@@ -0,0 +1,77 @@
+#!/usr/bin/env ruby
+
+BEGIN {
+	require 'pathname'
+	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
+
+	libdir = basedir + "lib"
+
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+}
+
+require 'rspec'
+
+require 'spec/lib/helpers'
+
+require 'treequel/model'
+require 'treequel/model/errors'
+require 'treequel/branchset'
+
+
+
+#####################################################################
+###	C O N T E X T S
+#####################################################################
+
+describe Treequel::Model::Errors do
+
+	before( :all ) do
+		setup_logging( :fatal )
+	end
+
+	before( :each ) do
+		@errors = Treequel::Model::Errors.new
+	end
+
+	after( :all ) do
+		reset_logging()
+	end
+
+
+	it "allows the addition of errors" do
+		@errors.add( :cn, "Not a common name." )
+		@errors[:cn].should have( 1 ).member
+		@errors[:cn].should include( "Not a common name." )
+	end
+
+	it "knows how many errors there are" do
+		@errors.add( :l, "is not valid" )
+		@errors.add( :description, "must " )
+		@errors.add( :description, "must have at least one description" )
+
+		@errors.count.should == 3
+	end
+
+	it "is empty if there haven't been any errors registered" do
+		@errors.should be_empty()
+	end
+
+	it "isn't empty if there have been errors registered" do
+		@errors.add( :uid, 'duplicate value' )
+		@errors.should_not be_empty()
+	end
+
+	it "can build an array of error messages" do
+		@errors.add( :l, "is not a valid location" )
+		@errors.add( [:givenName, :sn, :displayName], "must be unique" )
+
+		@errors.full_messages.should have( 2 ).members
+		@errors.full_messages.should include( "givenName and sn and displayName must be unique" )
+		@errors.full_messages.should include( "l is not a valid location" )
+	end
+
+end
+
+
+# vim: set nosta noet ts=4 sw=4:

data/spec/treequel/model/objectclass_spec.rb

@@ -12,34 +12,29 @@ BEGIN {
 
 require 'rspec'
 
-require 'spec/lib/constants'
 require 'spec/lib/helpers'
-require 'spec/lib/matchers'
 
 require 'treequel/model'
 require 'treequel/model/objectclass'
 require 'treequel/branchset'
 
 
-include Treequel::TestConstants
-include Treequel::Constants
 
 #####################################################################
 ###	C O N T E X T S
 #####################################################################
 
 describe Treequel::Model::ObjectClass do
-	include Treequel::SpecHelpers,
-	        Treequel::Matchers
-
-	class << self
-		alias_method :they, :it
-	end
 
 	before( :all ) do
 		setup_logging( :fatal )
 	end
 
+	after( :each ) do
+		Treequel::Model.objectclass_registry.clear
+		Treequel::Model.base_registry.clear
+	end
+
 	after( :all ) do
 		reset_logging()
 	end
@@ -54,14 +49,9 @@ describe Treequel::Model::ObjectClass do
 	end
 
 
-	describe "modules" do
-
-		after( :each ) do
-			Treequel::Model.objectclass_registry.clear
-			Treequel::Model.base_registry.clear
-		end
+	context "extended module" do
 
-		they "can declare a required objectClass" do
+		it "can declare a required objectClass" do
 			mixin = Module.new do
 				extend Treequel::Model::ObjectClass
 				model_objectclasses :inetOrgPerson
@@ -70,7 +60,7 @@ describe Treequel::Model::ObjectClass do
 			mixin.model_objectclasses.should == [:inetOrgPerson]
 		end
 
-		they "can declare a required objectClass as a String" do
+		it "can declare a required objectClass as a String" do
 			mixin = Module.new do
 				extend Treequel::Model::ObjectClass
 				model_objectclasses 'apple-computer-list'
@@ -79,7 +69,7 @@ describe Treequel::Model::ObjectClass do
 			mixin.model_objectclasses.should == [:'apple-computer-list']
 		end
 
-		they "can declare multiple required objectClasses" do
+		it "can declare multiple required objectClasses" do
 			mixin = Module.new do
 				extend Treequel::Model::ObjectClass
 				model_objectclasses :inetOrgPerson, :acmeAccount
@@ -88,9 +78,10 @@ describe Treequel::Model::ObjectClass do
 			mixin.model_objectclasses.should == [ :inetOrgPerson, :acmeAccount ]
 		end
 
-		they "can declare a single base" do
+		it "can declare a single base" do
 			mixin = Module.new do
-				extend Treequel::Model::ObjectClass
+				extend Treequel::Model::ObjectClass,
+				       Treequel::TestConstants
 				model_objectclasses :device
 				model_bases TEST_PHONES_DN
 			end
@@ -98,7 +89,7 @@ describe Treequel::Model::ObjectClass do
 			mixin.model_bases.should == [TEST_PHONES_DN]
 		end
 
-		they "can declare base with spaces" do
+		it "can declare a base with spaces" do
 			mixin = Module.new do
 				extend Treequel::Model::ObjectClass
 				model_objectclasses :device
@@ -108,9 +99,10 @@ describe Treequel::Model::ObjectClass do
 			mixin.model_bases.should == ['ou=phones,dc=acme,dc=com']
 		end
 
-		they "can declare multiple bases" do
+		it "can declare multiple bases" do
 			mixin = Module.new do
-				extend Treequel::Model::ObjectClass
+				extend Treequel::Model::ObjectClass,
+				       Treequel::TestConstants
 				model_objectclasses :ipHost
 				model_bases TEST_HOSTS_DN,
 				            TEST_SUBHOSTS_DN
@@ -119,7 +111,7 @@ describe Treequel::Model::ObjectClass do
 			mixin.model_bases.should include( TEST_HOSTS_DN, TEST_SUBHOSTS_DN )
 		end
 
-		they "raises an exception when creating a search for a mixin that hasn't declared " +
+		it "raises an exception when creating a search for a mixin that hasn't declared " +
 		     "at least one objectClass or base"  do
 			mixin = Module.new do
 				extend Treequel::Model::ObjectClass
@@ -130,7 +122,7 @@ describe Treequel::Model::ObjectClass do
 			}.to raise_exception( Treequel::ModelError, /has no search criteria defined/ )
 		end
 
-		they "default to using Treequel::Model as their model class" do
+		it "defaults to using Treequel::Model as its model class" do
 			mixin = Module.new do
 				extend Treequel::Model::ObjectClass
 			end
@@ -138,7 +130,7 @@ describe Treequel::Model::ObjectClass do
 			mixin.model_class.should == Treequel::Model
 		end
 
-		they "can declare a model class other than Treequel::Model" do
+		it "can declare a model class other than Treequel::Model" do
 			class MyModel < Treequel::Model; end
 			mixin = Module.new do
 				extend Treequel::Model::ObjectClass
@@ -148,7 +140,7 @@ describe Treequel::Model::ObjectClass do
 			mixin.model_class.should == MyModel
 		end
 
-		they "re-register objectClasses that have already been declared when declaring a " +
+		it "re-registers objectClasses that have already been declared when declaring a " +
 		     "new model class" do
 			class MyModel < Treequel::Model; end
 
@@ -162,7 +154,7 @@ describe Treequel::Model::ObjectClass do
 			MyModel.objectclass_registry[:inetOrgPerson].should include( mixin )
 		end
 
-		they "re-register bases that have already been declared when declaring a " +
+		it "re-registers bases that have already been declared when declaring a " +
 		     "new model class" do
 			class MyModel < Treequel::Model; end
 
@@ -175,10 +167,88 @@ describe Treequel::Model::ObjectClass do
 			Treequel::Model.base_registry['ou=people,dc=acme,dc=com'].should_not include( mixin )
 			MyModel.base_registry['ou=people,dc=acme,dc=com'].should include( mixin )
 		end
+	end
+
+	context "model instantiation" do
+
+		before( :each ) do
+			@conn = mock( "ldap connection object" )
+			@directory = get_fixtured_directory( @conn )
+		end
+
+		it "can instantiate a new model object with its declared objectClasses" do
+			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' )
+			result[TEST_PERSON_DN_ATTR].should include( TEST_PERSON_DN_VALUE )
+		end
+
+		it "merges objectClasses passed to the creation method" do
+			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' )
+			result[TEST_PERSON_DN_ATTR].should include( TEST_PERSON_DN_VALUE )
+		end
+
+		it "handles the creation of objects with multi-value DNs" do
+			mixin = Module.new do
+				extend Treequel::Model::ObjectClass
+				model_objectclasses :ipHost, :ieee802Device, :device
+			end
+
+			result = mixin.create( @directory, TEST_HOST_MULTIVALUE_DN )
+			result.should be_a( Treequel::Model )
+			result[:objectClass].should have( 3 ).members
+			result[:objectClass].should include( 'ipHost', 'ieee802Device', 'device' )
+			result[TEST_HOST_MULTIVALUE_DN_ATTR1].should include( TEST_HOST_MULTIVALUE_DN_VALUE1 )
+			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
 
-	describe "module that has one required objectClass declared" do
+	context "module that has one required objectClass declared" do
 
 		before( :each ) do
 			@mixin = Module.new do
@@ -216,7 +286,7 @@ describe Treequel::Model::ObjectClass do
 
 	end
 
-	describe "module that has more than one required objectClass declared" do
+	context "module that has more than one required objectClass declared" do
 
 		before( :each ) do
 			@mixin = Module.new do
@@ -256,10 +326,11 @@ describe Treequel::Model::ObjectClass do
 
 	end
 
-	describe "module that has one base declared" do
+	context "module that has one base declared" do
 		before( :each ) do
 			@mixin = Module.new do
-				extend Treequel::Model::ObjectClass
+				extend Treequel::Model::ObjectClass,
+				       Treequel::TestConstants
 				model_bases TEST_PEOPLE_DN
 			end
 		end
@@ -293,10 +364,11 @@ describe Treequel::Model::ObjectClass do
 
 	end
 
-	describe "module that has more than one base declared" do
+	context "module that has more than one base declared" do
 		before( :each ) do
 			@mixin = Module.new do
-				extend Treequel::Model::ObjectClass
+				extend Treequel::Model::ObjectClass,
+				       Treequel::TestConstants
 				model_bases TEST_HOSTS_DN,
 				            TEST_SUBHOSTS_DN
 			end

data/spec/treequel/model/schemavalidations_spec.rb

@@ -0,0 +1,112 @@
+#!/usr/bin/env ruby
+
+BEGIN {
+	require 'pathname'
+	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
+
+	libdir = basedir + "lib"
+
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+}
+
+require 'rspec'
+
+require 'spec/lib/helpers'
+
+require 'treequel/model'
+require 'treequel/model/schemavalidations'
+
+
+
+#####################################################################
+###	C O N T E X T S
+#####################################################################
+
+describe Treequel::Model::SchemaValidations do
+
+	before( :all ) do
+		setup_logging( :fatal )
+	end
+
+	before( :each ) do
+		@conn = double( "LDAP connection", :bound? => false )
+		@directory = get_fixtured_directory( @conn )
+		@modelobj = Treequel::Model.new( @directory, TEST_PERSON_DN )
+	end
+
+	after( :all ) do
+		reset_logging()
+	end
+
+	# StructuralObjectClass ( 2.5.6.6 NAME 'person' 
+	#	DESC 'RFC2256: a person' 
+	# 	SUP top STRUCTURAL 
+	# 	MUST ( sn $ cn ) 
+	# 	MAY ( userPassword $ telephoneNumber $ seeAlso $ description ) )
+
+	it "adds an error if the object doesn't have at least one value for all of its MUST attributes" do
+		@conn.stub( :search_ext2 ).and_return( [] )
+		@modelobj.object_class = 'person'
+		@modelobj.validate
+		@modelobj.errors.should have( 2 ).members
+		@modelobj.errors.full_messages.should include( 'cn MUST have at least one value' )
+		@modelobj.errors.full_messages.should include( 'sn MUST have at least one value' )
+	end
+
+	it "adds an error if the object has a value for an attribute that isn't in one of its MAY attributes" do
+		# First set the object classes to include one which MAY have a 'displayName'
+		entry = {
+			'objectClass' => ['person', 'inetOrgPerson'],
+			'cn'          => ['J. Random'],
+			'sn'          => ['Hacker'],
+			'displayName' => ['Trinket the Trivial']
+		}
+		@conn.stub( :search_ext2 ).and_return([ entry ])
+
+		# ..then remove the objectclass that grants it and validate
+		@modelobj.object_class -= ['inetOrgPerson']
+		@modelobj.validate
+
+		@modelobj.errors.full_messages.
+			should == [%{displayName is not allowed by entry's objectClasses}]
+	end
+
+	# AuxiliaryObjectClass ( 1.3.6.1.1.1.2.0 NAME 'posixAccount' 
+	# 	DESC 'Abstraction of an account with POSIX attributes' 
+	# 	SUP top AUXILIARY 
+	# 	MUST ( cn $ uid $ uidNumber $ gidNumber $ homeDirectory ) 
+	# 	MAY ( userPassword $ loginShell $ gecos $ description ) )
+
+	it "adds an error if the object has a value for an attribute that doesn't match the " +
+	   "attribute's syntax" do
+		@conn.stub( :search_ext2 ).and_return( [] )
+
+		@modelobj.object_class = ['inetOrgPerson', 'posixAccount']
+		@modelobj.cn = 'J. Random'
+		@modelobj.sn = 'Hacker'
+		@modelobj.uid = 'jrandom'
+		@modelobj.home_directory = '/users/j/jrandom'
+
+		# Set the 'Integer' attributes to values that can't be cast to integers
+		@modelobj.uid_number = "something that's not a number"
+		@modelobj.gid_number = "also not a number"
+
+		@modelobj.validate
+
+		@modelobj.errors.should have( 2 ).members
+		@modelobj.errors.full_messages.should include( "uidNumber isn't a valid Integer value" )
+		@modelobj.errors.full_messages.should include( "gidNumber isn't a valid Integer value" )
+	end
+
+	it "does nothing if :with_schema => false is passed to #validate" do
+		@conn.stub( :search_ext2 ).and_return( [] )
+		@modelobj.object_class = 'person' # MUST ( sn $ cn )
+		@modelobj.validate( :with_schema => false )
+		@modelobj.errors.should be_empty()
+	end
+
+end
+
+
+# vim: set nosta noet ts=4 sw=4: