treequel 1.5.0 → 1.5.1

data/spec/lib/constants.rb

@@ -167,8 +167,7 @@ module Treequel::TestConstants # :nodoc:all
 			],
 		}
 
-		TEST_OPERATIONAL_PEOPLE_ENTRY = {
-			TEST_PEOPLE_DN_ATTR     => [TEST_PEOPLE_DN_VALUE], 
+		TEST_OPERATIONAL_PEOPLE_ENTRY = TEST_PEOPLE_ENTRY.merge(
 			'structuralObjectClass' => ['organizationalUnit'],
 			'entryUUID'             => ['5035e674-bae3-102b-992e-e9e937d524d6'],
 			'creatorsName'          => ['cn=admin,dc=laika,dc=com'],
@@ -178,11 +177,21 @@ module Treequel::TestConstants # :nodoc:all
 			'modifyTimestamp'       => ['20070629232213Z'],
 			'entryDN'               => [TEST_PEOPLE_DN],
 			'subschemaSubentry'     => ['cn=Subschema'],
-			'hasSubordinates'       => ['TRUE'],
-			'dn'                    => [TEST_PEOPLE_DN],
-			'objectClass'           => ['top', 'organizationalUnit'],
-			'description'           => ['Acme.com employees'],
-		}
+			'hasSubordinates'       => ['TRUE']
+		)
+
+		TEST_OPERATIONAL_PERSON_ENTRY = TEST_PERSON_ENTRY.merge(
+			'structuralObjectClass' => ['inetOrgPerson'],
+			'entryUUID'             => ['65acd5dc-b146-102f-8d60-c1597577de09'],
+			'creatorsName'          => ['cn=admin,dc=laika,dc=com'],
+			'createTimestamp'       => ['20110110204609Z'],
+			'entryCSN'              => ['20110224232421.753555Z#000000#000#000000'],
+			'modifiersName'         => ['cn=admin,dc=laika,dc=com'],
+			'modifyTimestamp'       => ['20110224232421Z'],
+			'entryDN'               => [TEST_PEOPLE_DN],
+			'subschemaSubentry'     => ['cn=Subschema'],
+			'hasSubordinates'       => ['FALSE']
+		)
 
 
 		constants.each do |cname|

data/spec/treequel/branch_spec.rb

@@ -375,9 +375,14 @@ describe Treequel::Branch do
 		end
 
 		it "knows what the OIDs of its operational attributes are" do
-			op_oids = @directory.schema.attribute_types.values.select do |attrtype|
+			op_numeric_oids = @directory.schema.attribute_types.values.select do |attrtype|
 				attrtype.operational?
 			end.uniq.map( &:oid )
+			op_names = @directory.schema.attribute_types.values.select do |attrtype|
+				attrtype.operational?
+			end.uniq.map( &:names ).flatten
+
+			op_oids = op_numeric_oids + op_names
 
 			@branch.operational_attribute_oids.should have( op_oids.length ).members
 			@branch.operational_attribute_oids.should include( *op_oids )
@@ -462,7 +467,7 @@ describe Treequel::Branch do
 		   "MUST and MAY attributes plus the directory's operational attributes" do
 			all_attrs = @branch.valid_attribute_types
 
-			all_attrs.should have( 54 ).members
+			all_attrs.should have( 57 ).members
 			all_attrs.should include( @directory.schema.attribute_types[:ou] )
 			all_attrs.should include( @directory.schema.attribute_types[:l] )
 		end

data/spec/treequel/model/schemavalidations_spec.rb

@@ -68,23 +68,26 @@ describe Treequel::Model::SchemaValidations do
 	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 ])
+		@conn.stub( :search_ext2 ).and_return([ TEST_PERSON_ENTRY.dup ])
 
 		# ..then remove the objectclass that grants it and validate
 		@modelobj.object_class -= ['inetOrgPerson']
 		@modelobj.should_not be_valid()
 
 		@modelobj.errors.full_messages.
-			should == [%{displayName is not allowed by entry's objectClasses}]
+			should include( "displayName is not allowed by entry's objectClasses" )
 	end
 
+	it "doesn't add errors for operational attributes" do
+		@conn.stub( :search_ext2 ).and_return([ TEST_OPERATIONAL_PERSON_ENTRY.dup ])
+		@modelobj.l = ['Birmingham']
+		@modelobj.validate
+		# @modelobj.operational_attribute_oids.should == []
+		# @modelobj.should be_valid()
+		@modelobj.errors.full_messages.should == []
+	end
+
+
 	# AuxiliaryObjectClass ( 1.3.6.1.1.1.2.0 NAME 'posixAccount' 
 	# 	DESC 'Abstraction of an account with POSIX attributes' 
 	# 	SUP top AUXILIARY 

data/spec/treequel/schema_spec.rb

@@ -51,13 +51,13 @@ describe Treequel::Schema do
 
 		schema = Treequel::Schema.new( schemahash )
 
-		schema.object_classes.should have( 298 ).members
-		schema.attribute_types.should have( 1085 ).members
-		schema.matching_rules.should have( 72 ).members
+		schema.object_classes.should have( 308 ).members
+		schema.attribute_types.should have( 1193 ).members
+		schema.matching_rules.should have( 74 ).members
 		schema.matching_rule_uses.should have( 54 ).members
-		schema.ldap_syntaxes.should have( 31 ).members
+		schema.ldap_syntaxes.should have( 32 ).members
 
-		schema.operational_attribute_types.should have( 31 ).members
+		schema.operational_attribute_types.should have( 34 ).members
 	end
 
 
@@ -73,13 +73,13 @@ describe Treequel::Schema do
 			schema = Treequel::Schema.new( schemahash )
 		end.join
 
-		schema.object_classes.should have( 298 ).members
-		schema.attribute_types.should have( 1085 ).members
-		schema.matching_rules.should have( 72 ).members
+		schema.object_classes.should have( 308 ).members
+		schema.attribute_types.should have( 1193 ).members
+		schema.matching_rules.should have( 74 ).members
 		schema.matching_rule_uses.should have( 54 ).members
-		schema.ldap_syntaxes.should have( 31 ).members
+		schema.ldap_syntaxes.should have( 32 ).members
 
-		schema.operational_attribute_types.should have( 31 ).members
+		schema.operational_attribute_types.should have( 34 ).members
 	end
 
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: treequel
 version: !ruby/object:Gem::Version 
-  hash: 3
   prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 0
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors: 
 - Michael Granger
@@ -36,37 +31,29 @@ cert_chain:
   cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
   -----END CERTIFICATE-----
 
-date: 2011-02-24 00:00:00 -08:00
+date: 2011-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: diff-lcs
+  name: ruby-ldap
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+        version: "0.9"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ruby-ldap
+  name: diff-lcs
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+        version: "1.1"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -77,11 +64,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 2
-        - 1
         version: 1.2.1
   type: :development
   version_requirements: *id003
@@ -93,27 +75,18 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
         version: 0.1.2
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: columnize
+  name: rspec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
+        version: "2.4"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -124,10 +97,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
         version: "0.9"
   type: :development
   version_requirements: *id006
@@ -139,56 +108,40 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 1
         version: "0.1"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: columnize
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 4
-        version: "2.4"
+        version: "0.3"
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: sequel
+  name: sysexits
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 3
-        - 20
-        version: "3.20"
+        version: "1.0"
   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: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+        version: "3.20"
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
@@ -199,11 +152,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 2
-        - 9
-        - 1
         version: 2.9.1
   type: :development
   version_requirements: *id011
@@ -312,11 +260,9 @@ post_install_message: |-
   You can install them automatically if you use the --development flag when
   installing Treequel.
 rdoc_options: 
-- --use-cache
-- --protected
-- --verbose
 - --title
 - Treequel Documentation
+- --quiet
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -324,25 +270,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: treequel
-rubygems_version: 1.5.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Treequel is an LDAP toolkit for Ruby