treequel 1.4.4 → 1.5.0pre445

data/spec/treequel/model/objectclass_spec.rb

@@ -30,7 +30,14 @@ describe Treequel::Model::ObjectClass do
 		setup_logging( :fatal )
 	end
 
+	before( :each ) do
+		@conn = mock( "ldap connection object" )
+		@directory = get_fixtured_directory( @conn )
+		Treequel::Model.directory = @directory
+	end
+
 	after( :each ) do
+		Treequel::Model.directory = nil
 		Treequel::Model.objectclass_registry.clear
 		Treequel::Model.base_registry.clear
 	end
@@ -167,16 +174,73 @@ 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
+
+		it "re-registers bases that have already been declared when declaring a " +
+		     "new model class" do
+			class MyModel < Treequel::Model; end
+
+			mixin = Module.new do
+				extend Treequel::Model::ObjectClass
+				model_bases 'ou=people,dc=acme,dc=com', 'ou=notpeople,dc=acme,dc=com'
+				model_class MyModel
+			end
+
+			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
+
+		it "uses the directory associated with its model_class instead of Treequel::Model's if " +
+		   "its model_class is set when creating a search Branchset"  do
+			conn = mock( "ldap connection object" )
+			directory = get_fixtured_directory( conn )
+
+			class MyModel < Treequel::Model; end
+			MyModel.directory = directory
+
+			mixin = Module.new do
+				extend Treequel::Model::ObjectClass
+				model_objectclasses :inetOrgPerson
+				model_class MyModel
+			end
+
+			result = mixin.search
+
+			result.should be_a( Treequel::Branchset )
+			result.branch.directory.should == directory
+		end
+
+		it "delegates Branchset methods through the Branchset returned by its #search method" do
+			mixin = Module.new do
+				extend Treequel::Model::ObjectClass
+				model_objectclasses :inetOrgPerson
+			end
+
+			mixin.filter( :mail ).should be_a( Treequel::Branchset )
+		end
+
+		it "delegates Branchset Enumerable methods through the Branchset returned by its " +
+		   "#search method" do
+			
+		end
+
 	end
 
 	context "model instantiation" do
 
-		before( :each ) do
-			@conn = mock( "ldap connection object" )
-			@directory = get_fixtured_directory( @conn )
+		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( TEST_PERSON_DN )
+			result.should be_a( Treequel::Model )
+			result[:objectClass].should include( 'inetOrgPerson' )
+			result[TEST_PERSON_DN_ATTR].should == [ TEST_PERSON_DN_VALUE ]
 		end
 
-		it "can instantiate a new model object with its declared objectClasses" do
+		it "can instantiate a new model object with its declared objectClasses in a directory " +
+		   "other than the one associated with its model_class" do
 			mixin = Module.new do
 				extend Treequel::Model::ObjectClass
 				model_objectclasses :inetOrgPerson
@@ -194,7 +258,7 @@ describe Treequel::Model::ObjectClass do
 				model_objectclasses :inetOrgPerson
 			end
 
-			result = mixin.create( @directory, TEST_PERSON_DN,
+			result = mixin.create( TEST_PERSON_DN,
 				TEST_PERSON_DN_ATTR => [TEST_PERSON_DN_VALUE] )
 			result.should be_a( Treequel::Model )
 			result[:objectClass].should include( 'inetOrgPerson' )
@@ -208,7 +272,7 @@ describe Treequel::Model::ObjectClass do
 				model_objectclasses :inetOrgPerson
 			end
 
-			result = mixin.create( @directory, TEST_PERSON_DN,
+			result = mixin.create( TEST_PERSON_DN,
 				:objectClass => [:person, :inetOrgPerson] )
 			result.should be_a( Treequel::Model )
 			result[:objectClass].should have( 2 ).members
@@ -223,7 +287,7 @@ describe Treequel::Model::ObjectClass do
 				model_objectclasses :ipHost, :ieee802Device, :device
 			end
 
-			result = mixin.create( @directory, TEST_HOST_MULTIVALUE_DN )
+			result = mixin.create( TEST_HOST_MULTIVALUE_DN )
 			result.should be_a( Treequel::Model )
 			result[:objectClass].should have( 3 ).members
 			result[:objectClass].should include( 'ipHost', 'ieee802Device', 'device' )
@@ -236,6 +300,10 @@ describe Treequel::Model::ObjectClass do
 	context "module that has one required objectClass declared" do
 
 		before( :each ) do
+			@conn = mock( "ldap connection object" )
+			@directory = get_fixtured_directory( @conn )
+			Treequel::Model.directory = @directory
+
 			@mixin = Module.new do
 				extend Treequel::Model::ObjectClass
 				model_objectclasses :inetOrgPerson
@@ -257,16 +325,26 @@ describe Treequel::Model::ObjectClass do
 				should_not include( @mixin )
 		end
 
-		it "can set up a search for applicable entries given a Treequel::Directory to " +
-		   "search"  do
-			directory = mock( "Treequel directory", :registered_controls => [] )
-			directory.should_receive( :base_dn ).and_return( TEST_BASE_DN )
+		it "can create a Branchset that will search for applicable entries"  do
+			result = @mixin.search
+
+			result.should be_a( Treequel::Branchset )
+			result.base_dn.should == TEST_BASE_DN
+			result.filter.to_s.should == '(objectClass=inetOrgPerson)'
+			result.branch.directory.should == @directory
+		end
+
+		it "can create a Branchset that will search for applicable entries in a Directory other " +
+		   "than the one set for Treequel::Model"  do
+			conn = mock( "second ldap connection object" )
+			directory = get_fixtured_directory( conn )
 
 			result = @mixin.search( directory )
 
 			result.should be_a( Treequel::Branchset )
 			result.base_dn.should == TEST_BASE_DN
 			result.filter.to_s.should == '(objectClass=inetOrgPerson)'
+			result.branch.directory.should == directory
 		end
 
 	end
@@ -297,16 +375,26 @@ describe Treequel::Model::ObjectClass do
 				should_not include( @mixin )
 		end
 
-		it "can set up a search for applicable entries given a Treequel::Directory to " +
-		   "search"  do
-			directory = mock( "Treequel directory", :registered_controls => [] )
-			directory.should_receive( :base_dn ).and_return( TEST_BASE_DN )
+		it "can create a Branchset that will search for applicable entries"  do
+			result = @mixin.search
+
+			result.should be_a( Treequel::Branchset )
+			result.base_dn.should == TEST_BASE_DN
+			result.filter.to_s.should == '(&(objectClass=device)(objectClass=ipHost))'
+			result.branch.directory.should == @directory
+		end
+
+		it "can create a Branchset that will search for applicable entries in a Directory other " +
+		   "than the one set for Treequel::Model"  do
+			conn = mock( "second ldap connection object" )
+			directory = get_fixtured_directory( conn )
 
 			result = @mixin.search( directory )
 
 			result.should be_a( Treequel::Branchset )
 			result.base_dn.should == TEST_BASE_DN
 			result.filter.to_s.should == '(&(objectClass=device)(objectClass=ipHost))'
+			result.branch.directory.should == directory
 		end
 
 	end
@@ -336,15 +424,26 @@ describe Treequel::Model::ObjectClass do
 				should_not include( @mixin )
 		end
 
-		it "can set up a search for applicable entries given a Treequel::Directory to " +
-		   "search"  do
-			directory = stub( "Treequel directory", :registered_controls => [] )
+		it "can create a Branchset that will search for applicable entries"  do
+			result = @mixin.search
+
+			result.should be_a( Treequel::Branchset )
+			result.base_dn.should == TEST_PEOPLE_DN
+			result.filter.to_s.should == '(objectClass=*)'
+			result.branch.directory.should == @directory
+		end
+
+		it "can create a Branchset that will search for applicable entries in a Directory other " +
+		   "than the one set for Treequel::Model"  do
+			conn = mock( "second ldap connection object" )
+			directory = get_fixtured_directory( conn )
 
 			result = @mixin.search( directory )
 
 			result.should be_a( Treequel::Branchset )
 			result.base_dn.should == TEST_PEOPLE_DN
 			result.filter.to_s.should == '(objectClass=*)'
+			result.branch.directory.should == directory
 		end
 
 	end
@@ -376,17 +475,32 @@ describe Treequel::Model::ObjectClass do
 				should_not include( @mixin )
 		end
 
-		it "can set up a search for applicable entries given a Treequel::Directory to " +
-		   "search"  do
-			directory = stub( "Treequel directory", :registered_controls => [] )
+		it "can create a BranchCollection that will search for applicable entries"  do
+			result = @mixin.search
+
+			result.should be_a( Treequel::BranchCollection )
+			result.base_dns.should have( 2 ).members
+			result.base_dns.should include( TEST_HOSTS_DN, TEST_SUBHOSTS_DN )
+			result.branchsets.each do |brset|
+				brset.filter_string.should == '(objectClass=*)'
+				brset.branch.directory.should == @directory
+			end
+		end
+
+		it "can create a BranchCollection that will search for applicable entries in a Directory " +
+		   " other than the one set for Treequel::Model"  do
+			conn = mock( "second ldap connection object" )
+			directory = get_fixtured_directory( conn )
 
 			result = @mixin.search( directory )
 
 			result.should be_a( Treequel::BranchCollection )
 			result.base_dns.should have( 2 ).members
 			result.base_dns.should include( TEST_HOSTS_DN, TEST_SUBHOSTS_DN )
-			result.branchsets.all? {|brset| brset.filter_string == '(objectClass=*)' }.
-				should be_true()
+			result.branchsets.each do |brset|
+				brset.filter_string.should == '(objectClass=*)'
+				brset.branch.directory.should == directory
+			end
 		end
 
 	end

data/spec/treequel/model_spec.rb

@@ -22,11 +22,13 @@ require 'treequel/model'
 describe Treequel::Model do
 
 	before( :all ) do
+		GC.disable
 		setup_logging( :fatal )
 	end
 
 	after( :all ) do
 		reset_logging()
+		GC.enable
 	end
 
 	before( :each ) do
@@ -41,9 +43,22 @@ describe Treequel::Model do
 	after( :each ) do
 		Treequel::Model.objectclass_registry.clear
 		Treequel::Model.base_registry.clear
+		Treequel::Model.directory = nil
 	end
 
 
+	it "allows a Treequel::Directory object to be set as the default directory to use for searches" do
+		Treequel::Model.directory = @directory
+		@directory.results_class.should == Treequel::Model
+	end
+
+	it "can return a Treequel::Directory object configured to use the system directory if " +
+	   "none has been set" do
+		Treequel.should_receive( :directory_from_config ).and_return( @directory )
+		Treequel::Model.directory.should == @directory
+		@directory.results_class.should == Treequel::Model
+	end
+
 	it "knows which mixins should be applied for a single objectClass" do
 		mixin = Module.new
 		mixin.should_receive( :model_objectclasses ).at_least( :once ).
@@ -295,37 +310,8 @@ describe Treequel::Model 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'     => ['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
-					inetOrgPerson
-					posixAccount
-					shadowAccount
-					apple-user
-				],
-			}
-		end
-
 		before( :each ) do
+			@entry = TEST_PERSON_ENTRY.dup
 			@obj = Treequel::Model.new_from_entry( @entry, @directory )
 		end
 
@@ -523,7 +509,7 @@ describe Treequel::Model do
 			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 ])
+					and_return([ @entry.dup ])
 
 				@obj.revert
 
@@ -533,8 +519,8 @@ describe Treequel::Model do
 
 			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')] )
+					with( TEST_PERSON_DN, 
+					      [ ldap_mod_delete(:uid, 'slappy'),  ldap_mod_add(:uid, 'slippy') ] )
 				@obj.save
 			end
 
@@ -636,7 +622,7 @@ describe Treequel::Model do
 			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 ])
+					and_return([ @entry.dup ])
 
 				@obj.revert
 

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: treequel
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 1923832739
   prerelease: 
   segments: 
   - 1
-  - 4
-  - 4
-  version: 1.4.4
+  - 5
+  - 0
+  - pre
+  - 445
+  version: 1.5.0pre445
 platform: ruby
 authors: 
 - Michael Granger
@@ -36,7 +38,7 @@ cert_chain:
   cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
   -----END CERTIFICATE-----
 
-date: 2011-02-10 00:00:00 -08:00
+date: 2011-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,12 +49,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 13
         segments: 
         - 1
         - 1
-        - 2
-        version: 1.1.2
+        version: "1.1"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -63,12 +64,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 45
+        hash: 25
         segments: 
         - 0
         - 9
-        - 11
-        version: 0.9.11
+        version: "0.9"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -127,12 +127,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 13
         segments: 
         - 0
         - 3
-        - 1
-        version: 0.3.1
+        version: "0.3"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -143,12 +142,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 25
         segments: 
         - 0
         - 9
-        - 6
-        version: 0.9.6
+        version: "0.9"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -159,12 +157,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 9
         segments: 
         - 0
         - 1
-        - 1
-        version: 0.1.1
+        version: "0.1"
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -175,46 +172,59 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 11
         segments: 
         - 2
         - 4
-        - 0
-        version: 2.4.0
+        version: "2.4"
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: sysexits
+  name: sequel
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 47
+        segments: 
+        - 3
+        - 20
+        version: "3.20"
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: sysexits
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
-        - 2
-        version: 1.0.2
+        version: "1.0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 43
         segments: 
         - 2
         - 9
-        - 1
-        version: 2.9.1
+        - 0
+        version: 2.9.0
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 description: |-
   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,
@@ -312,7 +322,7 @@ post_install_message: |-
   If you want to use the included 'treequel' LDAP shell, you'll need to install
   the following libraries as well:
   
-      - termios
+      - ruby-termios
       - ruby-terminfo
       - columnize
       - sysexits
@@ -350,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: treequel
-rubygems_version: 1.4.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Treequel is an LDAP toolkit for Ruby