ruby-activeldap 0.5.0 → 0.5.1

data/lib/activeldap/base.rb

@@ -612,9 +612,7 @@ module ActiveLDAP
 
       # Make sure all MUST attributes have a value
       @data['objectClass'].each do |objc|
-        must = Base.schema.attr('objectClasses', objc, 'MUST')
-        may = Base.schema.attr('objectClasses', objc, 'MAY')
-        must.each do |req_attr|
+        @must.each do |req_attr|
           deref = @attr_methods[req_attr]
           if @data[deref] == []
             raise AttributeEmpty,
@@ -887,13 +885,17 @@ module ActiveLDAP
         # Build |data| from schema
         # clear attr_method mapping first
         @attr_methods = {}
-        attributes = []
+	@must = []
+	@may = []
         new_oc.each do |objc|
           # get all attributes for the class
-          attributes += Base.schema.class_attributes(objc.to_s)
+          attributes = Base.schema.class_attributes(objc.to_s)
+	  @must += attributes[:must]
+	  @may += attributes[:may]
         end
-        attributes.uniq
-        attributes.each do |attr|
+	@must.uniq!
+	@may.uniq!
+        (@must+@may).each do |attr|
             # Update attr_method with appropriate
             define_attribute_methods(attr)
         end

data/lib/activeldap/schema2.rb

@@ -151,8 +151,12 @@ module LDAP
         return @@class_cache[objc]
       end
 
+      # Setup the cache
+      @@class_cache[objc] = {}
+
       # First get all the current level attributes
-      @@class_cache[objc] = attr('objectClasses', objc, 'MUST') + attr('objectClasses', objc, 'MAY')
+      @@class_cache[objc] = {:must => attr('objectClasses', objc, 'MUST'), 
+        :may => attr('objectClasses', objc, 'MAY')}
 
       # Now add all attributes from the parent object (SUPerclasses)
       # Hopefully an iterative approach will be pretty speedy
@@ -166,15 +170,17 @@ module LDAP
           new_sups += attr('objectClasses', sup, 'SUP')
         end
 	sups += new_sups
-	sups = sups.uniq
+	sups.uniq!
         break if sups.size == start_size
       end
       sups.each do |sup|
-        @@class_cache[objc] += attr('objectClasses', sup, 'MUST') + attr('objectClasses', sup, 'MAY')
+        @@class_cache[objc][:must] += attr('objectClasses', sup, 'MUST')
+	@@class_cache[objc][:may] += attr('objectClasses', sup, 'MAY')
       end
 
       # Clean out the dupes.
-      @@class_cache[objc] = @@class_cache[objc].uniq
+      @@class_cache[objc][:must].uniq!
+      @@class_cache[objc][:may].uniq!
 
       # Return the cached value
       return @@class_cache[objc].dup

data/lib/activeldap.rb

@@ -898,7 +898,7 @@ require 'activeldap/configuration'
 require 'activeldap/schema2'
 
 module ActiveLDAP
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end
 
 ActiveLDAP::Base.class_eval do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: ruby-activeldap
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2004-10-21
+  version: 0.5.1
+date: 2004-10-22
 summary: Ruby/ActiveLDAP is a object-oriented API to LDAP
 require_paths: 
   - lib