treequel 1.0.1 → 1.0.4

data/spec/treequel/schema/attributetype_spec.rb

@@ -9,22 +9,14 @@ BEGIN {
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
-begin
-	require 'spec'
-	require 'spec/lib/constants'
-	require 'spec/lib/helpers'
-
-	require 'yaml'
-	require 'ldap'
-	require 'ldap/schema'
-	require 'treequel/schema/attributetype'
-rescue LoadError
-	unless Object.const_defined?( :Gem )
-		require 'rubygems'
-		retry
-	end
-	raise
-end
+require 'spec'
+require 'spec/lib/constants'
+require 'spec/lib/helpers'
+
+require 'yaml'
+require 'ldap'
+require 'ldap/schema'
+require 'treequel/schema/attributetype'
 
 
 include Treequel::TestConstants
@@ -40,7 +32,6 @@ describe Treequel::Schema::AttributeType do
 
 	before( :all ) do
 		setup_logging( :fatal )
-		@datadir = Pathname( __FILE__ ).dirname.parent.parent + 'data'
 	end
 
 	before( :each ) do
@@ -185,7 +176,7 @@ describe Treequel::Schema::AttributeType do
 
 	describe "parsed from an attributeType that has a list as the value of its NAME attribute" do
 
-		MULTINAME_ATTRIBUTETYPE = %{( 1.1.1.1 NAME ('firstname' 'secondname') )}
+		MULTINAME_ATTRIBUTETYPE = %{( 1.1.1.1 NAME ('firstName' 'secondName') )}
 
 		before( :each ) do
 			@attrtype = Treequel::Schema::AttributeType.parse( @schema, MULTINAME_ATTRIBUTETYPE )
@@ -193,13 +184,24 @@ describe Treequel::Schema::AttributeType do
 
 		it "knows what both names are" do
 			@attrtype.names.should have(2).members
-			@attrtype.names.should include( :firstname, :secondname )
+			@attrtype.names.should include( :firstName, :secondName )
 		end
 
 		it "returns the first of its names for the #name method" do
-			@attrtype.name.should == :firstname
+			@attrtype.name.should == :firstName
+		end
+
+		it "knows how to build a normalized list of its names" do
+			@attrtype.normalized_names.should == [ :firstname, :secondname ]
+		end
+
+		it "knows when a name is valid" do
+			@attrtype.valid_name?( 'first name' ).should be_true()
 		end
 
+		it "knows when a name is invalid" do
+			@attrtype.valid_name?( :name2 ).should be_false()
+		end
 	end
 
 	describe "parsed from an attributeType that has escaped characters in its DESC attribute" do

data/spec/treequel/schema/objectclass_spec.rb

@@ -9,24 +9,15 @@ BEGIN {
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
-begin
-	require 'spec'
-	require 'spec/lib/constants'
-	require 'spec/lib/helpers'
-
-	require 'yaml'
-	require 'ldap'
-	require 'ldap/schema'
-	require 'treequel/schema/objectclass'
-	require 'treequel/schema/attributetype'
-rescue LoadError
-	unless Object.const_defined?( :Gem )
-		require 'rubygems'
-		retry
-	end
-	raise
-end
+require 'spec'
+require 'spec/lib/constants'
+require 'spec/lib/helpers'
 
+require 'yaml'
+require 'ldap'
+require 'ldap/schema'
+require 'treequel/schema/objectclass'
+require 'treequel/schema/attributetype'
 
 include Treequel::TestConstants
 include Treequel::Constants
@@ -38,14 +29,40 @@ include Treequel::Constants
 describe Treequel::Schema::ObjectClass do
 	include Treequel::SpecHelpers
 
+	TOP_OBJECTCLASS =
+		%{( 2.5.6.0 NAME 'top' } +
+		%{DESC 'top of the superclass chain' ABSTRACT } +
+		%{MUST objectClass )}
+
+	PERSON_OBJECTCLASS =
+		%{( 2.5.6.6 NAME 'person'} +
+		%{    DESC 'RFC2256: a person'} +
+		%{    SUP top STRUCTURAL} +
+		%{    MUST ( sn $ cn )} +
+		%{    MAY ( userPassword $ telephoneNumber $ seeAlso $ description ) )}
+
+	ORGPERSON_OBJECTCLASS =
+		%{( 2.5.6.7 NAME 'organizationalPerson'} +
+		%{    DESC 'RFC2256: an organizational person'} +
+		%{    SUP person STRUCTURAL} +
+		%{    MAY ( title $ x121Address $ registeredAddress $ destinationIndicator $} +
+		%{        preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $} +
+		%{        telephoneNumber $ internationaliSDNNumber $ } +
+		%{        facsimileTelephoneNumber $ street $ postOfficeBox $ postalCode $} +
+		%{        postalAddress $ physicalDeliveryOfficeName $ ou $ st $ l ) )}
+
 
 	before( :all ) do
-		setup_logging( :fatal )
+		setup_logging( :debug )
 		@datadir = Pathname( __FILE__ ).dirname.parent.parent + 'data'
 	end
 
 	before( :each ) do
-		@schema = mock( "Treequel schema" )
+		octable = {}
+		@schema = stub( "Treequel schema", :object_classes => octable )
+		octable[:top] = Treequel::Schema::ObjectClass.parse( @schema, TOP_OBJECTCLASS )
+		octable[:person] = Treequel::Schema::ObjectClass.parse( @schema, PERSON_OBJECTCLASS )
+		octable[:orgPerson] = Treequel::Schema::ObjectClass.parse( @schema, ORGPERSON_OBJECTCLASS )
 	end
 
 	after( :all ) do
@@ -55,11 +72,8 @@ describe Treequel::Schema::ObjectClass do
 
 	describe "parsed from the 'top' objectClass" do
 
-		TOP_OBJECTCLASS = %{( 2.5.6.0 NAME 'top' DESC 'top of the superclass chain' ABSTRACT } +
-			%{MUST objectClass )}
-
 		before( :each ) do
-			@oc = Treequel::Schema::ObjectClass.parse( @schema, TOP_OBJECTCLASS )
+			@oc = @schema.object_classes[:top]
 		end
 
 		it "is an AbstractObjectClass because its 'kind' is 'ABSTRACT'" do
@@ -114,19 +128,10 @@ describe Treequel::Schema::ObjectClass do
 	end
 
 
-	describe "parsed from the 'organizationalUnit' objectClass" do
-
-		OU_OBJECTCLASS = %{( 2.5.6.5 NAME 'organizationalUnit' } +
-			%{DESC 'RFC2256: an organizational unit' SUP top STRUCTURAL } +
-			%{MUST ou MAY ( userPassword $ searchGuide $ seeAlso $ } +
-			%{businessCategory $ x121Address $ registeredAddress $ } +
-			%{destinationIndicator $ preferredDeliveryMethod $ telexNumber $ } +
-			%{teletexTerminalIdentifier $ telephoneNumber $ internationaliSDNNumber $ } +
-			%{facsimileTelephoneNumber $ street $ postOfficeBox $ postalCode $ postalAddress $ } +
-			%{physicalDeliveryOfficeName $ st $ l $ description ) )}
+	describe "parsed from the 'organizationalPerson' objectClass" do
 
 		before( :each ) do
-			@oc = Treequel::Schema::ObjectClass.parse( @schema, OU_OBJECTCLASS )
+			@oc = @schema.object_classes[:orgPerson]
 		end
 
 		it "is a StructuralObjectClass because its kind is 'STRUCTURAL'" do
@@ -134,29 +139,45 @@ describe Treequel::Schema::ObjectClass do
 		end
 
 		it "knows what OID corresponds to the class" do
-			@oc.oid.should == '2.5.6.5'
+			@oc.oid.should == '2.5.6.7'
 		end
 
 		it "knows what its NAME attribute is" do
-			@oc.name.should == :organizationalUnit
+			@oc.name.should == :organizationalPerson
 		end
 
 		it "knows what its DESC attribute is" do
-			@oc.desc.should == 'RFC2256: an organizational unit'
+			@oc.desc.should == 'RFC2256: an organizational person'
 		end
 
-		it "knows that it has one MUST attribute" do
-			@oc.must_oids.should have( 1 ).member
-			@oc.must_oids.should == [ :ou ]
+		it "knows what its MUST attributes are" do
+			@oc.must_oids.should have( 3 ).members
+			@oc.must_oids.should include( :sn, :cn, :objectClass )
+		end
+
+		it "knows what its unique MUST attributes are" do
+			@oc.must_oids( false ).should be_empty()
 		end
 
 		it "knows what its MAY attributes are" do
-			@oc.may_oids.should have( 21 ).members
-        	@oc.may_oids.should include( :userPassword, :searchGuide, :seeAlso, :businessCategory,
-	        	:x121Address, :registeredAddress, :destinationIndicator, :preferredDeliveryMethod,
-	        	:telexNumber, :teletexTerminalIdentifier, :telephoneNumber, :internationaliSDNNumber,
-	        	:facsimileTelephoneNumber, :street, :postOfficeBox, :postalCode, :postalAddress,
-	        	:physicalDeliveryOfficeName, :st, :l, :description )
+			@oc.may_oids.should have( 22 ).members
+        	@oc.may_oids.should include(
+				:userPassword, :telephoneNumber, :seeAlso, :description,
+				:title, :x121Address, :registeredAddress, :destinationIndicator,
+				:preferredDeliveryMethod, :telexNumber, :teletexTerminalIdentifier,
+				:telephoneNumber, :internationaliSDNNumber, :facsimileTelephoneNumber,
+				:street, :postOfficeBox, :postalCode, :postalAddress,
+				:physicalDeliveryOfficeName, :ou, :st, :l )
+		end
+
+		it "knows what its unique MAY attributes are" do
+			@oc.may_oids( false ).should have( 18 ).members
+        	@oc.may_oids( false ).should include(
+				:title, :x121Address, :registeredAddress, :destinationIndicator,
+				:preferredDeliveryMethod, :telexNumber, :teletexTerminalIdentifier,
+				:telephoneNumber, :internationaliSDNNumber, :facsimileTelephoneNumber,
+				:street, :postOfficeBox, :postalCode, :postalAddress,
+				:physicalDeliveryOfficeName, :ou, :st, :l )
 		end
 
 	end

data/spec/treequel/schema/table_spec.rb

@@ -0,0 +1,134 @@
+#!/usr/bin/env ruby
+
+BEGIN {
+	require 'pathname'
+	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
+
+	libdir = basedir + "lib"
+
+	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+}
+
+begin
+	require 'spec'
+	require 'spec/lib/constants'
+	require 'spec/lib/helpers'
+
+	require 'yaml'
+	require 'ldap'
+	require 'ldap/schema'
+	require 'treequel/schema'
+rescue LoadError
+	unless Object.const_defined?( :Gem )
+		require 'rubygems'
+		retry
+	end
+	raise
+end
+
+
+include Treequel::TestConstants
+include Treequel::Constants
+
+#####################################################################
+###	C O N T E X T S
+#####################################################################
+
+describe Treequel::Schema::Table do
+	include Treequel::SpecHelpers
+
+
+	before( :all ) do
+		setup_logging( :fatal )
+	end
+
+	before( :each ) do
+		@table = Treequel::Schema::Table.new
+	end
+
+	after( :all ) do
+		reset_logging()
+	end
+
+
+	it "allows setting/fetching case-insensitively" do
+		@table['organizationalRole'] = :or
+		@table["apple-preset-computer-list"] = :applepreset
+		@table.deltaCRL = :deltacrl
+
+		@table['organizationalrole'].should == :or
+		@table[:organizationalrole].should == :or
+		@table.organizationalRole.should == :or
+		@table.organizationalrole.should == :or
+
+		@table[:"apple-preset-computer-list"].should == :applepreset
+		@table['apple-preset-computer-list'].should == :applepreset
+		@table[:apple_preset_computer_list].should == :applepreset
+		@table.apple_preset_computer_list.should == :applepreset
+
+		@table['deltacrl'].should == :deltacrl
+		@table[:deltaCRL].should == :deltacrl
+		@table[:deltacrl].should == :deltacrl
+		@table.deltaCRL.should == :deltacrl
+		@table.deltacrl.should == :deltacrl
+
+	end
+
+
+	it "doesn't try to normalize numeric OIDs" do
+		@table['1.3.6.1.4.1.4203.666.11.1.4.2.1.2'] = :an_oid
+		@table['1.3.6.1.4.1.4203.666.11.1.4.2.1.2'].should == :an_oid
+		@table['13614142036661114212'].should_not == :an_oid
+		@table.keys.should include( '1.3.6.1.4.1.4203.666.11.1.4.2.1.2' )
+	end
+
+
+	it "merges other Tables" do
+		othertable = Treequel::Schema::Table.new
+
+		@table['ou'] = 'thing'
+		@table['cn'] = 'chunker'
+
+		othertable['cn'] = 'phunker'
+
+		ot = @table.merge( othertable )
+		ot['ou'].should == 'thing'
+		ot['cn'].should == 'phunker'
+	end
+
+
+	it "merges hashes after normalizing keys" do
+		@table['ou'] = 'thing'
+		@table['apple-computer-list'] = 'trishtrash'
+
+		hash = { 'apple-computer-list' => 'pinhash' }
+
+		ot = @table.merge( hash )
+		ot['ou'].should == 'thing'
+		ot['apple-computer-list'].should == 'pinhash'
+	end
+
+
+	it "dupes its inner hash when duped" do
+		newtable = @table.dup
+
+		newtable[:cn] = 'god'
+		@table.should_not include( :cn )
+		@table.should be_empty()
+	end
+
+
+	it "provides a case-insensitive version of #values_at" do
+		@table[:cn]      = 'contra_rules'
+		@table[:d]       = 'ghosty'
+		@table[:porntipsGuzzardo] = 'cha-ching'
+
+		results = @table.values_at( :CN, 'PornTipsGuzzARDO' )
+		results.should include( 'contra_rules' )
+		results.should include( 'cha-ching' )
+		results.should_not include( 'ghosty' )
+	end
+
+end
+
+

data/spec/treequel_spec.rb

@@ -9,21 +9,12 @@ BEGIN {
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
-begin
-	require 'spec'
-	require 'spec/lib/constants'
-	require 'spec/lib/helpers'
-
-	require 'treequel'
-	require 'treequel/directory'
-rescue LoadError
-	unless Object.const_defined?( :Gem )
-		require 'rubygems'
-		retry
-	end
-	raise
-end
+require 'spec'
+require 'spec/lib/constants'
+require 'spec/lib/helpers'
 
+require 'treequel'
+require 'treequel/directory'
 
 include Treequel::TestConstants
 
@@ -36,6 +27,10 @@ describe Treequel do
 	include Treequel::SpecHelpers
 
 	before( :all ) do
+		setup_logging( :fatal )
+	end
+
+	after( :all ) do
 		reset_logging()
 	end
 
@@ -53,7 +48,7 @@ describe Treequel do
 
 
 	it "returns a version string with a build number if asked" do
-		Treequel.version_string(true).should =~ /\w+ [\d.]+ \(build rev.*\)/
+		Treequel.version_string(true).should =~ /\w+ [\d.]+ \(build [[:xdigit:]]+\)/
 	end
 
 
@@ -126,6 +121,273 @@ describe Treequel do
 	end
 
 
+	it "provides a convenience method for creating directory objects from the system LDAP config" do
+		Treequel.should_receive( :find_configfile ).and_return( :a_configfile_path )
+		Treequel.should_receive( :read_opts_from_config ).with( :a_configfile_path ).
+			and_return({ :configfile_opts => 1 })
+		Treequel.should_receive( :read_opts_from_environment ).
+			and_return({ :environment_opts => 1 })
+
+		merged_config = Treequel::Directory::DEFAULT_OPTIONS.
+			merge({ :configfile_opts => 1, :environment_opts => 1 })
+
+		Treequel::Directory.should_receive( :new ).with( merged_config ).
+			and_return( :a_directory )
+
+		Treequel.directory_from_config.should == :a_directory
+	end
+
+
+	describe "system LDAP config methods" do
+
+		before( :each ) do
+			ENV['LDAPCONF']   = nil
+			ENV['LDAPRC']     = nil
+			ENV['LDAPURI']    = nil
+			ENV['LDAPBASE']   = nil
+			ENV['LDAPBINDDN'] = nil
+			ENV['LDAPHOST']   = nil
+			ENV['LDAPPORT']   = nil
+		end
+
+
+		it "uses the LDAPCONF environment variable if it is set" do
+			configpath = mock( "configfile Pathname object" )
+			ENV['LDAPCONF'] = 'a_configfile_path'
+
+			Treequel.should_receive( :Pathname ).with( 'a_configfile_path' ).and_return( configpath )
+			configpath.should_receive( :expand_path ).and_return( configpath )
+			configpath.should_receive( :readable? ).and_return( true )
+
+			Treequel.find_configfile.should == configpath
+		end
+
+		it "raises an exception if the file specified in LDAPCONF isn't readable" do
+			configpath = mock( "configfile Pathname object" )
+			ENV['LDAPCONF'] = 'a_configfile_path'
+
+			Treequel.should_receive( :Pathname ).with( 'a_configfile_path' ).and_return( configpath )
+			configpath.should_receive( :expand_path ).and_return( configpath )
+			configpath.should_receive( :readable? ).and_return( false )
+
+			expect {
+				Treequel.find_configfile
+			}.to raise_exception( RuntimeError, /a_configfile_path.*LDAPCONF/ )
+		end
+
+		it "uses the LDAPRC environment variable if it is set and LDAPCONF isn't" do
+			configpath = mock( "configfile Pathname object" )
+			ENV['LDAPRC'] = 'a_configfile_path'
+
+			Treequel.should_receive( :Pathname ).with( 'a_configfile_path' ).and_return( configpath )
+			configpath.should_receive( :expand_path ).and_return( configpath )
+			configpath.should_receive( :readable? ).and_return( true )
+
+			Treequel.find_configfile.should == configpath
+		end
+
+		it "looks in the current user's HOME for the LDAPRC file if it isn't in the CWD" do
+			cwd_path = mock( "CWD configfile Pathname object" )
+			homedir_path = mock( "HOME configfile Pathname object" )
+			ENV['LDAPRC'] = 'a_configfile_path'
+
+			Treequel.should_receive( :Pathname ).with( 'a_configfile_path' ).and_return( cwd_path )
+			cwd_path.should_receive( :expand_path ).and_return( cwd_path )
+			cwd_path.should_receive( :readable? ).and_return( false )
+
+			Treequel.should_receive( :Pathname ).with( '~' ).and_return( homedir_path )
+			homedir_path.should_receive( :expand_path ).and_return( homedir_path )
+			homedir_path.should_receive( :+ ).with( 'a_configfile_path' ).and_return( homedir_path )
+			homedir_path.should_receive( :readable? ).and_return( true )
+
+			Treequel.find_configfile.should == homedir_path
+		end
+
+		it "raises an exception if the file specified in LDAPRC isn't readable" do
+			cwd_path = mock( "CWD configfile Pathname object" )
+			homedir_path = mock( "HOME configfile Pathname object" )
+			ENV['LDAPRC'] = 'a_configfile_path'
+
+			Treequel.should_receive( :Pathname ).with( 'a_configfile_path' ).and_return( cwd_path )
+			cwd_path.should_receive( :expand_path ).and_return( cwd_path )
+			cwd_path.should_receive( :readable? ).and_return( false )
+
+			Treequel.should_receive( :Pathname ).with( '~' ).and_return( homedir_path )
+			homedir_path.should_receive( :expand_path ).and_return( homedir_path )
+			homedir_path.should_receive( :+ ).with( 'a_configfile_path' ).and_return( homedir_path )
+			homedir_path.should_receive( :readable? ).and_return( false )
+
+			expect {
+				Treequel.find_configfile
+			}.to raise_exception( RuntimeError, /a_configfile_path.*LDAPRC/ )
+		end
+
+		it "searches a list of common ldap.conf paths if neither LDAPCONF nor LDAPRC are set" do
+			pathmocks = []
+
+			Treequel::COMMON_LDAP_CONF_PATHS.each do |path|
+				pathname = mock( "pathname: #{path}" )
+				pathmocks << pathname
+			end
+			Treequel.should_receive( :Pathname ).and_return( *pathmocks )
+
+			# Index of the entry we're going to pretend exists
+			successful_index = 6
+			0.upto( successful_index ) do |i|
+				pathmocks[i].should_receive( :readable? ).and_return( i == successful_index )
+			end
+
+			Treequel.find_configfile.should == pathmocks[ successful_index ]
+		end
+
+		# 
+		# OpenLDAP-style config
+		# 
+
+		it "maps the OpenLDAP URI directive to equivalent options" do
+			IO.should_receive( :foreach ).with( :a_configfile ).
+				and_yield( "URI ldap://ldap.acme.com/dc=acme,dc=com" )
+			Treequel.read_opts_from_config( :a_configfile ).should ==
+				{ :port => 389, :base_dn => "dc=acme,dc=com", :host => "ldap.acme.com" }
+		end
+
+		it "maps the OpenLDAP BASE directive to the base_dn option" do
+			IO.should_receive( :foreach ).with( :a_configfile ).
+				and_yield( "BASE dc=acme,dc=com" )
+			Treequel.read_opts_from_config( :a_configfile ).should == 
+				{ :base_dn => "dc=acme,dc=com" }
+		end
+
+		it "maps the OpenLDAP BINDDN directive to the bind_dn option" do
+			IO.should_receive( :foreach ).with( :a_configfile ).
+				and_yield( "BINDDN cn=admin,dc=acme,dc=com" )
+			Treequel.read_opts_from_config( :a_configfile ).should ==
+				{ :bind_dn => "cn=admin,dc=acme,dc=com" }
+		end
+
+		it "maps the OpenLDAP HOST directive to the host option" do
+			IO.should_receive( :foreach ).with( :a_configfile ).
+				and_yield( "# Host file\nHOST ldap.acme.com\n\n" )
+			Treequel.read_opts_from_config( :a_configfile ).should ==
+				{ :host => 'ldap.acme.com' }
+		end
+
+		it "maps the OpenLDAP PORT directive to the port option" do
+			IO.should_receive( :foreach ).with( :a_configfile ).
+				and_yield( "PORT 389" )
+			Treequel.read_opts_from_config( :a_configfile ).should ==
+				{ :port => 389 }
+		end
+
+		# 
+		# NSS-style config
+		# 
+
+		it "maps the nss-style uri directive to equivalent options" do
+			IO.should_receive( :foreach ).with( :a_configfile ).
+				and_yield( "uri ldap://ldap.acme.com/dc=acme,dc=com" )
+			Treequel.read_opts_from_config( :a_configfile ).should ==
+				{ :port => 389, :base_dn => "dc=acme,dc=com", :host => "ldap.acme.com" }
+		end
+
+		it "maps the nss-style 'host' option correctly" do
+			IO.should_receive( :foreach ).with( :a_configfile ).
+				and_yield( "host ldap.acme.com\n\n" )
+			Treequel.read_opts_from_config( :a_configfile ).should ==
+				{ :host => 'ldap.acme.com' }
+		end
+
+		it "maps the nss-style 'binddn' option correctly" do
+			IO.should_receive( :foreach ).with( :a_configfile ).
+				and_yield( "binddn cn=superuser,dc=acme,dc=com" )
+			Treequel.read_opts_from_config( :a_configfile ).should == 
+				{ :bind_dn => "cn=superuser,dc=acme,dc=com" }
+		end
+
+		it "maps the nss-style 'bindpw' option correctly" do
+			IO.should_receive( :foreach ).with( :a_configfile ).
+				and_yield( "# My totally awesome password" ).
+				and_yield( "bindpw a:password!" )
+			Treequel.read_opts_from_config( :a_configfile ).should == 
+				{ :pass => "a:password!" }
+		end
+
+		it "maps the nss-style 'base' option correctly" do
+			IO.should_receive( :foreach ).with( :a_configfile ).
+				and_yield( "base dc=acme,dc=com" )
+			Treequel.read_opts_from_config( :a_configfile ).should == 
+				{ :base_dn => "dc=acme,dc=com" }
+		end
+
+		it "maps the nss-style 'ssl' option to the correct port and connect_type if it's 'off'" do
+			IO.should_receive( :foreach ).with( :a_configfile ).
+				and_yield( "ssl  off" )
+			Treequel.read_opts_from_config( :a_configfile ).should == 
+				{ :port => 389, :connect_type => :plain }
+		end
+
+		it "maps the nss-style 'ssl' option to the correct port and connect_type if " +
+		   "it's 'start_tls'" do
+			IO.should_receive( :foreach ).with( :a_configfile ).
+				and_yield( '' ).
+				and_yield( '# Use TLS' ).
+				and_yield( 'ssl start_tls' )
+			Treequel.read_opts_from_config( :a_configfile ).should == 
+				{ :port => 389, :connect_type => :tls }
+		end
+
+		it "maps the nss-style 'ssl' option to the correct port and connect_type if " +
+		   "it's 'on'" do
+			IO.should_receive( :foreach ).with( :a_configfile ).
+				and_yield( "\n# Use plain SSL\nssl on\n" )
+			Treequel.read_opts_from_config( :a_configfile ).should == 
+				{ :port => 636, :connect_type => :ssl }
+		end
+
+		# 
+		# Environment
+		# 
+
+		it "maps the OpenLDAP LDAPURI environment variable to equivalent options" do
+			ENV['LDAPURI'] = 'ldaps://quomsohutch.linkerlinlinkin.org/o=linkerlickin'
+			Treequel.read_opts_from_environment.should == {
+				:host         => 'quomsohutch.linkerlinlinkin.org',
+				:connect_type => :ssl,
+				:port         => 636,
+				:base_dn      => 'o=linkerlickin'
+			  }
+		end
+
+		it "maps the OpenLDAP LDAPBASE environment variable to the base_dn option" do
+			ENV['LDAPBASE'] = 'o=linkerlickin'
+			Treequel.read_opts_from_environment.should == {
+				:base_dn => 'o=linkerlickin'
+			  }
+		end
+
+		it "maps the OpenLDAP LDAPBINDDN environment variable to the bind_dn option" do
+			ENV['LDAPBINDDN'] = 'cn=superuser,ou=people,o=linkerlickin'
+			Treequel.read_opts_from_environment.should == {
+				:bind_dn => 'cn=superuser,ou=people,o=linkerlickin'
+			  }
+		end
+
+		it "maps the OpenLDAP LDAPHOST environment variable to the host option" do
+			ENV['LDAPHOST'] = 'quomsohutch.linkerlinlinkin.org'
+			Treequel.read_opts_from_environment.should == {
+				:host => 'quomsohutch.linkerlinlinkin.org',
+			  }
+		end
+
+		it "maps the OpenLDAP LDAPPORT environment variable to the port option" do
+			ENV['LDAPPORT'] = '636'
+			Treequel.read_opts_from_environment.should == {
+				:port => 636,
+			  }
+		end
+	end
+
+
 	describe " logging subsystem" do
 		before(:each) do
 			Treequel.reset_logger