ruby-activeldap 0.5.5 → 0.5.7

data/lib/activeldap/associations.rb

@@ -107,8 +107,16 @@ module ActiveLDAP
           end
           results = []
           @data["#{key}"].each do |item|
+            fkey = ""
+            if foreign_key == "dn" and not item.empty?
+              fkey = item.split(',')[0].split('=')[0]
+              item = item.split(',')[0].split('=')[1]
+            end
             # This will even yield entries that don't necessarily exist
-            #{klass}.find_all(:attribute => foreign_key, :value => item, :objects => objects).each do |match|
+            if foreign_key != "dn"
+              fkey = foreign_key
+            end
+            #{klass}.find_all(:attribute =>  fkey, :value => item, :objects => objects).each do |match|
               results << match
             end
           end

data/lib/activeldap/base.rb

@@ -497,9 +497,7 @@ module ActiveLDAP
       end
 
       @data = {} # where the r/w entry data is stored
-      @data.default = []
       @ldap_data = {} # original ldap entry data
-      @ldap_data.default = []
       @attr_methods = {} # list of valid method calls for attributes used for dereferencing
 
       # Break val apart if it is a dn
@@ -624,7 +622,10 @@ module ActiveLDAP
       @data['objectClass'].each do |objc|
         @must.each do |req_attr|
           deref = @attr_methods[req_attr]
-          if @data[deref] == []
+          # Set default if it wasn't yet set.
+          @data[deref] = [] if @data[deref].nil?
+          # Check for missing requirements.
+          if @data[deref].empty?
             raise AttributeEmpty,
               "objectClass '#{objc}' requires attribute '#{Base.schema.attribute_aliases(req_attr).join(', ')}'"
           end
@@ -867,9 +868,7 @@ module ActiveLDAP
         end
 
         @data = {} # where the r/w entry data is stored
-        @data.default = []
         @ldap_data = {} # original ldap entry data
-        @ldap_data.default = []
         @attr_methods = {} # list of valid method calls for attributes used for dereferencing
 
         # Get some attributes
@@ -1165,6 +1164,9 @@ module ActiveLDAP
        
        attr = @attr_methods[method]
 
+       # Set the default value to empty if attr is not set.
+       @data[attr] = [] if @data[attr].nil?
+
        # Return a copy of the stored data
        return array_of(@data[attr].dup, false) if not_array
        return @data[attr]

data/lib/activeldap.rb

@@ -907,7 +907,7 @@ require 'activeldap/configuration'
 require 'activeldap/schema2'
 
 module ActiveLDAP
-  VERSION = "0.5.5"
+  VERSION = "0.5.7"
 end
 
 ActiveLDAP::Base.class_eval do

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.10
 specification_version: 1
 name: ruby-activeldap
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
-date: 2005-02-20
+  version: 0.5.7
+date: 2005-05-24
 summary: Ruby/ActiveLDAP is a object-oriented API to LDAP
 require_paths: 
   - lib