treequel 1.1.1 → 1.2.0pre320

data/spec/treequel/control_spec.rb

@@ -10,7 +10,8 @@ BEGIN {
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
-require 'spec'
+require 'rspec'
+
 require 'spec/lib/constants'
 require 'spec/lib/helpers'
 

data/spec/treequel/controls/contentsync_spec.rb

@@ -10,7 +10,8 @@ BEGIN {
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
-require 'spec'
+require 'rspec'
+
 require 'spec/lib/constants'
 require 'spec/lib/helpers'
 require 'spec/lib/control_behavior'

data/spec/treequel/controls/pagedresults_spec.rb

@@ -10,7 +10,8 @@ BEGIN {
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
-require 'spec'
+require 'rspec'
+
 require 'spec/lib/constants'
 require 'spec/lib/helpers'
 require 'spec/lib/control_behavior'
@@ -18,8 +19,6 @@ require 'spec/lib/control_behavior'
 require 'treequel'
 require 'treequel/controls/pagedresults'
 
-include Treequel::TestConstants
-include Treequel::Constants
 
 #####################################################################
 ###	C O N T E X T S
@@ -32,13 +31,11 @@ describe Treequel::PagedResultsControl do
 	end
 
 	before( :each ) do
-		# Used by the shared behavior
-		@control = Treequel::PagedResultsControl
 		@branch = mock( "Branch", :dn => 'cn=example,dc=acme,dc=com' )
 		@directory = mock( "Directory" )
 
-		@branch.stub!( :directory ).and_return( @directory )
-		@directory.stub!( :registered_controls ).and_return([ Treequel::PagedResultsControl ])
+		@branch.stub( :directory ).and_return( @directory )
+		@directory.stub( :registered_controls ).and_return([ Treequel::PagedResultsControl ])
 		@branchset = Treequel::Branchset.new( @branch )
 	end
 

data/spec/treequel/controls/sortedresults_spec.rb

@@ -10,7 +10,8 @@ BEGIN {
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
-require 'spec'
+require 'rspec'
+
 require 'spec/lib/constants'
 require 'spec/lib/helpers'
 require 'spec/lib/control_behavior'
@@ -19,8 +20,6 @@ require 'treequel'
 require 'treequel/branchset'
 require 'treequel/controls/sortedresults'
 
-include Treequel::TestConstants
-include Treequel::Constants
 
 #####################################################################
 ###	C O N T E X T S
@@ -33,13 +32,11 @@ describe Treequel::SortedResultsControl do
 	end
 
 	before( :each ) do
-		# Used by the shared behavior
-		@control = Treequel::SortedResultsControl
 		@branch = mock( "Branch", :dn => 'cn=example,dc=acme,dc=com' )
 		@directory = mock( "Directory" )
 
-		@branch.stub!( :directory ).and_return( @directory )
-		@directory.stub!( :registered_controls ).and_return([ Treequel::SortedResultsControl ])
+		@branch.stub( :directory ).and_return( @directory )
+		@directory.stub( :registered_controls ).and_return([ Treequel::SortedResultsControl ])
 		@branchset = Treequel::Branchset.new( @branch )
 
 	end

data/spec/treequel/directory_spec.rb

@@ -10,7 +10,8 @@ BEGIN {
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
-require 'spec'
+require 'rspec'
+
 require 'spec/lib/constants'
 require 'spec/lib/helpers'
 
@@ -19,8 +20,6 @@ require 'treequel/branch'
 require 'treequel/control'
 
 
-include Treequel::TestConstants
-include Treequel::Constants
 
 #####################################################################
 ###	C O N T E X T S
@@ -46,8 +45,8 @@ describe Treequel::Directory do
 			:connect_type => :plain,
 		}
 		@conn = mock( "LDAP connection", :set_option => true, :bound? => false )
-		LDAP::SSLConn.stub!( :new ).and_return( @conn )
-		@conn.stub!( :root_dse ).and_return( nil )
+		LDAP::SSLConn.stub( :new ).and_return( @conn )
+		@conn.stub( :root_dse ).and_return( nil )
 	end
 
 
@@ -82,7 +81,7 @@ describe Treequel::Directory do
 
 	it "uses the first namingContext from the Root DSE if no base is specified" do
 		conn = mock( "LDAP connection", :set_option => true )
-		LDAP::Conn.stub!( :new ).and_return( conn )
+		LDAP::Conn.stub( :new ).and_return( conn )
 		conn.should_receive( :root_dse ).and_return( TEST_DSE )
 
 		@dir = Treequel::Directory.new( @options.merge(:base_dn => nil) )
@@ -151,9 +150,9 @@ describe Treequel::Directory do
 			@dir.instance_variable_set( :@conn, @conn )
 
 			@schema = mock( "Directory schema" )
-			@conn.stub!( :schema ).and_return( :the_schema )
-			Treequel::Schema.stub!( :new ).with( :the_schema ).and_return( @schema )
-			@schema.stub!( :attribute_types ).and_return({ :cn => :a_value, :ou => :a_value })
+			@conn.stub( :schema ).and_return( :the_schema )
+			Treequel::Schema.stub( :new ).with( :the_schema ).and_return( @schema )
+			@schema.stub( :attribute_types ).and_return({ :cn => :a_value, :ou => :a_value })
 		end
 
 		it "can bind with the given user DN and password" do
@@ -303,7 +302,7 @@ describe Treequel::Directory do
 				and_return( true )
 			branch.should_receive( :respond_to? ).with( :dn ).
 				and_return( true )
-		   	branch.stub!( :include_operational_attrs? ).and_return( true )
+		   	branch.stub( :include_operational_attrs? ).and_return( true )
 
 			found_branch1 = stub( "entry1 branch" )
 			found_branch2 = stub( "entry2 branch" )
@@ -437,7 +436,7 @@ describe Treequel::Directory do
 			@schema.should_receive( :attribute_types ).
 				and_return({ :cn => :a_value, :ou => :a_value })
 
-			@dir.stub!( :bound? ).and_return( false )
+			@dir.stub( :bound? ).and_return( false )
 			rval = @dir.ou( :people )
 			rval.dn.downcase.should == TEST_PEOPLE_DN.downcase
 		end
@@ -541,7 +540,7 @@ describe Treequel::Directory do
 
 
 		it "can move a record to a new dn within the same branch" do
-			@dir.stub!( :bound? ).and_return( false )
+			@dir.stub( :bound? ).and_return( false )
 			branch = mock( "sibling branch obj" )
 			branch.should_receive( :dn ).at_least( :once ).and_return( TEST_PERSON_DN )
 			branch.should_receive( :split_dn ).at_least( :once ).

data/spec/treequel/filter_spec.rb

@@ -10,7 +10,8 @@ BEGIN {
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
-require 'spec'
+require 'rspec'
+
 require 'spec/lib/constants'
 require 'spec/lib/helpers'
 
@@ -404,39 +405,31 @@ describe Treequel::Filter do
 		end
 	end
 
-	describe "support for Sequel expressions" do
+	describe "support for Sequel expressions", :sequel_integration => true do
 
 		before( :each ) do
 			pending "requires the 'sequel' library" unless Sequel.const_defined?( :Model )
 		end
 
-		it "supports the boolean expression syntax" do
-			pending( "inequality operators don't work under 1.9.1" ) if
-				vvec( RUBY_VERSION ) > vvec( '1.8.7' )
+		it "supports the boolean expression syntax", :ruby_1_8_only => true do
 			filter = Treequel::Filter.new( :uid >= 2000 )
 			filter.should be_a( Treequel::Filter )
 			filter.to_s.should == '(uid>=2000)'
 		end
 
-		it "supports Sequel expressions in ANDed subexpressions" do
-			pending( "inequality operators don't work under 1.9.1" ) if
-				vvec( RUBY_VERSION ) > vvec( '1.8.7' )
+		it "supports Sequel expressions in ANDed subexpressions", :ruby_1_8_only => true do
 			filter = Treequel::Filter.new( :and, [:uid >= 1024], [:uid <= 65535] )
 			filter.should be_a( Treequel::Filter )
 			filter.to_s.should == '(&(uid>=1024)(uid<=65535))'
 		end
 
-		it "advises user to use '>=' instead of '>' in expressions" do
-			pending( "inequality operators don't work under 1.9.1" ) if
-				vvec( RUBY_VERSION ) > vvec( '1.8.7' )
+		it "advises user to use '>=' instead of '>' in expressions", :ruby_1_8_only => true do
 			expect {
 				Treequel::Filter.new( :uid > 1024 )
 			}.to raise_error( Treequel::ExpressionError, /greater-than-or-equal/i )
 		end
 
-		it "advises user to use '<=' instead of '<' in expressions" do
-			pending( "inequality operators don't work under 1.9.1" ) if
-				vvec( RUBY_VERSION ) > vvec( '1.8.7' )
+		it "advises user to use '<=' instead of '<' in expressions", :ruby_1_8_only => true do
 			expect {
 				Treequel::Filter.new( :activated < Time.now )
 			}.to raise_error( Treequel::ExpressionError, /less-than-or-equal/i )

data/spec/treequel/mixins_spec.rb

@@ -12,7 +12,8 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
+
 require 'spec/lib/constants'
 require 'spec/lib/helpers'
 
@@ -249,10 +250,7 @@ describe Treequel, "mixin" do
 				@obj.delegated_method( :arg1, :arg2 )
 			end
 
-			it "reports errors from its caller's perspective" do
-				pending "doesn't work under 1.9, but may not be necessary" if
-					vvec(RUBY_VERSION) > vvec('1.8.7')
-
+			it "reports errors from its caller's perspective", :ruby_1_8_only => true do
 				begin
 					@obj.erroring_delegated_method
 				rescue NoMethodError => err
@@ -298,10 +296,7 @@ describe Treequel, "mixin" do
 				@obj.delegated_method( :arg1, :arg2 )
 			end
 
-			it "reports errors from its caller's perspective" do
-				pending "doesn't work under 1.9, but may not be necessary" if
-					vvec(RUBY_VERSION) > vvec('1.8.7')
-
+			it "reports errors from its caller's perspective", :ruby_1_8_only => true do
 				begin
 					@obj.erroring_delegated_method
 				rescue NoMethodError => err

data/spec/treequel/model/objectclass_spec.rb

@@ -10,7 +10,8 @@ BEGIN {
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
-require 'spec'
+require 'rspec'
+
 require 'spec/lib/constants'
 require 'spec/lib/helpers'
 require 'spec/lib/matchers'

data/spec/treequel/model_spec.rb

@@ -10,7 +10,8 @@ BEGIN {
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
-require 'spec'
+require 'rspec'
+
 require 'spec/lib/constants'
 require 'spec/lib/helpers'
 require 'spec/lib/matchers'
@@ -28,13 +29,9 @@ describe Treequel::Model do
 	include Treequel::SpecHelpers,
 	        Treequel::Matchers
 
-	SCHEMA_DUMPFILE = Pathname( __FILE__ ).dirname.parent + 'data' + 'schema.yml'
-	SCHEMAHASH      = LDAP::Schema.new( YAML.load_file(SCHEMA_DUMPFILE) )
 
 	before( :all ) do
 		setup_logging( :fatal )
-
-		@schema = Treequel::Schema.new( SCHEMAHASH )
 	end
 
 	after( :all ) do
@@ -42,19 +39,12 @@ describe Treequel::Model do
 	end
 
 	before( :each ) do
-		@top_oc    = @schema.object_classes[:top]
-		@iphost_oc = @schema.object_classes[:ipHost]
-		@device_oc = @schema.object_classes[:device]
-
-		@iphost_oc.stub!( :ancestors ).and_return([ @iphost_oc, @top_oc ])
-		@device_oc.stub!( :ancestors ).and_return([ @device_oc, @top_oc ])
-
 		@simple_entry = {
 			'dn' => TEST_HOST_DN,
 			'objectClass' => ['ipHost', 'device']
 		}
-		@directory = mock( "treequel directory", :schema => @schema )
-		@directory.stub!( :convert_to_object ).and_return {|oid,value| value }
+		@conn = double( "LDAP connection", :set_option => true, :bound? => false )
+		@directory = get_fixtured_directory( @conn )
 	end
 
 	after( :each ) do
@@ -186,7 +176,7 @@ describe Treequel::Model do
 		end
 
 		obj = Treequel::Model.new( @directory, TEST_HOST_DN )
-		@directory.stub!( :get_entry ).with( obj ).and_return( @simple_entry )
+		@directory.stub( :get_entry ).with( obj ).and_return( @simple_entry )
 		obj.exists? # Trigger the lookup
 
 		obj.should be_a( mixin1 )
@@ -201,7 +191,7 @@ describe Treequel::Model do
 			model_objectclasses :ipHost
 		end
 
-		@directory.stub!( :get_entry ).and_return( nil )
+		@directory.stub( :get_entry ).and_return( nil )
 		obj = Treequel::Model.new( @directory, TEST_HOST_DN )
 		obj.exists? # Trigger the lookup
 
@@ -225,39 +215,30 @@ describe Treequel::Model do
 			@entry = {
 				'dn'          => [TEST_PERSON_DN],
 				'cn'          => ['Slappy the Frog'],
-				'objectClass' => %w[
-					ipHost
-				],
+				'objectClass' => ['ipHost'],
 			}
 		end
 
 		before( :each ) do
+			Treequel::Model.objectclass_registry.clear
+			Treequel::Model.base_registry.clear
+
 			@mixin = Module.new do
 				extend Treequel::Model::ObjectClass
 				model_objectclasses :ipHost
 				def fqdn; "some.home.example.com"; end
 			end
-			@directory.stub!( :convert_to_object ).with( Treequel::OIDS::OID_SYNTAX, 'ipHost' ).
-				and_return( 'ipHost' )
-			@directory.stub!( :convert_to_object ).
-				with( Treequel::OIDS::DIRECTORY_STRING_SYNTAX, 'Slappy the Frog' ).
-				and_return( 'Slappy the Frog' )
 			@obj = Treequel::Model.new( @directory, TEST_PERSON_DN )
 		end
 
-		after( :each ) do
-			Treequel::Model.objectclass_registry.clear
-			Treequel::Model.base_registry.clear
-		end
-
 		it "correctly dispatches to methods added via extension that are called before its " +
 		     "entry is loaded" do
-			@directory.stub!( :get_entry ).with( @obj ).and_return( @entry )
+			@directory.should_receive( :get_entry ).with( @obj ).at_least( :once ).and_return( @entry )
 			@obj.fqdn.should == 'some.home.example.com'
 		end
 
 		it "correctly falls through for methods not added by loading the entry" do
-			@directory.stub!( :get_entry ).with( @obj ).and_return( @entry )
+			@directory.should_receive( :get_entry ).with( @obj ).and_return( @entry )
 			@obj.cn.should == ['Slappy the Frog']
 		end
 	end
@@ -388,7 +369,7 @@ describe Treequel::Model do
 		end
 
 		it "falls through to the default proxy method for invalid attributes" do
-			@obj.stub!( :valid_attribute_type ).and_return( nil )
+			@obj.stub( :valid_attribute_type ).and_return( nil )
 			@entry.should_not_receive( :[] )
 
 			expect {
@@ -398,7 +379,7 @@ describe Treequel::Model do
 
 		it "adds the objectClass attribute to the attribute list when executing a search that " +
 		   "contains a select" do
-			@directory.stub!( :convert_to_object ).and_return {|oid,str| str }
+			@directory.stub( :convert_to_object ).and_return {|oid,str| str }
 			@directory.should_receive( :search ).
 				with( @obj, :scope, :filter, :selectattrs => ['cn', 'objectClass'] )
 			@obj.search( :scope, :filter, :selectattrs => ['cn'] )
@@ -406,14 +387,14 @@ describe Treequel::Model do
 
 		it "doesn't add the objectClass attribute to the attribute list when the search " +
 		   "doesn't contain a select" do
-			@directory.stub!( :convert_to_object ).and_return {|oid,str| str }
+			@directory.stub( :convert_to_object ).and_return {|oid,str| str }
 			@directory.should_receive( :search ).
 				with( @obj, :scope, :filter, :selectattrs => [] )
 			@obj.search( :scope, :filter, :selectattrs => [] )
 		end
 
 		it "knows which attribute methods it responds to" do
-			@directory.stub!( :convert_to_object ).and_return {|oid,str| str }
+			@directory.stub( :convert_to_object ).and_return {|oid,str| str }
 			@obj.should respond_to( :cn )
 			@obj.should_not respond_to( :humpsize )
 		end

data/spec/treequel/monkeypatches_spec.rb

@@ -11,7 +11,8 @@ BEGIN {
 
 require 'time'
 
-require 'spec'
+require 'rspec'
+
 require 'spec/lib/constants'
 require 'spec/lib/helpers'
 
@@ -72,10 +73,20 @@ end # module Treequel::LDAPControlExtensions
 
 describe Treequel::TimeExtensions do
 
+	before( :all ) do
+		# Make the local timezone PDT so offsets show up correctly
+		@real_tz = ENV['TZ']
+		ENV['TZ'] = ':PST8PDT'
+	end
+
 	before( :each ) do
 		@time = Time.parse( "Fri Aug 20 08:21:35.1876455 -0700 2010" )
 	end
 
+	after( :all ) do
+		ENV['TZ'] = @real_tz
+	end
+
 	describe "RFC4517 LDAP Generalized Time method" do
 
 		it "returns the time in 'Generalized Time' format" do

data/spec/treequel/schema/attributetype_spec.rb

@@ -10,7 +10,8 @@ BEGIN {
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
-require 'spec'
+require 'rspec'
+
 require 'spec/lib/constants'
 require 'spec/lib/helpers'