treequel 1.1.0 → 1.1.1

data/lib/treequel.rb

@@ -25,7 +25,7 @@ end
 
 # A library for interacting with LDAP modelled after Sequel.
 #
-# @version 1.1.0
+# @version 1.1.1
 # 
 # @example
 #   # Connect to the directory at the specified URL
@@ -53,10 +53,10 @@ end
 module Treequel
 
 	# Library version
-	VERSION = '1.1.0'
+	VERSION = '1.1.1'
 
 	# VCS revision
-	REVISION = %q$Revision: 2e2b035d3721 $
+	REVISION = %q$Revision: c6d26ab6a7a4 $
 
 	# Common paths for ldap.conf
 	COMMON_LDAP_CONF_PATHS = %w[

data/lib/treequel/branch.rb

@@ -478,7 +478,7 @@ class Treequel::Branch
 
 		oc_oids = self[:objectClass] || []
 		oc_oids |= additional_classes.collect {|str| str.to_sym }
-		oc_oids << :top if oc_oids.empty?
+		oc_oids << 'top' if oc_oids.empty?
 
 		oclasses = []
 		oc_oids.each do |oid|

data/lib/treequel/model.rb

@@ -96,6 +96,7 @@ class Treequel::Model < Treequel::Branch
 	### @param [Array<Symbol>] objectclasses  the objectclasses from the entry
 	### @return [Set<Module>] the Set of mixin modules which apply
 	def self::mixins_for_objectclasses( *objectclasses )
+		return self.objectclass_registry[:top] if objectclasses.empty?
 		ocsymbols = objectclasses.flatten.collect {|oc| oc.untaint.to_sym }
 
 		# Get the union of all of the mixin sets for the objectclasses in question
@@ -317,7 +318,10 @@ class Treequel::Model < Treequel::Branch
 	### Apply mixins that are applicable considering the receiver's DN and the 
 	### objectClasses from its entry.
 	def apply_applicable_mixins( dn, entry )
-		ocs = entry.object_classes.collect do |explicit_oc|
+		schema = self.directory.schema
+
+		ocs = entry['objectClass'].collect do |oc_oid|
+			explicit_oc = schema.object_classes[ oc_oid ]
 			explicit_oc.ancestors.collect {|oc| oc.name }
 		end.flatten.uniq
 
@@ -328,7 +332,8 @@ class Treequel::Model < Treequel::Branch
 		# inferred by its objectclasses and those that apply to its DN
 		mixins = ( oc_mixins & dn_mixins )
 
-		self.log.debug "  %d mixins apply to %s: %p" % [ mixins.length, dn, mixins.to_a ]
+		self.log.debug "Applying %d mixins to %s: %p" %
+			[ mixins.length, dn, mixins.collect(&:inspect) ]
 		mixins.each {|mod| self.extend(mod) }
 	end
 

data/spec/treequel/model_spec.rb

@@ -28,8 +28,13 @@ 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
@@ -37,9 +42,9 @@ describe Treequel::Model do
 	end
 
 	before( :each ) do
-		@top_oc    = mock( "top objectClass", :name => 'top' )
-		@iphost_oc = mock( "ipHost objectClass", :name => 'ipHost' )
-		@device_oc = mock( "device objectClass", :name => 'device' )
+		@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 ])
@@ -48,8 +53,8 @@ describe Treequel::Model do
 			'dn' => TEST_HOST_DN,
 			'objectClass' => ['ipHost', 'device']
 		}
-		@simple_entry.stub!( :object_classes ).and_return([ @iphost_oc, @device_oc ])
-		@directory = mock( "treequel directory", :get_entry => @simple_entry )
+		@directory = mock( "treequel directory", :schema => @schema )
+		@directory.stub!( :convert_to_object ).and_return {|oid,value| value }
 	end
 
 	after( :each ) do
@@ -181,6 +186,7 @@ describe Treequel::Model do
 		end
 
 		obj = Treequel::Model.new( @directory, TEST_HOST_DN )
+		@directory.stub!( :get_entry ).with( obj ).and_return( @simple_entry )
 		obj.exists? # Trigger the lookup
 
 		obj.should be_a( mixin1 )
@@ -223,10 +229,6 @@ describe Treequel::Model do
 					ipHost
 				],
 			}
-			schema_dumpfile = Pathname( __FILE__ ).dirname.parent + 'data' + 'schema.yml'
-			hash = YAML.load_file( schema_dumpfile )
-			schemahash = LDAP::Schema.new( hash )
-			@schema = Treequel::Schema.new( schemahash )
 		end
 
 		before( :each ) do
@@ -235,14 +237,12 @@ describe Treequel::Model do
 				model_objectclasses :ipHost
 				def fqdn; "some.home.example.com"; end
 			end
-			@directory = mock( 'Treequel Directory', :schema => @schema )
 			@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 )
-			@entry.stub!( :object_classes ).and_return([ @schema.object_classes[:ipHost] ])
 		end
 
 		after( :each ) do
@@ -252,12 +252,12 @@ describe Treequel::Model do
 
 		it "correctly dispatches to methods added via extension that are called before its " +
 		     "entry is loaded" do
-			@directory.should_receive( :get_entry ).with( @obj ).and_return( @entry )
+			@directory.stub!( :get_entry ).with( @obj ).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.should_receive( :get_entry ).with( @obj ).and_return( @entry )
+			@directory.stub!( :get_entry ).with( @obj ).and_return( @entry )
 			@obj.cn.should == ['Slappy the Frog']
 		end
 	end
@@ -286,16 +286,9 @@ describe Treequel::Model do
 					apple-user
 				],
 			}
-
-			schema_dumpfile = Pathname( __FILE__ ).dirname.parent + 'data' + 'schema.yml'
-			hash = YAML.load_file( schema_dumpfile )
-			schemahash = LDAP::Schema.new( hash )
-			@schema = Treequel::Schema.new( schemahash )
 		end
 
 		before( :each ) do
-			@directory = mock( 'Treequel Directory', :schema => @schema )
-			@entry.stub!( :object_classes ).and_return([ @schema.object_classes[:ipHost] ])
 			@obj = Treequel::Model.new_from_entry( @entry, @directory )
 		end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: treequel
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Michael Granger, Mahlon E. Smith
@@ -35,7 +35,7 @@ cert_chain:
   cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
   -----END CERTIFICATE-----
 
-date: 2010-09-20 00:00:00 -07:00
+date: 2010-09-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency