treequel 1.5.3 → 1.6.0

data/spec/data/ticket11.yml

@@ -0,0 +1,17 @@
+---
+attributeTypes: 
+- ( 1.3.6.1.4.1.1466.101.120.15 NAME 'supportedLDAPVersion' DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 USAGE dsaOperation X-ORIGIN 'RFC 2252' )
+- ( 1.3.6.1.4.1.1466.101.120.6 NAME 'altServer' DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 USAGE dsaOperation X-ORIGIN 'RFC 2252' )
+- ( 1.3.6.1.1.4 NAME 'vendorName'  EQUALITY 1.3.6.1.4.1.1466.109.114.1 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE NO-USER-MODIFICATION USAGE dsaOperation X-ORIGIN 'RFC 3045' )
+- ( 1.3.6.1.4.1.42.2.27.9.1.800 NAME 'supportedSSLCiphers' DESC 'List of ciphers supported by SSL lib' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 USAGE dsaOperation X-ORIGIN 'Sun Directory Server' )
+- ( 1.3.6.1.1.5 NAME 'vendorVersion'  EQUALITY 1.3.6.1.4.1.1466.109.114.1 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE NO-USER-MODIFICATION USAGE dsaOperation X-ORIGIN 'RFC 3045' )
+- ( 1.3.6.1.4.1.1466.101.120.14 NAME 'supportedSASLMechanisms' DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 USAGE dsaOperation X-ORIGIN 'RFC 2252' )
+- ( 1.3.6.1.4.1.1466.101.120.7 NAME 'supportedExtension' DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 USAGE dsaOperation X-ORIGIN 'RFC 2252' )
+- ( 1.3.6.1.4.1.1466.101.120.13 NAME 'supportedControl' DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 USAGE dsaOperation X-ORIGIN 'RFC 2252' )
+- ( 1.3.6.1.4.1.1466.101.120.5 NAME 'namingContexts' DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 USAGE dsaOperation X-ORIGIN 'RFC 2252' )
+
+matchingRules:
+- ( 1.3.6.1.4.1.42.2.27.9.4.0.3 NAME 'caseExactOrderingMatch-2.16.840.1.113730.3.3.2.0.3' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+- ( 1.3.6.1.4.1.42.2.27.9.4.0.3.6 NAME 'caseExactSubstringMatch-2.16.840.1.113730.3.3.2.0.3' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+- ( 1.3.6.1.4.1.42.2.27.9.4.34.3 NAME 'caseExactOrderingMatch-2.16.840.1.113730.3.3.2.11.3' DESC 'en' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+- ( 1.3.6.1.4.1.42.2.27.9.4.34.3.6 NAME 'caseExactSubstringMatch-2.16.840.1.113730.3.3.2.11.3' DESC 'en' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )

data/spec/lib/helpers.rb

@@ -10,6 +10,17 @@ BEGIN {
 	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
 }
 
+# SimpleCov test coverage reporting; enable this using the :coverage rake task
+if ENV['COVERAGE']
+	require 'simplecov'
+	SimpleCov.start do
+		add_filter 'spec'
+		add_group "Needing tests" do |file|
+			file.covered_percent < 90
+		end
+	end
+end
+
 require 'rspec'
 
 require 'treequel'
@@ -161,8 +172,10 @@ module Treequel::SpecHelpers
 end
 
 
-### Mock with Rspec
-Rspec.configure do |c|
+abort "You need a version of RSpec >= 2.6.0" unless defined?( RSpec )
+
+### Mock with RSpec
+RSpec.configure do |c|
 	include Treequel::TestConstants
 
 	c.mock_with :rspec
@@ -175,6 +188,8 @@ Rspec.configure do |c|
 
 	c.filter_run_excluding( :ruby_1_8_only => true ) if
 		Treequel::SpecHelpers.vvec( RUBY_VERSION ) >= Treequel::SpecHelpers.vvec('1.9.1')
+	c.filter_run_excluding( :mri_only => true ) if
+		defined?( RUBY_ENGINE ) && RUBY_ENGINE != 'ruby'
 end
 
 # vim: set nosta noet ts=4 sw=4:

data/spec/treequel/branch_spec.rb

@@ -636,7 +636,14 @@ describe Treequel::Branch do
 		end
 
 
-		it "knows how to represent its DN as an RFC1781-style UFN" do
+		it "knows how to represent its DN as an RFC1781-style UFN", :if => LDAP.respond_to?(:dn2ufn) do
+			@branch.to_ufn.should =~ /Hosts, acme\.com/i
+		end
+
+
+		it "knows how to represent its DN as a UFN even if the LDAP library doesn't " +
+		   "define #dn2ufn" do
+		   	LDAP.stub( :respond_to? ).with( :dn2ufn ).and_return( false )
 			@branch.to_ufn.should =~ /Hosts, acme\.com/i
 		end
 

data/spec/treequel/branchset_spec.rb

@@ -418,6 +418,15 @@ describe Treequel::Branchset do
 			newset.base_dn.should == TEST_SUBHOSTS_DN
 		end
 
+
+		#
+		# with_operational_attributes
+		#
+		it "can create a new branchset cloned from itself with operational attributes selected" do
+			newset = @branchset.with_operational_attributes
+			newset.options[:select].should include( :+ )
+		end
+
 	end
 
 

data/spec/treequel/directory_spec.rb

@@ -191,7 +191,6 @@ describe Treequel::Directory do
 			@dir.should be_bound()
 		end
 
-
 		it "can be unbound, which replaces the bound connection with a duplicate that is unbound" do
 			dupconn = mock( "duplicate connection" )
 			@conn.should_receive( :bound? ).and_return( true )
@@ -203,7 +202,6 @@ describe Treequel::Directory do
 			@dir.conn.should == dupconn
 		end
 
-
 		it "doesn't do anything if told to unbind but the current connection is not bound" do
 			@conn.should_receive( :bound? ).and_return( false )
 			@conn.should_not_receive( :dup )
@@ -385,6 +383,10 @@ describe Treequel::Directory do
 		end
 
 
+		it "doesn't retain its connection when duplicated" do
+			@dir.dup.conn.should_not equal( @dir.conn )
+		end
+
 		describe "and a custom search results class" do
 
 			before( :each ) do

data/spec/treequel/monkeypatches_spec.rb

@@ -75,7 +75,7 @@ describe Treequel::TimeExtensions do
 	before( :all ) do
 		# Make the local timezone PDT so offsets show up correctly
 		@real_tz = ENV['TZ']
-		ENV['TZ'] = ':PST8PDT'
+		ENV['TZ'] = 'US/Pacific'
 	end
 
 	before( :each ) do

data/spec/treequel/schema/attributetype_spec.rb

@@ -52,7 +52,7 @@ describe Treequel::Schema::AttributeType do
 			%{EQUALITY objectIdentifierMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )}
 
 		before( :each ) do
-			@attrtype = Treequel::Schema::AttributeType.parse( @schema, OBJECTCLASS_ATTRTYPE )
+			@attrtype = described_class.parse( @schema, OBJECTCLASS_ATTRTYPE )
 		end
 
 		it "knows what OID corresponds to the type" do
@@ -138,7 +138,7 @@ describe Treequel::Schema::AttributeType do
 			%{SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )}
 
 		before( :each ) do
-			@attrtype = Treequel::Schema::AttributeType.parse( @schema, DERIVED_ATTRTYPE )
+			@attrtype = described_class.parse( @schema, DERIVED_ATTRTYPE )
 		end
 
 		it "can fetch its superior type from its schema" do
@@ -184,7 +184,7 @@ describe Treequel::Schema::AttributeType do
 		DERIVED_NOSYN_ATTRTYPE = %{( 1.11.2.11.1 SUP aSuperType )}
 
 		before( :each ) do
-			@attrtype = Treequel::Schema::AttributeType.parse( @schema, DERIVED_NOSYN_ATTRTYPE )
+			@attrtype = described_class.parse( @schema, DERIVED_NOSYN_ATTRTYPE )
 		end
 
 		it "fetches its SYNTAX from its supertype" do
@@ -203,7 +203,7 @@ describe Treequel::Schema::AttributeType do
 		MULTINAME_ATTRIBUTETYPE = %{( 1.1.1.1 NAME ('firstName' 'secondName') )}
 
 		before( :each ) do
-			@attrtype = Treequel::Schema::AttributeType.parse( @schema, MULTINAME_ATTRIBUTETYPE )
+			@attrtype = described_class.parse( @schema, MULTINAME_ATTRIBUTETYPE )
 		end
 
 		it "knows what both names are" do
@@ -234,7 +234,7 @@ describe Treequel::Schema::AttributeType do
 			%{'This spec\\27s example, which includes a \\5c character.' )}
 
 		before( :each ) do
-			@attrtype = Treequel::Schema::AttributeType.parse( @schema, ESCAPED_DESC_ATTRIBUTETYPE )
+			@attrtype = described_class.parse( @schema, ESCAPED_DESC_ATTRIBUTETYPE )
 		end
 
 		it "unscapes the escaped characters" do
@@ -248,7 +248,7 @@ describe Treequel::Schema::AttributeType do
 		OBSOLETE_ATTRIBUTETYPE = %{( 1.1.1.1 OBSOLETE )}
 
 		before( :each ) do
-			@attrtype = Treequel::Schema::AttributeType.parse( @schema, OBSOLETE_ATTRIBUTETYPE )
+			@attrtype = described_class.parse( @schema, OBSOLETE_ATTRIBUTETYPE )
 		end
 
 		it "knows that it's obsolete" do
@@ -262,8 +262,7 @@ describe Treequel::Schema::AttributeType do
 		DIRECTORY_OPERATIONAL_ATTRIBUTETYPE = %{( 1.1.1.1 USAGE directoryOperation )}
 
 		before( :each ) do
-			@attrtype = Treequel::Schema::AttributeType.
-				parse( @schema, DIRECTORY_OPERATIONAL_ATTRIBUTETYPE )
+			@attrtype = described_class.parse( @schema, DIRECTORY_OPERATIONAL_ATTRIBUTETYPE )
 		end
 
 		it "knows that it's not a user-application attribute type" do
@@ -293,7 +292,7 @@ describe Treequel::Schema::AttributeType do
 		DISTRIBUTED_OPERATIONAL_ATTRIBUTETYPE = %{( 1.1.1.1 USAGE distributedOperation )}
 
 		before( :each ) do
-			@attrtype = Treequel::Schema::AttributeType.
+			@attrtype = described_class.
 				parse( @schema, DISTRIBUTED_OPERATIONAL_ATTRIBUTETYPE )
 		end
 
@@ -324,8 +323,7 @@ describe Treequel::Schema::AttributeType do
 		DSASPECIFIC_OPERATIONAL_ATTRIBUTETYPE = %{( 1.1.1.1 USAGE dSAOperation )}
 
 		before( :each ) do
-			@attrtype = Treequel::Schema::AttributeType.
-				parse( @schema, DSASPECIFIC_OPERATIONAL_ATTRIBUTETYPE )
+			@attrtype = described_class.parse( @schema, DSASPECIFIC_OPERATIONAL_ATTRIBUTETYPE )
 		end
 
 		it "knows that it's not a user-application attribute type" do
@@ -350,6 +348,85 @@ describe Treequel::Schema::AttributeType do
 
 	end
 
+	describe "parsed from the 'supportedLDAPVersion' attribute type" do
+
+		SUPPORTED_LDAP_VERSION_ATTRIBUTETYPE = %{( 1.3.6.1.4.1.1466.101.120.15 NAME } +
+			%{'supportedLDAPVersion' DESC 'Standard LDAP attribute type' SYNTAX } +
+			%{1.3.6.1.4.1.1466.115.121.1.27 USAGE dsaOperation X-ORIGIN 'RFC 2252' )}
+
+		before( :each ) do
+			@attrtype = described_class.parse( @schema, SUPPORTED_LDAP_VERSION_ATTRIBUTETYPE )
+		end
+
+		it "knows what OID corresponds to the type" do
+			@attrtype.oid.should == '1.3.6.1.4.1.1466.101.120.15'
+		end
+
+		it "knows what its NAME attribute is" do
+			@attrtype.name.should == :supportedLDAPVersion
+		end
+
+		it "knows what its DESC attribute is" do
+			@attrtype.desc.should == 'Standard LDAP attribute type'
+		end
+
+		it "knows it doesn't have a superior type" do
+			@attrtype.sup.should be_nil()
+		end
+
+		it "knows what the name of its equality matching rule is" do
+			@attrtype.eqmatch_oid.should be_nil()
+		end
+
+	end
+
+	describe "compatibility with malformed declarations: " do
+
+		LDAP_CHANGELOG_ATTRIBUTETYPE = %{
+			(   2.16.840.1.113730.3.1.35
+				NAME 'changelog'
+				DESC 'the distinguished name of the entry which contains
+				      the set of entries comprising this server's changelog'
+				EQUALITY distinguishedNameMatch
+				SYNTAX 'DN'
+			)
+		}
+
+		it "parses the 'changelog' attribute type from draft-good-ldap-changelog" do
+			attrtype = described_class.parse( @schema, LDAP_CHANGELOG_ATTRIBUTETYPE )
+
+			attrtype.should be_a( described_class )
+			attrtype.name.should == :changelog
+			attrtype.oid.should == '2.16.840.1.113730.3.1.35'
+			attrtype.desc.should == %{the distinguished name of the entry which contains } +
+				%{the set of entries comprising this server's changelog}
+		end
+
+		LDAP_CHANGELOG_CHANGENUMBER_ATTRIBUTETYPE = %{
+			( 2.16.840.1.113730.3.1.5
+				NAME 'changeNumber'
+				DESC 'a number which uniquely identifies a change made to a
+				      directory entry'
+				SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+				EQUALITY integerMatch
+				ORDERING integerOrderingMatch
+				SINGLE-VALUE
+			)
+		}
+
+		it "parses the 'changeNumber' attribute from draft-good-ldap-changelog" do
+			attrtype = described_class.parse( @schema, LDAP_CHANGELOG_CHANGENUMBER_ATTRIBUTETYPE )
+
+			attrtype.should be_a( described_class )
+			attrtype.name.should == :changeNumber
+			attrtype.oid.should == '2.16.840.1.113730.3.1.5'
+			attrtype.syntax_oid.should == '1.3.6.1.4.1.1466.115.121.1.27'
+			attrtype.desc.should == %{a number which uniquely identifies a change made to a } +
+			      %{directory entry}
+		end
+
+	end
+
 end
 
 

data/spec/treequel/schema/matchingrule_spec.rb

@@ -158,6 +158,43 @@ describe Treequel::Schema::MatchingRule do
 
 	end
 
+
+	describe "parsed from one of the matching rules from the OpenDS schema" do
+
+		TIME_BASED_MATCHINGRULE = %{( 1.3.6.1.4.1.26027.1.4.5 NAME } +
+			%{( 'relativeTimeGTOrderingMatch' 'relativeTimeOrderingMatch.gt' ) } +
+			%{SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )}
+
+		before( :each ) do
+			@rule = Treequel::Schema::MatchingRule.parse( @schema, TIME_BASED_MATCHINGRULE )
+		end
+
+		it "knows that it's obsolete" do
+			@rule.name.should == :relativeTimeGTOrderingMatch
+			@rule.names.should include( :relativeTimeGTOrderingMatch, :'relativeTimeOrderingMatch.gt' )
+			@rule.syntax_oid.should == '1.3.6.1.4.1.1466.115.121.1.24'
+		end
+
+	end
+
+
+	describe "parsed from one of the matching rules from issue 11" do
+
+		NAME_AND_OID_MATCHINGRULE = %{( 1.3.6.1.4.1.42.2.27.9.4.0.3 } +
+			%{NAME 'caseExactOrderingMatch-2.16.840.1.113730.3.3.2.0.3' } +
+			%{SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )}
+
+		before( :each ) do
+			@rule = Treequel::Schema::MatchingRule.parse( @schema, NAME_AND_OID_MATCHINGRULE )
+		end
+
+		it "knows what its rule is" do
+			@rule.name.should == 'caseExactOrderingMatch-2.16.840.1.113730.3.3.2.0.3'.to_sym
+			@rule.syntax_oid.should == '1.3.6.1.4.1.1466.115.121.1.15'
+		end
+
+	end
+
 end
 
 

data/spec/treequel/schema/objectclass_spec.rb

@@ -53,7 +53,6 @@ describe Treequel::Schema::ObjectClass do
 		%{        facsimileTelephoneNumber $ street $ postOfficeBox $ postalCode $} +
 		%{        postalAddress $ physicalDeliveryOfficeName $ ou $ st $ l ) )}
 
-
 	before( :all ) do
 		setup_logging( :fatal )
 		@datadir = Pathname( __FILE__ ).dirname.parent.parent + 'data'
@@ -316,6 +315,91 @@ describe Treequel::Schema::ObjectClass do
 		end
 	end
 
+
+	# Sun/Oracle OpenDS (as of 2.2, at least) "allows a non-numeric OID [as the 
+	# 'numericoid' part of an objectClass definition] for the purpose of convenience"
+	describe "Sun OpenDS compatibility workarounds (ticket #11)" do
+
+		SUN_ODS_DESCR_OID_OBJECTCLASS = 
+			%{( interwovengroup-oid NAME 'interwovengroup' SUP posixgroup } +
+			%{    STRUCTURAL MAY path X-ORIGIN 'user defined' )}
+
+		before( :each ) do
+			@oc = Treequel::Schema::ObjectClass.parse( @schema, SUN_ODS_DESCR_OID_OBJECTCLASS )
+		end
+
+
+		it "sets the oid to the non-numeric OID value" do
+			@oc.oid.should == 'interwovengroup-oid'
+			@oc.name.should == :interwovengroup
+			@oc.extensions.should == %{X-ORIGIN 'user defined'}
+		end
+
+	end
+
+
+	describe "compatibility with malformed declarations: " do
+
+		SLP_SERVICE_OBJECTCLASS = %{
+		( 1.3.6.1.4.1.6252.2.27.6.2.1
+			NAME 'slpService'
+			DESC 'parent superclass for SLP services'
+			ABSTRACT
+			SUP top
+			MUST  ( template-major-version-number $
+			        template-minor-version-number $
+			        description $
+			        template-url-syntax $
+			        service-advert-service-type $
+			        service-advert-scopes )
+			MAY   ( service-advert-url-authenticator $
+			        service-advert-attribute-authenticator ) )
+		}
+
+		it "parses the malformed objectClass from RFC 2926" do
+			oc = Treequel::Schema::ObjectClass.parse( @schema, SLP_SERVICE_OBJECTCLASS )
+
+			oc.should be_a( Treequel::Schema::ObjectClass )
+			oc.name.should == :slpService
+			oc.oid.should == '1.3.6.1.4.1.6252.2.27.6.2.1'
+		end
+
+
+		AUTH_PASSWORD_OBJECT_OBJECTCLASS = %{
+		( 1.3.6.1.4.1.4203.1.4.7 NAME 'authPasswordObject'
+			DESC 'authentication password mix in class'
+			MAY 'authPassword'
+			AUXILIARY )
+		}
+
+		it "parses the malformed authPasswordObject objectClass from RFC2696" do
+			oc = Treequel::Schema::ObjectClass.parse( @schema, AUTH_PASSWORD_OBJECT_OBJECTCLASS )
+
+			oc.should be_a( Treequel::Schema::ObjectClass )
+			oc.name.should == :authPasswordObject
+			oc.oid.should == '1.3.6.1.4.1.4203.1.4.7'
+		end
+
+		DRAFT_HOWARD_RFC2307BIS_OBJECTCLASS = %{
+		( 1.3.6.1.1.1.2.0 NAME 'posixAccount' 
+			SUP top 
+			AUXILIARY 
+			DESC 'Abstraction of an account with POSIX attributes' 
+			MUST ( cn $ uid $ uidNumber $ gidNumber $ homeDirectory ) 
+			MAY ( authPassword $ userPassword $ loginShell $ gecos $ description ) 
+			X-ORIGIN 'draft-howard-rfc2307bis' )
+		}
+
+		it "parses the malformed objectClasses from draft-howard-rfc2307bis" do
+			oc = Treequel::Schema::ObjectClass.parse( @schema, DRAFT_HOWARD_RFC2307BIS_OBJECTCLASS )
+
+			oc.should be_a( Treequel::Schema::ObjectClass )
+			oc.name.should == :posixAccount
+			oc.oid.should == '1.3.6.1.1.1.2.0'
+		end
+
+	end
+
 end
 
 

data/spec/treequel/schema_spec.rb

@@ -12,7 +12,6 @@ BEGIN {
 
 require 'rspec'
 
-require 'spec/lib/constants'
 require 'spec/lib/helpers'
 
 require 'yaml'
@@ -21,29 +20,108 @@ require 'ldap/schema'
 require 'treequel/schema'
 
 
-include Treequel::TestConstants
-include Treequel::Constants
-
-#####################################################################
-###	C O N T E X T S
-#####################################################################
-
 describe Treequel::Schema do
 	include Treequel::SpecHelpers
 
 	before( :all ) do
-		setup_logging( :fatal )
+		setup_logging( :warn )
 		@datadir = Pathname( __FILE__ ).dirname.parent + 'data'
 	end
 
+	before( :each ) do
+		@strict_flag = Treequel::Schema.strict_parse_mode?
+	end
+
+	after( :each ) do
+		Treequel::Schema.strict_parse_mode = @strict_flag
+	end
+
 	after( :all ) do
 		reset_logging()
 	end
 
+	### Constants
+
+	# Some simple parser-testing values
 	TEST_NUMERICOID = '1.12.3.8.16.1.1.5'
 	TEST_DESCR      = 'objectClass'
 	TEST_OIDLIST    = %:( #{TEST_DESCR} $ objectCaste $ #{TEST_NUMERICOID} )  :
 
+	# The malformed objectClass from RFC2926, for testing schema-parsing lenience
+	BAD_OBJECTCLASS = "( 1.3.6.1.4.1.6252.2.27.6.2.1 NAME 'slpService' " +
+		"DESC 'parent superclass for SLP services' ABSTRACT SUP top MUST " +
+		" ( template-major-version-number $ template-minor-version-number " +
+		"$ description $ template-url-syntax $ service-advert-service-type " +
+		"$ service-advert-scopes ) MAY ( service-advert-url-authenticator " +
+		"$ service-advert-attribute-authenticator ) X-ORIGIN 'RFC 2926' )"
+
+	### Matchers
+
+	RSpec::Matchers.define( :be_lenient ) do
+		match do |actual|
+			!actual.strict_parse_mode?
+		end
+	end
+
+
+	### Examples
+
+	it "defaults to lenient schema-parsing" do
+		Treequel::Schema.should be_lenient()
+	end
+
+	it "can be told to propagate schema-parsing failures for easier problem-detection" do
+		Treequel::Schema.strict_parse_mode = true
+		Treequel::Schema.should_not be_lenient()
+	end
+
+
+	it "doesn't propagate parse errors while in lenient schema-parsing mode" do
+		schema = Treequel::Schema.new( 'objectClasses'   => [BAD_OBJECTCLASS],
+		                               'attributeTypes'  => [], 
+		                               'ldapSyntaxes'    => [], 
+		                               'matchingRules'   => [], 
+		                               'matchingRuleUse' => [] )
+		schema.should be_a( Treequel::Schema )
+		schema.object_classes.keys.should_not include( 'slpService' )
+	end
+
+	it "propagates parse errors while in strict schema-parsing mode" do
+		Treequel::Schema.strict_parse_mode = true
+		expect {
+			Treequel::Schema.new( 'objectClasses' => [BAD_OBJECTCLASS] )
+		}.to raise_exception( Treequel::ParseError, /malformed objectClass/i )
+	end
+
+	it "can parse a valid oidlist" do
+		oids = Treequel::Schema.parse_oids( TEST_OIDLIST )
+		oids.should have(3).members
+		oids.should == [ :objectClass, :objectCaste, TEST_NUMERICOID ]
+	end
+
+	it "returns an empty Array if oidlist it's asked to parse is nil" do
+		Treequel::Schema.parse_oids( nil ).should == []
+	end
+
+	it "raises an exception if it's asked to parse an invalid oidlist" do
+		expect do
+			Treequel::Schema.parse_oids( %Q{my name is Jorma, I'm the sensitive one} )
+		end.to raise_error( Treequel::ParseError, /oidlist/i )
+	end
+
+
+	it "keeps a numeric OID as a String when parsing it" do
+		Treequel::Schema.parse_oid( TEST_NUMERICOID ).should be_a( String )
+		Treequel::Schema.parse_oid( TEST_NUMERICOID ).should == TEST_NUMERICOID
+	end
+
+	it "transforms a named OID as a Symbol when parsing it" do
+		Treequel::Schema.parse_oid( TEST_DESCR ).should be_a( Symbol )
+		Treequel::Schema.parse_oid( TEST_DESCR ).should == TEST_DESCR.to_sym
+	end
+
+
+
 	context "OpenLDAP schema" do
 		before( :all ) do
 			@schema_dumpfile = @datadir + 'schema.yml'
@@ -72,7 +150,8 @@ describe Treequel::Schema do
 		end
 
 
-		it "can parse the schema structure returned from LDAP::Conn#schema even under $SAFE >= 1" do
+		it "can parse the schema structure returned from LDAP::Conn#schema even under $SAFE >= 1",
+			:mri_only => true do
 			schema = nil
 			Thread.new do
 				Thread.current.abort_on_exception = true
@@ -105,37 +184,73 @@ describe Treequel::Schema do
 			@schema.operational_attribute_types.should be_empty()
 		end
 
-
 	end
 
 
-	it "can parse a valid oidlist" do
-		oids = Treequel::Schema.parse_oids( TEST_OIDLIST )
-		oids.should have(3).members
-		oids.should == [ :objectClass, :objectCaste, TEST_NUMERICOID ]
-	end
+	# Dumped from an OpenDS 2.2 server with the included 'test data' -- dunno if that's
+	# representative of schemas one would find in the wild, but it doesn't parse as-is
+	# currently because of (at least) the objectClasses from RFCs 2696, 3112, 3712, and 
+	# draft-howard-rfc2307bi
+	context "OpenDS schema" do
 
-	it "returns an empty Array if oidlist it's asked to parse is nil" do
-		Treequel::Schema.parse_oids( nil ).should == []
-	end
+		before( :all ) do
+			@schema_dumpfile = @datadir + 'opends.yml'
+			@hash = YAML.load_file( @schema_dumpfile )
+			@schemahash = LDAP::Schema.new( @hash )
+		end
 
-	it "raises an exception if it's asked to parse an invalid oidlist" do
-		expect do
-			Treequel::Schema.parse_oids( %Q{my name is Jorma, I'm the sensitive one} )
-		end.to raise_error( Treequel::ParseError, /oidlist/i )
-	end
+		it "can parse an OpenDS schema structure, too" do
+			@schema = Treequel::Schema.new( @schemahash )
 
+			@schema.object_classes.values.uniq.should have( @hash['objectClasses'].length ).members
+			@schema.attribute_types.values.uniq.should have( @hash['attributeTypes'].length ).members
+			@schema.matching_rules.values.uniq.should have( @hash['matchingRules'].length ).members
+			@schema.ldap_syntaxes.values.uniq.should have( @hash['ldapSyntaxes'].length ).members
+
+			@schema.matching_rule_uses.should be_empty()
+
+			# Not yet supported			
+			# @schema.dit_structure_rules.values.uniq.should have( @hash['dITStructureRules'].length ).members
+			# @schema.dit_content_rules.values.uniq.should have( @hash['dITContentRules'].length ).members
+			# @schema.name_forms.values.uniq.should have( @hash['nameForms'].length ).members
+
+			dirop_count = @hash['attributeTypes'].
+				count {|type| type.index('USAGE directoryOperation') }
+			dsaop_count = @hash['attributeTypes'].
+				count {|type| type.index('USAGE dSAOperation') }
+			distop_count = @hash['attributeTypes'].
+				count {|type| type.index('USAGE distributedOperation') }
+			op_attrcount = dirop_count + dsaop_count + distop_count
+
+			@schema.operational_attribute_types.should have( op_attrcount ).members
+		end
 
-	it "keeps a numeric OID as a String when parsing it" do
-		Treequel::Schema.parse_oid( TEST_NUMERICOID ).should be_a( String )
-		Treequel::Schema.parse_oid( TEST_NUMERICOID ).should == TEST_NUMERICOID
 	end
 
-	it "transforms a named OID as a Symbol when parsing it" do
-		Treequel::Schema.parse_oid( TEST_DESCR ).should be_a( Symbol )
-		Treequel::Schema.parse_oid( TEST_DESCR ).should == TEST_DESCR.to_sym
+
+	# Attribute types and matching rules from ticket #11
+	context "ticket 11 schema artifacts" do
+
+		before( :all ) do
+			@schema_dumpfile = @datadir + 'ticket11.yml'
+			@hash = YAML.load_file( @schema_dumpfile )
+			@schemahash = LDAP::Schema.new( @hash )
+			@schema = Treequel::Schema.new( @schemahash )
+		end
+
+		it "can parse schema artifacts from ticket 11" do
+			@schema.attribute_types.values.uniq.should have( @hash['attributeTypes'].length ).members
+			@schema.matching_rules.values.uniq.should have( @hash['matchingRules'].length ).members
+
+			dsaop_count = @hash['attributeTypes'].
+				count {|type| type.index('USAGE dsaOperation') }
+
+			@schema.operational_attribute_types.should have( dsaop_count ).members
+		end
+
 	end
 
+
 end